Merge branch 'main' into INFOPLAT-2963-beholder-rotating-auth-headers-loop-wire-up

Author: ilija42

.github/workflows/golangci_lint.yml

@@ -1,14 +1,35 @@
-name: Golangci-lint
+name: golangci-lint
 
-on: [pull_request]
+on: [pull_request, merge_group]
 
 jobs:
-  golangci-lint:
+  detect-modules:
+    runs-on: ubuntu-latest
+    outputs:
+      modules: ${{ steps.set-modules.outputs.modules }}
+    steps:
+      - uses: actions/checkout@v5
+      - id: set-modules
+        run: |
+          # Find all go.mod files and extract their directories
+          modules=$(find . -name "go.mod" -not -path "./vendor/*" -exec dirname {} \; | jq -R -s -c 'split("\n") | map(select(. != ""))')
+          echo "modules=${modules}" >> $GITHUB_OUTPUT
+          echo "Found modules: ${modules}"
+
+  lint-module:
+    # Avoid running in merge queue since we run in PR's and have an optional
+    # label to skip lint issues on a PR which would be ignored in the merge queue.
+    if: ${{ github.event_name != 'merge_group' }}
+    needs: detect-modules
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        module: ${{ fromJSON(needs.detect-modules.outputs.modules) }}
     permissions:
       id-token: write
       contents: read
       actions: read
+      pull-requests: read
     steps:
       - name: Checkout code
         uses: actions/checkout@v5
@@ -21,10 +42,20 @@ jobs:
           version=$(grep '^golangci-lint ' .tool-versions | awk '{print $2}')
           echo "version=${version}" | tee -a "$GITHUB_OUTPUT"
 
-      - name: golangci-lint
+      - name: golangci-lint ${{ matrix.module }}
         if: ${{ always() && !contains(join(github.event.pull_request.labels.*.name, ' '), 'allow-lint-issues') }}
         # NOTE: Keep this version in sync with ACTION_CI_LINT_GO_GIT_TAG in ./script/lint.sh
         uses: smartcontractkit/.github/actions/ci-lint-go@ci-lint-go/3.0.0
         with:
           checkout-repo: false
           golangci-lint-version: v${{ steps.get-version.outputs.version }}
+          go-directory: ${{ matrix.module }}
+
+  golangci-lint:
+    # Required sink job that waits for all lint jobs to complete
+    if: ${{ github.event_name != 'merge_group' }}
+    needs: [detect-modules, lint-module]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Lint complete
+        run: echo "All lint jobs completed"

.github/workflows/keystore.yml

@@ -2,17 +2,34 @@ name: Keystore Checks
 permissions:
   contents: read
 
-on:
-  push:
-    paths:
-      - "keystore/**"
+on: [push, merge_group]
 
 jobs:
+  changes:
+    name: detect changes
+    runs-on: ubuntu-latest
+    outputs:
+      keystore-src: ${{ steps.keystore-changes.outputs.src }}
+    steps:
+      - name: Checkout the repo
+        uses: actions/checkout@v4
+        with:
+          persist-credentials: false
+      - uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
+        id: keystore-changes
+        with:
+          filters: |
+            src:
+            - 'keystore/**'
+
   run-tests:
+    name: run tests
+    runs-on: ubuntu-latest
+    needs: changes
+    if: needs.changes.outputs.keystore-src == 'true'
     defaults:
       run:
         working-directory: keystore
-    runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -30,7 +47,13 @@ jobs:
         run: go test ./... -coverpkg=./... -coverprofile=coverage.txt
 
   build-race-tests:
+    name: race tests
     runs-on: ubuntu-latest
+    needs: changes
+    if: needs.changes.outputs.keystore-src == 'true'
+    defaults:
+      run:
+        working-directory: keystore
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -61,4 +84,17 @@ jobs:
         with:
           name: go-race-results
           path: |
-            ./race.*
+            ./race.*
+
+  gate:
+    name: summary gate
+    runs-on: ubuntu-latest
+    needs: [changes, run-tests, build-race-tests]
+    if: always()
+    steps:
+      - name: Fail if any job ran and failed
+        if: needs.changes.outputs.keystore-src == 'true' &&
+          (needs.run-tests.result != 'success' || 
+           needs.build-race-tests.result != 'success')
+        run: exit 1
+

.github/workflows/pkg.yml

@@ -1,6 +1,6 @@
 name: PKG Build and Test
 
-on: [push]
+on: [push, merge_group]
 
 jobs:
   build-test:

go.md

@@ -15,6 +15,8 @@ flowchart LR
 	chainlink-common --> grpc-proxy
 	chainlink-common --> libocr
 	click chainlink-common href "https://github.com/smartcontractkit/chainlink-common"
+	chainlink-common/keystore --> chainlink-common
+	click chainlink-common/keystore href "https://github.com/smartcontractkit/chainlink-common"
 	chainlink-common/pkg/chipingress
 	click chainlink-common/pkg/chipingress href "https://github.com/smartcontractkit/chainlink-common"
 	chainlink-common/pkg/monitoring --> chainlink-common
@@ -40,6 +42,7 @@ flowchart LR
 
 	subgraph chainlink-common-repo[chainlink-common]
 		 chainlink-common
+		 chainlink-common/keystore
 		 chainlink-common/pkg/chipingress
 		 chainlink-common/pkg/monitoring
 		 chainlink-common/pkg/values

go.mod

@@ -20,7 +20,7 @@ require (
 	github.com/google/uuid v1.6.0
 	github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.0.1
 	github.com/hashicorp/go-hclog v1.6.3
-	github.com/hashicorp/go-plugin v1.6.3
+	github.com/hashicorp/go-plugin v1.7.0
 	github.com/iancoleman/strcase v0.3.0
 	github.com/invopop/jsonschema v0.13.0
 	github.com/jackc/pgx/v4 v4.18.3
@@ -37,9 +37,9 @@ require (
 	github.com/scylladb/go-reflectx v1.0.1
 	github.com/shopspring/decimal v1.4.0
 	github.com/smartcontractkit/chain-selectors v1.0.67
-	github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.9-0.20251020164035-ab562b473fe2
-	github.com/smartcontractkit/chainlink-protos/billing/go v0.0.0-20251020004840-4638e4262066
-	github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20251008161434-22d9bd439bba
+	github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.10
+	github.com/smartcontractkit/chainlink-protos/billing/go v0.0.0-20251024234028-0988426d98f4
+	github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20251021010742-3f8d3dba17d8
 	github.com/smartcontractkit/chainlink-protos/linking-service/go v0.0.0-20251002192024-d2ad9222409b
 	github.com/smartcontractkit/chainlink-protos/storage-service v0.3.0
 	github.com/smartcontractkit/chainlink-protos/workflows/go v0.0.0-20251020004840-4638e4262066
@@ -65,11 +65,11 @@ require (
 	go.opentelemetry.io/otel/sdk/metric v1.38.0
 	go.opentelemetry.io/otel/trace v1.38.0
 	go.uber.org/zap v1.27.0
-	golang.org/x/crypto v0.41.0
+	golang.org/x/crypto v0.45.0
 	golang.org/x/exp v0.0.0-20250711185948-6ae5c78190dc
-	golang.org/x/sync v0.16.0
+	golang.org/x/sync v0.18.0
 	golang.org/x/time v0.12.0
-	golang.org/x/tools v0.35.0
+	golang.org/x/tools v0.38.0
 	gonum.org/v1/gonum v0.16.0
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20250825161204-c5933d9347a5
 	google.golang.org/grpc v1.75.0
@@ -83,7 +83,6 @@ require (
 	github.com/aybabtme/rgbterm v0.0.0-20170906152045-cc83f3b3ce59 // indirect
 	github.com/bahlo/generic-list-go v0.2.0 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/bufbuild/protocompile v0.14.1 // indirect
 	github.com/buger/goterm v1.0.4 // indirect
 	github.com/buger/jsonparser v1.1.1 // indirect
 	github.com/cenkalti/backoff/v5 v5.0.2 // indirect
@@ -112,7 +111,6 @@ require (
 	github.com/jackc/pgproto3/v2 v2.3.3 // indirect
 	github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
 	github.com/jackc/pgtype v1.14.4 // indirect
-	github.com/jhump/protoreflect v1.15.3 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/klauspost/compress v1.18.0 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.10 // indirect
@@ -147,11 +145,12 @@ require (
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.36.0 // indirect
 	go.opentelemetry.io/proto/otlp v1.6.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	golang.org/x/mod v0.26.0 // indirect
-	golang.org/x/net v0.43.0 // indirect
-	golang.org/x/sys v0.35.0 // indirect
-	golang.org/x/term v0.34.0 // indirect
-	golang.org/x/text v0.28.0 // indirect
+	golang.org/x/mod v0.29.0 // indirect
+	golang.org/x/net v0.47.0 // indirect
+	golang.org/x/sys v0.38.0 // indirect
+	golang.org/x/telemetry v0.0.0-20251008203120-078029d740a8 // indirect
+	golang.org/x/term v0.37.0 // indirect
+	golang.org/x/text v0.31.0 // indirect
 	golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20250707201910-8d1bb00bc6a7 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect