Uses unique Resource Group ID to generate unique workspace id, to avo…

…id multiple workspace gets created when deploy template multiple times
Azure · Dec 4, 2020 · aa4c0de · aa4c0de
1 parent 750b88a
commit aa4c0de
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/Secure Score/Get-SecureScoreData/azuredeploy-existingLogA.json b/Secure Score/Get-SecureScoreData/azuredeploy-existingLogA.json
@@ -5,11 +5,7 @@
         "PlaybookName": {
             "defaultValue": "Get-SecureScoreData",
             "type": "String"
-        },
-        "GUID": {
-            "type": "string",
-            "defaultValue": "[newGuid()]"
-        },
+        },        
         "workspaceName": {
             "type": "string",
             "defaultValue": "Enter the workspace name"
@@ -26,7 +22,7 @@
     "variables": {
         "AzureLogAnalyticsDataCollectorConnectionName": "[concat('azureloganalyticsdatacollector-', parameters('PlaybookName'))]",
         "WorkbookName": "SecureScoreWorkbook",
-        "WorkbookId": "[guid('SecureScoreData', subscription().subscriptionId)]"
+        "WorkbookId": "[guid('SecureScoreData', resourceGroup().id)]"
     },
     "resources": [
         {

diff --git a/Secure Score/Get-SecureScoreData/azuredeploy.json b/Secure Score/Get-SecureScoreData/azuredeploy.json
@@ -5,17 +5,13 @@
         "PlaybookName": {
             "defaultValue": "Get-SecureScoreData",
             "type": "String"
-        },
-        "GUID": {
-            "type": "string",
-            "defaultValue": "[newGuid()]"
         }
     },
     "variables": {
         "AzureLogAnalyticsDataCollectorConnectionName": "[concat('azureloganalyticsdatacollector-', parameters('PlaybookName'))]",
-        "AzureLogAnalyticsWorkspaceName": "[concat('SecureScoreData-', uniqueString(parameters('GUID')))]",
+        "AzureLogAnalyticsWorkspaceName": "[concat('SecureScoreData-', uniqueString(resourceGroup().id))]",
         "WorkbookName": "SecureScoreWorkbook",
-        "WorkbookId": "[guid('SecureScoreData', subscription().subscriptionId)]"
+        "WorkbookId": "[guid('SecureScoreData', resourceGroup().id)]"
     },
     "resources": [
         {