Skip to content

Commit 9d9cc72

Browse files
JamesDemeryNavaJamesDemeryNava
committed
Merge branch 'master' into jamesdemery/bb2-4997-add-can-metrics-to-qs
2 parents 585a9c6 + ad359b7 commit 9d9cc72

160 files changed

Lines changed: 2785 additions & 1168 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/_deploy-tofuservice-layer.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
service:${{ matrix.context.service }}
6868
steps:
6969
- name: Checkout
70-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
70+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
7171
with:
7272
fetch-depth: 0
7373
ref: ${{ inputs.git-ref || github.ref }}
@@ -81,7 +81,7 @@ jobs:
8181
echo "role-arn=$role_arn" >> "$GITHUB_OUTPUT"
8282
8383
- name: Configure AWS credentials
84-
uses: aws-actions/configure-aws-credentials@517a711dbcd0e402f90c77e7e2f81e849156e31d # v6
84+
uses: aws-actions/configure-aws-credentials@e6de054238d6b7531b4efff3b6587d9aade6a06c # v6
8585
with:
8686
role-to-assume: ${{ steps.get-role-arn.outputs.role-arn }}
8787
role-session-name: deploy-${{ matrix.context.layer }}-${{ matrix.context.service }}-${{ github.run_id }}-${{ github.run_attempt }}

‎.github/workflows/_deploy-tofuservices.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ jobs:
9696
echo "account-type=$account_type" >> "$GITHUB_OUTPUT"
9797
9898
- name: Checkout
99-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
99+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
100100
with:
101101
fetch-depth: 0
102102
ref: ${{ inputs.git-ref || github.ref_name }}

‎.github/workflows/build-container-images.yml‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ jobs:
131131
echo "Validating inputs to ensure they conform to expected formats..."
132132
echo "${{ inputs.versionTag }}" | grep -P '^\d+\.\d+\.\d+$|^\d+\.\d+\.\d+-[a-zA-Z0-9-]+|v3\.\d{4}.\d{2}.\d{2}.\d+.*$'
133133
134-
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
134+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
135135
with:
136136
fetch-depth: 0
137137
ref: ${{ inputs.branch || github.ref_name }}
@@ -190,7 +190,7 @@ jobs:
190190
steps:
191191
- name: Configure AWS credentials
192192
if: ${{ !inputs.skipBasePull }}
193-
uses: aws-actions/configure-aws-credentials@517a711dbcd0e402f90c77e7e2f81e849156e31d # v6
193+
uses: aws-actions/configure-aws-credentials@e6de054238d6b7531b4efff3b6587d9aade6a06c # v6
194194
with:
195195
role-to-assume: ${{ secrets.NON_PROD_ACCOUNT_GHA_ROLE_ARN }}
196196
role-session-name: build-container-images-${{ github.run_id }}-${{ github.run_attempt }}
@@ -244,7 +244,7 @@ jobs:
244244
BASE_IMAGES_VERSION: ${{ needs.compute-matrix-and-version.outputs.base-images-version }}
245245
steps:
246246
- name: Checkout
247-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
247+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
248248
with:
249249
fetch-depth: 0
250250
ref: ${{ inputs.branch || github.ref_name }}
@@ -277,6 +277,8 @@ jobs:
277277
- name: Generate build-contexts
278278
if: ${{ !inputs.skipBasePull }}
279279
id: gen-build-contexts
280+
env:
281+
NAMED_CONTEXTS: ${{ toJSON(matrix.image.namedContexts) || '{}' }}
280282
run: |
281283
build_contexts=()
282284
@@ -287,6 +289,15 @@ jobs:
287289
build_contexts+=("${image}:latest=docker-image://localhost:5000/${image}:${BASE_IMAGES_VERSION}")
288290
done
289291
292+
readarray -t named_contexts < <(echo "$NAMED_CONTEXTS" | jq -rc '. // {} | to_entries[]')
293+
for named_context in "${named_contexts[@]}"
294+
do
295+
context_name="$(jq -rc '.key' <<<"$named_context")"
296+
context_path="$(jq -rc '.value' <<<"$named_context")"
297+
298+
build_contexts+=("${context_name}=${context_path}")
299+
done
300+
290301
build_contexts_json="$(jq -c -n '$ARGS.positional' --args "${build_contexts[@]}")"
291302
292303
echo "build-contexts=$build_contexts_json" >> "$GITHUB_OUTPUT"
@@ -349,7 +360,7 @@ jobs:
349360
merge-multiple: true
350361

351362
- name: Configure AWS credentials
352-
uses: aws-actions/configure-aws-credentials@517a711dbcd0e402f90c77e7e2f81e849156e31d # v6
363+
uses: aws-actions/configure-aws-credentials@e6de054238d6b7531b4efff3b6587d9aade6a06c # v6
353364
with:
354365
role-to-assume: ${{ steps.get-role-arn.outputs.role-arn }}
355366
role-session-name: build-container-images-${{ github.run_id }}-${{ github.run_attempt }}

‎.github/workflows/build-release.yml‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ jobs:
119119
bfd_dev_version: ${{ steps.bfd-version-strings.outputs.BFD_DEV_VERSION }}
120120
steps:
121121
- name: Checkout
122-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
122+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
123123
with:
124124
fetch-depth: 0
125125
ref: ${{ inputs.releaseBranch || github.ref_name }}
@@ -182,7 +182,7 @@ jobs:
182182
private-key: ${{ secrets.BFD_RELEASE_APP_KEY }}
183183

184184
- name: Checkout
185-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
185+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
186186
with:
187187
fetch-depth: 0
188188
ref: ${{ inputs.releaseBranch || github.ref_name }}
@@ -210,7 +210,7 @@ jobs:
210210
sudo chmod +x /usr/bin/gitleaks
211211
212212
- name: Setup JDK
213-
uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95 # v5
213+
uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5
214214
with:
215215
java-version: "25"
216216
distribution: corretto
@@ -304,7 +304,7 @@ jobs:
304304
working-directory: apps/bfd-model-idr
305305

306306
- name: Install uv
307-
uses: astral-sh/setup-uv@37802adc94f370d6bfd71619e3f0bf239e1f3b78 # v7
307+
uses: astral-sh/setup-uv@c771a70e6277c0a99b617c7a806ffedaca235ff9 # v9.0.0
308308
with:
309309
version: "0.11.2"
310310

@@ -392,7 +392,7 @@ jobs:
392392
path: ${{ runner.temp }}
393393

394394
- name: Configure AWS credentials
395-
uses: aws-actions/configure-aws-credentials@517a711dbcd0e402f90c77e7e2f81e849156e31d # v6
395+
uses: aws-actions/configure-aws-credentials@e6de054238d6b7531b4efff3b6587d9aade6a06c # v6
396396
with:
397397
role-to-assume: ${{ steps.get-role-arn.outputs.role-arn }}
398398
role-session-name: build-release-${{ github.run_id }}-${{ github.run_attempt }}
@@ -452,7 +452,8 @@ jobs:
452452
bfd-platform-pipeline-ccw-runner,
453453
bfd-platform-consume-idr-events,
454454
bfd-platform-run-idr-pipeline,
455-
bfd-platform-codebuild-runner
455+
bfd-platform-codebuild-runner,
456+
bfd-platform-idr-bfd-validator
456457
baseImagesVersion: ${{ needs.compute-version-strings.outputs.bfd_release }}
457458
cleanupImageArtifacts: false # We'll cleanup at the end of build-release, so don't do anything
458459
tagLatest: ${{ !contains(needs.compute-version-strings.outputs.bfd_release, '-') }}

‎.github/workflows/build_container_images_matrix.json‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,5 +82,14 @@
8282
"dockerfile": "ops/images/bfd-platform-codebuild-runner/Dockerfile",
8383
"contextDir": "ops/images/bfd-platform-codebuild-runner",
8484
"platform": "linux/arm64"
85+
},
86+
{
87+
"name": "bfd-platform-idr-bfd-validator",
88+
"dockerfile": "apps/utils/idr-bfd-validator/Dockerfile",
89+
"contextDir": "apps/utils/idr-bfd-validator",
90+
"namedContexts": {
91+
"idr-pipeline": "apps/bfd-pipeline-idr"
92+
},
93+
"platform": "linux/arm64"
8594
}
8695
]

‎.github/workflows/ci-java.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
files: ${{ steps.workflow_files.outputs.files }}
3939
steps:
4040
- name: Checkout repository
41-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
41+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
4242
with:
4343
fetch-depth: 2
4444
ref: ${{ inputs.branch }}
@@ -54,12 +54,12 @@ jobs:
5454
needs: workflow
5555
if: needs.workflow.outputs.files
5656
steps:
57-
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
57+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
5858
with:
5959
fetch-depth: 2
6060
ref: ${{ inputs.branch }}
6161
- name: 'Setup JDK'
62-
uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95 # v5
62+
uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5
6363
with:
6464
java-version: '25'
6565
distribution: 'corretto'
@@ -73,7 +73,7 @@ jobs:
7373
if: ${{ needs.workflow.outputs.files || (github.actor != 'actions-user' && github.ref_name == 'master') }}
7474
steps:
7575
- name: 'Checkout repo'
76-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
76+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
7777
with:
7878
fetch-depth: 0
7979
ref: ${{ inputs.branch }}
@@ -82,13 +82,13 @@ jobs:
8282
with:
8383
node-version: "22"
8484
- name: 'Setup JDK'
85-
uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95 # v5
85+
uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5
8686
with:
8787
java-version: '25'
8888
distribution: 'corretto'
8989
cache: 'maven'
9090
- name: Install uv
91-
uses: astral-sh/setup-uv@37802adc94f370d6bfd71619e3f0bf239e1f3b78 # v7
91+
uses: astral-sh/setup-uv@c771a70e6277c0a99b617c7a806ffedaca235ff9 # v9.0.0
9292

9393
- name: Mask sensitive AWS data
9494
id: mask-sensitive-aws-data

‎.github/workflows/ci-pipeline-synthetic.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ jobs:
1414
steps:
1515
- name: Checkout code
1616
id: code-checkout
17-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
17+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
1818
- name: Install uv
19-
uses: astral-sh/setup-uv@37802adc94f370d6bfd71619e3f0bf239e1f3b78 # v7
19+
uses: astral-sh/setup-uv@c771a70e6277c0a99b617c7a806ffedaca235ff9 # v9.0.0
2020
with:
2121
version: "0.11.2"
2222
- name: Install node
@@ -25,7 +25,7 @@ jobs:
2525
node-version: "22"
2626
# Maven is needed to run the migrator
2727
- name: "Setup JDK"
28-
uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95 # v5
28+
uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5
2929
with:
3030
java-version: "25"
3131
distribution: "corretto"

‎.github/workflows/ci-python.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,16 +50,16 @@ jobs:
5050
steps:
5151
- name: Checkout code
5252
id: code-checkout
53-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
53+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
5454
with:
5555
ref: ${{ inputs.branch }}
5656
# Maven is needed to run the migrator
5757
- name: "Setup JDK"
58-
uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95 # v5
58+
uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5
5959
with:
6060
java-version: "25"
6161
distribution: "corretto"
62-
- uses: astral-sh/setup-uv@37802adc94f370d6bfd71619e3f0bf239e1f3b78 # v7
62+
- uses: astral-sh/setup-uv@c771a70e6277c0a99b617c7a806ffedaca235ff9 # v9.0.0
6363
- name: Run Python Tests per project
6464
id: run-pytest-set
6565
run: |

‎.github/workflows/ci-static-site.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ jobs:
8686
runs-on: ubuntu-24.04
8787
steps:
8888
- name: Checkout
89-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
89+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
9090
with:
9191
fetch-depth: 0
9292
ref: ${{ inputs.branch || github.ref_name }}
@@ -110,7 +110,7 @@ jobs:
110110
echo "BFD_RELEASE=$release_version" >> $GITHUB_ENV
111111
112112
- name: Configure AWS credentials
113-
uses: aws-actions/configure-aws-credentials@517a711dbcd0e402f90c77e7e2f81e849156e31d # v6
113+
uses: aws-actions/configure-aws-credentials@e6de054238d6b7531b4efff3b6587d9aade6a06c # v6
114114
with:
115115
role-to-assume: ${{ secrets.GHA_AWS_IAM_ROLE_ARN }}
116116
role-session-name: ci-static-site
@@ -169,7 +169,7 @@ jobs:
169169
}
170170
171171
- name: Setup Ruby and install dependencies
172-
uses: ruby/setup-ruby@003a5c4d8d6321bd302e38f6f0ec593f77f06600 # v1
172+
uses: ruby/setup-ruby@95ef2b042f9d7a56d8268cba8559e2842e2ad01b # v1
173173
with:
174174
ruby-version: "3.3"
175175
bundler-cache: true

‎.github/workflows/release-and-deploy-bfd.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
echo "role-arn=$role_arn" >> "$GITHUB_OUTPUT"
5757
5858
- name: Assume role to AWS
59-
uses: aws-actions/configure-aws-credentials@ec61189d14ec14c8efccab744f656cffd0e33f37 # v6.1.0
59+
uses: aws-actions/configure-aws-credentials@e6de054238d6b7531b4efff3b6587d9aade6a06c # v6.2.3
6060
with:
6161
role-to-assume: ${{ steps.get-role-arn.outputs.role-arn }}
6262
role-session-name: get-sops-slack-webhook-${{ github.run_id }}-${{ github.run_attempt }}
@@ -152,7 +152,7 @@ jobs:
152152
echo "role-arn=$role_arn" >> "$GITHUB_OUTPUT"
153153
154154
- name: Assume role to AWS
155-
uses: aws-actions/configure-aws-credentials@ec61189d14ec14c8efccab744f656cffd0e33f37 # v6.1.0
155+
uses: aws-actions/configure-aws-credentials@e6de054238d6b7531b4efff3b6587d9aade6a06c # v6.2.3
156156
with:
157157
role-to-assume: ${{ steps.get-role-arn.outputs.role-arn }}
158158
role-session-name: get-sops-slack-webhook-${{ github.run_id }}-${{ github.run_attempt }}

0 commit comments

Comments
 (0)