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..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 @@ -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,39 @@ "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" + } + } + ] + } + } + }, + "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 308e614cb01d..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 @@ -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,48 @@ "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" + } + } + ] + } + } + }, + "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..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,8 +8,10 @@ "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": {}, + "204": {} } } 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..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 @@ -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" } } @@ -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" } ] } 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 a3e39064a6fe..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", - "tags": { - "tagName": "value" - } - } - ] - } - } - } - } -} 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..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,8 +8,9 @@ "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":{} } } 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..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 @@ -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", @@ -39,13 +39,18 @@ "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" } } ] } } - } + }, + "202": { + "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 668c8f78f517..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 @@ -17,6 +17,9 @@ "name": "myImageTemplate", "location": "westus", "type": "Microsoft.VirtualMachineImages/imageTemplate", + "identity": { + "type": "None" + }, "tags": { "new-tag": "new-value" }, @@ -39,13 +42,18 @@ "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" } } ] } } + }, + "202": { + "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/imagebuilder.json b/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/preview/2019-05-01-preview/imagebuilder.json index 6c381ba54295..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 @@ -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" } } }, @@ -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", @@ -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": [ @@ -1235,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": { @@ -1244,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": { diff --git a/specification/imagebuilder/resource-manager/readme.go.md b/specification/imagebuilder/resource-manager/readme.go.md index 7bd34af5f1cf..93711868114b 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-preview-2019-05 ``` ### Tag: package-2018-02 @@ -33,3 +34,12 @@ Please also specify `--go-sdk-folder=`. + +``` 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 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'