Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
Expand Down Expand Up @@ -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"
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
Expand Down Expand Up @@ -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"
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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": {}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
Expand Down Expand Up @@ -64,7 +64,7 @@
"location": "eastus",
"runOutputName": "eus",
"imageId": "/subscriptions/{subscription-id}/resourceGroups/rg1/providers/Microsoft.Compute/images/mySecondImage-eus",
"tags": {
"artifactTags": {
"stage": "development"
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
Expand Down Expand Up @@ -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"
}
]
}
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -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":{}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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"
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@
"name": "myImageTemplate",
"location": "westus",
"type": "Microsoft.VirtualMachineImages/imageTemplate",
"identity": {
"type": "None"
},
"tags": {
"new-tag": "new-value"
},
Expand All @@ -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"
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
},
Expand All @@ -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",
Expand Down Expand Up @@ -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": [
Expand Down Expand Up @@ -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": {
Expand All @@ -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": {
Expand Down
10 changes: 10 additions & 0 deletions specification/imagebuilder/resource-manager/readme.go.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -33,3 +34,12 @@ Please also specify `--go-sdk-folder=<path to the root directory of your azure-s
``` yaml $(tag) == 'package-2019-02' && $(go)
output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2019-02-01-preview/$(namespace)
```

### Tag: package-preview-2019-05

These settings apply only when `--tag=package-preview-2019-05 --go` is specified on the command line.
Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.

``` yaml $(tag) == 'package-preview-2019-05' && $(go)
output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2019-05-01-preview/$(namespace)
```
2 changes: 1 addition & 1 deletion specification/imagebuilder/resource-manager/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down