Merge pull request #254 from davidsmatlak/ds-update-arm-2

Updates ARM sample files
Azure · Sep 15, 2021 · c7170f6 · c7170f6
2 parents 3cfa5f9 + eaf535c
commit c7170f6
Show file tree

Hide file tree

Showing 8 changed files with 100 additions and 168 deletions.
diff --git a/azure-resource-manager/functions/resource/resourcegroup-name.json b/azure-resource-manager/functions/resource/resourcegroup-name.json
diff --git a/azure-resource-manager/lock.json b/azure-resource-manager/lock.json
diff --git a/azure-resource-manager/outputs.json b/azure-resource-manager/outputs.json
@@ -1,27 +1,27 @@
 {
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
-    "contentVersion": "1.0.0.0",
-    "resources": [],
-    "outputs": {
-        "stringOutput": {
-            "type": "string",
-            "value": "[deployment().name]"
-        },
-        "integerOutput": {
-            "type": "int",
-            "value": "[length(environment().authentication.audiences)]"
-        },
-        "booleanOutput": {
-            "type": "bool",
-            "value": "[contains(deployment().name, 'demo')]"
-        },
-        "arrayOutput": {
-            "type": "array",
-            "value": "[environment().authentication.audiences]"
-        },
-        "objectOutput": {
-            "type": "object",
-            "value": "[subscription()]"
-        }
+  "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
+  "contentVersion": "1.0.0.0",
+  "resources": [],
+  "outputs": {
+    "stringOutput": {
+      "type": "string",
+      "value": "[deployment().name]"
+    },
+    "integerOutput": {
+      "type": "int",
+      "value": "[length(environment().authentication.audiences)]"
+    },
+    "booleanOutput": {
+      "type": "bool",
+      "value": "[contains(deployment().name, 'demo')]"
+    },
+    "arrayOutput": {
+      "type": "array",
+      "value": "[environment().authentication.audiences]"
+    },
+    "objectOutput": {
+      "type": "object",
+      "value": "[subscription()]"
     }
-}
+  }
+}
diff --git a/azure-resource-manager/parameterobject.json b/azure-resource-manager/parameterobject.json
@@ -1,47 +1,47 @@
 {
-    "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "vNetSettings": {
-            "type": "object",
-            "defaultValue": {
-                "name": "VNet1",
-                "addressPrefixes": [
-                    {
-                        "name": "firstPrefix",
-                        "addressPrefix": "10.0.0.0/22"
-                    }
-                ],
-                "subnets": [
-                    {
-                        "name": "firstSubnet",
-                        "addressPrefix": "10.0.0.0/24"
-                    },
-                    {
-                        "name": "secondSubnet",
-                        "addressPrefix": "10.0.1.0/24"
-                    }
-                ]
-            }
-        }
+  "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
+  "contentVersion": "1.0.0.0",
+  "parameters": {
+    "vNetSettings": {
+      "type": "object",
+      "defaultValue": {
+        "name": "VNet1",
+        "addressPrefixes": [
+          {
+            "name": "firstPrefix",
+            "addressPrefix": "10.0.0.0/22"
+          }
+        ],
+        "subnets": [
+          {
+            "name": "firstSubnet",
+            "addressPrefix": "10.0.0.0/24"
+          },
+          {
+            "name": "secondSubnet",
+            "addressPrefix": "10.0.1.0/24"
+          }
+        ]
+      }
+    }
+  },
+  "resources": [],
+  "outputs": {
+    "name": {
+      "type": "string",
+      "value": "[parameters('vNetSettings').name]"
+    },
+    "addressPrefix": {
+      "type": "string",
+      "value": "[parameters('vNetSettings').addressPrefixes[0].addressPrefix]"
+    },
+    "subnet1": {
+      "type": "string",
+      "value": "[parameters('vNetSettings').subnets[0].addressPrefix]"
     },
-    "resources": [],
-    "outputs": {
-        "name": {
-            "type": "string",
-            "value": "[parameters('vNetSettings').name]"
-        },
-        "addressPrefix": {
-            "type": "string",
-            "value": "[parameters('vNetSettings').addressPrefixes[0].addressPrefix]"
-        },
-        "subnet1": {
-            "type": "string",
-            "value": "[parameters('vNetSettings').subnets[0].addressPrefix]"
-        },
-        "subnet2": {
-            "type": "string",
-            "value": "[parameters('vNetSettings').subnets[1].addressPrefix]"
-        }
+    "subnet2": {
+      "type": "string",
+      "value": "[parameters('vNetSettings').subnets[1].addressPrefix]"
     }
-}
+  }
+}
diff --git a/azure-resource-manager/parameterswithfunctions.json b/azure-resource-manager/parameterswithfunctions.json
@@ -1,31 +1,31 @@
 {
-    "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "siteName": {
-            "type": "string",
-            "defaultValue": "[concat('site', uniqueString(resourceGroup().id))]",
-            "metadata": {
-                "description": "The site name. To use the default value, do not specify a new value."
-            }
-        },
-        "hostingPlanName": {
-            "type": "string",
-            "defaultValue": "[concat(parameters('siteName'),'-plan')]",
-            "metadata": {
-                "description": "The host name. To use the default value, do not specify a new value."
-            }
-        }
+  "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
+  "contentVersion": "1.0.0.0",
+  "parameters": {
+    "siteName": {
+      "type": "string",
+      "defaultValue": "[concat('site', uniqueString(resourceGroup().id))]",
+      "metadata": {
+        "description": "The site name. To use the default value, do not specify a new value."
+      }
     },
-    "resources": [],
-    "outputs": {
-        "siteNameOutput": {
-            "type": "string",
-            "value": "[parameters('siteName')]"
-        },
-        "hostingPlanOutput": {
-            "type": "string",
-            "value": "[parameters('hostingPlanName')]"
-        }
+    "hostingPlanName": {
+      "type": "string",
+      "defaultValue": "[concat(parameters('siteName'),'-plan')]",
+      "metadata": {
+        "description": "The host name. To use the default value, do not specify a new value."
+      }
     }
-}
+  },
+  "resources": [],
+  "outputs": {
+    "siteNameOutput": {
+      "type": "string",
+      "value": "[parameters('siteName')]"
+    },
+    "hostingPlanOutput": {
+      "type": "string",
+      "value": "[parameters('hostingPlanName')]"
+    }
+  }
+}
diff --git a/azure-resource-manager/tags.json b/azure-resource-manager/tags.json
@@ -15,7 +15,7 @@
   "resources": [
     {
       "type": "Microsoft.Resources/tags",
-      "apiVersion": "2019-10-01",
+      "apiVersion": "2021-04-01",
       "name": "default",
       "dependsOn": [],
       "properties": {

diff --git a/azure-resource-manager/variables.json b/azure-resource-manager/variables.json
@@ -117,4 +117,4 @@
       "value": "[variables('topLevelCopy4')]"
     }
   }
-}
+}
diff --git a/azure-resource-manager/variablesconfigurations.json b/azure-resource-manager/variablesconfigurations.json
@@ -36,4 +36,4 @@
       "type": "int"
     }
   }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -117,4 +117,4 @@ @@
           "value": "[variables('topLevelCopy4')]"
         }
       }
-    }
+    }