Skip to content

Commit 162e172

Browse files
committed
migrate SMP from static keys to oidc
Signed-off-by: Caleb Metz <caleb.metz@datadoghq.com>
1 parent 24d8db4 commit 162e172

1 file changed

Lines changed: 21 additions & 18 deletions

File tree

.github/workflows/regression.yml

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -279,13 +279,14 @@ jobs:
279279
needs:
280280
- should-run-gate
281281
- resolve-inputs
282+
# Job level permissions for downloading SMP binary
283+
permissions:
284+
id-token: write # Required for GitHub OIDC token exchange
282285
steps:
283286
- name: Configure AWS Credentials
284287
uses: aws-actions/configure-aws-credentials@8df5847569e6427dd6c4fb1cf565c83acfa8afa7 # v6.0.0
285288
with:
286-
aws-access-key-id: ${{ secrets.SINGLE_MACHINE_PERFORMANCE_BOT_ACCESS_KEY_ID }}
287-
aws-secret-access-key: ${{ secrets.SINGLE_MACHINE_PERFORMANCE_BOT_SECRET_ACCESS_KEY }}
288-
aws-region: us-west-2
289+
role-to-assume: arn:aws:iam::850406765696:role/smp-regression-oidc
289290

290291
- name: Download SMP binary
291292
run: |
@@ -304,6 +305,9 @@ jobs:
304305
- resolve-inputs
305306
- confirm-valid-credentials
306307
- build-baseline
308+
# Job level permissions for uploading baseline image to SMP ECR
309+
permissions:
310+
id-token: write # Required for GitHub OIDC token exchange
307311
steps:
308312
- name: 'Download baseline image'
309313
uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
@@ -317,9 +321,7 @@ jobs:
317321
- name: Configure AWS Credentials
318322
uses: aws-actions/configure-aws-credentials@8df5847569e6427dd6c4fb1cf565c83acfa8afa7 # v6.0.0
319323
with:
320-
aws-access-key-id: ${{ secrets.SINGLE_MACHINE_PERFORMANCE_BOT_ACCESS_KEY_ID }}
321-
aws-secret-access-key: ${{ secrets.SINGLE_MACHINE_PERFORMANCE_BOT_SECRET_ACCESS_KEY }}
322-
aws-region: us-west-2
324+
role-to-assume: arn:aws:iam::850406765696:role/smp-regression-oidc
323325

324326
- name: Login to Amazon ECR
325327
id: login-ecr
@@ -344,6 +346,9 @@ jobs:
344346
- resolve-inputs
345347
- confirm-valid-credentials
346348
- build-comparison
349+
# Job level permissions for uploading comparison image to SMP ECR
350+
permissions:
351+
id-token: write # Required for GitHub OIDC token exchange
347352
steps:
348353
- name: 'Download comparison image'
349354
uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
@@ -357,9 +362,7 @@ jobs:
357362
- name: Configure AWS Credentials
358363
uses: aws-actions/configure-aws-credentials@8df5847569e6427dd6c4fb1cf565c83acfa8afa7 # v6.0.0
359364
with:
360-
aws-access-key-id: ${{ secrets.SINGLE_MACHINE_PERFORMANCE_BOT_ACCESS_KEY_ID }}
361-
aws-secret-access-key: ${{ secrets.SINGLE_MACHINE_PERFORMANCE_BOT_SECRET_ACCESS_KEY }}
362-
aws-region: us-west-2
365+
role-to-assume: arn:aws:iam::850406765696:role/smp-regression-oidc
363366

364367
- name: Login to Amazon ECR
365368
id: login-ecr
@@ -388,6 +391,7 @@ jobs:
388391
permissions:
389392
contents: read # Required to checkout code
390393
actions: write # Required to upload artifacts
394+
id-token: write # Required for GitHub OIDC token exchange
391395
steps:
392396
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
393397
with:
@@ -396,9 +400,7 @@ jobs:
396400
- name: Configure AWS Credentials
397401
uses: aws-actions/configure-aws-credentials@8df5847569e6427dd6c4fb1cf565c83acfa8afa7 # v6.0.0
398402
with:
399-
aws-access-key-id: ${{ secrets.SINGLE_MACHINE_PERFORMANCE_BOT_ACCESS_KEY_ID }}
400-
aws-secret-access-key: ${{ secrets.SINGLE_MACHINE_PERFORMANCE_BOT_SECRET_ACCESS_KEY }}
401-
aws-region: us-west-2
403+
role-to-assume: arn:aws:iam::850406765696:role/smp-regression-oidc
402404

403405
- name: Login to Amazon ECR
404406
id: login-ecr
@@ -463,15 +465,17 @@ jobs:
463465
- submit-job
464466
- should-run-gate
465467
- resolve-inputs
468+
# Job level permissions for downloading SMP results
469+
permissions:
470+
contents: read # Required to checkout code
471+
id-token: write # Required for GitHub OIDC token exchange
466472
steps:
467473
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
468474

469475
- name: Configure AWS Credentials
470476
uses: aws-actions/configure-aws-credentials@8df5847569e6427dd6c4fb1cf565c83acfa8afa7 # v6.0.0
471477
with:
472-
aws-access-key-id: ${{ secrets.SINGLE_MACHINE_PERFORMANCE_BOT_ACCESS_KEY_ID }}
473-
aws-secret-access-key: ${{ secrets.SINGLE_MACHINE_PERFORMANCE_BOT_SECRET_ACCESS_KEY }}
474-
aws-region: us-west-2
478+
role-to-assume: arn:aws:iam::850406765696:role/smp-regression-oidc
475479

476480
- name: Download SMP binary
477481
run: |
@@ -504,6 +508,7 @@ jobs:
504508
permissions:
505509
contents: read # Required to checkout code
506510
actions: write # Required to upload artifacts
511+
id-token: write # Required for GitHub OIDC token exchange
507512
steps:
508513
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
509514
with:
@@ -512,9 +517,7 @@ jobs:
512517
- name: Configure AWS Credentials
513518
uses: aws-actions/configure-aws-credentials@8df5847569e6427dd6c4fb1cf565c83acfa8afa7 # v6.0.0
514519
with:
515-
aws-access-key-id: ${{ secrets.SINGLE_MACHINE_PERFORMANCE_BOT_ACCESS_KEY_ID }}
516-
aws-secret-access-key: ${{ secrets.SINGLE_MACHINE_PERFORMANCE_BOT_SECRET_ACCESS_KEY }}
517-
aws-region: us-west-2
520+
role-to-assume: arn:aws:iam::850406765696:role/smp-regression-oidc
518521

519522
- name: Download SMP binary
520523
run: |

0 commit comments

Comments
 (0)