Add support for JSON literal string conversion (#3510)

* Add support for JSON literal string conversion * Address comments * Add test for unparseable JSON, JSON with comments * Use TryFromJson
Azure · Jul 9, 2021 · 632fa2d · 632fa2d
1 parent 6987e17
commit 632fa2d
Show file tree

Hide file tree

Showing 32 changed files with 397 additions and 63 deletions.
diff --git a/docs/examples/101/azurefirewall-create-with-zones/main.bicep b/docs/examples/101/azurefirewall-create-with-zones/main.bicep
@@ -45,7 +45,7 @@ resource publicIP 'Microsoft.Network/publicIPAddresses@2020-06-01' = {
 resource firewall 'Microsoft.Network/azureFirewalls@2020-06-01' = {
   name: firewallName
   location: location
-  zones: length(availabilityZones) == 0 ? json('null') : availabilityZones
+  zones: length(availabilityZones) == 0 ? null : availabilityZones
   properties: {
     ipConfigurations: [
       {

diff --git a/docs/examples/101/azurefirewall-create-with-zones/main.json b/docs/examples/101/azurefirewall-create-with-zones/main.json
@@ -5,7 +5,7 @@
     "_generator": {
       "name": "bicep",
       "version": "dev",
-      "templateHash": "16439774586836419118"
+      "templateHash": "1241648137071561964"
     }
   },
   "parameters": {
@@ -85,7 +85,7 @@
       "apiVersion": "2020-06-01",
       "name": "[parameters('firewallName')]",
       "location": "[parameters('location')]",
-      "zones": "[if(equals(length(parameters('availabilityZones')), 0), json('null'), parameters('availabilityZones'))]",
+      "zones": "[if(equals(length(parameters('availabilityZones')), 0), null(), parameters('availabilityZones'))]",
       "properties": {
         "ipConfigurations": [
           {

diff --git a/docs/examples/201/private-aks-cluster/aks.bicep b/docs/examples/201/private-aks-cluster/aks.bicep
@@ -231,7 +231,7 @@ resource aksCluster 'Microsoft.ContainerService/managedClusters@2021-02-01' = {
       dockerBridgeCidr: aksClusterDockerBridgeCidr
       loadBalancerSku: aksClusterLoadBalancerSku
     }
-    aadProfile: (aadEnabled ? aadProfileConfiguration : json('null'))
+    aadProfile: (aadEnabled ? aadProfileConfiguration : null)
     apiServerAccessProfile: {
       enablePrivateCluster: aksClusterEnablePrivateCluster
     }

diff --git a/docs/examples/201/private-aks-cluster/aks.json b/docs/examples/201/private-aks-cluster/aks.json
@@ -5,7 +5,7 @@
     "_generator": {
       "name": "bicep",
       "version": "dev",
-      "templateHash": "11819378221515304822"
+      "templateHash": "5882575949678654988"
     }
   },
   "parameters": {
@@ -389,7 +389,7 @@
           "dockerBridgeCidr": "[parameters('aksClusterDockerBridgeCidr')]",
           "loadBalancerSku": "[parameters('aksClusterLoadBalancerSku')]"
         },
-        "aadProfile": "[if(parameters('aadEnabled'), variables('aadProfileConfiguration'), json('null'))]",
+        "aadProfile": "[if(parameters('aadEnabled'), variables('aadProfileConfiguration'), null())]",
         "apiServerAccessProfile": {
           "enablePrivateCluster": "[parameters('aksClusterEnablePrivateCluster')]"
         }

diff --git a/docs/examples/201/private-aks-cluster/jumpbox.bicep b/docs/examples/201/private-aks-cluster/jumpbox.bicep
@@ -133,7 +133,7 @@ resource virtualMachines 'Microsoft.Compute/virtualMachines@2020-12-01' = {
       computerName: vmName
       adminUsername: vmAdminUsername
       adminPassword: vmAdminPasswordOrKey
-      linuxConfiguration: ((authenticationType == 'password') ? json('null') : linuxConfiguration)
+      linuxConfiguration: ((authenticationType == 'password') ? null : linuxConfiguration)
     }
     storageProfile: {
       imageReference: {

diff --git a/docs/examples/201/private-aks-cluster/jumpbox.json b/docs/examples/201/private-aks-cluster/jumpbox.json
@@ -5,7 +5,7 @@
     "_generator": {
       "name": "bicep",
       "version": "dev",
-      "templateHash": "10939577128460965414"
+      "templateHash": "6673211936035085652"
     }
   },
   "parameters": {
@@ -217,7 +217,7 @@
           "computerName": "[parameters('vmName')]",
           "adminUsername": "[parameters('vmAdminUsername')]",
           "adminPassword": "[parameters('vmAdminPasswordOrKey')]",
-          "linuxConfiguration": "[if(equals(parameters('authenticationType'), 'password'), json('null'), variables('linuxConfiguration'))]"
+          "linuxConfiguration": "[if(equals(parameters('authenticationType'), 'password'), null(), variables('linuxConfiguration'))]"
         },
         "storageProfile": {
           "copy": [

diff --git a/docs/examples/201/private-aks-cluster/main.json b/docs/examples/201/private-aks-cluster/main.json
@@ -5,7 +5,7 @@
     "_generator": {
       "name": "bicep",
       "version": "dev",
-      "templateHash": "5568127674592377707"
+      "templateHash": "10839339689322770047"
     }
   },
   "parameters": {
@@ -1076,7 +1076,7 @@
             "_generator": {
               "name": "bicep",
               "version": "dev",
-              "templateHash": "10939577128460965414"
+              "templateHash": "6673211936035085652"
             }
           },
           "parameters": {
@@ -1288,7 +1288,7 @@
                   "computerName": "[parameters('vmName')]",
                   "adminUsername": "[parameters('vmAdminUsername')]",
                   "adminPassword": "[parameters('vmAdminPasswordOrKey')]",
-                  "linuxConfiguration": "[if(equals(parameters('authenticationType'), 'password'), json('null'), variables('linuxConfiguration'))]"
+                  "linuxConfiguration": "[if(equals(parameters('authenticationType'), 'password'), null(), variables('linuxConfiguration'))]"
                 },
                 "storageProfile": {
                   "copy": [
@@ -1591,7 +1591,7 @@
             "_generator": {
               "name": "bicep",
               "version": "dev",
-              "templateHash": "11819378221515304822"
+              "templateHash": "5882575949678654988"
             }
           },
           "parameters": {
@@ -1975,7 +1975,7 @@
                   "dockerBridgeCidr": "[parameters('aksClusterDockerBridgeCidr')]",
                   "loadBalancerSku": "[parameters('aksClusterLoadBalancerSku')]"
                 },
-                "aadProfile": "[if(parameters('aadEnabled'), variables('aadProfileConfiguration'), json('null'))]",
+                "aadProfile": "[if(parameters('aadEnabled'), variables('aadProfileConfiguration'), null())]",
                 "apiServerAccessProfile": {
                   "enablePrivateCluster": "[parameters('aksClusterEnablePrivateCluster')]"
                 }

diff --git a/docs/examples/201/wvd-create-hostpool/main.json b/docs/examples/201/wvd-create-hostpool/main.json
@@ -5,7 +5,7 @@
     "_generator": {
       "name": "bicep",
       "version": "dev",
-      "templateHash": "5336278593853148904"
+      "templateHash": "13154155776809438883"
     }
   },
   "parameters": {
@@ -840,7 +840,7 @@
             "_generator": {
               "name": "bicep",
               "version": "dev",
-              "templateHash": "16380997742108041127"
+              "templateHash": "12159192052625478905"
             }
           },
           "parameters": {
@@ -1162,7 +1162,7 @@
                   }
                 ],
                 "enableAcceleratedNetworking": "[parameters('enableAcceleratedNetworking')]",
-                "networkSecurityGroup": "[if(empty(parameters('networkSecurityGroupId')), json('null'), json(format('{{\"id\": \"{0}\"}}', variables('nsgId'))))]"
+                "networkSecurityGroup": "[if(empty(parameters('networkSecurityGroupId')), null(), json(format('{{\"id\": \"{0}\"}}', variables('nsgId'))))]"
               },
               "dependsOn": [
                 "[resourceId('Microsoft.Resources/deployments', 'NSG-linkedTemplate')]"
@@ -1185,7 +1185,7 @@
                 "hardwareProfile": {
                   "vmSize": "[parameters('rdshVmSize')]"
                 },
-                "availabilitySet": "[if(equals(parameters('availabilityOption'), 'AvailabilitySet'), variables('vmAvailabilitySetResourceId'), json('null'))]",
+                "availabilitySet": "[if(equals(parameters('availabilityOption'), 'AvailabilitySet'), variables('vmAvailabilitySetResourceId'), null())]",
                 "osProfile": {
                   "computerName": "[concat(parameters('rdshPrefix'), add(range(0, parameters('rdshNumberOfInstances'))[copyIndex()], parameters('vmInitialNumber')))]",
                   "adminUsername": "[variables('vmAdministratorUsername')]",
@@ -1528,7 +1528,7 @@
             "_generator": {
               "name": "bicep",
               "version": "dev",
-              "templateHash": "3622114365539263083"
+              "templateHash": "3610555063404175184"
             }
           },
           "parameters": {
@@ -1833,7 +1833,7 @@
                   }
                 ],
                 "enableAcceleratedNetworking": "[parameters('enableAcceleratedNetworking')]",
-                "networkSecurityGroup": "[if(empty(parameters('networkSecurityGroupId')), json('null'), json(format('{{\"id\": \"{0}\"}}', variables('nsgId'))))]"
+                "networkSecurityGroup": "[if(empty(parameters('networkSecurityGroupId')), null(), json(format('{{\"id\": \"{0}\"}}', variables('nsgId'))))]"
               },
               "dependsOn": [
                 "[resourceId('Microsoft.Resources/deployments', 'NSG-linkedTemplate')]"
@@ -1856,7 +1856,7 @@
                 "hardwareProfile": {
                   "vmSize": "[parameters('rdshVmSize')]"
                 },
-                "availabilitySet": "[if(equals(parameters('availabilityOption'), 'AvailabilitySet'), variables('vmAvailabilitySetResourceId'), json('null'))]",
+                "availabilitySet": "[if(equals(parameters('availabilityOption'), 'AvailabilitySet'), variables('vmAvailabilitySetResourceId'), null())]",
                 "osProfile": {
                   "computerName": "[concat(parameters('rdshPrefix'), add(range(0, parameters('rdshNumberOfInstances'))[copyIndex()], parameters('vmInitialNumber')))]",
                   "adminUsername": "[variables('vmAdministratorUsername')]",
@@ -2201,7 +2201,7 @@
             "_generator": {
               "name": "bicep",
               "version": "dev",
-              "templateHash": "13456880223628676085"
+              "templateHash": "11204922523232167930"
             }
           },
           "parameters": {
@@ -2505,7 +2505,7 @@
                   }
                 ],
                 "enableAcceleratedNetworking": "[parameters('enableAcceleratedNetworking')]",
-                "networkSecurityGroup": "[if(empty(parameters('networkSecurityGroupId')), json('null'), json(format('{{\"id\": \"{0}\"}}', variables('nsgId'))))]"
+                "networkSecurityGroup": "[if(empty(parameters('networkSecurityGroupId')), null(), json(format('{{\"id\": \"{0}\"}}', variables('nsgId'))))]"
               },
               "dependsOn": [
                 "[resourceId('Microsoft.Resources/deployments', 'NSG-linkedTemplate')]"
@@ -2528,7 +2528,7 @@
                 "hardwareProfile": {
                   "vmSize": "[parameters('rdshVmSize')]"
                 },
-                "availabilitySet": "[if(equals(parameters('availabilityOption'), 'AvailabilitySet'), variables('vmAvailabilitySetResourceId'), json('null'))]",
+                "availabilitySet": "[if(equals(parameters('availabilityOption'), 'AvailabilitySet'), variables('vmAvailabilitySetResourceId'), null())]",
                 "osProfile": {
                   "computerName": "[concat(parameters('rdshPrefix'), add(range(0, parameters('rdshNumberOfInstances'))[copyIndex()], parameters('vmInitialNumber')))]",
                   "adminUsername": "[variables('vmAdministratorUsername')]",
@@ -2870,7 +2870,7 @@
             "_generator": {
               "name": "bicep",
               "version": "dev",
-              "templateHash": "3774652722909324444"
+              "templateHash": "1641105856964782992"
             }
           },
           "parameters": {
@@ -3174,7 +3174,7 @@
                   }
                 ],
                 "enableAcceleratedNetworking": "[parameters('enableAcceleratedNetworking')]",
-                "networkSecurityGroup": "[if(empty(parameters('networkSecurityGroupId')), json('null'), json(format('{{\"id\": \"{0}\"}}', variables('nsgId'))))]"
+                "networkSecurityGroup": "[if(empty(parameters('networkSecurityGroupId')), null(), json(format('{{\"id\": \"{0}\"}}', variables('nsgId'))))]"
               },
               "dependsOn": [
                 "[resourceId('Microsoft.Resources/deployments', 'NSG-linkedTemplate')]"
@@ -3197,7 +3197,7 @@
                 "hardwareProfile": {
                   "vmSize": "[parameters('rdshVmSize')]"
                 },
-                "availabilitySet": "[if(equals(parameters('availabilityOption'), 'AvailabilitySet'), variables('vmAvailabilitySetResourceId'), json('null'))]",
+                "availabilitySet": "[if(equals(parameters('availabilityOption'), 'AvailabilitySet'), variables('vmAvailabilitySetResourceId'), null())]",
                 "osProfile": {
                   "computerName": "[concat(parameters('rdshPrefix'), add(range(0, parameters('rdshNumberOfInstances'))[copyIndex()], parameters('vmInitialNumber')))]",
                   "adminUsername": "[variables('vmAdministratorUsername')]",

diff --git a/docs/examples/201/wvd-create-hostpool/modules/managedDisks-customimagevm.bicep b/docs/examples/201/wvd-create-hostpool/modules/managedDisks-customimagevm.bicep
@@ -164,7 +164,7 @@ resource nic 'Microsoft.Network/networkInterfaces@2018-11-01' = [for i in range(
       }
     ]
     enableAcceleratedNetworking: enableAcceleratedNetworking
-    networkSecurityGroup: (empty(networkSecurityGroupId) ? json('null') : json('{"id": "${nsgId}"}'))
+    networkSecurityGroup: (empty(networkSecurityGroupId) ? null : json('{"id": "${nsgId}"}'))
   }
   dependsOn: [
     NSG
@@ -182,7 +182,7 @@ resource vm 'Microsoft.Compute/virtualMachines@2018-10-01' = [for i in range(0,
     hardwareProfile: {
       vmSize: rdshVmSize
     }
-    availabilitySet: ((availabilityOption == 'AvailabilitySet') ? vmAvailabilitySetResourceId : json('null'))
+    availabilitySet: ((availabilityOption == 'AvailabilitySet') ? vmAvailabilitySetResourceId : null)
     osProfile: {
       computerName: concat(rdshPrefix, (i + vmInitialNumber))
       adminUsername: vmAdministratorUsername

diff --git a/docs/examples/201/wvd-create-hostpool/modules/managedDisks-customimagevm.json b/docs/examples/201/wvd-create-hostpool/modules/managedDisks-customimagevm.json
@@ -5,7 +5,7 @@
     "_generator": {
       "name": "bicep",
       "version": "dev",
-      "templateHash": "13456880223628676085"
+      "templateHash": "11204922523232167930"
     }
   },
   "parameters": {
@@ -309,7 +309,7 @@
           }
         ],
         "enableAcceleratedNetworking": "[parameters('enableAcceleratedNetworking')]",
-        "networkSecurityGroup": "[if(empty(parameters('networkSecurityGroupId')), json('null'), json(format('{{\"id\": \"{0}\"}}', variables('nsgId'))))]"
+        "networkSecurityGroup": "[if(empty(parameters('networkSecurityGroupId')), null(), json(format('{{\"id\": \"{0}\"}}', variables('nsgId'))))]"
       },
       "dependsOn": [
         "[resourceId('Microsoft.Resources/deployments', 'NSG-linkedTemplate')]"
@@ -332,7 +332,7 @@
         "hardwareProfile": {
           "vmSize": "[parameters('rdshVmSize')]"
         },
-        "availabilitySet": "[if(equals(parameters('availabilityOption'), 'AvailabilitySet'), variables('vmAvailabilitySetResourceId'), json('null'))]",
+        "availabilitySet": "[if(equals(parameters('availabilityOption'), 'AvailabilitySet'), variables('vmAvailabilitySetResourceId'), null())]",
         "osProfile": {
           "computerName": "[concat(parameters('rdshPrefix'), add(range(0, parameters('rdshNumberOfInstances'))[copyIndex()], parameters('vmInitialNumber')))]",
           "adminUsername": "[variables('vmAdministratorUsername')]",

diff --git a/docs/examples/201/wvd-create-hostpool/modules/managedDisks-customvhdvm.bicep b/docs/examples/201/wvd-create-hostpool/modules/managedDisks-customvhdvm.bicep
@@ -181,7 +181,7 @@ resource nic 'Microsoft.Network/networkInterfaces@2018-11-01' = [for i in range(
       }
     ]
     enableAcceleratedNetworking: enableAcceleratedNetworking
-    networkSecurityGroup: (empty(networkSecurityGroupId) ? json('null') : json('{"id": "${nsgId}"}'))
+    networkSecurityGroup: (empty(networkSecurityGroupId) ? null : json('{"id": "${nsgId}"}'))
   }
   dependsOn: [
     NSG
@@ -199,7 +199,7 @@ resource vm 'Microsoft.Compute/virtualMachines@2018-10-01' = [for i in range(0,
     hardwareProfile: {
       vmSize: rdshVmSize
     }
-    availabilitySet: ((availabilityOption == 'AvailabilitySet') ? vmAvailabilitySetResourceId : json('null'))
+    availabilitySet: ((availabilityOption == 'AvailabilitySet') ? vmAvailabilitySetResourceId : null)
     osProfile: {
       computerName: concat(rdshPrefix, (i + vmInitialNumber))
       adminUsername: vmAdministratorUsername

diff --git a/docs/examples/201/wvd-create-hostpool/modules/managedDisks-customvhdvm.json b/docs/examples/201/wvd-create-hostpool/modules/managedDisks-customvhdvm.json
@@ -5,7 +5,7 @@
     "_generator": {
       "name": "bicep",
       "version": "dev",
-      "templateHash": "16380997742108041127"
+      "templateHash": "12159192052625478905"
     }
   },
   "parameters": {
@@ -327,7 +327,7 @@
           }
         ],
         "enableAcceleratedNetworking": "[parameters('enableAcceleratedNetworking')]",
-        "networkSecurityGroup": "[if(empty(parameters('networkSecurityGroupId')), json('null'), json(format('{{\"id\": \"{0}\"}}', variables('nsgId'))))]"
+        "networkSecurityGroup": "[if(empty(parameters('networkSecurityGroupId')), null(), json(format('{{\"id\": \"{0}\"}}', variables('nsgId'))))]"
       },
       "dependsOn": [
         "[resourceId('Microsoft.Resources/deployments', 'NSG-linkedTemplate')]"
@@ -350,7 +350,7 @@
         "hardwareProfile": {
           "vmSize": "[parameters('rdshVmSize')]"
         },
-        "availabilitySet": "[if(equals(parameters('availabilityOption'), 'AvailabilitySet'), variables('vmAvailabilitySetResourceId'), json('null'))]",
+        "availabilitySet": "[if(equals(parameters('availabilityOption'), 'AvailabilitySet'), variables('vmAvailabilitySetResourceId'), null())]",
         "osProfile": {
           "computerName": "[concat(parameters('rdshPrefix'), add(range(0, parameters('rdshNumberOfInstances'))[copyIndex()], parameters('vmInitialNumber')))]",
           "adminUsername": "[variables('vmAdministratorUsername')]",

diff --git a/docs/examples/201/wvd-create-hostpool/modules/managedDisks-galleryvm.bicep b/docs/examples/201/wvd-create-hostpool/modules/managedDisks-galleryvm.bicep
@@ -164,7 +164,7 @@ resource nic 'Microsoft.Network/networkInterfaces@2018-11-01' = [for i in range(
       }
     ]
     enableAcceleratedNetworking: enableAcceleratedNetworking
-    networkSecurityGroup: (empty(networkSecurityGroupId) ? json('null') : json('{"id": "${nsgId}"}'))
+    networkSecurityGroup: (empty(networkSecurityGroupId) ? null : json('{"id": "${nsgId}"}'))
   }
   dependsOn: [
     NSG
@@ -182,7 +182,7 @@ resource vm 'Microsoft.Compute/virtualMachines@2018-10-01' = [for i in range(0,
     hardwareProfile: {
       vmSize: rdshVmSize
     }
-    availabilitySet: ((availabilityOption == 'AvailabilitySet') ? vmAvailabilitySetResourceId : json('null'))
+    availabilitySet: ((availabilityOption == 'AvailabilitySet') ? vmAvailabilitySetResourceId : null)
     osProfile: {
       computerName: concat(rdshPrefix, (i + vmInitialNumber))
       adminUsername: vmAdministratorUsername

diff --git a/docs/examples/201/wvd-create-hostpool/modules/managedDisks-galleryvm.json b/docs/examples/201/wvd-create-hostpool/modules/managedDisks-galleryvm.json
@@ -5,7 +5,7 @@
     "_generator": {
       "name": "bicep",
       "version": "dev",
-      "templateHash": "3774652722909324444"
+      "templateHash": "1641105856964782992"
     }
   },
   "parameters": {
@@ -309,7 +309,7 @@
           }
         ],
         "enableAcceleratedNetworking": "[parameters('enableAcceleratedNetworking')]",
-        "networkSecurityGroup": "[if(empty(parameters('networkSecurityGroupId')), json('null'), json(format('{{\"id\": \"{0}\"}}', variables('nsgId'))))]"
+        "networkSecurityGroup": "[if(empty(parameters('networkSecurityGroupId')), null(), json(format('{{\"id\": \"{0}\"}}', variables('nsgId'))))]"
       },
       "dependsOn": [
         "[resourceId('Microsoft.Resources/deployments', 'NSG-linkedTemplate')]"
@@ -332,7 +332,7 @@
         "hardwareProfile": {
           "vmSize": "[parameters('rdshVmSize')]"
         },
-        "availabilitySet": "[if(equals(parameters('availabilityOption'), 'AvailabilitySet'), variables('vmAvailabilitySetResourceId'), json('null'))]",
+        "availabilitySet": "[if(equals(parameters('availabilityOption'), 'AvailabilitySet'), variables('vmAvailabilitySetResourceId'), null())]",
         "osProfile": {
           "computerName": "[concat(parameters('rdshPrefix'), add(range(0, parameters('rdshNumberOfInstances'))[copyIndex()], parameters('vmInitialNumber')))]",
           "adminUsername": "[variables('vmAdministratorUsername')]",

diff --git a/docs/examples/201/wvd-create-hostpool/modules/unmanagedDisks-customvhdvm.bicep b/docs/examples/201/wvd-create-hostpool/modules/unmanagedDisks-customvhdvm.bicep
@@ -165,7 +165,7 @@ resource nic 'Microsoft.Network/networkInterfaces@2018-11-01' = [for i in range(
       }
     ]
     enableAcceleratedNetworking: enableAcceleratedNetworking
-    networkSecurityGroup: (empty(networkSecurityGroupId) ? json('null') : json('{"id": "${nsgId}"}'))
+    networkSecurityGroup: (empty(networkSecurityGroupId) ? null : json('{"id": "${nsgId}"}'))
   }
   dependsOn: [
     NSG
@@ -183,7 +183,7 @@ resource vm 'Microsoft.Compute/virtualMachines@2018-10-01' = [for i in range(0,
     hardwareProfile: {
       vmSize: rdshVmSize
     }
-    availabilitySet: ((availabilityOption == 'AvailabilitySet') ? vmAvailabilitySetResourceId : json('null'))
+    availabilitySet: ((availabilityOption == 'AvailabilitySet') ? vmAvailabilitySetResourceId : null)
     osProfile: {
       computerName: concat(rdshPrefix, (i + vmInitialNumber))
       adminUsername: vmAdministratorUsername