Skip to content

Commit

Permalink
Merge pull request #263 from davidsmatlak/ds-update-deploy-script
Browse files Browse the repository at this point in the history
Updates deployment script samples
  • Loading branch information
davidsmatlak authored Sep 27, 2021
2 parents 26fa394 + 08035bc commit f4b63df
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 15 deletions.
6 changes: 3 additions & 3 deletions deployment-script/deploymentscript-basic.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
"contentVersion": "1.0.0.0",
"parameters": {
"name":{
"type":"string",
"name": {
"type": "string",
"defaultValue": "John Dole"
},
"utcValue": {
Expand Down Expand Up @@ -65,4 +65,4 @@
"type": "string"
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
"contentVersion": "1.0.0.0",
"parameters": {
"name":{
"name": {
"type": "string",
"defaultValue": "\\\"John Dole\\\""
},
Expand All @@ -14,7 +14,7 @@
"resources": [
{
"type": "Microsoft.Resources/deploymentScripts",
"apiVersion": "2019-10-01-preview",
"apiVersion": "2020-10-01",
"name": "scriptInTemplate1",
"location": "[resourceGroup().location]",
"kind": "AzurePowerShell",
Expand All @@ -35,4 +35,4 @@
"type": "string"
}
}
}
}
4 changes: 2 additions & 2 deletions deployment-script/deploymentscript-helloworld.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
"contentVersion": "1.0.0.0",
"parameters": {
"name":{
"name": {
"type": "string",
"defaultValue": "\\\"John Dole\\\""
},
Expand Down Expand Up @@ -41,4 +41,4 @@
"type": "string"
}
}
}
}
4 changes: 2 additions & 2 deletions deployment-script/deploymentscript-keyvault-mi.json
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@
},
{
"type": "Microsoft.Authorization/roleAssignments",
"apiVersion": "2018-09-01-preview",
"apiVersion": "2020-10-01-preview",
"name": "[variables('bootstrapRoleAssignmentId')]",
"dependsOn": [
"[resourceId('Microsoft.ManagedIdentity/userAssignedIdentities', parameters('identityName'))]"
Expand All @@ -148,7 +148,7 @@
},
{
"type": "Microsoft.KeyVault/vaults",
"apiVersion": "2018-02-14",
"apiVersion": "2021-06-01-preview",
"name": "[parameters('keyVaultName')]",
"location": "[parameters('location')]",
"properties": {
Expand Down
8 changes: 4 additions & 4 deletions deployment-script/deploymentscript-keyvault-subscription.json
Original file line number Diff line number Diff line change
Expand Up @@ -127,14 +127,14 @@
"resources": [
{
"type": "Microsoft.Resources/resourceGroups",
"apiVersion": "2020-06-01",
"apiVersion": "2021-04-01",
"name": "[variables('resourceGroupName')]",
"location": "[parameters('location')]",
"properties": {}
},
{
"type": "Microsoft.Resources/deployments",
"apiVersion": "2020-06-01",
"apiVersion": "2021-04-01",
"name": "KeyVaultDeployment",
"resourceGroup": "[variables('resourceGroupName')]",
"dependsOn": [
Expand All @@ -151,7 +151,7 @@
{
"type": "Microsoft.KeyVault/vaults",
"name": "[variables('keyVaultName')]",
"apiVersion": "2019-09-01",
"apiVersion": "2021-06-01-preview",
"location": "[parameters('location')]",
"properties": {
"enabledForDeployment": "[parameters('enabledForDeployment')]",
Expand Down Expand Up @@ -268,4 +268,4 @@
}
}
]
}
}
2 changes: 1 addition & 1 deletion deployment-script/deploymentscript-keyvault.json
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@
{
"type": "Microsoft.KeyVault/vaults",
"name": "[parameters('keyVaultName')]",
"apiVersion": "2018-02-14",
"apiVersion": "2021-06-01-preview",
"location": "[parameters('location')]",
"properties": {
"enabledForDeployment": "[parameters('enabledForDeployment')]",
Expand Down

0 comments on commit f4b63df

Please sign in to comment.