Skip to content

Commit 9e0d9ff

Browse files
authored
Merge pull request #58 from oslokommune/github-actions-oidc
Do GitHub auth with OIDC instead of IAM access key
2 parents 80a32a6 + 19f0e5a commit 9e0d9ff

File tree

2 files changed

+20
-12
lines changed

2 files changed

+20
-12
lines changed

.github/workflows/deploy_dev.yml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,13 @@ on:
44
workflow_dispatch:
55
workflow_call:
66
secrets:
7-
AWS_ACCESS_KEY_DEV:
8-
required: true
9-
AWS_SECRET_ACCESS_KEY_DEV:
7+
AWS_ACCOUNT_DEV:
108
required: true
119

10+
permissions:
11+
id-token: write
12+
contents: read
13+
1214
jobs:
1315
push:
1416
name: Build, push image
@@ -21,12 +23,14 @@ jobs:
2123
uses: docker/setup-buildx-action@94ab11c41e45d028884a99163086648e898eed25 # v1.6.0
2224

2325
- name: Configure AWS credentials
24-
uses: aws-actions/configure-aws-credentials@05b148adc31e091bafbaf404f745055d4d3bc9d2 # v1.6.1
26+
uses: aws-actions/configure-aws-credentials@a03048d87541d1d9fcf2ecf528a4a65ba9bd7838 # v5.0.0
2527
with:
26-
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_DEV }}
27-
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY_DEV }}
28+
role-to-assume: arn:aws:iam::${{ secrets.AWS_ACCOUNT_DEV }}:role/github-deploy
2829
aws-region: eu-west-1
2930

31+
- name: Sts GetCallerIdentity
32+
run: aws sts get-caller-identity
33+
3034
- name: Login to Amazon ECR
3135
id: login-ecr
3236
uses: aws-actions/amazon-ecr-login@aaf69d68aa3fb14c1d5a6be9ac61fe15b48453a2 # v1.3.3

.github/workflows/deploy_prod.yml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,13 @@ on:
44
workflow_dispatch:
55
workflow_call:
66
secrets:
7-
AWS_ACCESS_KEY_PROD:
8-
required: true
9-
AWS_SECRET_ACCESS_KEY_PROD:
7+
AWS_ACCOUNT_PROD:
108
required: true
119

10+
permissions:
11+
id-token: write
12+
contents: read
13+
1214
jobs:
1315
push:
1416
name: Build, push image
@@ -21,12 +23,14 @@ jobs:
2123
uses: docker/setup-buildx-action@94ab11c41e45d028884a99163086648e898eed25 # v1.6.0
2224

2325
- name: Configure AWS credentials
24-
uses: aws-actions/configure-aws-credentials@05b148adc31e091bafbaf404f745055d4d3bc9d2 # v1.6.1
26+
uses: aws-actions/configure-aws-credentials@a03048d87541d1d9fcf2ecf528a4a65ba9bd7838 # v5.0.0
2527
with:
26-
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_PROD }}
27-
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY_PROD }}
28+
role-to-assume: arn:aws:iam::${{ secrets.AWS_ACCOUNT_PROD }}:role/github-deploy
2829
aws-region: eu-west-1
2930

31+
- name: Sts GetCallerIdentity
32+
run: aws sts get-caller-identity
33+
3034
- name: Login to Amazon ECR
3135
id: login-ecr
3236
uses: aws-actions/amazon-ecr-login@aaf69d68aa3fb14c1d5a6be9ac61fe15b48453a2 # v1.3.3

0 commit comments

Comments
 (0)