Remove deployment().name from uniquestrings

stuartleeks · stuartleeks · commit 42a1f67cace2 · 2015-12-09T15:42:24.000Z
diff --git a/201-2-vms-loadbalancer-natrules/azuredeploy.json b/201-2-vms-loadbalancer-natrules/azuredeploy.json
@@ -106,7 +106,7 @@
     "lbID": "[resourceId('Microsoft.Network/loadBalancers',parameters('lbName'))]",
     "numberOfInstances": 2,
     "frontEndIPConfigID": "[concat(variables('lbID'),'/frontendIPConfigurations/loadBalancerFrontend')]",
-    "storageAccountName": "[uniqueString(resourceGroup().id, deployment().name)]"
+    "storageAccountName": "[uniqueString(resourceGroup().id)]"
   },
   "resources": [
     {
diff --git a/201-vmss-lapstack-autoscale/azuredeploy.json b/201-vmss-lapstack-autoscale/azuredeploy.json
@@ -76,11 +76,11 @@
     "saCount":5,
     "newStorageAccountSuffix":"[concat(parameters('vmssName'), 'sa')]",
     "uniqueStringArray":[
-      "[concat(uniqueString(concat(resourceGroup().id, deployment().name, variables('newStorageAccountSuffix'), '0')))]",
-      "[concat(uniqueString(concat(resourceGroup().id, deployment().name, variables('newStorageAccountSuffix'), '1')))]",
-      "[concat(uniqueString(concat(resourceGroup().id, deployment().name, variables('newStorageAccountSuffix'), '2')))]",
-      "[concat(uniqueString(concat(resourceGroup().id, deployment().name, variables('newStorageAccountSuffix'), '3')))]",
-      "[concat(uniqueString(concat(resourceGroup().id, deployment().name, variables('newStorageAccountSuffix'), '4')))]"
+      "[concat(uniqueString(concat(resourceGroup().id, variables('newStorageAccountSuffix'), '0')))]",
+      "[concat(uniqueString(concat(resourceGroup().id, variables('newStorageAccountSuffix'), '1')))]",
+      "[concat(uniqueString(concat(resourceGroup().id, variables('newStorageAccountSuffix'), '2')))]",
+      "[concat(uniqueString(concat(resourceGroup().id, variables('newStorageAccountSuffix'), '3')))]",
+      "[concat(uniqueString(concat(resourceGroup().id, variables('newStorageAccountSuffix'), '4')))]"
     ],
     "vhdContainerName":"[concat(parameters('vmssName'), 'vhd')]",
     "osDiskName":"[concat(parameters('vmssName'), 'osdisk')]",
diff --git a/201-vmss-linux-jumpbox/azuredeploy.json b/201-vmss-linux-jumpbox/azuredeploy.json
@@ -74,7 +74,7 @@
   "variables":{
     "apiVersion":"2015-06-15",
     "jumpBoxName":"[concat(parameters('vmssName'), 'jumpbox')]",
-    "jumpBoxSAName":"[concat(uniqueString(concat(resourceGroup().id, deployment().name, variables('newStorageAccountSuffix'), 'jumpboxsa')), 'jb')]",
+    "jumpBoxSAName":"[concat(uniqueString(concat(resourceGroup().id, variables('newStorageAccountSuffix'), 'jumpboxsa')), 'jb')]",
     "jumpBoxOSDiskName":"[concat(variables('jumpBoxName'), 'osdisk')]",
     "jumpBoxVHDContainerName":"[concat(variables('jumpBoxName'), 'vhd')]",
     "jumpBoxIPConfigName":"[concat(variables('jumpBoxName'), 'ipconfig')]",
@@ -84,11 +84,11 @@
     "namingInfix": "[toLower(parameters('vmssName'))]",
     "newStorageAccountSuffix":"[concat(variables('namingInfix'), 'sa')]",
     "uniqueStringArray":[
-      "[concat(uniqueString(concat(resourceGroup().id, deployment().name, variables('newStorageAccountSuffix'), '0')))]",
-      "[concat(uniqueString(concat(resourceGroup().id, deployment().name, variables('newStorageAccountSuffix'), '1')))]",
-      "[concat(uniqueString(concat(resourceGroup().id, deployment().name, variables('newStorageAccountSuffix'), '2')))]",
-      "[concat(uniqueString(concat(resourceGroup().id, deployment().name, variables('newStorageAccountSuffix'), '3')))]",
-      "[concat(uniqueString(concat(resourceGroup().id, deployment().name, variables('newStorageAccountSuffix'), '4')))]"
+      "[concat(uniqueString(concat(resourceGroup().id, variables('newStorageAccountSuffix'), '0')))]",
+      "[concat(uniqueString(concat(resourceGroup().id, variables('newStorageAccountSuffix'), '1')))]",
+      "[concat(uniqueString(concat(resourceGroup().id, variables('newStorageAccountSuffix'), '2')))]",
+      "[concat(uniqueString(concat(resourceGroup().id, variables('newStorageAccountSuffix'), '3')))]",
+      "[concat(uniqueString(concat(resourceGroup().id, variables('newStorageAccountSuffix'), '4')))]"
     ],
     "vhdContainerName":"[concat(variables('namingInfix'), 'vhd')]",
     "osDiskName":"[concat(variables('namingInfix'), 'osdisk')]",
diff --git a/201-vmss-linux-nat/azuredeploy.json b/201-vmss-linux-nat/azuredeploy.json
@@ -78,11 +78,11 @@
     "namingInfix": "[toLower(parameters('vmssName'))]",
     "newStorageAccountSuffix":"[concat(variables('namingInfix'), 'sa')]",
     "uniqueStringArray":[
-      "[concat(uniqueString(concat(resourceGroup().id, deployment().name, variables('newStorageAccountSuffix'), '0')))]",
-      "[concat(uniqueString(concat(resourceGroup().id, deployment().name, variables('newStorageAccountSuffix'), '1')))]",
-      "[concat(uniqueString(concat(resourceGroup().id, deployment().name, variables('newStorageAccountSuffix'), '2')))]",
-      "[concat(uniqueString(concat(resourceGroup().id, deployment().name, variables('newStorageAccountSuffix'), '3')))]",
-      "[concat(uniqueString(concat(resourceGroup().id, deployment().name, variables('newStorageAccountSuffix'), '4')))]"
+      "[concat(uniqueString(concat(resourceGroup().id, variables('newStorageAccountSuffix'), '0')))]",
+      "[concat(uniqueString(concat(resourceGroup().id, variables('newStorageAccountSuffix'), '1')))]",
+      "[concat(uniqueString(concat(resourceGroup().id, variables('newStorageAccountSuffix'), '2')))]",
+      "[concat(uniqueString(concat(resourceGroup().id, variables('newStorageAccountSuffix'), '3')))]",
+      "[concat(uniqueString(concat(resourceGroup().id, variables('newStorageAccountSuffix'), '4')))]"
     ],
     "vhdContainerName":"[concat(variables('namingInfix'), 'vhd')]",
     "osDiskName":"[concat(variables('namingInfix'), 'osdisk')]",
diff --git a/201-vmss-ubuntu-autoscale/azuredeploy.json b/201-vmss-ubuntu-autoscale/azuredeploy.json
@@ -76,11 +76,11 @@
     "saCount":5,
     "newStorageAccountSuffix":"[concat(parameters('vmssName'), 'sa')]",
     "uniqueStringArray":[
-      "[concat(uniqueString(concat(resourceGroup().id, deployment().name, variables('newStorageAccountSuffix'), '0')))]",
-      "[concat(uniqueString(concat(resourceGroup().id, deployment().name, variables('newStorageAccountSuffix'), '1')))]",
-      "[concat(uniqueString(concat(resourceGroup().id, deployment().name, variables('newStorageAccountSuffix'), '2')))]",
-      "[concat(uniqueString(concat(resourceGroup().id, deployment().name, variables('newStorageAccountSuffix'), '3')))]",
-      "[concat(uniqueString(concat(resourceGroup().id, deployment().name, variables('newStorageAccountSuffix'), '4')))]"
+      "[concat(uniqueString(concat(resourceGroup().id, variables('newStorageAccountSuffix'), '0')))]",
+      "[concat(uniqueString(concat(resourceGroup().id, variables('newStorageAccountSuffix'), '1')))]",
+      "[concat(uniqueString(concat(resourceGroup().id, variables('newStorageAccountSuffix'), '2')))]",
+      "[concat(uniqueString(concat(resourceGroup().id, variables('newStorageAccountSuffix'), '3')))]",
+      "[concat(uniqueString(concat(resourceGroup().id, variables('newStorageAccountSuffix'), '4')))]"
     ],
     "vhdContainerName":"[concat(parameters('vmssName'), 'vhd')]",
     "osDiskName":"[concat(parameters('vmssName'), 'osdisk')]",
diff --git a/201-vmss-windows-jumpbox/azuredeploy.json b/201-vmss-windows-jumpbox/azuredeploy.json
@@ -74,7 +74,7 @@
   "variables":{
     "apiVersion":"2015-06-15",
     "jumpBoxName":"[concat(parameters('vmssName'), 'jumpbox')]",
-    "jumpBoxSAName":"[concat(uniqueString(concat(resourceGroup().id, deployment().name, variables('newStorageAccountSuffix'), 'jumpboxsa')), 'jb')]",
+    "jumpBoxSAName":"[concat(uniqueString(concat(resourceGroup().id, variables('newStorageAccountSuffix'), 'jumpboxsa')), 'jb')]",
     "jumpBoxOSDiskName":"[concat(variables('jumpBoxName'), 'osdisk')]",
     "jumpBoxVHDContainerName":"[concat(variables('jumpBoxName'), 'vhd')]",
     "jumpBoxIPConfigName":"[concat(variables('jumpBoxName'), 'ipconfig')]",
@@ -84,11 +84,11 @@
     "namingInfix": "[toLower(parameters('vmssName'))]",
     "newStorageAccountSuffix":"[concat(variables('namingInfix'), 'sa')]",
     "uniqueStringArray":[
-      "[concat(uniqueString(concat(resourceGroup().id, deployment().name, variables('newStorageAccountSuffix'), '0')))]",
-      "[concat(uniqueString(concat(resourceGroup().id, deployment().name, variables('newStorageAccountSuffix'), '1')))]",
-      "[concat(uniqueString(concat(resourceGroup().id, deployment().name, variables('newStorageAccountSuffix'), '2')))]",
-      "[concat(uniqueString(concat(resourceGroup().id, deployment().name, variables('newStorageAccountSuffix'), '3')))]",
-      "[concat(uniqueString(concat(resourceGroup().id, deployment().name, variables('newStorageAccountSuffix'), '4')))]"
+      "[concat(uniqueString(concat(resourceGroup().id, variables('newStorageAccountSuffix'), '0')))]",
+      "[concat(uniqueString(concat(resourceGroup().id, variables('newStorageAccountSuffix'), '1')))]",
+      "[concat(uniqueString(concat(resourceGroup().id, variables('newStorageAccountSuffix'), '2')))]",
+      "[concat(uniqueString(concat(resourceGroup().id, variables('newStorageAccountSuffix'), '3')))]",
+      "[concat(uniqueString(concat(resourceGroup().id, variables('newStorageAccountSuffix'), '4')))]"
     ],
     "vhdContainerName":"[concat(variables('namingInfix'), 'vhd')]",
     "osDiskName":"[concat(variables('namingInfix'), 'osdisk')]",
diff --git a/201-vmss-windows-nat/azuredeploy.json b/201-vmss-windows-nat/azuredeploy.json
@@ -78,11 +78,11 @@
     "namingInfix": "[toLower(parameters('vmssName'))]",
     "newStorageAccountSuffix":"[concat(variables('namingInfix'), 'sa')]",
     "uniqueStringArray":[
-      "[concat(uniqueString(concat(resourceGroup().id, deployment().name, variables('newStorageAccountSuffix'), '0')))]",
-      "[concat(uniqueString(concat(resourceGroup().id, deployment().name, variables('newStorageAccountSuffix'), '1')))]",
-      "[concat(uniqueString(concat(resourceGroup().id, deployment().name, variables('newStorageAccountSuffix'), '2')))]",
-      "[concat(uniqueString(concat(resourceGroup().id, deployment().name, variables('newStorageAccountSuffix'), '3')))]",
-      "[concat(uniqueString(concat(resourceGroup().id, deployment().name, variables('newStorageAccountSuffix'), '4')))]"
+      "[concat(uniqueString(concat(resourceGroup().id, variables('newStorageAccountSuffix'), '0')))]",
+      "[concat(uniqueString(concat(resourceGroup().id, variables('newStorageAccountSuffix'), '1')))]",
+      "[concat(uniqueString(concat(resourceGroup().id, variables('newStorageAccountSuffix'), '2')))]",
+      "[concat(uniqueString(concat(resourceGroup().id, variables('newStorageAccountSuffix'), '3')))]",
+      "[concat(uniqueString(concat(resourceGroup().id, variables('newStorageAccountSuffix'), '4')))]"
     ],
     "vhdContainerName":"[concat(variables('namingInfix'), 'vhd')]",
     "osDiskName":"[concat(variables('namingInfix'), 'osdisk')]",

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@`
`106`	`106`	`"lbID": "[resourceId('Microsoft.Network/loadBalancers',parameters('lbName'))]",`
`107`	`107`	`"numberOfInstances": 2,`
`108`	`108`	`"frontEndIPConfigID": "[concat(variables('lbID'),'/frontendIPConfigurations/loadBalancerFrontend')]",`
`109`		`- "storageAccountName": "[uniqueString(resourceGroup().id, deployment().name)]"`
	`109`	`+ "storageAccountName": "[uniqueString(resourceGroup().id)]"`
`110`	`110`	`},`
`111`	`111`	`"resources": [`
`112`	`112`	`{`