Merge branch 'master' into chore/summary/adjust-recipients

equinor · Aug 27, 2024 · d1950a2 · d1950a2
2 parents 83884a0 + 79309c2
commit d1950a2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/pipelines/secret-rotation-pipeline.yml b/pipelines/secret-rotation-pipeline.yml
@@ -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)
@@ -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)
@@ -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)
@@ -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)
@@ -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)

diff --git a/pipelines/templates/secret-rotation/ensure-secret.yml b/pipelines/templates/secret-rotation/ensure-secret.yml
@@ -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
@@ -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 }}'
@@ -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)