Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move shared gallery to stable folder, and update blob as source template #12442

Merged
Merged
Show file tree
Hide file tree
Changes from 47 commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
d486942
add new api version 2020-09-30 for gallery.json
kangsun-ctrl Aug 14, 2020
9e5b055
add support for api change, sharing profile related
kangsun-ctrl Aug 14, 2020
9b6d3b7
update, change post to patch
kangsun-ctrl Aug 17, 2020
ce522c0
fix model validation error
kangsun-ctrl Aug 17, 2020
b9cb068
fix typo
kangsun-ctrl Aug 17, 2020
91e2ebf
add shared gallery api
kangsun-ctrl Aug 18, 2020
c7bd944
update
kangsun-ctrl Aug 18, 2020
df04728
fix typo
kangsun-ctrl Aug 18, 2020
3984a1b
update
kangsun-ctrl Aug 18, 2020
1511e27
update
kangsun-ctrl Aug 18, 2020
6387f21
update
kangsun-ctrl Aug 18, 2020
102e7e6
chagne new api version to preview
kangsun-ctrl Aug 18, 2020
02ee910
update readme.md and nit
kangsun-ctrl Aug 18, 2020
d7dd703
remove some required field and make groups readonly
kangsun-ctrl Aug 18, 2020
d06a615
add swagger support for Grace's and Tim's work
kangsun-ctrl Aug 18, 2020
33ac934
error fix
kangsun-ctrl Aug 18, 2020
d7caf62
error fix
kangsun-ctrl Aug 18, 2020
b3d26ff
change api version name to 2020-09-30 withour 'preview'
kangsun-ctrl Aug 19, 2020
9bc78e1
update
kangsun-ctrl Aug 22, 2020
62ac80a
Merge branch 'master' into master
kangsun-ctrl Aug 22, 2020
eb10543
fix typo
kangsun-ctrl Aug 22, 2020
64ed1e5
Merge branch 'master' of https://github.com/kangsun-ctrl/azure-rest-a…
kangsun-ctrl Aug 22, 2020
b752dbf
address pr comment
kangsun-ctrl Aug 26, 2020
4ee4346
set modelAsString to true for gallery sharing-related enum
kangsun-ctrl Aug 27, 2020
83ee500
Merge branch 'master' into master
kangsun-ctrl Sep 2, 2020
5cb2d3d
update, fix merge
kangsun-ctrl Sep 2, 2020
24ba11f
remove duplicate entry
kangsun-ctrl Sep 2, 2020
c5d5e8f
Merge branch 'master' of https://github.com/Azure/azure-rest-api-specs
kangsun-ctrl Sep 2, 2020
f300000
Merge branch 'master' of https://github.com/Azure/azure-rest-api-specs
kangsun-ctrl Sep 2, 2020
d3f40ca
shared gallery, change id to identifier.uniqueId
kangsun-ctrl Sep 4, 2020
0f7b05f
fix typo
kangsun-ctrl Sep 4, 2020
052e0d4
update, remove x-ms-azure-resource for shared gallery
kangsun-ctrl Sep 4, 2020
891be34
update latest api version to 2020-09-30
kangsun-ctrl Oct 8, 2020
3b598b7
change name of Permissions to avoid SDK code build error
kangsun-ctrl Oct 8, 2020
046b74c
Merge branch 'master' of https://github.com/Azure/azure-rest-api-spec…
kangsun-ctrl Oct 12, 2020
04d9130
update
kangsun-ctrl Jan 9, 2021
5db8c6a
update
kangsun-ctrl Jan 9, 2021
0dae5c6
add new line
kangsun-ctrl Jan 9, 2021
8f2eaca
Merge branch 'master' of https://github.com/Azure/azure-rest-api-spec…
kangsun-ctrl Jan 13, 2021
cbac240
Merge branch 'master' of https://github.com/Azure/azure-rest-api-spec…
kangsun-ctrl Jan 14, 2021
7b494bc
move all 2020-09-30 shared gallery api version to stable
kangsun-ctrl Jan 14, 2021
3d55e3b
update blob as source template and example
kangsun-ctrl Jan 14, 2021
66a3ae9
add example that user can update sig image without source id
kangsun-ctrl Jan 15, 2021
0b5b690
update get sig version with vhd source
kangsun-ctrl Jan 15, 2021
6b65102
update readme.md
kangsun-ctrl Jan 15, 2021
c39286c
update files after prettier check
kangsun-ctrl Jan 15, 2021
fd98e6d
update azureresourceschema.md
kangsun-ctrl Jan 15, 2021
15b1882
merge
kangsun-ctrl Jan 22, 2021
eb05853
update typo
kangsun-ctrl Jan 29, 2021
62c4a6a
resolve breaking change
kangsun-ctrl Mar 4, 2021
bfd212d
address comments
kangsun-ctrl Mar 5, 2021
4722d12
include gallery example change
kangsun-ctrl Mar 5, 2021
00b687a
Merge branch 'compute-2021-03' of https://github.com/Azure/azure-rest…
kangsun-ctrl Mar 5, 2021
36580a9
add stable/2020-09-30/gallery and sharedGallery to readme file
kangsun-ctrl Mar 5, 2021
b73241e
nit
kangsun-ctrl Mar 8, 2021
de5699e
address comment
kangsun-ctrl Mar 11, 2021
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 @@ -34,10 +34,23 @@
]
kangsun-ctrl marked this conversation as resolved.
Show resolved Hide resolved
},
"storageProfile": {
"source": {
"id": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.Storage/storageAccounts/{storageAccount}",
"uri": "https://gallerysourcencus.blob.core.windows.net/myvhds/Windows-Server-2012-R2-20171216-en.us-128GB.vhd"
}
"osDiskImage": {
"source": {
"id": "/subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.Storage/storageAccounts/{storageAccount}",
"uri": "https://gallerysourcencus.blob.core.windows.net/myvhds/Windows-Server-2012-R2-20171216-en.us-128GB.vhd"
},
"hostCaching": "ReadOnly"
},
"dataDiskImages": [
{
"source": {
"id": "/subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.Storage/storageAccounts/{storageAccount}",
"uri": "https://gallerysourcencus.blob.core.windows.net/myvhds/Windows-Server-2012-R2-20171216-en.us-128GB.vhd"
},
"lun": 1,
"hostCaching": "None"
}
]
}
}
}
Expand Down Expand Up @@ -75,10 +88,23 @@
"storageAccountType": "Standard_LRS"
},
"storageProfile": {
"source": {
"id": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.Storage/storageAccounts/{storageAccount}",
"uri": "https://gallerysourcencus.blob.core.windows.net/myvhds/Windows-Server-2012-R2-20171216-en.us-128GB.vhd"
}
"osDiskImage": {
"source": {
"id": "/subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.Storage/storageAccounts/{storageAccount}",
"uri": "https://gallerysourcencus.blob.core.windows.net/myvhds/Windows-Server-2012-R2-20171216-en.us-128GB.vhd"
},
"hostCaching": "ReadOnly"
},
"dataDiskImages": [
{
"source": {
"id": "/subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.Storage/storageAccounts/{storageAccount}",
"uri": "https://gallerysourcencus.blob.core.windows.net/myvhds/Windows-Server-2012-R2-20171216-en.us-128GB.vhd"
},
"lun": 1,
"hostCaching": "None"
}
]
},
"provisioningState": "Updating"
},
Expand Down Expand Up @@ -118,10 +144,23 @@
"storageAccountType": "Standard_LRS"
},
"storageProfile": {
"source": {
"id": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.Storage/storageAccounts/{storageAccount}",
"uri": "https://gallerysourcencus.blob.core.windows.net/myvhds/Windows-Server-2012-R2-20171216-en.us-128GB.vhd"
}
"osDiskImage": {
"source": {
"id": "/subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.Storage/storageAccounts/{storageAccount}",
"uri": "https://gallerysourcencus.blob.core.windows.net/myvhds/Windows-Server-2012-R2-20171216-en.us-128GB.vhd"
},
"hostCaching": "ReadOnly"
},
"dataDiskImages": [
{
"source": {
"id": "/subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.Storage/storageAccounts/{storageAccount}",
"uri": "https://gallerysourcencus.blob.core.windows.net/myvhds/Windows-Server-2012-R2-20171216-en.us-128GB.vhd"
},
"lun": 1,
"hostCaching": "None"
}
]
},
"provisioningState": "Creating"
},
Expand Down Expand Up @@ -161,10 +200,23 @@
"storageAccountType": "Standard_LRS"
},
"storageProfile": {
"source": {
"id": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.Storage/storageAccounts/{storageAccount}",
"uri": "https://gallerysourcencus.blob.core.windows.net/myvhds/Windows-Server-2012-R2-20171216-en.us-128GB.vhd"
}
"osDiskImage": {
"source": {
"id": "/subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.Storage/storageAccounts/{storageAccount}",
"uri": "https://gallerysourcencus.blob.core.windows.net/myvhds/Windows-Server-2012-R2-20171216-en.us-128GB.vhd"
},
"hostCaching": "ReadOnly"
},
"dataDiskImages": [
{
"source": {
"id": "/subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.Storage/storageAccounts/{storageAccount}",
"uri": "https://gallerysourcencus.blob.core.windows.net/myvhds/Windows-Server-2012-R2-20171216-en.us-128GB.vhd"
},
"lun": 1,
"hostCaching": "None"
}
]
},
"provisioningState": "Updating"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,23 @@
"storageAccountType": "Standard_LRS"
},
"storageProfile": {
"source": {
"id": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.Storage/storageAccounts/{storageAccount}",
"uri": "https://gallerysourcencus.blob.core.windows.net/myvhds/Windows-Server-2012-R2-20171216-en.us-128GB.vhd"
}
"osDiskImage": {
"source": {
"id": "/subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.Storage/storageAccounts/{storageAccount}",
"uri": "https://gallerysourcencus.blob.core.windows.net/myvhds/Windows-Server-2012-R2-20171216-en.us-128GB.vhd"
},
"hostCaching": "ReadOnly"
},
"dataDiskImages": [
{
"source": {
"id": "/subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.Storage/storageAccounts/{storageAccount}",
"uri": "https://gallerysourcencus.blob.core.windows.net/myvhds/Windows-Server-2012-R2-20171216-en.us-128GB.vhd"
},
"lun": 1,
"hostCaching": "None"
}
]
},
"provisioningState": "Succeeded"
},
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
{
"parameters": {
"subscriptionId": "{subscription-id}",
"resourceGroupName": "myResourceGroup",
"api-version": "2020-09-30",
"galleryName": "myGalleryName",
"galleryImageName": "myGalleryImageName",
"galleryImageVersionName": "1.0.0",
"galleryImageVersion": {
"properties": {
"publishingProfile": {
"targetRegions": [
{
"name": "West US",
"regionalReplicaCount": 1
},
{
"name": "East US",
"regionalReplicaCount": 2,
"storageAccountType": "Standard_ZRS"
}
]
},
"storageProfile": {}
}
}
},
"responses": {
"200": {
"body": {
"properties": {
"publishingProfile": {
"targetRegions": [
{
"name": "West US",
"regionalReplicaCount": 1,
"storageAccountType": "Standard_LRS",
"encryption": {
"osDiskImage": {
"diskEncryptionSetId": "/subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/diskEncryptionSet/myDiskEncryptionSet"
},
"dataDiskImages": [
{
"lun": 1,
"diskEncryptionSetId": "/subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/diskEncryptionSet/myDiskEncryptionSet"
}
]
}
},
{
"name": "East US",
"regionalReplicaCount": 2,
"storageAccountType": "Standard_ZRS"
}
],
"replicaCount": 1,
"publishedDate": "2018-01-01T00:00:00Z",
"storageAccountType": "Standard_LRS"
},
"storageProfile": {
"source": {
"id": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.Compute/images/{imageName}"
},
"osDiskImage": {
"sizeInGB": 10,
"hostCaching": "ReadOnly"
},
"dataDiskImages": [
{
"lun": 1,
"sizeInGB": 10,
"hostCaching": "None"
}
]
},
"provisioningState": "Updating"
},
"location": "West US",
"name": "1.0.0"
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -662,6 +662,9 @@
"x-ms-examples": {
"Update a simple Gallery Image Version (Managed Image as source).": {
"$ref": "./examples/UpdateASimpleGalleryImageVersion.json"
},
"Update a simple Gallery Image Version without source id.": {
"$ref": "./examples/UpdateASimpleGalleryImageVersionWithoutSourceId.json"
}
}
},
Expand Down Expand Up @@ -2457,13 +2460,23 @@
"id": {
"type": "string",
"description": "The id of the gallery artifact version source. Can specify a disk uri, snapshot uri, user image or storage account resource."
},
}
},
"description": "The gallery artifact version source."
},
"GalleryDiskImageSource": {
"properties": {
"uri": {
"type": "string",
"description": "The uri of the gallery artifact version source. Currently used to specify vhd/blob source."
}
},
"description": "The gallery artifact version source."
"allOf": [
{
"$ref": "#/definitions/GalleryArtifactVersionSource"
}
],
"description": "The gallery disk image source."
},
"GalleryOSDiskImage": {
"allOf": [
Expand Down Expand Up @@ -2513,7 +2526,7 @@
}
},
"source": {
"$ref": "#/definitions/GalleryArtifactVersionSource"
"$ref": "#/definitions/GalleryDiskImageSource"
}
},
"description": "This is the disk image base class."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,8 @@ output-folder: $(azureresourceschema-folder)/schemas

# all the input files in this apiVersion
input-file:
- Microsoft.Compute/preview/2020-09-30/gallery.json
- Microsoft.Compute/preview/2020-09-30/sharedGallery.json
- Microsoft.Compute/stable/2020-09-30/gallery.json
kangsun-ctrl marked this conversation as resolved.
Show resolved Hide resolved
- Microsoft.Compute/stable/2020-09-30/sharedGallery.json

```

Expand Down
12 changes: 6 additions & 6 deletions specification/compute/resource-manager/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -219,8 +219,8 @@ input-file:
- Microsoft.Compute/stable/2020-06-01/runCommands.json
- Microsoft.Compute/stable/2019-04-01/skus.json
- Microsoft.Compute/stable/2020-09-30/disk.json
- Microsoft.Compute/preview/2020-09-30/gallery.json
- Microsoft.Compute/preview/2020-09-30/sharedGallery.json
- Microsoft.Compute/stable/2020-09-30/gallery.json
- Microsoft.Compute/stable/2020-09-30/sharedGallery.json
- Microsoft.ContainerService/stable/2017-01-31/containerService.json
- Microsoft.Compute/preview/2020-10-01-preview/cloudService.json
```
Expand All @@ -243,8 +243,8 @@ input-file:
- Microsoft.Compute/stable/2020-06-01/runCommands.json
- Microsoft.Compute/stable/2019-04-01/skus.json
- Microsoft.Compute/stable/2020-09-30/disk.json
- Microsoft.Compute/preview/2020-09-30/gallery.json
- Microsoft.Compute/preview/2020-09-30/sharedGallery.json
- Microsoft.Compute/stable/2020-09-30/gallery.json
kangsun-ctrl marked this conversation as resolved.
Show resolved Hide resolved
- Microsoft.Compute/stable/2020-09-30/sharedGallery.json
- Microsoft.ContainerService/stable/2017-01-31/containerService.json
```

Expand All @@ -255,8 +255,8 @@ These settings apply only when `--tag=package-2020-09-30-only` is specified on t
``` yaml $(tag) == 'package-2020-09-30-only'
input-file:
- Microsoft.Compute/stable/2020-09-30/disk.json
- Microsoft.Compute/preview/2020-09-30/gallery.json
- Microsoft.Compute/preview/2020-09-30/sharedGallery.json
- Microsoft.Compute/stable/2020-09-30/gallery.json
kangsun-ctrl marked this conversation as resolved.
Show resolved Hide resolved
- Microsoft.Compute/stable/2020-09-30/sharedGallery.json
```

### Tag: package-2020-06-30
Expand Down