Skip to content

Commit 0eca36b

Browse files
AlexFenlonpdabelf5
authored andcommitted
Migrate AWS Roles to Azure Vault
1 parent d5dffbf commit 0eca36b

File tree

3 files changed

+48
-3
lines changed

3 files changed

+48
-3
lines changed

.github/workflows/oss-release.yml

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,21 @@ jobs:
121121
with:
122122
ref: ${{ inputs.branch }}
123123

124+
- name: Azure login
125+
uses: azure/login@a457da9ea143d694b1b9c7c869ebb04ebe844ef5 # v2.3.0
126+
with:
127+
client-id: ${{ secrets.AZURE_VAULT_CLIENT_ID }}
128+
tenant-id: ${{ secrets.AZURE_VAULT_TENANT_ID }}
129+
subscription-id: ${{ secrets.AZURE_VAULT_SUBSCRIPTION_ID }}
130+
131+
- name: Setup secrets
132+
id: secrets
133+
run: |
134+
echo "Setting secrets for job"
135+
AWS_ROLE_PUBLIC_ECR=$(az keyvault secret show --name aws-public-role --vault-name ${{ secrets.NIC_KEYVAULT_NAME }} --query value -o tsv)
136+
echo "::add-mask::$AWS_ROLE_PUBLIC_ECR"
137+
echo "AWS_ROLE_PUBLIC_ECR=$AWS_ROLE_PUBLIC_ECR" >> $GITHUB_OUTPUT
138+
124139
- name: Authenticate to Google Cloud
125140
id: gcr-auth
126141
uses: google-github-actions/auth@7c6bc770dae815cd3e89ee6cdf493a5fab2cc093 # v3.0.0
@@ -140,7 +155,7 @@ jobs:
140155
uses: aws-actions/configure-aws-credentials@00943011d9042930efac3dcd3a170e4273319bc8 # v5.1.0
141156
with:
142157
aws-region: us-east-1
143-
role-to-assume: ${{ secrets.AWS_ROLE_PUBLIC_ECR }}
158+
role-to-assume: ${{ steps.secrets.outputs.AWS_ROLE_PUBLIC_ECR }}
144159

145160
- name: Login to Public ECR
146161
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0

.github/workflows/plus-release.yml

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,21 @@ jobs:
215215
with:
216216
ref: ${{ inputs.branch }}
217217

218+
- name: Azure login
219+
uses: azure/login@a457da9ea143d694b1b9c7c869ebb04ebe844ef5 # v2.3.0
220+
with:
221+
client-id: ${{ secrets.AZURE_VAULT_CLIENT_ID }}
222+
tenant-id: ${{ secrets.AZURE_VAULT_TENANT_ID }}
223+
subscription-id: ${{ secrets.AZURE_VAULT_SUBSCRIPTION_ID }}
224+
225+
- name: Setup secrets
226+
id: secrets
227+
run: |
228+
echo "Setting secrets for job"
229+
AWS_ROLE_MARKETPLACE=$(az keyvault secret show --name aws-mktpl-role --vault-name ${{ secrets.NIC_KEYVAULT_NAME }} --query value -o tsv)
230+
echo "::add-mask::$AWS_ROLE_MARKETPLACE"
231+
echo "AWS_ROLE_MARKETPLACE=$AWS_ROLE_MARKETPLACE" >> $GITHUB_OUTPUT
232+
218233
- name: Authenticate to Google Cloud
219234
id: gcr-auth
220235
uses: google-github-actions/auth@7c6bc770dae815cd3e89ee6cdf493a5fab2cc093 # v3.0.0
@@ -234,7 +249,7 @@ jobs:
234249
uses: aws-actions/configure-aws-credentials@00943011d9042930efac3dcd3a170e4273319bc8 # v5.1.0
235250
with:
236251
aws-region: us-east-1
237-
role-to-assume: ${{ secrets.AWS_ROLE_MARKETPLACE }}
252+
role-to-assume: ${{ steps.secrets.outputs.AWS_ROLE_MARKETPLACE }}
238253

239254
- name: Login to ECR
240255
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0

.github/workflows/release.yml

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -437,11 +437,26 @@ jobs:
437437
# with:
438438
# ref: ${{ inputs.release_branch }}
439439

440+
# - name: Azure login
441+
# uses: azure/login@a457da9ea143d694b1b9c7c869ebb04ebe844ef5 # v2.3.0
442+
# with:
443+
# client-id: ${{ secrets.AZURE_VAULT_CLIENT_ID }}
444+
# tenant-id: ${{ secrets.AZURE_VAULT_TENANT_ID }}
445+
# subscription-id: ${{ secrets.AZURE_VAULT_SUBSCRIPTION_ID }}
446+
447+
# - name: Setup secrets
448+
# id: secrets
449+
# run: |
450+
# echo "Setting secrets for job"
451+
# AWS_ROLE_MARKETPLACE=$(az keyvault secret show --name aws-mktpl-role --vault-name ${{ secrets.NIC_KEYVAULT_NAME }} --query value -o tsv)
452+
# echo "::add-mask::$AWS_ROLE_MARKETPLACE"
453+
# echo "AWS_ROLE_MARKETPLACE=$AWS_ROLE_MARKETPLACE" >> $GITHUB_OUTPUT
454+
440455
# - name: Configure AWS Credentials
441456
# uses: aws-actions/configure-aws-credentials@b47578312673ae6fa5b5096b330d9fbac3d116df # v4.2.1
442457
# with:
443458
# aws-region: us-east-1
444-
# role-to-assume: ${{ secrets.AWS_ROLE_MARKETPLACE }}
459+
# role-to-assume: ${{ steps.secrets.outputs.AWS_ROLE_MARKETPLACE }}
445460

446461
# - name: Publish to AWS Marketplace
447462
# uses: nginx/aws-marketplace-publish@accf7b4c725796b744f2ee27acc2488d76f63d32 # v1.0.8

0 commit comments

Comments
 (0)