Skip to content

Commit 40195dd

Browse files
authored
fix(ci): Partition workflows (#4084)
1 parent 66fb73e commit 40195dd

File tree

5 files changed

+47
-291
lines changed

5 files changed

+47
-291
lines changed

.github/workflows/layer_govcloud_verify.yml

Lines changed: 0 additions & 108 deletions
This file was deleted.

.github/workflows/layers_govcloud.yml

Lines changed: 0 additions & 145 deletions
This file was deleted.

.github/workflows/layers_partition_verify.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,19 +52,22 @@ jobs:
5252
outputs:
5353
regions: ${{ format('{0}{1}', steps.regions_china.outputs.regions, steps.regions_govcloud.outputs.regions) }}
5454
parition: ${{ format('{0}{1}', steps.regions_china.outputs.partition, steps.regions_govcloud.outputs.parition) }}
55+
aud: ${{ format('{0}{1}', steps.regions_china.outputs.aud, steps.regions_govcloud.outputs.aud) }}
5556
steps:
5657
- id: regions_china
5758
name: Parition (China)
5859
if: ${{ inputs.partition == 'China' }}
5960
run: |
60-
echo regions='["cn-north-1", "cn-northwest-1"]'>> "$GITHUB_OUTPUT"
61+
echo regions='["cn-north-1"]'>> "$GITHUB_OUTPUT"
6162
echo partition='aws-cn'>> "$GITHUB_OUTPUT"
63+
echo aud='sts.amazonaws.com.cn'>> "$GITHUB_OUTPUT"
6264
- id: regions_govcloud
6365
name: Partition (GovCloud)
6466
if: ${{ inputs.partition == 'GovCloud' }}
6567
run: |
6668
echo regions='["us-gov-east-1", "us-gov-west-1"]'>> "$GITHUB_OUTPUT"
6769
echo partition='aws-us-gov'>> "$GITHUB_OUTPUT"
70+
echo aud='sts.amazonaws.com'>> "$GITHUB_OUTPUT"
6871
commercial:
6972
runs-on: ubuntu-latest
7073
permissions:
@@ -118,6 +121,7 @@ jobs:
118121
role-to-assume: ${{ secrets[format('IAM_ROLE_{0}', steps.transform.outputs.CONVERTED_REGION)] }}
119122
aws-region: ${{ matrix.region}}
120123
mask-aws-account-id: true
124+
audience: ${{ needs.setup.outputs.aud }}
121125
- id: partition_version
122126
name: Partition Layer Version
123127
run: |

.github/workflows/layers_partitions.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,19 +49,22 @@ jobs:
4949
outputs:
5050
regions: ${{ format('{0}{1}', steps.regions_china.outputs.regions, steps.regions_govcloud.outputs.regions) }}
5151
parition: ${{ format('{0}{1}', steps.regions_china.outputs.partition, steps.regions_govcloud.outputs.parition) }}
52+
aud: ${{ format('{0}{1}', steps.regions_china.outputs.aud, steps.regions_govcloud.outputs.aud) }}
5253
steps:
5354
- id: regions_china
5455
name: Parition (China)
5556
if: ${{ inputs.partition == 'China' }}
5657
run: |
57-
echo regions='["cn-north-1", "cn-northwest-1"]'>> "$GITHUB_OUTPUT"
58+
echo regions='["cn-north-1"]'>> "$GITHUB_OUTPUT"
5859
echo partition='aws-cn'>> "$GITHUB_OUTPUT"
60+
echo aud='sts.amazonaws.com.cn'>> "$GITHUB_OUTPUT"
5961
- id: regions_govcloud
6062
name: Partition (GovCloud)
6163
if: ${{ inputs.partition == 'GovCloud' }}
6264
run: |
6365
echo regions='["us-gov-east-1", "us-gov-west-1"]'>> "$GITHUB_OUTPUT"
6466
echo partition='aws-us-gov'>> "$GITHUB_OUTPUT"
67+
echo aud='sts.amazonaws.com'>> "$GITHUB_OUTPUT"
6568
download:
6669
runs-on: ubuntu-latest
6770
permissions:
@@ -130,6 +133,7 @@ jobs:
130133
role-to-assume: ${{ secrets[format('IAM_ROLE_{0}', steps.transform.outputs.CONVERTED_REGION)] }}
131134
aws-region: ${{ matrix.region}}
132135
mask-aws-account-id: true
136+
audience: ${{ needs.setup.outputs.aud }}
133137
- name: Create Layer
134138
id: create-layer
135139
run: |

0 commit comments

Comments
 (0)