From 6bc1b8cbb7c31b4a6027d62f81549ad9c3fcbfec Mon Sep 17 00:00:00 2001 From: Feiyu Shi Date: Sun, 21 Apr 2019 15:32:58 -0700 Subject: [PATCH 01/13] Update description of property "destination" in "ImageTemplateFileCustomizer" --- .../preview/2019-05-01-preview/imagebuilder.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/imagebuilder.json b/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/imagebuilder.json index 6c381ba54295..24a119a435bb 100644 --- a/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/imagebuilder.json +++ b/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/imagebuilder.json @@ -711,7 +711,7 @@ }, "destination": { "type": "string", - "description": "The absolute path (with existing directory structure) where the file will be uploaded to in the VM" + "description": "The absolute path to a file (with nested directory structures already created) where the file (from sourceUri) will be uploaded to in the VM" } } }, From a290d93a05364dc7b830b281965b3c1004133125 Mon Sep 17 00:00:00 2001 From: Feiyu Shi Date: Sun, 21 Apr 2019 15:34:20 -0700 Subject: [PATCH 02/13] Update min and max values of property "buildTimeoutInMinutes" --- .../preview/2019-05-01-preview/imagebuilder.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/imagebuilder.json b/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/imagebuilder.json index 24a119a435bb..3a40e89c005e 100644 --- a/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/imagebuilder.json +++ b/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/imagebuilder.json @@ -914,7 +914,9 @@ }, "buildTimeoutInMinutes": { "type": "integer", - "description": "Maximum duration to wait while building the image template. Default is 60 minutes." + "minimum": 0, + "maximum": 960, + "description": "Maximum duration to wait while building the image template. Omit or specify 0 to use the default (60 minutes)." } }, "required": [ From 9923e7f89f84436a04664c8333f1891080043826 Mon Sep 17 00:00:00 2001 From: Feiyu Shi Date: Sun, 21 Apr 2019 15:37:42 -0700 Subject: [PATCH 03/13] Fix a bug to reflect the actual resource naming pattern (which allows dot) of the service --- .../preview/2019-05-01-preview/imagebuilder.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/imagebuilder.json b/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/imagebuilder.json index 3a40e89c005e..37c68407ed42 100644 --- a/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/imagebuilder.json +++ b/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/imagebuilder.json @@ -727,7 +727,7 @@ "runOutputName": { "type": "string", "description": "The name to be used for the associated RunOutput.", - "pattern": "^[A-Za-z0-9-_]{1,64}$" + "pattern": "^[A-Za-z0-9-_.]{1,64}$" }, "artifactTags": { "type": "object", @@ -1237,7 +1237,7 @@ "required": true, "type": "string", "description": "The name of the image Template", - "pattern": "^[A-Za-z0-9-_]{1,64}$", + "pattern": "^[A-Za-z0-9-_.]{1,64}$", "x-ms-parameter-location": "method" }, "RunOutputNameParameter": { @@ -1246,7 +1246,7 @@ "required": true, "type": "string", "description": "The name of the run output", - "pattern": "^[A-Za-z0-9-_]{1,64}$", + "pattern": "^[A-Za-z0-9-_.]{1,64}$", "x-ms-parameter-location": "method" }, "LocationParameter": { From 4c252d68de3e9a9678c2e4f7cd31a75970cb4bee Mon Sep 17 00:00:00 2001 From: Feiyu Shi Date: Sun, 21 Apr 2019 15:52:45 -0700 Subject: [PATCH 04/13] Use correct "artifactTags" instead of "tags" for distribute in examples --- .../2019-05-01-preview/examples/CreateImageTemplate.json | 4 ++-- .../examples/CreateImageTemplateWithUserAssignedIdentity.json | 4 ++-- .../preview/2019-05-01-preview/examples/GetImageTemplate.json | 2 +- .../2019-05-01-preview/examples/ListImageTemplates.json | 4 ++-- .../2019-05-01-preview/examples/ListImageTemplatesByRg.json | 2 +- .../examples/RemoveImageTemplateIdentity.json | 2 +- .../2019-05-01-preview/examples/UpdateImageTemplateTags.json | 2 +- .../examples/UpdateImageTemplateToRemoveIdentities.json | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/examples/CreateImageTemplate.json b/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/examples/CreateImageTemplate.json index 2414c0bb8873..9830e51490e8 100644 --- a/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/examples/CreateImageTemplate.json +++ b/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/examples/CreateImageTemplate.json @@ -28,7 +28,7 @@ "location": "1_location", "runOutputName": "image_it_pir_1", "imageId": "/subscriptions/{subscription-id}/resourceGroups/rg1/providers/Microsoft.Compute/images/image_it_1", - "tags": { + "artifactTags": { "tagName": "value" } } @@ -61,7 +61,7 @@ "location": "1_location", "runOutputName": "image_it_pir_1", "imageId": "/subscriptions/{subscription-id}/resourceGroups/rg1/providers/Microsoft.Compute/images/image_it_1", - "tags": { + "artifactTags": { "tagName": "value" } } diff --git a/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/examples/CreateImageTemplateWithUserAssignedIdentity.json b/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/examples/CreateImageTemplateWithUserAssignedIdentity.json index 308e614cb01d..b3bfcc6a136f 100644 --- a/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/examples/CreateImageTemplateWithUserAssignedIdentity.json +++ b/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/examples/CreateImageTemplateWithUserAssignedIdentity.json @@ -34,7 +34,7 @@ "location": "1_location", "runOutputName": "image_it_pir_1", "imageId": "/subscriptions/{subscription-id}/resourceGroups/rg1/providers/Microsoft.Compute/images/image_it_1", - "tags": { + "artifactTags": { "tagName": "value" } } @@ -76,7 +76,7 @@ "location": "1_location", "runOutputName": "image_it_pir_1", "imageId": "/subscriptions/{subscription-id}/resourceGroups/rg1/providers/Microsoft.Compute/images/image_it_1", - "tags": { + "artifactTags": { "tagName": "value" } } diff --git a/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/examples/GetImageTemplate.json b/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/examples/GetImageTemplate.json index 435231254d75..2922845adcc2 100644 --- a/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/examples/GetImageTemplate.json +++ b/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/examples/GetImageTemplate.json @@ -31,7 +31,7 @@ "location": "1_location", "runOutputName": "image_it_pir_1", "imageId": "/subscriptions/{subscription-id}/resourceGroups/rg1/providers/Microsoft.Compute/images/image_it_1", - "tags": { + "artifactTags": { "tagName": "value" } } diff --git a/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/examples/ListImageTemplates.json b/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/examples/ListImageTemplates.json index 966e76c3c470..a8ef6e29e60b 100644 --- a/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/examples/ListImageTemplates.json +++ b/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/examples/ListImageTemplates.json @@ -31,7 +31,7 @@ "location": "1_location", "runOutputName": "image_it_pir_1", "imageId": "/subscriptions/{subscription-id}/resourceGroups/rg1/providers/Microsoft.Compute/images/image_it_1", - "tags": { + "artifactTags": { "tagName": "value" } } @@ -64,7 +64,7 @@ "location": "eastus", "runOutputName": "eus", "imageId": "/subscriptions/{subscription-id}/resourceGroups/rg1/providers/Microsoft.Compute/images/mySecondImage-eus", - "tags": { + "artifactTags": { "stage": "development" } } diff --git a/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/examples/ListImageTemplatesByRg.json b/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/examples/ListImageTemplatesByRg.json index aa072cb92783..e8af1591e994 100644 --- a/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/examples/ListImageTemplatesByRg.json +++ b/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/examples/ListImageTemplatesByRg.json @@ -32,7 +32,7 @@ "location": "1_location", "runOutputName": "image_it_pir_1", "imageId": "/subscriptions/{subscription-id}/resourceGroups/rg1/providers/Microsoft.Compute/images/image_it_1", - "tags": { + "artifactTags": { "tagName": "value" } } diff --git a/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/examples/RemoveImageTemplateIdentity.json b/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/examples/RemoveImageTemplateIdentity.json index a3e39064a6fe..6c7b9bf78a13 100644 --- a/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/examples/RemoveImageTemplateIdentity.json +++ b/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/examples/RemoveImageTemplateIdentity.json @@ -37,7 +37,7 @@ "location": "1_location", "runOutputName": "image_it_pir_1", "imageId": "/subscriptions/{subscription-id}/resourceGroups/rg1/providers/Microsoft.Compute/images/image_it_1", - "tags": { + "artifactTags": { "tagName": "value" } } diff --git a/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/examples/UpdateImageTemplateTags.json b/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/examples/UpdateImageTemplateTags.json index 622362aec679..bb6b496cf26b 100644 --- a/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/examples/UpdateImageTemplateTags.json +++ b/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/examples/UpdateImageTemplateTags.json @@ -39,7 +39,7 @@ "location": "1_location", "runOutputName": "image_it_pir_1", "imageId": "/subscriptions/{subscription-id}/resourceGroups/rg1/providers/Microsoft.Compute/images/image_it_1", - "tags": { + "artifactTags": { "tagName": "value" } } diff --git a/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/examples/UpdateImageTemplateToRemoveIdentities.json b/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/examples/UpdateImageTemplateToRemoveIdentities.json index 668c8f78f517..862d63d48906 100644 --- a/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/examples/UpdateImageTemplateToRemoveIdentities.json +++ b/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/examples/UpdateImageTemplateToRemoveIdentities.json @@ -39,7 +39,7 @@ "location": "1_location", "runOutputName": "image_it_pir_1", "imageId": "/subscriptions/{subscription-id}/resourceGroups/rg1/providers/Microsoft.Compute/images/image_it_1", - "tags": { + "artifactTags": { "tagName": "value" } } From 6b2ad3c6da5e871eae9bebe40e1c00c60110a8d1 Mon Sep 17 00:00:00 2001 From: Feiyu Shi Date: Sun, 21 Apr 2019 16:28:47 -0700 Subject: [PATCH 05/13] Fix an example by removing unnecessary field "imageId" --- .../2019-05-01-preview/examples/ListImageTemplatesByRg.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/examples/ListImageTemplatesByRg.json b/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/examples/ListImageTemplatesByRg.json index e8af1591e994..24262e24f3f8 100644 --- a/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/examples/ListImageTemplatesByRg.json +++ b/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/examples/ListImageTemplatesByRg.json @@ -70,8 +70,7 @@ "type": "SharedImage", "galleryImageId": "/subscriptions/{subscription-id}/resourceGroups/rg1/providers/Microsoft.Compute/gallery/baseimages/images/baseimage", "replicationRegions":[ "eastus", "westus"], - "runOutputName": "gallery", - "imageId": "/subscriptions/{subscription-id}/resourceGroups/rg1/providers/Microsoft.Compute/images/baseimage-eus" + "runOutputName": "gallery" } ] } From 41c34bc08188f5ccc102094595c9fb4ac0fe2c04 Mon Sep 17 00:00:00 2001 From: Feiyu Shi Date: Sun, 21 Apr 2019 16:41:36 -0700 Subject: [PATCH 06/13] generate GO SDK for 2019-05-01-preview --- .../imagebuilder/resource-manager/readme.go.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/specification/imagebuilder/resource-manager/readme.go.md b/specification/imagebuilder/resource-manager/readme.go.md index 7bd34af5f1cf..9aad0bd3bcdf 100644 --- a/specification/imagebuilder/resource-manager/readme.go.md +++ b/specification/imagebuilder/resource-manager/readme.go.md @@ -14,6 +14,7 @@ These settings apply only when `--go` is specified on the command line. batch: - tag: package-2018-02 - tag: package-2019-02 + - tag: package-2019-05 ``` ### Tag: package-2018-02 @@ -33,3 +34,12 @@ Please also specify `--go-sdk-folder=`. + +``` yaml $(tag) == 'package-2019-05' && $(go) +output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2019-05-01-preview/$(namespace) +``` \ No newline at end of file From 45059cc98402a88a7c1fd3bf3c519ffe722eb5bc Mon Sep 17 00:00:00 2001 From: Feiyu Shi Date: Sun, 21 Apr 2019 16:43:13 -0700 Subject: [PATCH 07/13] Re-generate python SDK --- specification/imagebuilder/resource-manager/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/imagebuilder/resource-manager/readme.md b/specification/imagebuilder/resource-manager/readme.md index 5aea79fabff9..346af35398d1 100644 --- a/specification/imagebuilder/resource-manager/readme.md +++ b/specification/imagebuilder/resource-manager/readme.md @@ -90,7 +90,7 @@ python: namespace: azure.mgmt.imagebuilder package-name: azure-mgmt-imagebuilder clear-output-folder: true - package-version: 0.2.0 + package-version: 0.2.1 ``` ``` yaml $(python) && $(python-mode) == 'update' From 770176ce8c82070a2473badf49758af3c2054d70 Mon Sep 17 00:00:00 2001 From: Feiyu Shi Date: Mon, 22 Apr 2019 10:46:31 -0700 Subject: [PATCH 08/13] fix go sdk for 2019-05-01-preview package --- specification/imagebuilder/resource-manager/readme.go.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/specification/imagebuilder/resource-manager/readme.go.md b/specification/imagebuilder/resource-manager/readme.go.md index 9aad0bd3bcdf..93711868114b 100644 --- a/specification/imagebuilder/resource-manager/readme.go.md +++ b/specification/imagebuilder/resource-manager/readme.go.md @@ -14,7 +14,7 @@ These settings apply only when `--go` is specified on the command line. batch: - tag: package-2018-02 - tag: package-2019-02 - - tag: package-2019-05 + - tag: package-preview-2019-05 ``` ### Tag: package-2018-02 @@ -35,11 +35,11 @@ Please also specify `--go-sdk-folder=`. -``` yaml $(tag) == 'package-2019-05' && $(go) +``` yaml $(tag) == 'package-preview-2019-05' && $(go) output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2019-05-01-preview/$(namespace) ``` \ No newline at end of file From 56e5a9ee4fa892c74f0254becd0f82ad431e603c Mon Sep 17 00:00:00 2001 From: Feiyu Shi Date: Mon, 22 Apr 2019 15:22:45 -0700 Subject: [PATCH 09/13] Fix example response status codes --- .../examples/CreateImageTemplate.json | 32 ++++++++++++++ ...ImageTemplateWithUserAssignedIdentity.json | 41 +++++++++++++++++ .../examples/DeleteImageTemplate.json | 4 +- .../examples/RunImageTemplate.json | 3 +- .../examples/UpdateImageTemplateTags.json | 44 +++++++++++++++++-- ...UpdateImageTemplateToRemoveIdentities.json | 36 +++++++++++++++ 6 files changed, 154 insertions(+), 6 deletions(-) diff --git a/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/examples/CreateImageTemplate.json b/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/examples/CreateImageTemplate.json index 9830e51490e8..4755b18654e1 100644 --- a/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/examples/CreateImageTemplate.json +++ b/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/examples/CreateImageTemplate.json @@ -68,6 +68,38 @@ ] } } + }, + "200": { + "body": { + "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.VirtualMachineImages/imageTemplates/myImageTemplate", + "name": "myImageTemplate", + "location": "westus", + "type": "Microsoft.VirtualMachineImages/imageTemplate", + "properties": { + "source": { + "type": "ManagedImage", + "imageId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.Compute/images/source_image" + }, + "customize": [ + { + "type": "Shell", + "name": "Shell Customizer Example", + "scriptUri": "https://example.com/path/to/script.sh" + } + ], + "distribute": [ + { + "type": "ManagedImage", + "location": "1_location", + "runOutputName": "image_it_pir_1", + "imageId": "/subscriptions/{subscription-id}/resourceGroups/rg1/providers/Microsoft.Compute/images/image_it_1", + "artifactTags": { + "tagName": "value" + } + } + ] + } + } } } } diff --git a/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/examples/CreateImageTemplateWithUserAssignedIdentity.json b/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/examples/CreateImageTemplateWithUserAssignedIdentity.json index b3bfcc6a136f..6a62e9eaa9eb 100644 --- a/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/examples/CreateImageTemplateWithUserAssignedIdentity.json +++ b/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/examples/CreateImageTemplateWithUserAssignedIdentity.json @@ -83,6 +83,47 @@ ] } } + }, + "200": { + "body": { + "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.VirtualMachineImages/imageTemplates/myImageTemplate", + "name": "myImageTemplate", + "location": "westus", + "type": "Microsoft.VirtualMachineImages/imageTemplate", + "identity": { + "type": "UserAssigned", + "userAssignedIdentities": { + "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identity_1": { + "clientId": "00000000-0000-0000-0000-000000000000", + "principalId": "00000000-0000-0000-0000-000000000000" + } + } + }, + "properties": { + "source": { + "type": "ManagedImage", + "imageId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.Compute/images/source_image" + }, + "customize": [ + { + "type": "Shell", + "name": "Shell Customizer Example", + "scriptUri": "https://example.com/path/to/script.sh" + } + ], + "distribute": [ + { + "type": "ManagedImage", + "location": "1_location", + "runOutputName": "image_it_pir_1", + "imageId": "/subscriptions/{subscription-id}/resourceGroups/rg1/providers/Microsoft.Compute/images/image_it_1", + "artifactTags": { + "tagName": "value" + } + } + ] + } + } } } } diff --git a/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/examples/DeleteImageTemplate.json b/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/examples/DeleteImageTemplate.json index 4fb1d3f5c1f1..995b4c968f7c 100644 --- a/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/examples/DeleteImageTemplate.json +++ b/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/examples/DeleteImageTemplate.json @@ -10,6 +10,8 @@ "headers": { "Azure-AsyncOperation": "https://management.azure.com/subscriptions/{subscription-id}/providers/Microsoft.VirtualMachineImages/locations/westus/operations/85506efc-36f7-11e9-a0c2-000d3afd16e3?api-version=2018-02-01-preview" } - } + }, + "200": {}, + "204": {} } } diff --git a/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/examples/RunImageTemplate.json b/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/examples/RunImageTemplate.json index 28b38949d895..07524c2f06cb 100644 --- a/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/examples/RunImageTemplate.json +++ b/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/examples/RunImageTemplate.json @@ -10,6 +10,7 @@ "headers": { "Azure-AsyncOperation": "https://management.azure.com/subscriptions/{subscription-id}/providers/Microsoft.VirtualMachineImages/locations/westus/operations/777b2050-36f8-11e9-b8fa-000d3afd16e3?api-version=2018-02-01-preview" } - } + }, + "204":{} } } diff --git a/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/examples/UpdateImageTemplateTags.json b/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/examples/UpdateImageTemplateTags.json index bb6b496cf26b..4090cbc4683e 100644 --- a/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/examples/UpdateImageTemplateTags.json +++ b/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/examples/UpdateImageTemplateTags.json @@ -2,15 +2,15 @@ "parameters": { "subscriptionId": "{subscription-id}", "resourceGroupName": "myResourceGroup", - "imageTemplateName":"myImageTemplate", + "imageTemplateName": "myImageTemplate", "api-version": "2019-05-01-preview", - "parameters":{ + "parameters": { "tags": { "new-tag": "new-value" } } }, - "responses":{ + "responses": { "200": { "body": { "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.VirtualMachineImages/imageTemplates/myImageTemplate", @@ -46,6 +46,42 @@ ] } } - } + }, + "202": { + "body": { + "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.VirtualMachineImages/imageTemplates/myImageTemplate", + "name": "myImageTemplate", + "location": "westus", + "type": "Microsoft.VirtualMachineImages/imageTemplate", + "tags": { + "new-tag": "new-value" + }, + "properties": { + "source": { + "type": "ISO", + "sourceUri": "http://redhat.com/path/to/installation.iso", + "sha256Checksum": "120acbca7b3d55465eb9f8ef53ad7365f2997d42d4f83d7cc285bf5c71e1131f" + }, + "customize": [ + { + "type": "Shell", + "name": "Shell customization example", + "scriptUri": "https://example.com/path/to/script.sh" + } + ], + "distribute": [ + { + "type": "ManagedImage", + "location": "1_location", + "runOutputName": "image_it_pir_1", + "imageId": "/subscriptions/{subscription-id}/resourceGroups/rg1/providers/Microsoft.Compute/images/image_it_1", + "artifactTags": { + "tagName": "value" + } + } + ] + } + } + } } } diff --git a/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/examples/UpdateImageTemplateToRemoveIdentities.json b/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/examples/UpdateImageTemplateToRemoveIdentities.json index 862d63d48906..fe42cbad3133 100644 --- a/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/examples/UpdateImageTemplateToRemoveIdentities.json +++ b/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/examples/UpdateImageTemplateToRemoveIdentities.json @@ -46,6 +46,42 @@ ] } } + }, + "202": { + "body": { + "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.VirtualMachineImages/imageTemplates/myImageTemplate", + "name": "myImageTemplate", + "location": "westus", + "type": "Microsoft.VirtualMachineImages/imageTemplate", + "tags": { + "new-tag": "new-value" + }, + "properties": { + "source": { + "type": "ISO", + "sourceUri": "http://redhat.com/path/to/installation.iso", + "sha256Checksum": "120acbca7b3d55465eb9f8ef53ad7365f2997d42d4f83d7cc285bf5c71e1131f" + }, + "customize": [ + { + "type": "Shell", + "name": "Shell customization example", + "scriptUri": "https://example.com/path/to/script.sh" + } + ], + "distribute": [ + { + "type": "ManagedImage", + "location": "1_location", + "runOutputName": "image_it_pir_1", + "imageId": "/subscriptions/{subscription-id}/resourceGroups/rg1/providers/Microsoft.Compute/images/image_it_1", + "artifactTags": { + "tagName": "value" + } + } + ] + } + } } } } From c1299bf907310bc9f6771cef45e4fa784ce7c3c2 Mon Sep 17 00:00:00 2001 From: Feiyu Shi Date: Mon, 22 Apr 2019 15:23:35 -0700 Subject: [PATCH 10/13] Remove duplicate unreferenced example --- .../examples/RemoveImageTemplateIdentity.json | 49 ------------------- 1 file changed, 49 deletions(-) delete mode 100644 specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/examples/RemoveImageTemplateIdentity.json diff --git a/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/examples/RemoveImageTemplateIdentity.json b/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/examples/RemoveImageTemplateIdentity.json deleted file mode 100644 index 6c7b9bf78a13..000000000000 --- a/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/examples/RemoveImageTemplateIdentity.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "parameters": { - "subscriptionId": "{subscription-id}", - "resourceGroupName": "myResourceGroup", - "imageTemplateName":"myImageTemplate", - "api-version": "2019-05-01-preview", - "parameters":{ - "identity": { - "type": "None" - } - } - }, - "responses":{ - "200": { - "body": { - "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.VirtualMachineImages/imageTemplates/myImageTemplate", - "name": "myImageTemplate", - "location": "westus", - "type": "Microsoft.VirtualMachineImages/imageTemplate", - "identity": null, - "properties": { - "source": { - "type": "ISO", - "sourceUri": "http://redhat.com/path/to/installation.iso", - "sha256Checksum": "120acbca7b3d55465eb9f8ef53ad7365f2997d42d4f83d7cc285bf5c71e1131f" - }, - "customize": [ - { - "type": "Shell", - "name": "Shell customization example", - "scriptUri": "https://example.com/path/to/script.sh" - } - ], - "distribute": [ - { - "type": "ManagedImage", - "location": "1_location", - "runOutputName": "image_it_pir_1", - "imageId": "/subscriptions/{subscription-id}/resourceGroups/rg1/providers/Microsoft.Compute/images/image_it_1", - "artifactTags": { - "tagName": "value" - } - } - ] - } - } - } - } -} From 54813d93cdee60aeb29880cabb358ed2cbbd1452 Mon Sep 17 00:00:00 2001 From: Feiyu Shi Date: Mon, 22 Apr 2019 15:24:54 -0700 Subject: [PATCH 11/13] Fix update identity example by including identity section in the response --- .../examples/UpdateImageTemplateToRemoveIdentities.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/examples/UpdateImageTemplateToRemoveIdentities.json b/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/examples/UpdateImageTemplateToRemoveIdentities.json index fe42cbad3133..4aec0236f6b7 100644 --- a/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/examples/UpdateImageTemplateToRemoveIdentities.json +++ b/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/examples/UpdateImageTemplateToRemoveIdentities.json @@ -17,6 +17,9 @@ "name": "myImageTemplate", "location": "westus", "type": "Microsoft.VirtualMachineImages/imageTemplate", + "identity": { + "type": "None" + }, "tags": { "new-tag": "new-value" }, @@ -53,6 +56,9 @@ "name": "myImageTemplate", "location": "westus", "type": "Microsoft.VirtualMachineImages/imageTemplate", + "identity": { + "type": "None" + }, "tags": { "new-tag": "new-value" }, From 6ff554e870b9f4e4a56c732caa904011f8f7d2e0 Mon Sep 17 00:00:00 2001 From: Feiyu Shi Date: Mon, 22 Apr 2019 15:49:15 -0700 Subject: [PATCH 12/13] Fix PATCH examples for 202 response --- .../examples/UpdateImageTemplateTags.json | 35 +---------------- ...UpdateImageTemplateToRemoveIdentities.json | 38 +------------------ 2 files changed, 4 insertions(+), 69 deletions(-) diff --git a/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/examples/UpdateImageTemplateTags.json b/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/examples/UpdateImageTemplateTags.json index 4090cbc4683e..f2fdecea60dd 100644 --- a/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/examples/UpdateImageTemplateTags.json +++ b/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/examples/UpdateImageTemplateTags.json @@ -48,39 +48,8 @@ } }, "202": { - "body": { - "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.VirtualMachineImages/imageTemplates/myImageTemplate", - "name": "myImageTemplate", - "location": "westus", - "type": "Microsoft.VirtualMachineImages/imageTemplate", - "tags": { - "new-tag": "new-value" - }, - "properties": { - "source": { - "type": "ISO", - "sourceUri": "http://redhat.com/path/to/installation.iso", - "sha256Checksum": "120acbca7b3d55465eb9f8ef53ad7365f2997d42d4f83d7cc285bf5c71e1131f" - }, - "customize": [ - { - "type": "Shell", - "name": "Shell customization example", - "scriptUri": "https://example.com/path/to/script.sh" - } - ], - "distribute": [ - { - "type": "ManagedImage", - "location": "1_location", - "runOutputName": "image_it_pir_1", - "imageId": "/subscriptions/{subscription-id}/resourceGroups/rg1/providers/Microsoft.Compute/images/image_it_1", - "artifactTags": { - "tagName": "value" - } - } - ] - } + "headers": { + "Azure-AsyncOperation": "https://management.azure.com/subscriptions/{subscription-id}/providers/Microsoft.VirtualMachineImages/locations/{location}/operations/{operation-id}?api-version=2019-05-01-preview" } } } diff --git a/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/examples/UpdateImageTemplateToRemoveIdentities.json b/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/examples/UpdateImageTemplateToRemoveIdentities.json index 4aec0236f6b7..8aac53df36d2 100644 --- a/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/examples/UpdateImageTemplateToRemoveIdentities.json +++ b/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/examples/UpdateImageTemplateToRemoveIdentities.json @@ -51,42 +51,8 @@ } }, "202": { - "body": { - "id": "/subscriptions/{subscription-id}/resourceGroups/myResourceGroup/providers/Microsoft.VirtualMachineImages/imageTemplates/myImageTemplate", - "name": "myImageTemplate", - "location": "westus", - "type": "Microsoft.VirtualMachineImages/imageTemplate", - "identity": { - "type": "None" - }, - "tags": { - "new-tag": "new-value" - }, - "properties": { - "source": { - "type": "ISO", - "sourceUri": "http://redhat.com/path/to/installation.iso", - "sha256Checksum": "120acbca7b3d55465eb9f8ef53ad7365f2997d42d4f83d7cc285bf5c71e1131f" - }, - "customize": [ - { - "type": "Shell", - "name": "Shell customization example", - "scriptUri": "https://example.com/path/to/script.sh" - } - ], - "distribute": [ - { - "type": "ManagedImage", - "location": "1_location", - "runOutputName": "image_it_pir_1", - "imageId": "/subscriptions/{subscription-id}/resourceGroups/rg1/providers/Microsoft.Compute/images/image_it_1", - "artifactTags": { - "tagName": "value" - } - } - ] - } + "headers": { + "Azure-AsyncOperation": "https://management.azure.com/subscriptions/{subscription-id}/providers/Microsoft.VirtualMachineImages/locations/{location}/operations/{operation-id}?api-version=2019-05-01-preview" } } } From 99fa75eb5e8f1a1b29e815be1855e855273dda6a Mon Sep 17 00:00:00 2001 From: Feiyu Shi Date: Mon, 22 Apr 2019 15:50:18 -0700 Subject: [PATCH 13/13] Fix async operation urls in responses --- .../2019-05-01-preview/examples/DeleteImageTemplate.json | 2 +- .../preview/2019-05-01-preview/examples/RunImageTemplate.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/examples/DeleteImageTemplate.json b/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/examples/DeleteImageTemplate.json index 995b4c968f7c..dc4f7d07c7ef 100644 --- a/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/examples/DeleteImageTemplate.json +++ b/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/examples/DeleteImageTemplate.json @@ -8,7 +8,7 @@ "responses":{ "202": { "headers": { - "Azure-AsyncOperation": "https://management.azure.com/subscriptions/{subscription-id}/providers/Microsoft.VirtualMachineImages/locations/westus/operations/85506efc-36f7-11e9-a0c2-000d3afd16e3?api-version=2018-02-01-preview" + "Azure-AsyncOperation": "https://management.azure.com/subscriptions/{subscription-id}/providers/Microsoft.VirtualMachineImages/locations/{location}/operations/{operation-id}?api-version=2019-05-01-preview" } }, "200": {}, diff --git a/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/examples/RunImageTemplate.json b/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/examples/RunImageTemplate.json index 07524c2f06cb..5c6f65b35b59 100644 --- a/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/examples/RunImageTemplate.json +++ b/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/examples/RunImageTemplate.json @@ -8,7 +8,7 @@ "responses":{ "202":{ "headers": { - "Azure-AsyncOperation": "https://management.azure.com/subscriptions/{subscription-id}/providers/Microsoft.VirtualMachineImages/locations/westus/operations/777b2050-36f8-11e9-b8fa-000d3afd16e3?api-version=2018-02-01-preview" + "Azure-AsyncOperation": "https://management.azure.com/subscriptions/{subscription-id}/providers/Microsoft.VirtualMachineImages/locations/{location}/operations/{operation-id}?api-version=2019-05-01-preview" } }, "204":{}