Merge branch 'main' into fix-es-log-levels-1

.codecov.yml

@@ -1,7 +1,7 @@
 codecov:
   notify:
     require_ci_to_pass: yes
-  strict_yaml_branch: master  # only use the latest copy on master branch
+  strict_yaml_branch: main  # only use the latest copy on the main branch
 
 coverage:
   precision: 2

.github/workflows/ci-all-in-one-build.yml

@@ -2,27 +2,28 @@ name: Build all-in-one
 
 on:
   push:
-    branches: [ master ]
+    branches: [main]
+
   pull_request:
-    branches: [ master ]
+    branches: [main]
 
 jobs:
   all-in-one:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2.4.0
+    - uses: actions/checkout@v3
       with:
         submodules: true
 
     - name: Fetch git tags
       run: |
         git fetch --prune --unshallow --tags
 
-    - uses: actions/setup-go@v2
+    - uses: actions/setup-go@v3
       with:
-        go-version: ^1.17
+        go-version: 1.18.x
 
-    - uses: actions/setup-node@v2.4.1
+    - uses: actions/setup-node@v3
       with:
         node-version: '10'
 

.github/workflows/ci-build-binaries.yml

@@ -2,9 +2,10 @@ name: Build binaries
 
 on:
   push:
-    branches: [ master ]
+    branches: [main]
+
   pull_request:
-    branches: [ master ]
+    branches: [main]
 
 jobs:
   build-binaries:
@@ -18,6 +19,8 @@ jobs:
           task: build-binaries-windows
         - name: osx
           task: build-binaries-darwin
+        - name: osx-m1
+          task: build-binaries-darwin-arm64
         - name: system/390
           task: build-binaries-s390x
         - name: arm
@@ -26,17 +29,17 @@ jobs:
           task: build-binaries-ppc64le
     name: build binaries for ${{ matrix.platform.name }}
     steps:
-    - uses: actions/checkout@v2.4.0
+    - uses: actions/checkout@v3
       with:
         submodules: true
 
     - name: Fetch git tags
       run: |
         git fetch --prune --unshallow --tags
 
-    - uses: actions/setup-go@v2
+    - uses: actions/setup-go@v3
       with:
-        go-version: ^1.17
+        go-version: 1.18.x
 
     - name: Export BRANCH variable
       uses: ./.github/actions/setup-branch

.github/workflows/ci-cassandra.yml

@@ -2,9 +2,10 @@ name: CIT Cassandra
 
 on:
   push:
-    branches: [ master ]
+    branches: [main]
+
   pull_request:
-    branches: [ master ]
+    branches: [main]
 
 jobs:
   cassandra:
@@ -22,11 +23,11 @@ jobs:
           schema: v004
     name: ${{ matrix.version.distribution }} ${{ matrix.version.major }}
     steps:
-    - uses: actions/checkout@v2.4.0
+    - uses: actions/checkout@v3
 
-    - uses: actions/setup-go@v2
+    - uses: actions/setup-go@v3
       with:
-        go-version: ^1.17
+        go-version: 1.18.x
 
     - name: Run cassandra integration tests
       run: bash scripts/cassandra-integration-test.sh ${{ matrix.version.image }} ${{ matrix.version.schema }}

.github/workflows/ci-crossdock.yml

@@ -2,9 +2,10 @@ name: CIT Crossdock
 
 on:
   push:
-    branches: [ master ]
+    branches: [main]
+
   pull_request:
-    branches: [ master ]
+    branches: [main]
 
 jobs:
   crossdock:
@@ -16,17 +17,17 @@ jobs:
           cmd: bash scripts/build-crossdock.sh
     name: ${{ matrix.steps.name }}
     steps:
-    - uses: actions/checkout@v2.4.0
+    - uses: actions/checkout@v3
       with:
         submodules: true
 
     - name: Fetch git tags
       run: |
         git fetch --prune --unshallow --tags
 
-    - uses: actions/setup-go@v2
+    - uses: actions/setup-go@v3
       with:
-        go-version: ^1.17
+        go-version: 1.18.x
 
     - name: Export BRANCH variable
       uses: ./.github/actions/setup-branch

.github/workflows/ci-docker-build.yml

@@ -2,28 +2,29 @@ name: Build docker images
 
 on:
   push:
-    branches: [ master ]
+    branches: [main]
+
   pull_request:
-    branches: [ master ]
+    branches: [main]
 
 jobs:
   docker-images:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2.4.0
+    - uses: actions/checkout@v3
       with:
         submodules: true
 
     - name: Fetch git tags
       run: |
         git fetch --prune --unshallow --tags
 
-    - uses: actions/setup-go@v2
+    - uses: actions/setup-go@v3
       with:
-        go-version: ^1.17
+        go-version: 1.18.x
 
-    - uses: actions/setup-node@v2.4.1
+    - uses: actions/setup-node@v3
       with:
         node-version: '10'
 

.github/workflows/ci-elasticsearch.yml

@@ -2,9 +2,10 @@ name: CIT Elasticsearch
 
 on:
   push:
-    branches: [ master ]
+    branches: [main]
+
   pull_request:
-    branches: [ master ]
+    branches: [main]
 
 jobs:
   elasticsearch:
@@ -21,22 +22,19 @@ jobs:
         - major: 7.x
           image: 7.14.0
           distribution: elasticsearch
-        - major: 1.x
-          image: 1.0.0
-          distribution: opensearch
     name: ${{ matrix.version.distribution }} ${{ matrix.version.major }}
     steps:
-    - uses: actions/checkout@v2.4.0
+    - uses: actions/checkout@v3
       with:
         submodules: true
 
     - name: Fetch git tags
       run: |
         git fetch --prune --unshallow --tags
 
-    - uses: actions/setup-go@v2
+    - uses: actions/setup-go@v3
       with:
-        go-version: ^1.17
+        go-version: 1.18.x
 
     - name: Install tools
       run: make install-ci

.github/workflows/ci-grpc-badger.yml

@@ -2,19 +2,20 @@ name: CIT gRPC And Badger
 
 on:
   push:
-    branches: [ master ]
+    branches: [main]
+
   pull_request:
-    branches: [ master ]
+    branches: [main]
 
 jobs:
   grpc-and-badger:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2.4.0
+    - uses: actions/checkout@v3
 
-    - uses: actions/setup-go@v2
+    - uses: actions/setup-go@v3
       with:
-        go-version: ^1.17
+        go-version: 1.18.x
 
     - name: Run Badger storage integration tests
       run: make badger-storage-integration-test

.github/workflows/ci-hotrod.yml

@@ -2,25 +2,26 @@ name: CIT Hotrod
 
 on:
   push:
-    branches: [ master ]
+    branches: [main]
+
   pull_request:
-    branches: [ master ]
+    branches: [main]
 
 jobs:
   hotrod:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2.4.0
+    - uses: actions/checkout@v3
       with:
         submodules: true
 
     - name: Fetch git tags
       run: |
         git fetch --prune --unshallow --tags
 
-    - uses: actions/setup-go@v2
+    - uses: actions/setup-go@v3
       with:
-        go-version: ^1.17
+        go-version: 1.18.x
 
     - name: Export BRANCH variable
       uses: ./.github/actions/setup-branch

.github/workflows/ci-kafka.yml

@@ -2,19 +2,20 @@ name: CIT Kafka
 
 on:
   push:
-    branches: [ master ]
+    branches: [main]
+
   pull_request:
-    branches: [ master ]
+    branches: [main]
 
 jobs:
   kafka:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2.4.0
+    - uses: actions/checkout@v3
 
-    - uses: actions/setup-go@v2
+    - uses: actions/setup-go@v3
       with:
-        go-version: ^1.17
+        go-version: 1.18.x
 
     - name: Run kafka integration tests
       run: bash scripts/kafka-integration-test.sh

.github/workflows/ci-opensearch.yml

@@ -0,0 +1,39 @@
+name: CIT OpenSearch
+
+on:
+  push:
+    branches: [main]
+
+  pull_request:
+    branches: [main]
+
+jobs:
+  opensearch:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        version:
+        - major: 1.x
+          image: 1.0.0
+          distribution: opensearch
+    name: ${{ matrix.version.distribution }} ${{ matrix.version.major }}
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        submodules: true
+
+    - name: Fetch git tags
+      run: |
+        git fetch --prune --unshallow --tags
+
+    - uses: actions/setup-go@v3
+      with:
+        go-version: 1.18.x
+
+    - name: Install tools
+      run: make install-ci
+
+    - uses: docker/setup-qemu-action@v1
+
+    - name: Run opensearch integration tests
+      run: bash scripts/es-integration-test.sh ${{ matrix.version.distribution }} ${{ matrix.version.image }}

.github/workflows/ci-protogen-tests.yml

@@ -2,21 +2,22 @@ name: Protogen Validation
 
 on:
   push:
-    branches: [ master ]
+    branches: [main]
+
   pull_request:
-    branches: [ master ]
+    branches: [main]
 
 jobs:
   protogen:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2.4.0
+    - uses: actions/checkout@v3
       with:
         submodules: true
 
-    - uses: actions/setup-go@v2
+    - uses: actions/setup-go@v3
       with:
-        go-version: ^1.17
+        go-version: 1.18.x
 
     - name: Run protogen validation
       run: make proto && git diff --name-status --exit-code

.github/workflows/ci-release.yml

@@ -10,19 +10,19 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2.4.0
+    - uses: actions/checkout@v3
       with:
         submodules: true
 
     - name: Fetch git tags
       run: |
         git fetch --prune --unshallow --tags
 
-    - uses: actions/setup-go@v2
+    - uses: actions/setup-go@v3
       with:
-        go-version: ^1.17
+        go-version: 1.18.x
 
-    - uses: actions/setup-node@v2.4.1
+    - uses: actions/setup-node@v3
       with:
         node-version: '10'