Merge branch 'main' into ph/mbt

cosmos · Oct 19, 2023 · 234a89e · 234a89e
2 parents b856081 + 3989e17
commit 234a89e
Show file tree

Hide file tree

Showing 205 changed files with 21,972 additions and 13,094 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE/production.md b/.github/PULL_REQUEST_TEMPLATE/production.md
@@ -30,6 +30,7 @@ I have...
 * [ ] Updated the relevant documentation or specification
 * [ ] Reviewed "Files changed" and left comments if necessary <!-- relevant if the changes are not obvious  -->
 * [ ] Confirmed all CI checks have passed
+* [ ] If this PR is library API breaking, bump the go.mod version string of the repo, and follow through on a new major release for both the consumer and provider
 
 ### Reviewers Checklist
 

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -28,6 +28,26 @@ updates:
     labels:
       - dependencies
 
+  - package-ecosystem: gomod
+    directory: "/"
+    schedule:
+      interval: daily
+    target-branch: "release/v2.0.x-lsm"
+    # Only allow automated security-related dependency updates on release branches.
+    open-pull-requests-limit: 0
+    labels:
+      - dependencies
+
+  - package-ecosystem: gomod
+    directory: "/"
+    schedule:
+      interval: daily
+    target-branch: "release/v2.1.x-provider-lsm"
+    # Only allow automated security-related dependency updates on release branches.
+    open-pull-requests-limit: 0
+    labels:
+      - dependencies
+
   - package-ecosystem: gomod
     directory: "/"
     schedule:
@@ -47,3 +67,13 @@ updates:
     open-pull-requests-limit: 0
     labels:
       - dependencies
+
+  - package-ecosystem: gomod
+    directory: "/"
+    schedule:
+      interval: daily
+    target-branch: "release/v3.2.x-consumer"
+    # Only allow automated security-related dependency updates on release branches.
+    open-pull-requests-limit: 0
+    labels:
+      - dependencies
diff --git a/.github/workflows/automated-tests.yml b/.github/workflows/automated-tests.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           lfs: true
       - name: Checkout LFS objects
@@ -31,7 +31,7 @@ jobs:
   E2E_Tests:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           lfs: true
       - name: Checkout LFS objects
@@ -45,7 +45,7 @@ jobs:
   Cometmock_Tests:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           lfs: true
       - name: Checkout LFS objects
@@ -56,3 +56,17 @@ jobs:
           go-version: "1.20"
       - name: E2E tests
         run: make test-e2e-short-cometmock
+  Trace-Tests:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          lfs: true
+      - name: Checkout LFS objects
+        run: git lfs checkout
+      - name: Setup Go
+        uses: actions/setup-go@v4
+        with:
+          go-version: "1.20"
+      - name: E2E tests
+        run: make test-trace
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -12,7 +12,7 @@ jobs:
     name: SonarCloud
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
           lfs: true

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -41,7 +41,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL

diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml
@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout 🛎️
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           persist-credentials: false
           fetch-depth: 0

diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
@@ -20,12 +20,12 @@ jobs:
       - uses: actions/setup-go@v4
         with:
           go-version: '1.20'
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3
         with:
           # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
-          version: v1.53.3
+          version: v1.54.1
 
           # Optional: working directory, useful for monorepos
           # working-directory: somedir

diff --git a/.github/workflows/gosec.yml b/.github/workflows/gosec.yml
@@ -15,7 +15,7 @@ jobs:
       GO111MODULE: on
     steps:
       - name: Checkout Source
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Run Gosec Security Scanner
         uses: securego/gosec@master
         with:

diff --git a/.github/workflows/linkchecker.yml b/.github/workflows/linkchecker.yml
@@ -5,7 +5,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       # Check out the latest version of the code
-      - uses: actions/checkout@v3.5.2
+      - uses: actions/checkout@v4
 
       # Checks the status of hyperlinks in *.md files in docs/
       - uses: gaurav-nelson/[email protected]

diff --git a/.github/workflows/manual-e2e.yml b/.github/workflows/manual-e2e.yml
@@ -12,7 +12,7 @@ jobs:
       - uses: actions/setup-go@v4
         with:
           go-version: "1.20"
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Checkout LFS objects
         run: git lfs checkout
       - name: Setup Go
@@ -28,7 +28,7 @@ jobs:
       - uses: actions/setup-go@v4
         with:
           go-version: "1.20"
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Checkout LFS objects
         run: git lfs checkout
       - name: Setup Go
@@ -44,7 +44,7 @@ jobs:
         - uses: actions/setup-go@v4
           with:
             go-version: "1.20"
-        - uses: actions/checkout@v3
+        - uses: actions/checkout@v4
         - name: Checkout LFS objects
           run: git lfs checkout
         - name: Setup Go
@@ -60,7 +60,7 @@ jobs:
         - uses: actions/setup-go@v4
           with:
             go-version: "1.20"
-        - uses: actions/checkout@v3
+        - uses: actions/checkout@v4
         - name: Checkout LFS objects
           run: git lfs checkout
         - name: Setup Go
@@ -76,7 +76,7 @@ jobs:
         - uses: actions/setup-go@v4
           with:
             go-version: "1.20"
-        - uses: actions/checkout@v3
+        - uses: actions/checkout@v4
         - name: Checkout LFS objects
           run: git lfs checkout
         - name: Setup Go
@@ -87,12 +87,12 @@ jobs:
           run: go run ./tests/e2e/... --tc slash-throttle
   multiconsumer-test:
       runs-on: ubuntu-latest
-      timeout-minutes: 20
+      timeout-minutes: 40
       steps:
         - uses: actions/setup-go@v4
           with:
             go-version: "1.20"
-        - uses: actions/checkout@v3
+        - uses: actions/checkout@v4
         - name: Checkout LFS objects
           run: git lfs checkout
         - name: Setup Go

diff --git a/.github/workflows/nightly-e2e.yml b/.github/workflows/nightly-e2e.yml
@@ -25,7 +25,7 @@ jobs:
       - uses: actions/setup-go@v4
         with:
           go-version: "1.20"
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Checkout LFS objects
         run: git lfs checkout
       - name: Setup Go
@@ -41,7 +41,7 @@ jobs:
       - uses: actions/setup-go@v4
         with:
           go-version: "1.20"
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Checkout LFS objects
         run: git lfs checkout
       - name: Setup Go
@@ -57,7 +57,7 @@ jobs:
       - uses: actions/setup-go@v4
         with:
           go-version: "1.20"
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Checkout LFS objects
         run: git lfs checkout
       - name: Setup Go
@@ -73,7 +73,7 @@ jobs:
       - uses: actions/setup-go@v4
         with:
           go-version: "1.20"
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Checkout LFS objects
         run: git lfs checkout
       - name: Setup Go
@@ -89,7 +89,7 @@ jobs:
       - uses: actions/setup-go@v4
         with:
           go-version: "1.20"
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Checkout LFS objects
         run: git lfs checkout
       - name: Setup Go
@@ -100,12 +100,12 @@ jobs:
         run: go run ./tests/e2e/... --tc slash-throttle
   multiconsumer-test:
     runs-on: ubuntu-latest
-    timeout-minutes: 20
+    timeout-minutes: 40
     steps:
       - uses: actions/setup-go@v4
         with:
           go-version: "1.20"
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Checkout LFS objects
         run: git lfs checkout
       - name: Setup Go

diff --git a/.github/workflows/proto-registry.yml b/.github/workflows/proto-registry.yml
@@ -12,8 +12,8 @@ jobs:
   push:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: bufbuild/buf-setup-action@v1.26.0
+      - uses: actions/checkout@v4
+      - uses: bufbuild/buf-setup-action@v1.27.0
       - uses: bufbuild/buf-push-action@v1
         with:
           input: "proto"

diff --git a/.github/workflows/proto.yml b/.github/workflows/proto.yml
@@ -13,8 +13,8 @@ jobs:
   break-check:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: bufbuild/buf-setup-action@v1.26.0
+      - uses: actions/checkout@v4
+      - uses: bufbuild/buf-setup-action@v1.27.0
       - uses: bufbuild/buf-breaking-action@v1
         with:
           input: "proto"

diff --git a/.gitignore b/.gitignore
@@ -5,5 +5,6 @@ release/
 docs/tla/states/
 *.out
 vendor/
+build/
 .vscode
 .idea
diff --git a/.mergify.yml b/.mergify.yml
@@ -18,6 +18,22 @@ pull_request_rules:
       backport:
         branches:
           - release/v2.0.x
+  - name: Backport patches to the release/v2.0.x-lsm branch
+    conditions:
+      - base=main
+      - label=A:backport/v2.0.x-lsm
+    actions:
+      backport:
+        branches:
+          - release/v2.0.x-lsm
+  - name: Backport patches to the release/v2.1.x-provider-lsm branch
+    conditions:
+      - base=main
+      - label=A:backport/v2.1.x-provider-lsm
+    actions:
+      backport:
+        branches:
+          - release/v2.1.x-provider-lsm
   - name: Backport patches to the release/v3.0.x branch
     conditions:
       - base=main
@@ -34,3 +50,11 @@ pull_request_rules:
       backport:
         branches:
           - release/v3.1.x
+  - name: Backport patches to the release/v3.2.x-consumer branch
+    conditions:
+      - base=main
+      - label=A:backport/v3.2.x-consumer
+    actions:
+      backport:
+        branches:
+          - release/v3.2.x-consumer