Skip to content

Commit 01ef9ab

Browse files
blvablva
authored
fix: fed creds fix (#329)
1 parent ffdbd68 commit 01ef9ab

File tree

5 files changed

+28
-19
lines changed

5 files changed

+28
-19
lines changed

‎.github/workflows/generate-openapi.yml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,13 @@ on:
1818
description: 'Version of FOASCLI to use.'
1919
required: true
2020
type: string
21+
aws_s3_role_to_assume:
22+
description: 'AWS S3 Role to Assume.'
23+
required: true
24+
type: string
2125
secrets: # all secrets are passed explicitly in this workflow
2226
api_bot_pat:
2327
required: true
24-
aws_s3_role_to_assume:
25-
required: true
2628

2729
permissions:
2830
contents: write
@@ -62,7 +64,7 @@ jobs:
6264
- name: aws configure
6365
uses: aws-actions/configure-aws-credentials@v4
6466
with:
65-
role-to-assume: ${{ secrets.aws_s3_role_to_assume }}
67+
role-to-assume: ${{ inputs.aws_s3_role_to_assume }}
6668
aws-region: ${{inputs.aws_default_region}}
6769
- name: Retrieve Specs
6870
env:

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,15 @@ on:
2222
description: 'Version of FOASCLI to use.'
2323
required: true
2424
type: string
25+
aws_s3_role_to_assume:
26+
description: 'AWS S3 Role to Assume.'
27+
required: true
28+
type: string
2529
secrets: # all secrets are passed explicitly in this workflow
2630
api_bot_pat:
2731
required: true
28-
aws_s3_role_to_assume:
29-
required: true
30-
32+
33+
3134
permissions:
3235
contents: write
3336
issues: write
@@ -91,7 +94,7 @@ jobs:
9194
- name: aws configure
9295
uses: aws-actions/configure-aws-credentials@v4
9396
with:
94-
role-to-assume: ${{ secrets.aws_s3_role_to_assume }}
97+
role-to-assume: ${{ inputs.aws_s3_role_to_assume }}
9598
aws-region: ${{inputs.aws_default_region}}
9699
- name: Generate Changelog
97100
env:

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@ jobs:
5151
uses: ./.github/workflows/release-spec.yml
5252
secrets:
5353
api_bot_pat: ${{ secrets.API_BOT_PAT }}
54-
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}}
5857
aws_s3_bucket: ${{ vars.S3_BUCKET_DEV}}
58+
aws_s3_role_to_assume: ${{ vars.AWS_S3_ROLE_TO_ASSUME }}
5959
env: dev
6060
branch: dev
6161
spectral_version: ${{ vars.SPECTRAL_VERSION }}
@@ -68,10 +68,10 @@ jobs:
6868
uses: ./.github/workflows/release-spec.yml
6969
secrets:
7070
api_bot_pat: ${{ secrets.API_BOT_PAT }}
71-
aws_s3_role_to_assume: ${{ secrets.aws_s3_role_to_assume }}
7271
jira_api_token: ${{ secrets.JIRA_API_TOKEN }}
7372
with:
7473
aws_default_region: ${{ vars.AWS_DEFAULT_REGION}}
74+
aws_s3_role_to_assume: ${{ vars.AWS_S3_ROLE_TO_ASSUME }}
7575
aws_s3_bucket: ${{ vars.S3_BUCKET_QA}}
7676
env: qa
7777
branch: qa
@@ -85,10 +85,10 @@ jobs:
8585
uses: ./.github/workflows/release-spec.yml
8686
secrets:
8787
api_bot_pat: ${{ secrets.API_BOT_PAT }}
88-
aws_s3_role_to_assume: ${{ secrets.aws_s3_role_to_assume }}
8988
jira_api_token: ${{ secrets.JIRA_API_TOKEN }}
9089
with:
9190
aws_default_region: ${{ vars.AWS_DEFAULT_REGION}}
91+
aws_s3_role_to_assume: ${{ vars.AWS_S3_ROLE_TO_ASSUME }}
9292
aws_s3_bucket: ${{ vars.S3_BUCKET_STAGING}}
9393
env: stage
9494
branch: staging
@@ -102,12 +102,12 @@ jobs:
102102
uses: ./.github/workflows/release-spec.yml
103103
secrets:
104104
api_bot_pat: ${{ secrets.API_BOT_PAT }}
105-
aws_s3_role_to_assume: ${{ secrets.aws_s3_role_to_assume }}
106105
postman_api_key: ${{ secrets.POSTMAN_API_KEY }}
107106
workspace_id: ${{ secrets.WORKSPACE_ID }}
108107
jira_api_token: ${{ secrets.JIRA_API_TOKEN }}
109108
with:
110109
aws_default_region: ${{ vars.AWS_DEFAULT_REGION}}
110+
aws_s3_role_to_assume: ${{ vars.AWS_S3_ROLE_TO_ASSUME }}
111111
aws_s3_bucket: ${{ vars.S3_BUCKET_PROD}}
112112
env: prod
113113
branch: main
@@ -122,10 +122,10 @@ jobs:
122122
uses: ./.github/workflows/release-spec-v1.yml
123123
secrets:
124124
api_bot_pat: ${{ secrets.API_BOT_PAT }}
125-
aws_s3_role_to_assume: ${{ secrets.aws_s3_role_to_assume }}
126125
mms_deployed_sha_url: ${{ secrets.MMS_DEPLOYED_SHA_URL_PROD }}
127126
with:
128127
aws_default_region: ${{ vars.AWS_DEFAULT_REGION}}
128+
aws_s3_role_to_assume: ${{ vars.AWS_S3_ROLE_TO_ASSUME }}
129129
aws_s3_bucket: ${{ vars.S3_BUCKET_PROD}}
130130
env: prod
131131
branch: main

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,13 @@ on:
1818
description: 'Branch to release the OpenAPI Spec to.'
1919
required: true
2020
type: string
21+
aws_s3_role_to_assume:
22+
description: 'AWS S3 Role to Assume.'
23+
required: true
24+
type: string
2125
secrets: # all secrets are passed explicitly in this workflow
2226
api_bot_pat:
2327
required: true
24-
aws_s3_role_to_assume:
25-
required: true
2628
mms_deployed_sha_url:
2729
required: true
2830

@@ -39,7 +41,7 @@ jobs:
3941
- name: aws configure
4042
uses: aws-actions/configure-aws-credentials@v4
4143
with:
42-
role-to-assume: ${{ secrets.aws_s3_role_to_assume }}
44+
role-to-assume: ${{ inputs.aws_s3_role_to_assume }}
4345
aws-region: ${{inputs.aws_default_region}}
4446
- name: Download v1 Spec
4547
env:

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@ on:
3030
description: 'Base URL of Atlas.'
3131
required: false
3232
type: string
33+
aws_s3_role_to_assume:
34+
description: 'AWS S3 Role to Assume.'
35+
required: true
36+
type: string
3337
secrets: # all secrets are passed explicitly in this workflow
3438
api_bot_pat:
3539
required: true
@@ -39,8 +43,6 @@ on:
3943
required: false
4044
jira_api_token:
4145
required: true
42-
aws_s3_role_to_assume:
43-
required: true
4446

4547
permissions:
4648
contents: write
@@ -53,10 +55,10 @@ jobs:
5355
uses: ./.github/workflows/generate-openapi.yml
5456
secrets:
5557
api_bot_pat: ${{ secrets.api_bot_pat }}
56-
aws_s3_role_to_assume: ${{ secrets.aws_s3_role_to_assume }}
5758
with:
5859
aws_default_region: ${{ inputs.aws_default_region}}
5960
aws_s3_bucket: ${{ inputs.aws_s3_bucket}}
61+
aws_s3_role_to_assume: ${{ inputs.aws_s3_role_to_assume }}
6062
env: ${{ inputs.env }}
6163
foascli_version: ${{ inputs.foascli_version }}
6264

@@ -168,9 +170,9 @@ jobs:
168170
uses: ./.github/workflows/release-changelog.yml
169171
secrets:
170172
api_bot_pat: ${{ secrets.api_bot_pat }}
171-
aws_s3_role_to_assume: ${{ secrets.aws_s3_role_to_assume }}
172173
with:
173174
aws_default_region: ${{ inputs.aws_default_region}}
175+
aws_s3_role_to_assume: ${{ inputs.aws_s3_role_to_assume }}
174176
aws_s3_bucket: ${{ inputs.aws_s3_bucket}}
175177
env: ${{ inputs.env }}
176178
branch: ${{ inputs.branch }}

0 commit comments

Comments
 (0)