Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: Changed pipeline variable name #681

Merged
merged 2 commits into from
Aug 27, 2024
Merged

Fix: Changed pipeline variable name #681

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
04d4ed7
Changed variable name
larfeq Aug 26, 2024
82fe3aa
Updated to correct pipeline variable
larfeq Aug 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions pipelines/secret-rotation-pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ stages:
- template: templates/secret-rotation/ensure-secret.yml
parameters:
azureSubscription: $(subscriptionServiceNonProd)
azureSubscriptionCore: $(azureSubscriptionCore)
azureSubscriptionCore: $(subscriptionServiceCore)
name: 'resourceApi'
secretName: 'AzureAd--ClientSecret'
vaultName: $(vaultName)
Expand All @@ -64,7 +64,7 @@ stages:
- template: templates/secret-rotation/ensure-secret.yml
parameters:
azureSubscription: $(subscriptionServiceNonProd)
azureSubscriptionCore: $(azureSubscriptionCore)
azureSubscriptionCore: $(subscriptionServiceCore)
name: 'resourceApi'
secretName: 'AzureAd--ClientSecret'
vaultName: $(vaultName)
Expand All @@ -83,7 +83,7 @@ stages:
- template: templates/secret-rotation/ensure-secret.yml
parameters:
azureSubscription: $(subscriptionServiceNonProd)
azureSubscriptionCore: $(azureSubscriptionCore)
azureSubscriptionCore: $(subscriptionServiceCore)
name: 'resourceApi'
secretName: 'AzureAd--ClientSecret'
vaultName: $(vaultName)
Expand All @@ -102,7 +102,7 @@ stages:
- template: templates/secret-rotation/ensure-secret.yml
parameters:
azureSubscription: $(subscriptionServiceNonProd)
azureSubscriptionCore: $(azureSubscriptionCore)
azureSubscriptionCore: $(subscriptionServiceCore)
name: 'resourceApi'
secretName: 'AzureAd--ClientSecret'
vaultName: $(vaultName)
Expand All @@ -121,8 +121,8 @@ stages:
steps:
- template: templates/secret-rotation/ensure-secret.yml
parameters:
azureSubscription: $(subscriptionServiceNonProd)
azureSubscriptionCore: $(azureSubscriptionCore)
azureSubscription: $(subscriptionServiceProd)
azureSubscriptionCore: $(subscriptionServiceCore)
name: 'resourceApi'
secretName: 'AzureAd--ClientSecret'
vaultName: $(vaultName)
Expand Down
6 changes: 3 additions & 3 deletions pipelines/templates/secret-rotation/ensure-secret.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
parameters:
- name: azureSubscription
- name: subscriptionServiceCore
- name: azureSubscriptionCore
## The name is used to scope variables if multiple secrets are rotated within the pipeline.
- name: name
displayName: Secret id, to scope variables
Expand All @@ -24,7 +24,7 @@ steps:
- template: generate-secret.yml
parameters:
condition: eq(variables['${{ parameters.name }}_Check.generateNew'], 'true')
azureSubscription: ${{ parameters.subscriptionServiceCore }}
azureSubscription: ${{ parameters.azureSubscriptionCore }}
name: ${{ parameters.name }}_SecretGen
clientId: ${{ parameters.aadApplicationId }}
secretDescription: 'FRA - $(vaultName) - ${{ parameters.secretName }}'
Expand All @@ -40,6 +40,6 @@ steps:

- template: cleanup-expired-secrets.yml
parameters:
azureSubscription: ${{ parameters.subscriptionServiceCore }}
azureSubscription: ${{ parameters.azureSubscriptionCore }}
clientId: ${{ parameters.aadApplicationId }}
keyIds: $(${{ parameters.name }}_Check.keysToDelete)