681-CreateUIDefinition-Nested-Defaults (#689)

* Parameters w/o Default Must Exist In CreateUIDef: Excluding innertemplates (Fixes #681) * Adding Test for Nested Parameters (re #681) Co-authored-by: James Brundage <@github.com>
Azure · Sep 23, 2022 · 63c6a0c · 63c6a0c
1 parent 7bc3cfc
commit 63c6a0c
Show file tree

Hide file tree

Showing 3 changed files with 73 additions and 1 deletion.
diff --git a/...s/CreateUIDefinition/Parameters-Without-Default-Must-Exist-In-CreateUIDefinition.test.ps1 b/...s/CreateUIDefinition/Parameters-Without-Default-Must-Exist-In-CreateUIDefinition.test.ps1
@@ -12,9 +12,16 @@ $TemplateObject,
 
 [Parameter(Mandatory=$true)]
 [PSObject]
-$CreateUIDefinitionObject
+$CreateUIDefinitionObject,
+
+# If set, the TemplateObject is an inner template.
+[switch]
+$IsInnerTemplate
 )
 
+# We do not need to consider if inner template parameters exist in CreateUIDefinition.
+if ($IsInnerTemplate) { return }
+
 foreach ($parameter in $TemplateObject.parameters.psobject.properties) {
     $parameterName = $parameter.Name
     $parameterInfo = $parameter.Value

diff --git a/...out-Default-Must-Exist-In-CreateUIDefinition/Pass/nestedParameter/CreateUIDefinition.json b/...out-Default-Must-Exist-In-CreateUIDefinition/Pass/nestedParameter/CreateUIDefinition.json
@@ -0,0 +1,13 @@
+{
+    "$schema": "https://schema.management.azure.com/schemas/0.1.2-preview/CreateUIDefinition.MultiVm.json#",
+    "handler": "Microsoft.Azure.CreateUIDef",
+    "version": "0.1.2-preview",
+    "parameters": {
+      "basics": [
+        {}
+      ],
+      "outputs": {
+        "mainParameter": "value-from-ui"
+      }
+    }
+  }
diff --git a/...rs-Without-Default-Must-Exist-In-CreateUIDefinition/Pass/nestedParameter/azureDeploy.json b/...rs-Without-Default-Must-Exist-In-CreateUIDefinition/Pass/nestedParameter/azureDeploy.json
@@ -0,0 +1,52 @@
+{
+    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
+    "contentVersion": "1.0.0.0",
+    "metadata": {
+      "_generator": {
+        "name": "bicep",
+        "version": "0.9.1.41621",
+        "templateHash": "4551264275492999207"
+      }
+    },
+    "parameters": {
+      "mainParameter": {
+        "type": "string",
+        "defaultValue": "default-value"
+      }
+    },
+    "resources": [
+      {
+        "type": "Microsoft.Resources/deployments",
+        "apiVersion": "2020-10-01",
+        "name": "Module",
+        "properties": {
+          "expressionEvaluationOptions": {
+            "scope": "inner"
+          },
+          "mode": "Incremental",
+          "parameters": {
+            "moduleParameter": {
+              "value": "[parameters('mainParameter')]"
+            }
+          },
+          "template": {
+            "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
+            "contentVersion": "1.0.0.0",
+            "metadata": {
+              "_generator": {
+                "name": "bicep",
+                "version": "0.9.1.41621",
+                "templateHash": "15490559216858461434"
+              }
+            },
+            "parameters": {
+              "moduleParameter": {
+                "type": "string"
+              }
+            },
+            "resources": []
+          }
+        }
+      }
+    ]
+  }