Symbolic names: Generate dependsOn for "existing" resources (#11478)

Closes #10343
Azure · Aug 29, 2023 · feb4930 · feb4930
1 parent e3f82c6
commit feb4930
Show file tree

Hide file tree

Showing 32 changed files with 291 additions and 113 deletions.
diff --git a/src/Bicep.Core.IntegrationTests/ScenarioTests.cs b/src/Bicep.Core.IntegrationTests/ScenarioTests.cs
@@ -4987,4 +4987,30 @@ public void Test_Issue502()
 
  result.ExcludingLinterDiagnostics().Should().NotHaveAnyDiagnostics();
  }
+
+ // https://github.com/Azure/bicep/issues/10343
+ [TestMethod]
+ public void Test_Issue10343()
+ {
+ var result = CompilationHelper.Compile(Services.WithFeatureOverrides(new(SymbolicNameCodegenEnabled: true)), ("main.bicep", @"
+resource foo1 'Microsoft.Storage/storageAccounts@2022-09-01' = {
+ name: 'foo'
+}
+
+resource foo2 'Microsoft.Authorization/roleAssignments@2022-04-01' existing = {
+ scope: foo1
+ name: 'blah'
+}
+
+resource foo3 'Microsoft.Storage/storageAccounts@2022-09-01' = {
+ name: 'foo3'
+ properties: {
+ accessTier: foo2.id
+ }
+}
+"));
+
+ var evaluated = TemplateEvaluator.Evaluate(result.Template);
+ evaluated.Should().HaveValueAtPath("resources.foo3.dependsOn", new JArray("foo2"));
+ }
 }
diff --git a/src/Bicep.Core.Samples/Files/Modules_CRLF/main.symbolicnames.json b/src/Bicep.Core.Samples/Files/Modules_CRLF/main.symbolicnames.json
@@ -6,7 +6,7 @@
  "_generator": {
  "name": "bicep",
  "version": "dev",
- "templateHash": "13851089608436625807"
+ "templateHash": "13086160146120413117"
  }
  },
  "parameters": {
@@ -1801,7 +1801,10 @@
  }
  }
  }
- }
+ },
+ "dependsOn": [
+ "kv"
+ ]
  },
  "secureModule2": {
  "type": "Microsoft.Resources/deployments",
@@ -1859,7 +1862,10 @@
  }
  }
  }
- }
+ },
+ "dependsOn": [
+ "scopedKv"
+ ]
  },
  "secureModuleLooped": {
  "copy": {
@@ -1921,7 +1927,11 @@
  }
  }
  }
- }
+ },
+ "dependsOn": [
+ "[format('loopedKv[{0}]', copyIndex())]",
+ "[format('loopedKv[{0}]', copyIndex())]"
+ ]
  },
  "secureModuleCondition": {
  "type": "Microsoft.Resources/deployments",
@@ -1964,7 +1974,10 @@
  }
  }
  }
- }
+ },
+ "dependsOn": [
+ "kv"
+ ]
  },
  "withSpace": {
  "type": "Microsoft.Resources/deployments",

diff --git a/src/Bicep.Core.Samples/Files/NestedResources_LF/main.symbolicnames.json b/src/Bicep.Core.Samples/Files/NestedResources_LF/main.symbolicnames.json
@@ -6,7 +6,7 @@
  "_generator": {
  "name": "bicep",
  "version": "dev",
- "templateHash": "236868819280717113"
+ "templateHash": "16972434704035043060"
  }
  },
  "parameters": {
@@ -71,13 +71,19 @@
  "properties": {
  "size": "[reference('existingParent').size]",
  "style": "[reference('existingParent::existingChild').style]"
- }
+ },
+ "dependsOn": [
+ "existingParent::existingChild"
+ ]
  },
  "existingParent::existingChild": {
  "existing": true,
  "type": "My.Rp/parentType/childType",
  "apiVersion": "2020-12-01",
- "name": "[format('{0}/{1}', 'existingParent', 'existingChild')]"
+ "name": "[format('{0}/{1}', 'existingParent', 'existingChild')]",
+ "dependsOn": [
+ "existingParent"
+ ]
  },
  "conditionParent::conditionChild::conditionGrandchild": {
  "condition": "[and(and(parameters('createParent'), parameters('createChild')), parameters('createGrandchild'))]",

diff --git a/src/Bicep.Core.Samples/Files/Resources_CRLF/main.symbolicnames.json b/src/Bicep.Core.Samples/Files/Resources_CRLF/main.symbolicnames.json
@@ -6,7 +6,7 @@
  "_generator": {
  "name": "bicep",
  "version": "dev",
- "templateHash": "13455596478469973466"
+ "templateHash": "8982011885688931227"
  }
  },
  "parameters": {
@@ -359,7 +359,7 @@
  "scope": "[extensionResourceId(extensionResourceId(format('Microsoft.Compute/virtualMachines/{0}', 'vmName'), 'My.Rp/extensionResource', 'extension'), 'Mock.Rp/existingExtensionResource', 'existing1')]",
  "name": "existing2",
  "dependsOn": [
- "extension1"
+ "existing1"
  ]
  },
  "extension3": {
@@ -368,7 +368,7 @@
  "scope": "[extensionResourceId(extensionResourceId(format('Microsoft.Compute/virtualMachines/{0}', 'vmName'), 'My.Rp/extensionResource', 'extension'), 'Mock.Rp/existingExtensionResource', 'existing1')]",
  "name": "extension3",
  "dependsOn": [
- "extension1"
+ "existing1"
  ]
  },
  "storageResources": {
@@ -617,7 +617,10 @@
  "p3_child1": {
  "type": "Microsoft.Rp1/resource1/child1",
  "apiVersion": "2020-06-01",
- "name": "[format('{0}/{1}', 'res1', 'child1')]"
+ "name": "[format('{0}/{1}', 'res1', 'child1')]",
+ "dependsOn": [
+ "p3_res1"
+ ]
  },
  "p4_res1": {
  "existing": true,
@@ -631,7 +634,10 @@
  "type": "Microsoft.Rp1/resource1/child1",
  "apiVersion": "2020-06-01",
  "scope": "/",
- "name": "[format('{0}/{1}', 'res1', 'child1')]"
+ "name": "[format('{0}/{1}', 'res1', 'child1')]",
+ "dependsOn": [
+ "p4_res1"
+ ]
  }
  },
  "outputs": {

diff --git a/...ore.Samples/Files/user_submitted/101/api-management-modular/NameValues.symbolicnames.json b/...ore.Samples/Files/user_submitted/101/api-management-modular/NameValues.symbolicnames.json
@@ -6,7 +6,7 @@
  "_generator": {
  "name": "bicep",
  "version": "dev",
- "templateHash": "14248540637091011874"
+ "templateHash": "11528852364160566097"
  }
  },
  "parameters": {
@@ -56,7 +56,10 @@
  "secret": "[variables('apimNameValueSet')[copyIndex()].isSecret]",
  "value": "[variables('apimNameValueSet')[copyIndex()].value]",
  "tags": "[variables('apimNameValueSet')[copyIndex()].tags]"
- }
+ },
+ "dependsOn": [
+ "parentAPIM"
+ ]
  }
  },
  "outputs": {

diff --git a/...ep.Core.Samples/Files/user_submitted/101/api-management-modular/groups.symbolicnames.json b/...ep.Core.Samples/Files/user_submitted/101/api-management-modular/groups.symbolicnames.json
@@ -6,7 +6,7 @@
  "_generator": {
  "name": "bicep",
  "version": "dev",
- "templateHash": "6816770503491912011"
+ "templateHash": "403029788224868668"
  }
  },
  "parameters": {
@@ -47,7 +47,10 @@
  "properties": {
  "displayName": "[variables('groupsSet')[copyIndex()].groupDisplayName]",
  "description": "[variables('groupsSet')[copyIndex()].groupDescription]"
- }
+ },
+ "dependsOn": [
+ "parentAPIM"
+ ]
  }
  },
  "outputs": {

diff --git a/...icep.Core.Samples/Files/user_submitted/101/api-management-modular/main.symbolicnames.json b/...icep.Core.Samples/Files/user_submitted/101/api-management-modular/main.symbolicnames.json
@@ -6,7 +6,7 @@
  "_generator": {
  "name": "bicep",
  "version": "dev",
- "templateHash": "2208926443863165998"
+ "templateHash": "13726378283629199613"
  }
  },
  "parameters": {
@@ -163,7 +163,7 @@
  "_generator": {
  "name": "bicep",
  "version": "dev",
- "templateHash": "6816770503491912011"
+ "templateHash": "403029788224868668"
  }
  },
  "parameters": {
@@ -204,7 +204,10 @@
  "properties": {
  "displayName": "[variables('groupsSet')[copyIndex()].groupDisplayName]",
  "description": "[variables('groupsSet')[copyIndex()].groupDescription]"
- }
+ },
+ "dependsOn": [
+ "parentAPIM"
+ ]
  }
  },
  "outputs": {
@@ -248,7 +251,7 @@
  "_generator": {
  "name": "bicep",
  "version": "dev",
- "templateHash": "16793550498477002119"
+ "templateHash": "8034218730798252475"
  }
  },
  "parameters": {
@@ -298,7 +301,10 @@
  "email": "[variables('usersSet')[copyIndex()].email]",
  "state": "[variables('usersSet')[copyIndex()].state]",
  "note": "[variables('usersSet')[copyIndex()].notes]"
- }
+ },
+ "dependsOn": [
+ "parentAPIM"
+ ]
  }
  }
  }
@@ -330,7 +336,7 @@
  "_generator": {
  "name": "bicep",
  "version": "dev",
- "templateHash": "14248540637091011874"
+ "templateHash": "11528852364160566097"
  }
  },
  "parameters": {
@@ -380,7 +386,10 @@
  "secret": "[variables('apimNameValueSet')[copyIndex()].isSecret]",
  "value": "[variables('apimNameValueSet')[copyIndex()].value]",
  "tags": "[variables('apimNameValueSet')[copyIndex()].tags]"
- }
+ },
+ "dependsOn": [
+ "parentAPIM"
+ ]
  }
  },
  "outputs": {

diff --git a/...cep.Core.Samples/Files/user_submitted/101/api-management-modular/users.symbolicnames.json b/...cep.Core.Samples/Files/user_submitted/101/api-management-modular/users.symbolicnames.json
@@ -6,7 +6,7 @@
  "_generator": {
  "name": "bicep",
  "version": "dev",
- "templateHash": "16793550498477002119"
+ "templateHash": "8034218730798252475"
  }
  },
  "parameters": {
@@ -56,7 +56,10 @@
  "email": "[variables('usersSet')[copyIndex()].email]",
  "state": "[variables('usersSet')[copyIndex()].state]",
  "note": "[variables('usersSet')[copyIndex()].notes]"
- }
+ },
+ "dependsOn": [
+ "parentAPIM"
+ ]
  }
  }
 }
diff --git a/src/Bicep.Core.Samples/Files/user_submitted/101/azure-bastion/main.symbolicnames.json b/src/Bicep.Core.Samples/Files/user_submitted/101/azure-bastion/main.symbolicnames.json
@@ -6,7 +6,7 @@
  "_generator": {
  "name": "bicep",
  "version": "dev",
- "templateHash": "13199377578825632986"
+ "templateHash": "5898567106534730923"
  }
  },
  "parameters": {
@@ -149,7 +149,10 @@
  ]
  }
  }
- }
+ },
+ "dependsOn": [
+ "existingVirtualNetwork"
+ ]
  },
  "bastionHost": {
  "type": "Microsoft.Network/bastionHosts",
@@ -172,6 +175,7 @@
  ]
  },
  "dependsOn": [
+ "existingVirtualNetwork",
  "newVirtualNetwork",
  "publicIp",
  "subnet"

diff --git a/...r_submitted/101/databricks-all-in-one-template-for-vnet-injection/main.symbolicnames.json b/...r_submitted/101/databricks-all-in-one-template-for-vnet-injection/main.symbolicnames.json
@@ -6,7 +6,7 @@
  "_generator": {
  "name": "bicep",
  "version": "dev",
- "templateHash": "14481747842301389436"
+ "templateHash": "16714276462655423062"
  }
  },
  "parameters": {
@@ -275,6 +275,7 @@
  }
  },
  "dependsOn": [
+ "managedResourceGroup",
  "vnet"
  ]
  }

diff --git a/...amples/Files/user_submitted/101/function-premium-vnet-integration/main.symbolicnames.json b/...amples/Files/user_submitted/101/function-premium-vnet-integration/main.symbolicnames.json
@@ -6,7 +6,7 @@
  "_generator": {
  "name": "bicep",
  "version": "dev",
- "templateHash": "746252077949181675"
+ "templateHash": "18250750169409311102"
  }
  },
  "parameters": {
@@ -217,7 +217,7 @@
  },
  "dependsOn": [
  "function",
- "virtualNetwork"
+ "subnet"
  ]
  },
  "subnet": {

diff --git a/...Core.Samples/Files/user_submitted/101/resource-with-lock-existing/main.symbolicnames.json b/...Core.Samples/Files/user_submitted/101/resource-with-lock-existing/main.symbolicnames.json
@@ -6,7 +6,7 @@
  "_generator": {
  "name": "bicep",
  "version": "dev",
- "templateHash": "13154103683186341528"
+ "templateHash": "18313409063500380309"
  }
  },
  "parameters": {
@@ -28,7 +28,10 @@
  "name": "DontDelete",
  "properties": {
  "level": "CanNotDelete"
- }
+ },
+ "dependsOn": [
+ "storageAcc"
+ ]
  }
  }
 }