Skip to content

Commit f8046ff

Browse files
authored
CLOUDP-270507: Use federated credentials (#324)
1 parent 636a4e7 commit f8046ff

File tree

5 files changed

+27
-34
lines changed

5 files changed

+27
-34
lines changed

.github/workflows/generate-openapi.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,8 @@ on:
2121
secrets: # all secrets are passed explicitly in this workflow
2222
api_bot_pat:
2323
required: true
24-
aws_access_key_id:
24+
aws_s3_role_to_assume:
2525
required: true
26-
aws_secret_access_key:
27-
required: true
28-
2926

3027
permissions:
3128
contents: write
@@ -61,11 +58,14 @@ jobs:
6158
- name: Add permissions to execute scripts
6259
run: |
6360
chmod +x release-scripts/*.sh
61+
- name: aws configure
62+
uses: aws-actions/configure-aws-credentials@v4
63+
with:
64+
role-to-assume: ${{ secrets.aws_s3_role_to_assume }}
65+
aws-region: ${{inputs.aws_default_region}}
6466
- name: Retrieve Specs
6567
env:
6668
AWS_DEFAULT_REGION: ${{inputs.aws_default_region}}
67-
AWS_ACCESS_KEY_ID: ${{ secrets.aws_access_key_id }}
68-
AWS_SECRET_ACCESS_KEY: ${{ secrets.aws_secret_access_key }}
6969
S3_BUCKET: ${{ inputs.aws_s3_bucket }}
7070
run: ./release-scripts/download_specs.sh
7171
- name: Generate Federated Spec

.github/workflows/release-changelog.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,7 @@ on:
2525
secrets: # all secrets are passed explicitly in this workflow
2626
api_bot_pat:
2727
required: true
28-
aws_access_key_id:
29-
required: true
30-
aws_secret_access_key:
28+
aws_s3_role_to_assume:
3129
required: true
3230

3331
permissions:
@@ -89,11 +87,14 @@ jobs:
8987
- name: Add permissions to execute scripts
9088
run: |
9189
chmod +x release-scripts/*.sh
90+
- name: aws configure
91+
uses: aws-actions/configure-aws-credentials@v4
92+
with:
93+
role-to-assume: ${{ secrets.aws_s3_role_to_assume }}
94+
aws-region: ${{inputs.aws_default_region}}
9295
- name: Generate Changelog
9396
env:
9497
AWS_DEFAULT_REGION: ${{inputs.aws_default_region}}
95-
AWS_ACCESS_KEY_ID: ${{ secrets.aws_access_key_id }}
96-
AWS_SECRET_ACCESS_KEY: ${{ secrets.aws_secret_access_key }}
9798
S3_BUCKET: ${{ inputs.aws_s3_bucket }}
9899
run: ./release-scripts/generate_changelog.sh
99100
- name: Upload revision and base folders for debugging

.github/workflows/release-spec-runner.yml

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,7 @@ jobs:
5050
uses: ./.github/workflows/release-spec.yml
5151
secrets:
5252
api_bot_pat: ${{ secrets.API_BOT_PAT }}
53-
aws_access_key_id: ${{ secrets.AWS_ACCESS_KEY_ID_DEV }}
54-
aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY_DEV }}
53+
aws_s3_role_to_assume: ${{ secrets.aws_s3_role_to_assume }}
5554
jira_api_token: ${{ secrets.JIRA_API_TOKEN }}
5655
with:
5756
aws_default_region: ${{ vars.AWS_DEFAULT_REGION}}
@@ -68,8 +67,7 @@ jobs:
6867
uses: ./.github/workflows/release-spec.yml
6968
secrets:
7069
api_bot_pat: ${{ secrets.API_BOT_PAT }}
71-
aws_access_key_id: ${{ secrets.AWS_ACCESS_KEY_ID_QA }}
72-
aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY_QA }}
70+
aws_s3_role_to_assume: ${{ secrets.aws_s3_role_to_assume }}
7371
jira_api_token: ${{ secrets.JIRA_API_TOKEN }}
7472
with:
7573
aws_default_region: ${{ vars.AWS_DEFAULT_REGION}}
@@ -86,8 +84,7 @@ jobs:
8684
uses: ./.github/workflows/release-spec.yml
8785
secrets:
8886
api_bot_pat: ${{ secrets.API_BOT_PAT }}
89-
aws_access_key_id: ${{ secrets.AWS_ACCESS_KEY_ID_STAGING }}
90-
aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY_STAGING }}
87+
aws_s3_role_to_assume: ${{ secrets.aws_s3_role_to_assume }}
9188
jira_api_token: ${{ secrets.JIRA_API_TOKEN }}
9289
with:
9390
aws_default_region: ${{ vars.AWS_DEFAULT_REGION}}
@@ -104,8 +101,7 @@ jobs:
104101
uses: ./.github/workflows/release-spec.yml
105102
secrets:
106103
api_bot_pat: ${{ secrets.API_BOT_PAT }}
107-
aws_access_key_id: ${{ secrets.AWS_ACCESS_KEY_ID_PROD }}
108-
aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY_PROD }}
104+
aws_s3_role_to_assume: ${{ secrets.aws_s3_role_to_assume }}
109105
postman_api_key: ${{ secrets.POSTMAN_API_KEY }}
110106
workspace_id: ${{ secrets.WORKSPACE_ID }}
111107
jira_api_token: ${{ secrets.JIRA_API_TOKEN }}
@@ -125,8 +121,7 @@ jobs:
125121
uses: ./.github/workflows/release-spec-v1.yml
126122
secrets:
127123
api_bot_pat: ${{ secrets.API_BOT_PAT }}
128-
aws_access_key_id: ${{ secrets.AWS_ACCESS_KEY_ID_PROD }}
129-
aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY_PROD }}
124+
aws_s3_role_to_assume: ${{ secrets.aws_s3_role_to_assume }}
130125
mms_deployed_sha_url: ${{ secrets.MMS_DEPLOYED_SHA_URL_PROD }}
131126
with:
132127
aws_default_region: ${{ vars.AWS_DEFAULT_REGION}}

.github/workflows/release-spec-v1.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@ on:
2121
secrets: # all secrets are passed explicitly in this workflow
2222
api_bot_pat:
2323
required: true
24-
aws_access_key_id:
25-
required: true
26-
aws_secret_access_key:
24+
aws_s3_role_to_assume:
2725
required: true
2826
mms_deployed_sha_url:
2927
required: true
@@ -37,11 +35,14 @@ jobs:
3735
name: Release OpenAPI Spec for V1 (DEPRECATED) APIs
3836
runs-on: ubuntu-latest
3937
steps:
38+
- name: aws configure
39+
uses: aws-actions/configure-aws-credentials@v4
40+
with:
41+
role-to-assume: ${{ secrets.aws_s3_role_to_assume }}
42+
aws-region: ${{inputs.aws_default_region}}
4043
- name: Download v1 Spec
4144
env:
4245
AWS_DEFAULT_REGION: ${{inputs.aws_default_region}}
43-
AWS_ACCESS_KEY_ID: ${{ secrets.aws_access_key_id }}
44-
AWS_SECRET_ACCESS_KEY: ${{ secrets.aws_secret_access_key }}
4546
S3_BUCKET: ${{ inputs.aws_s3_bucket }}
4647
MMS_DEPLOYED_SHA_URL: ${{secrets.mms_deployed_sha_url}}
4748
run: |

.github/workflows/release-spec.yml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,14 @@ on:
3333
secrets: # all secrets are passed explicitly in this workflow
3434
api_bot_pat:
3535
required: true
36-
aws_access_key_id:
37-
required: true
38-
aws_secret_access_key:
39-
required: true
4036
postman_api_key:
4137
required: false
4238
workspace_id:
4339
required: false
4440
jira_api_token:
4541
required: true
42+
aws_s3_role_to_assume:
43+
required: true
4644

4745
permissions:
4846
contents: write
@@ -54,8 +52,7 @@ jobs:
5452
uses: ./.github/workflows/generate-openapi.yml
5553
secrets:
5654
api_bot_pat: ${{ secrets.api_bot_pat }}
57-
aws_access_key_id: ${{ secrets.aws_access_key_id }}
58-
aws_secret_access_key: ${{ secrets.aws_secret_access_key }}
55+
aws_s3_role_to_assume: ${{ secrets.aws_s3_role_to_assume }}
5956
with:
6057
aws_default_region: ${{ inputs.aws_default_region}}
6158
aws_s3_bucket: ${{ inputs.aws_s3_bucket}}
@@ -170,8 +167,7 @@ jobs:
170167
uses: ./.github/workflows/release-changelog.yml
171168
secrets:
172169
api_bot_pat: ${{ secrets.api_bot_pat }}
173-
aws_access_key_id: ${{ secrets.aws_access_key_id }}
174-
aws_secret_access_key: ${{ secrets.aws_secret_access_key }}
170+
aws_s3_role_to_assume: ${{ secrets.aws_s3_role_to_assume }}
175171
with:
176172
aws_default_region: ${{ inputs.aws_default_region}}
177173
aws_s3_bucket: ${{ inputs.aws_s3_bucket}}

0 commit comments

Comments
 (0)