From 0ea7f1e70e4550e98000dc8f7e24c788fd6243ea Mon Sep 17 00:00:00 2001 From: tfitzmac Date: Tue, 28 Jan 2020 07:30:06 -0800 Subject: [PATCH 1/3] fix examples for deployments link --- .../PutDeploymentAtManagementGroup.json | 4 +- .../examples/PutDeploymentAtScope.json | 4 +- .../examples/PutDeploymentAtTenant.json | 4 +- ...ntWithOnErrorDeploymentLastSuccessful.json | 126 +++++++++++++++++- ...thOnErrorDeploymentSpecificDeployment.json | 126 +++++++++++++++++- 5 files changed, 251 insertions(+), 13 deletions(-) diff --git a/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/examples/PutDeploymentAtManagementGroup.json b/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/examples/PutDeploymentAtManagementGroup.json index 28bd0ff42bb6..bff8e824152e 100644 --- a/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/examples/PutDeploymentAtManagementGroup.json +++ b/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/examples/PutDeploymentAtManagementGroup.json @@ -6,7 +6,9 @@ "parameters": { "location": "eastus", "properties": { - "templateLink": "{templateUri}", + "templateLink": { + "uri": "{templateUri}" + }, "parameters": {}, "mode": "Incremental" } diff --git a/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/examples/PutDeploymentAtScope.json b/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/examples/PutDeploymentAtScope.json index 03c8055ac899..3294dfca29bb 100644 --- a/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/examples/PutDeploymentAtScope.json +++ b/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/examples/PutDeploymentAtScope.json @@ -6,7 +6,9 @@ "parameters": { "location": "eastus", "properties": { - "templateLink": "{templateUri}", + "templateLink": { + "uri": "{templateUri}" + }, "parameters": {}, "mode": "Incremental" } diff --git a/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/examples/PutDeploymentAtTenant.json b/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/examples/PutDeploymentAtTenant.json index a10bac45d7bf..f41f473260b2 100644 --- a/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/examples/PutDeploymentAtTenant.json +++ b/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/examples/PutDeploymentAtTenant.json @@ -5,7 +5,9 @@ "parameters": { "location": "eastus", "properties": { - "templateLink": "{templateUri}", + "templateLink": { + "uri": "{templateUri}" + }, "parameters": {}, "mode": "Incremental" } diff --git a/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/examples/PutDeploymentWithOnErrorDeploymentLastSuccessful.json b/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/examples/PutDeploymentWithOnErrorDeploymentLastSuccessful.json index adf6fc284cce..f483aa914f7a 100644 --- a/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/examples/PutDeploymentWithOnErrorDeploymentLastSuccessful.json +++ b/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/examples/PutDeploymentWithOnErrorDeploymentLastSuccessful.json @@ -6,7 +6,9 @@ "api-version": "2019-10-01", "parameters": { "properties": { - "templateLink": "{templateUri}", + "templateLink": { + "uri": "{templateUri}" + }, "parameters": {}, "mode": "Complete", "onErrorDeployment": { @@ -22,10 +24,67 @@ "name": "exampleDeploymentName", "type": "Microsoft.Resources/deployments", "properties": { + "templateLink": { + "uri": "{templateUri}", + "contentVersion": "1.0.0.0" + }, + "templateHash": "9132645722898483367", + "parameters": {}, + "mode": "Complete", "provisioningState": "Accepted", - "correlationId": "{correlationId}", "timestamp": "2019-03-01T00:00:00.0000000Z", - "mode": "Complete", + "duration": "PT0.8204881S", + "correlationId": "{correlationId}", + "providers": [ + { + "namespace": "Microsoft.Network", + "resourceTypes": [ + { + "resourceType": "virtualNetworks", + "locations": [ + "centralus" + ] + }, + { + "resourceType": "virtualNetworks/subnets", + "locations": [ + "centralus" + ] + } + ] + } + ], + "dependencies": [ + { + "dependsOn": [ + { + "id": "/subscriptions/3a4176e0-58d3-4bb8-8cc2-9b8776777f27/resourceGroups/test1/providers/Microsoft.Network/virtualNetworks/VNet1", + "resourceType": "Microsoft.Network/virtualNetworks", + "resourceName": "VNet1" + } + ], + "id": "/subscriptions/3a4176e0-58d3-4bb8-8cc2-9b8776777f27/resourceGroups/test1/providers/Microsoft.Network/virtualNetworks/VNet1/subnets/Subnet1", + "resourceType": "Microsoft.Network/virtualNetworks/subnets", + "resourceName": "VNet1/Subnet1" + }, + { + "dependsOn": [ + { + "id": "/subscriptions/3a4176e0-58d3-4bb8-8cc2-9b8776777f27/resourceGroups/test1/providers/Microsoft.Network/virtualNetworks/VNet1", + "resourceType": "Microsoft.Network/virtualNetworks", + "resourceName": "VNet1" + }, + { + "id": "/subscriptions/3a4176e0-58d3-4bb8-8cc2-9b8776777f27/resourceGroups/test1/providers/Microsoft.Network/virtualNetworks/VNet1/subnets/Subnet1", + "resourceType": "Microsoft.Network/virtualNetworks/subnets", + "resourceName": "VNet1/Subnet1" + } + ], + "id": "/subscriptions/3a4176e0-58d3-4bb8-8cc2-9b8776777f27/resourceGroups/test1/providers/Microsoft.Network/virtualNetworks/VNet1/subnets/Subnet2", + "resourceType": "Microsoft.Network/virtualNetworks/subnets", + "resourceName": "VNet1/Subnet2" + } + ], "onErrorDeployment": { "type": "LastSuccessful", "deploymentName": "{nameOfLastSuccesfulDeployment}" @@ -39,10 +98,67 @@ "name": "exampleDeploymentName", "type": "Microsoft.Resources/deployments", "properties": { + "templateLink": { + "uri": "{templateUri}", + "contentVersion": "1.0.0.0" + }, + "templateHash": "9132645722898483367", + "parameters": {}, + "mode": "Complete", "provisioningState": "Accepted", - "correlationId": "{correlationId}", "timestamp": "2019-03-01T00:00:00.0000000Z", - "mode": "Complete", + "duration": "PT0.8204881S", + "correlationId": "{correlationId}", + "providers": [ + { + "namespace": "Microsoft.Network", + "resourceTypes": [ + { + "resourceType": "virtualNetworks", + "locations": [ + "centralus" + ] + }, + { + "resourceType": "virtualNetworks/subnets", + "locations": [ + "centralus" + ] + } + ] + } + ], + "dependencies": [ + { + "dependsOn": [ + { + "id": "{resourceid}", + "resourceType": "Microsoft.Network/virtualNetworks", + "resourceName": "VNet1" + } + ], + "id": "{resourceid}", + "resourceType": "Microsoft.Network/virtualNetworks/subnets", + "resourceName": "VNet1/Subnet1" + }, + { + "dependsOn": [ + { + "id": "{resourceid}", + "resourceType": "Microsoft.Network/virtualNetworks", + "resourceName": "VNet1" + }, + { + "id": "{resourceid}", + "resourceType": "Microsoft.Network/virtualNetworks/subnets", + "resourceName": "VNet1/Subnet1" + } + ], + "id": "{resourceid}", + "resourceType": "Microsoft.Network/virtualNetworks/subnets", + "resourceName": "VNet1/Subnet2" + } + ], "onErrorDeployment": { "type": "LastSuccessful", "deploymentName": "{nameOfLastSuccesfulDeployment}" diff --git a/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/examples/PutDeploymentWithOnErrorDeploymentSpecificDeployment.json b/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/examples/PutDeploymentWithOnErrorDeploymentSpecificDeployment.json index 0815fd9e7998..99c63caa1c5f 100644 --- a/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/examples/PutDeploymentWithOnErrorDeploymentSpecificDeployment.json +++ b/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/examples/PutDeploymentWithOnErrorDeploymentSpecificDeployment.json @@ -6,7 +6,9 @@ "api-version": "2019-10-01", "parameters": { "properties": { - "templateLink": "{templateUri}", + "templateLink": { + "uri": "{templateUri}" + }, "parameters": {}, "mode": "Complete", "onErrorDeployment": { @@ -23,10 +25,67 @@ "name": "exampleDeploymentName", "type": "Microsoft.Resources/deployments", "properties": { + "templateLink": { + "uri": "{templateUri}", + "contentVersion": "1.0.0.0" + }, + "templateHash": "9132645722898483367", + "parameters": {}, + "mode": "Complete", "provisioningState": "Accepted", - "correlationId": "{correlationId}", "timestamp": "2019-03-01T00:00:00.0000000Z", - "mode": "Complete", + "duration": "PT0.8204881S", + "correlationId": "{correlationId}", + "providers": [ + { + "namespace": "Microsoft.Network", + "resourceTypes": [ + { + "resourceType": "virtualNetworks", + "locations": [ + "centralus" + ] + }, + { + "resourceType": "virtualNetworks/subnets", + "locations": [ + "centralus" + ] + } + ] + } + ], + "dependencies": [ + { + "dependsOn": [ + { + "id": "{resourceid}", + "resourceType": "Microsoft.Network/virtualNetworks", + "resourceName": "VNet1" + } + ], + "id": "{resourceid}", + "resourceType": "Microsoft.Network/virtualNetworks/subnets", + "resourceName": "VNet1/Subnet1" + }, + { + "dependsOn": [ + { + "id": "{resourceid}", + "resourceType": "Microsoft.Network/virtualNetworks", + "resourceName": "VNet1" + }, + { + "id": "{resourceid}", + "resourceType": "Microsoft.Network/virtualNetworks/subnets", + "resourceName": "VNet1/Subnet1" + } + ], + "id": "{resourceid}", + "resourceType": "Microsoft.Network/virtualNetworks/subnets", + "resourceName": "VNet1/Subnet2" + } + ], "onErrorDeployment": { "type": "SpecificDeployment", "deploymentName": "{nameOfDeploymentToUse}" @@ -40,10 +99,67 @@ "name": "exampleDeploymentName", "type": "Microsoft.Resources/deployments", "properties": { + "templateLink": { + "uri": "{templateUri}", + "contentVersion": "1.0.0.0" + }, + "templateHash": "9132645722898483367", + "parameters": {}, + "mode": "Complete", "provisioningState": "Accepted", - "correlationId": "{correlationId}", "timestamp": "2019-03-01T00:00:00.0000000Z", - "mode": "Complete", + "duration": "PT0.8204881S", + "correlationId": "{correlationId}", + "providers": [ + { + "namespace": "Microsoft.Network", + "resourceTypes": [ + { + "resourceType": "virtualNetworks", + "locations": [ + "centralus" + ] + }, + { + "resourceType": "virtualNetworks/subnets", + "locations": [ + "centralus" + ] + } + ] + } + ], + "dependencies": [ + { + "dependsOn": [ + { + "id": "/subscriptions/3a4176e0-58d3-4bb8-8cc2-9b8776777f27/resourceGroups/test1/providers/Microsoft.Network/virtualNetworks/VNet1", + "resourceType": "Microsoft.Network/virtualNetworks", + "resourceName": "VNet1" + } + ], + "id": "/subscriptions/3a4176e0-58d3-4bb8-8cc2-9b8776777f27/resourceGroups/test1/providers/Microsoft.Network/virtualNetworks/VNet1/subnets/Subnet1", + "resourceType": "Microsoft.Network/virtualNetworks/subnets", + "resourceName": "VNet1/Subnet1" + }, + { + "dependsOn": [ + { + "id": "/subscriptions/3a4176e0-58d3-4bb8-8cc2-9b8776777f27/resourceGroups/test1/providers/Microsoft.Network/virtualNetworks/VNet1", + "resourceType": "Microsoft.Network/virtualNetworks", + "resourceName": "VNet1" + }, + { + "id": "/subscriptions/3a4176e0-58d3-4bb8-8cc2-9b8776777f27/resourceGroups/test1/providers/Microsoft.Network/virtualNetworks/VNet1/subnets/Subnet1", + "resourceType": "Microsoft.Network/virtualNetworks/subnets", + "resourceName": "VNet1/Subnet1" + } + ], + "id": "/subscriptions/3a4176e0-58d3-4bb8-8cc2-9b8776777f27/resourceGroups/test1/providers/Microsoft.Network/virtualNetworks/VNet1/subnets/Subnet2", + "resourceType": "Microsoft.Network/virtualNetworks/subnets", + "resourceName": "VNet1/Subnet2" + } + ], "onErrorDeployment": { "type": "SpecificDeployment", "deploymentName": "{nameOfDeploymentToUse}" From cc129cf8f8c2e8f3f398efb95d585f34427e9d23 Mon Sep 17 00:00:00 2001 From: tfitzmac Date: Tue, 28 Jan 2020 07:36:09 -0800 Subject: [PATCH 2/3] remove resource ids --- ...tDeploymentWithOnErrorDeploymentLastSuccessful.json | 10 +++++----- ...loymentWithOnErrorDeploymentSpecificDeployment.json | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/examples/PutDeploymentWithOnErrorDeploymentLastSuccessful.json b/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/examples/PutDeploymentWithOnErrorDeploymentLastSuccessful.json index f483aa914f7a..da2df99aaecf 100644 --- a/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/examples/PutDeploymentWithOnErrorDeploymentLastSuccessful.json +++ b/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/examples/PutDeploymentWithOnErrorDeploymentLastSuccessful.json @@ -58,29 +58,29 @@ { "dependsOn": [ { - "id": "/subscriptions/3a4176e0-58d3-4bb8-8cc2-9b8776777f27/resourceGroups/test1/providers/Microsoft.Network/virtualNetworks/VNet1", + "id": "{resourceid}", "resourceType": "Microsoft.Network/virtualNetworks", "resourceName": "VNet1" } ], - "id": "/subscriptions/3a4176e0-58d3-4bb8-8cc2-9b8776777f27/resourceGroups/test1/providers/Microsoft.Network/virtualNetworks/VNet1/subnets/Subnet1", + "id": "{resourceid}", "resourceType": "Microsoft.Network/virtualNetworks/subnets", "resourceName": "VNet1/Subnet1" }, { "dependsOn": [ { - "id": "/subscriptions/3a4176e0-58d3-4bb8-8cc2-9b8776777f27/resourceGroups/test1/providers/Microsoft.Network/virtualNetworks/VNet1", + "id": "{resourceid}", "resourceType": "Microsoft.Network/virtualNetworks", "resourceName": "VNet1" }, { - "id": "/subscriptions/3a4176e0-58d3-4bb8-8cc2-9b8776777f27/resourceGroups/test1/providers/Microsoft.Network/virtualNetworks/VNet1/subnets/Subnet1", + "id": "{resourceid}", "resourceType": "Microsoft.Network/virtualNetworks/subnets", "resourceName": "VNet1/Subnet1" } ], - "id": "/subscriptions/3a4176e0-58d3-4bb8-8cc2-9b8776777f27/resourceGroups/test1/providers/Microsoft.Network/virtualNetworks/VNet1/subnets/Subnet2", + "id": "{resourceid}", "resourceType": "Microsoft.Network/virtualNetworks/subnets", "resourceName": "VNet1/Subnet2" } diff --git a/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/examples/PutDeploymentWithOnErrorDeploymentSpecificDeployment.json b/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/examples/PutDeploymentWithOnErrorDeploymentSpecificDeployment.json index 99c63caa1c5f..936d53ac0d49 100644 --- a/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/examples/PutDeploymentWithOnErrorDeploymentSpecificDeployment.json +++ b/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/examples/PutDeploymentWithOnErrorDeploymentSpecificDeployment.json @@ -133,29 +133,29 @@ { "dependsOn": [ { - "id": "/subscriptions/3a4176e0-58d3-4bb8-8cc2-9b8776777f27/resourceGroups/test1/providers/Microsoft.Network/virtualNetworks/VNet1", + "id": "{resourceid}", "resourceType": "Microsoft.Network/virtualNetworks", "resourceName": "VNet1" } ], - "id": "/subscriptions/3a4176e0-58d3-4bb8-8cc2-9b8776777f27/resourceGroups/test1/providers/Microsoft.Network/virtualNetworks/VNet1/subnets/Subnet1", + "id": "{resourceid}", "resourceType": "Microsoft.Network/virtualNetworks/subnets", "resourceName": "VNet1/Subnet1" }, { "dependsOn": [ { - "id": "/subscriptions/3a4176e0-58d3-4bb8-8cc2-9b8776777f27/resourceGroups/test1/providers/Microsoft.Network/virtualNetworks/VNet1", + "id": "{resourceid}", "resourceType": "Microsoft.Network/virtualNetworks", "resourceName": "VNet1" }, { - "id": "/subscriptions/3a4176e0-58d3-4bb8-8cc2-9b8776777f27/resourceGroups/test1/providers/Microsoft.Network/virtualNetworks/VNet1/subnets/Subnet1", + "id": "{resourceid}", "resourceType": "Microsoft.Network/virtualNetworks/subnets", "resourceName": "VNet1/Subnet1" } ], - "id": "/subscriptions/3a4176e0-58d3-4bb8-8cc2-9b8776777f27/resourceGroups/test1/providers/Microsoft.Network/virtualNetworks/VNet1/subnets/Subnet2", + "id": "{resourceid}", "resourceType": "Microsoft.Network/virtualNetworks/subnets", "resourceName": "VNet1/Subnet2" } From 3692c0dfdf033256237ab43721f93d3442c0063c Mon Sep 17 00:00:00 2001 From: tfitzmac Date: Tue, 28 Jan 2020 10:20:42 -0800 Subject: [PATCH 3/3] fix code style issues --- .../2019-10-01/examples/PutDeploymentAtManagementGroup.json | 2 +- .../stable/2019-10-01/examples/PutDeploymentAtScope.json | 2 +- .../stable/2019-10-01/examples/PutDeploymentAtTenant.json | 2 +- .../PutDeploymentWithOnErrorDeploymentLastSuccessful.json | 2 +- .../PutDeploymentWithOnErrorDeploymentSpecificDeployment.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/examples/PutDeploymentAtManagementGroup.json b/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/examples/PutDeploymentAtManagementGroup.json index bff8e824152e..128a544429c8 100644 --- a/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/examples/PutDeploymentAtManagementGroup.json +++ b/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/examples/PutDeploymentAtManagementGroup.json @@ -8,7 +8,7 @@ "properties": { "templateLink": { "uri": "{templateUri}" - }, + }, "parameters": {}, "mode": "Incremental" } diff --git a/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/examples/PutDeploymentAtScope.json b/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/examples/PutDeploymentAtScope.json index 3294dfca29bb..aa313b602623 100644 --- a/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/examples/PutDeploymentAtScope.json +++ b/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/examples/PutDeploymentAtScope.json @@ -8,7 +8,7 @@ "properties": { "templateLink": { "uri": "{templateUri}" - }, + }, "parameters": {}, "mode": "Incremental" } diff --git a/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/examples/PutDeploymentAtTenant.json b/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/examples/PutDeploymentAtTenant.json index f41f473260b2..91e4625635e4 100644 --- a/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/examples/PutDeploymentAtTenant.json +++ b/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/examples/PutDeploymentAtTenant.json @@ -7,7 +7,7 @@ "properties": { "templateLink": { "uri": "{templateUri}" - }, + }, "parameters": {}, "mode": "Incremental" } diff --git a/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/examples/PutDeploymentWithOnErrorDeploymentLastSuccessful.json b/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/examples/PutDeploymentWithOnErrorDeploymentLastSuccessful.json index da2df99aaecf..6974c8d72105 100644 --- a/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/examples/PutDeploymentWithOnErrorDeploymentLastSuccessful.json +++ b/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/examples/PutDeploymentWithOnErrorDeploymentLastSuccessful.json @@ -8,7 +8,7 @@ "properties": { "templateLink": { "uri": "{templateUri}" - }, + }, "parameters": {}, "mode": "Complete", "onErrorDeployment": { diff --git a/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/examples/PutDeploymentWithOnErrorDeploymentSpecificDeployment.json b/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/examples/PutDeploymentWithOnErrorDeploymentSpecificDeployment.json index 936d53ac0d49..9140493abad3 100644 --- a/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/examples/PutDeploymentWithOnErrorDeploymentSpecificDeployment.json +++ b/specification/resources/resource-manager/Microsoft.Resources/stable/2019-10-01/examples/PutDeploymentWithOnErrorDeploymentSpecificDeployment.json @@ -8,7 +8,7 @@ "properties": { "templateLink": { "uri": "{templateUri}" - }, + }, "parameters": {}, "mode": "Complete", "onErrorDeployment": {