Externalize Log Analytics Workspace parameters when loading pipeline …

…variables (Azure#220) Externalize the log analytics parameters to load arbitary LAW variables
cds-snc · Mar 31, 2022 · 6b36096 · 6b36096
1 parent 0210df4
commit 6b36096
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 10 deletions.
diff --git a/.pipelines/platform-connectivity-hub-azfw.yml b/.pipelines/platform-connectivity-hub-azfw.yml
@@ -47,10 +47,14 @@ stages:
           steps:
           - checkout: self
 
-          - template: templates/steps/load-log-analytics-vars.yml
-
           - template: templates/steps/load-variables.yml
 
+          - template: templates/steps/load-log-analytics-vars.yml
+            parameters:
+              logAnalyticsSubscriptionId: $(var-logging-subscriptionId)
+              logAnalyticsResourceGroupName: $(var-logging-logAnalyticsResourceGroupName)
+              logAnalyticsWorkspaceName: $(var-logging-logAnalyticsWorkspaceName)
+
           - template: templates/steps/show-variables.yml
             parameters:
               json: ${{ convertToJson(variables) }}

diff --git a/.pipelines/platform-connectivity-hub-nva.yml b/.pipelines/platform-connectivity-hub-nva.yml
@@ -48,10 +48,14 @@ stages:
           steps:
           - checkout: self
 
-          - template: templates/steps/load-log-analytics-vars.yml
-
           - template: templates/steps/load-variables.yml
 
+          - template: templates/steps/load-log-analytics-vars.yml
+            parameters:
+              logAnalyticsSubscriptionId: $(var-logging-subscriptionId)
+              logAnalyticsResourceGroupName: $(var-logging-logAnalyticsResourceGroupName)
+              logAnalyticsWorkspaceName: $(var-logging-logAnalyticsWorkspaceName)
+
           - template: templates/steps/show-variables.yml
             parameters:
               json: ${{ convertToJson(variables) }}

diff --git a/.pipelines/policy.yml b/.pipelines/policy.yml
@@ -75,10 +75,14 @@ stages:
 
     steps:
 
-    - template: templates/steps/load-log-analytics-vars.yml
-
     - template: templates/steps/load-variables.yml
 
+    - template: templates/steps/load-log-analytics-vars.yml
+      parameters:
+        logAnalyticsSubscriptionId: $(var-logging-subscriptionId)
+        logAnalyticsResourceGroupName: $(var-logging-logAnalyticsResourceGroupName)
+        logAnalyticsWorkspaceName: $(var-logging-logAnalyticsWorkspaceName)
+
     - template: templates/steps/show-variables.yml
       parameters:
         json: ${{ convertToJson(variables) }}
@@ -111,10 +115,14 @@ stages:
 
     steps:
 
-    - template: templates/steps/load-log-analytics-vars.yml
-
     - template: templates/steps/load-variables.yml
 
+    - template: templates/steps/load-log-analytics-vars.yml
+      parameters:
+        logAnalyticsSubscriptionId: $(var-logging-subscriptionId)
+        logAnalyticsResourceGroupName: $(var-logging-logAnalyticsResourceGroupName)
+        logAnalyticsWorkspaceName: $(var-logging-logAnalyticsWorkspaceName)
+
     - template: templates/steps/show-variables.yml
       parameters:
         json: ${{ convertToJson(variables) }}

diff --git a/.pipelines/templates/steps/deploy-subscription.yml b/.pipelines/templates/steps/deploy-subscription.yml
@@ -41,6 +41,10 @@ steps:
     workingDir: $(Build.SourcesDirectory)/$(subscriptionsPathFromRoot)/${{ parameters.relativePath }}
 
 - template: ./load-log-analytics-vars.yml
+  parameters:
+    logAnalyticsSubscriptionId: $(var-logging-subscriptionId)
+    logAnalyticsResourceGroupName: $(var-logging-logAnalyticsResourceGroupName)
+    logAnalyticsWorkspaceName: $(var-logging-logAnalyticsWorkspaceName)
 
 - task: AzureCLI@2
   displayName: Register Azure Provider Features

diff --git a/.pipelines/templates/steps/load-log-analytics-vars.yml b/.pipelines/templates/steps/load-log-analytics-vars.yml
@@ -7,6 +7,14 @@
 # OF MERCHANTABILITY AND/OR FITNESS FOR A PARTICULAR PURPOSE.
 # ----------------------------------------------------------------------------------
 
+parameters:
+  - name: logAnalyticsSubscriptionId
+    type: string
+  - name: logAnalyticsResourceGroupName
+    type: string
+  - name: logAnalyticsWorkspaceName
+    type: string
+
 steps:
 
 - task: AzureCLI@2
@@ -19,8 +27,12 @@ steps:
       $(var-bashPreInjectScript)
 
       # Get workspace info via Azure CLI
-      echo 'Retrieving log analytics workspace info via Azure CLI...'
-      workspaceInfo=`az monitor log-analytics workspace show --subscription $(var-logging-subscriptionId) -g $(var-logging-logAnalyticsResourceGroupName) -n $(var-logging-logAnalyticsWorkspaceName) --query '{workspaceResourceId:id,workspaceId:customerId}' -o json`
+      echo 'Retrieving log analytics workspace info via Azure CLI ...'
+      echo 'Subscription: ${{ parameters.logAnalyticsSubscriptionId }}'
+      echo 'Resource Group: ${{ parameters.logAnalyticsResourceGroupName }}'
+      echo 'Log Analytics Workspace: ${{ parameters.logAnalyticsWorkspaceName }}'
+      
+      workspaceInfo=`az monitor log-analytics workspace show --subscription ${{ parameters.logAnalyticsSubscriptionId }} -g ${{ parameters.logAnalyticsResourceGroupName }} -n ${{ parameters.logAnalyticsWorkspaceName }} --query '{workspaceResourceId:id,workspaceId:customerId}' -o json`
     
       # Set local environment variables
       LOG_ANALYTICS_WORKSPACE_RESOURCE_ID=`echo $workspaceInfo | jq -r .workspaceResourceId`