From fa0234832a8470daa253853275269508dc18d06e Mon Sep 17 00:00:00 2001 From: Adam Sandor Date: Tue, 5 Sep 2023 14:50:31 -0400 Subject: [PATCH 1/3] all discalimer and previous arm updates --- .../stable/2022-08-03/communityGallery.json | 89 +++++++++++++++++-- .../CommunityGalleryImageVersion_Get.json | 6 +- .../CommunityGalleryImageVersion_List.json | 6 +- .../CommunityGalleryImage_Get.json | 8 +- .../CommunityGalleryImage_List.json | 6 +- .../CommunityGallery_Get.json | 15 ++++ .../SharedGalleryImageVersion_Get.json | 6 +- .../SharedGalleryImageVersions_List.json | 6 +- .../SharedGalleryImage_Get.json | 6 +- .../SharedGalleryImages_List.json | 15 ++-- .../SharedGallery_Get.json | 5 ++ .../SharedGallery_List.json | 5 ++ .../stable/2022-08-03/sharedGallery.json | 30 ++++++- 13 files changed, 180 insertions(+), 23 deletions(-) diff --git a/specification/compute/resource-manager/Microsoft.Compute/GalleryRP/stable/2022-08-03/communityGallery.json b/specification/compute/resource-manager/Microsoft.Compute/GalleryRP/stable/2022-08-03/communityGallery.json index 48c96664a22f..846801e6d120 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/GalleryRP/stable/2022-08-03/communityGallery.json +++ b/specification/compute/resource-manager/Microsoft.Compute/GalleryRP/stable/2022-08-03/communityGallery.json @@ -288,6 +288,24 @@ }, "description": "Base information about the community gallery resource in pir." }, + "CommunityGalleryArtifactTags": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "The artifact tags of a community gallery resource." + }, + "CommunityGalleryDisclaimer": { + "type": "string", + "properties": { + "disclaimer": { + "readOnly": true, + "type": "string", + "description": "Community gallery disclaimer" + } + }, + "description": "The disclaimer for a community gallery resource." + }, "CommunityGalleryIdentifier": { "properties": { "uniqueId": { @@ -297,8 +315,42 @@ }, "description": "The identifier information of community gallery." }, + "CommunityGalleryMetadata": { + "type": "object", + "properties": { + "publisherUri": { + "type": "string", + "description": "The publisher URI of this community gallery." + }, + "publisherContact": { + "type": "string", + "description": "The publisher contact of this community gallery." + }, + "eula": { + "type": "string", + "description": "The end-user license agreement for this community gallery." + }, + "publicNames": { + "type": "array", + "items": { + "type": "string" + }, + "description": "A list of public names the gallery has." + }, + "privacyStatementUri": { + "type": "string", + "description": "The link for the privacy statement of this community gallery from the gallery publisher." + } + }, + "description": "The metadata of community gallery." + }, "CommunityGallery": { - "properties": {}, + "properties": { + "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/CommunityGalleryProperties" + } + }, "allOf": [ { "$ref": "#/definitions/PirCommunityGalleryResource" @@ -306,6 +358,21 @@ ], "description": "Specifies information about the Community Gallery that you want to create or update." }, + "CommunityGalleryProperties": { + "type": "object", + "properties": { + "disclaimer": { + "$ref": "#/definitions/CommunityGalleryDisclaimer" + }, + "artifactTags": { + "$ref": "#/definitions/CommunityGalleryArtifactTags" + }, + "communityMetadata": { + "$ref": "#/definitions/CommunityGalleryMetadata" + } + }, + "description": "Describes the properties of a community gallery." + }, "CommunityGalleryImageList": { "type": "object", "description": "The List Community Gallery Images operation response.", @@ -320,7 +387,7 @@ }, "nextLink": { "type": "string", - "description": "The uri to fetch the next page of community gallery images. Call ListNext() with this to fetch the next page of community gallery images." + "description": "The URI to fetch the next page of community gallery images. Call ListNext() with this to fetch the next page of community gallery images." } }, "required": [ @@ -411,11 +478,17 @@ }, "privacyStatementUri": { "type": "string", - "description": "Privacy statement uri for the current community gallery image." + "description": "Privacy statement URI for the current community gallery image." }, "eula": { "type": "string", - "description": "End-user license agreement for the current community gallery image." + "description": "The end-user license agreement for the current community gallery image." + }, + "disclaimer": { + "$ref": "#/definitions/CommunityGalleryDisclaimer" + }, + "artifactTags": { + "$ref": "#/definitions/CommunityGalleryArtifactTags" } }, "required": [ @@ -439,7 +512,7 @@ }, "nextLink": { "type": "string", - "description": "The uri to fetch the next page of community gallery image versions. Call ListNext() with this to fetch the next page of community gallery image versions." + "description": "The URI to fetch the next page of community gallery image versions. Call ListNext() with this to fetch the next page of community gallery image versions." } }, "required": [ @@ -479,6 +552,12 @@ "storageProfile": { "$ref": "./galleryRPCommon.json#/definitions/SharedGalleryImageVersionStorageProfile", "description": "Describes the storage profile of the image version." + }, + "disclaimer": { + "$ref": "#/definitions/CommunityGalleryDisclaimer" + }, + "artifactTags": { + "$ref": "#/definitions/CommunityGalleryArtifactTags" } }, "description": "Describes the properties of a gallery image version." diff --git a/specification/compute/resource-manager/Microsoft.Compute/GalleryRP/stable/2022-08-03/examples/communityGalleryExamples/CommunityGalleryImageVersion_Get.json b/specification/compute/resource-manager/Microsoft.Compute/GalleryRP/stable/2022-08-03/examples/communityGalleryExamples/CommunityGalleryImageVersion_Get.json index 58ad6e95ffa4..96a30a889854 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/GalleryRP/stable/2022-08-03/examples/communityGalleryExamples/CommunityGalleryImageVersion_Get.json +++ b/specification/compute/resource-manager/Microsoft.Compute/GalleryRP/stable/2022-08-03/examples/communityGalleryExamples/CommunityGalleryImageVersion_Get.json @@ -19,7 +19,11 @@ "diskSizeGB": 29, "hostCaching": "None" } - } + }, + "artifactTags": { + "ShareTag-CommunityGallery": "CommunityGallery" + }, + "disclaimer": "https://test-uri.com" }, "location": "myLocation", "name": "myGalleryImageVersionName", diff --git a/specification/compute/resource-manager/Microsoft.Compute/GalleryRP/stable/2022-08-03/examples/communityGalleryExamples/CommunityGalleryImageVersion_List.json b/specification/compute/resource-manager/Microsoft.Compute/GalleryRP/stable/2022-08-03/examples/communityGalleryExamples/CommunityGalleryImageVersion_List.json index 0002bc9deadd..fb84f4aa715c 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/GalleryRP/stable/2022-08-03/examples/communityGalleryExamples/CommunityGalleryImageVersion_List.json +++ b/specification/compute/resource-manager/Microsoft.Compute/GalleryRP/stable/2022-08-03/examples/communityGalleryExamples/CommunityGalleryImageVersion_List.json @@ -20,7 +20,11 @@ "diskSizeGB": 29, "hostCaching": "None" } - } + }, + "artifactTags": { + "ShareTag-CommunityGallery": "CommunityGallery" + }, + "disclaimer": "https://test-uri.com" }, "location": "myLocation", "name": "myGalleryImageVersionName", diff --git a/specification/compute/resource-manager/Microsoft.Compute/GalleryRP/stable/2022-08-03/examples/communityGalleryExamples/CommunityGalleryImage_Get.json b/specification/compute/resource-manager/Microsoft.Compute/GalleryRP/stable/2022-08-03/examples/communityGalleryExamples/CommunityGalleryImage_Get.json index 9833b25c0154..ff0c008a0a3d 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/GalleryRP/stable/2022-08-03/examples/communityGalleryExamples/CommunityGalleryImage_Get.json +++ b/specification/compute/resource-manager/Microsoft.Compute/GalleryRP/stable/2022-08-03/examples/communityGalleryExamples/CommunityGalleryImage_Get.json @@ -18,8 +18,12 @@ "offer": "myOfferName", "sku": "mySkuName" }, - "privacyStatementUri": "https://www.microsoft.com/en-us/", - "eula": "https://www.microsoft.com/en-us/" + "privacyStatementUri": "https://test-uri.com", + "eula": "https://test-uri.com", + "artifactTags": { + "ShareTag-CommunityGallery": "CommunityGallery" + }, + "disclaimer": "https://test-uri.com" }, "location": "myLocation", "name": "myGalleryImageName", diff --git a/specification/compute/resource-manager/Microsoft.Compute/GalleryRP/stable/2022-08-03/examples/communityGalleryExamples/CommunityGalleryImage_List.json b/specification/compute/resource-manager/Microsoft.Compute/GalleryRP/stable/2022-08-03/examples/communityGalleryExamples/CommunityGalleryImage_List.json index ac294f799c8b..768c3a2fea82 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/GalleryRP/stable/2022-08-03/examples/communityGalleryExamples/CommunityGalleryImage_List.json +++ b/specification/compute/resource-manager/Microsoft.Compute/GalleryRP/stable/2022-08-03/examples/communityGalleryExamples/CommunityGalleryImage_List.json @@ -18,7 +18,11 @@ "publisher": "myPublisherName", "offer": "myOfferName", "sku": "mySkuName" - } + }, + "artifactTags": { + "ShareTag-CommunityGallery": "CommunityGallery" + }, + "disclaimer": "https://test-uri.com" }, "location": "myLocation", "name": "myGalleryImageName", diff --git a/specification/compute/resource-manager/Microsoft.Compute/GalleryRP/stable/2022-08-03/examples/communityGalleryExamples/CommunityGallery_Get.json b/specification/compute/resource-manager/Microsoft.Compute/GalleryRP/stable/2022-08-03/examples/communityGalleryExamples/CommunityGallery_Get.json index c9b599a32d97..8df7b7750c04 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/GalleryRP/stable/2022-08-03/examples/communityGalleryExamples/CommunityGallery_Get.json +++ b/specification/compute/resource-manager/Microsoft.Compute/GalleryRP/stable/2022-08-03/examples/communityGalleryExamples/CommunityGallery_Get.json @@ -13,6 +13,21 @@ "type": "Microsoft.Compute/Locations/CommunityGallery", "identifier": { "uniqueId": "/CommunityGalleries/publicGalleryName" + }, + "properties": { + "artifactTags": { + "ShareTag-CommunityGallery": "CommunityGallery" + }, + "disclaimer": "https://test-uri.com", + "communityMetadata": { + "publisherUri": "https://test-uri.com", + "publisherContact": "sameple@email.com", + "eula": "https://test-uri.com", + "publicNames": [ + "prefix-xxxxx" + ], + "privacyStatementUri": "https://test-uri.com" + } } } } diff --git a/specification/compute/resource-manager/Microsoft.Compute/GalleryRP/stable/2022-08-03/examples/sharedGalleryExamples/SharedGalleryImageVersion_Get.json b/specification/compute/resource-manager/Microsoft.Compute/GalleryRP/stable/2022-08-03/examples/sharedGalleryExamples/SharedGalleryImageVersion_Get.json index e6038b849848..890144cea8bc 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/GalleryRP/stable/2022-08-03/examples/sharedGalleryExamples/SharedGalleryImageVersion_Get.json +++ b/specification/compute/resource-manager/Microsoft.Compute/GalleryRP/stable/2022-08-03/examples/sharedGalleryExamples/SharedGalleryImageVersion_Get.json @@ -18,9 +18,11 @@ "osDiskImage": { "diskSizeGB": 29, "hostCaching": "None" + }, + "artifactTags": { + "ShareTag-Official1PGallery": "Official1PGallery" } - } - }, + }, "location": "myLocation", "name": "myGalleryImageVersionName", "identifier": { diff --git a/specification/compute/resource-manager/Microsoft.Compute/GalleryRP/stable/2022-08-03/examples/sharedGalleryExamples/SharedGalleryImageVersions_List.json b/specification/compute/resource-manager/Microsoft.Compute/GalleryRP/stable/2022-08-03/examples/sharedGalleryExamples/SharedGalleryImageVersions_List.json index 9c1201b89b0d..94a34c0460af 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/GalleryRP/stable/2022-08-03/examples/sharedGalleryExamples/SharedGalleryImageVersions_List.json +++ b/specification/compute/resource-manager/Microsoft.Compute/GalleryRP/stable/2022-08-03/examples/sharedGalleryExamples/SharedGalleryImageVersions_List.json @@ -19,9 +19,11 @@ "osDiskImage": { "diskSizeGB": 29, "hostCaching": "None" + }, + "artifactTags": { + "ShareTag-Official1PGallery": "Official1PGallery" } - } - }, + }, "location": "myLocation", "name": "myGalleryImageVersionName", "identifier": { diff --git a/specification/compute/resource-manager/Microsoft.Compute/GalleryRP/stable/2022-08-03/examples/sharedGalleryExamples/SharedGalleryImage_Get.json b/specification/compute/resource-manager/Microsoft.Compute/GalleryRP/stable/2022-08-03/examples/sharedGalleryExamples/SharedGalleryImage_Get.json index 2eb9fb1ec120..651948c2713b 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/GalleryRP/stable/2022-08-03/examples/sharedGalleryExamples/SharedGalleryImage_Get.json +++ b/specification/compute/resource-manager/Microsoft.Compute/GalleryRP/stable/2022-08-03/examples/sharedGalleryExamples/SharedGalleryImage_Get.json @@ -18,8 +18,10 @@ "offer": "myOfferName", "sku": "mySkuName" }, - "privacyStatementUri": "https://www.microsoft.com/en-us/", - "eula": "https://www.microsoft.com/en-us/" + "eula": "https://www.microsoft.com/en-us/", + "artifactTags": { + "ShareTag-Official1PGallery": "Official1PGallery" + } }, "location": "myLocation", "name": "myGalleryImageName", diff --git a/specification/compute/resource-manager/Microsoft.Compute/GalleryRP/stable/2022-08-03/examples/sharedGalleryExamples/SharedGalleryImages_List.json b/specification/compute/resource-manager/Microsoft.Compute/GalleryRP/stable/2022-08-03/examples/sharedGalleryExamples/SharedGalleryImages_List.json index 263451f84025..f1586602f198 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/GalleryRP/stable/2022-08-03/examples/sharedGalleryExamples/SharedGalleryImages_List.json +++ b/specification/compute/resource-manager/Microsoft.Compute/GalleryRP/stable/2022-08-03/examples/sharedGalleryExamples/SharedGalleryImages_List.json @@ -18,14 +18,17 @@ "publisher": "myPublisherName", "offer": "myOfferName", "sku": "mySkuName" + }, + "artifactTags": { + "ShareTag-Official1PGallery": "Official1PGallery" + } + }, + "location": "myLocation", + "name": "myGalleryImageName", + "identifier": { + "uniqueId": "/SharedGalleries/galleryUniqueName/Images/myGalleryImageName" } - }, - "location": "myLocation", - "name": "myGalleryImageName", - "identifier": { - "uniqueId": "/SharedGalleries/galleryUniqueName/Images/myGalleryImageName" } - } ], "nextLink": "http://svchost:99/subscriptions/{subscription-Id}/providers/Microsoft.Compute/sharedGalleries/galleryUniqueName/images?$skiptoken={token}/Subscriptions/{subscription-Id}/galleries/galleryUniqueName/images/myGalleryImageName" } diff --git a/specification/compute/resource-manager/Microsoft.Compute/GalleryRP/stable/2022-08-03/examples/sharedGalleryExamples/SharedGallery_Get.json b/specification/compute/resource-manager/Microsoft.Compute/GalleryRP/stable/2022-08-03/examples/sharedGalleryExamples/SharedGallery_Get.json index 15666880f80f..5db761e6eeb0 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/GalleryRP/stable/2022-08-03/examples/sharedGalleryExamples/SharedGallery_Get.json +++ b/specification/compute/resource-manager/Microsoft.Compute/GalleryRP/stable/2022-08-03/examples/sharedGalleryExamples/SharedGallery_Get.json @@ -12,6 +12,11 @@ "name": "myGalleryName", "identifier": { "uniqueId": "/SharedGalleries/galleryUniqueName" + }, + "properties": { + "artifactTags": { + "ShareTag-Official1PGallery": "Official1PGallery" + } } } } diff --git a/specification/compute/resource-manager/Microsoft.Compute/GalleryRP/stable/2022-08-03/examples/sharedGalleryExamples/SharedGallery_List.json b/specification/compute/resource-manager/Microsoft.Compute/GalleryRP/stable/2022-08-03/examples/sharedGalleryExamples/SharedGallery_List.json index 9b44cdd3e6be..b272ccfab35b 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/GalleryRP/stable/2022-08-03/examples/sharedGalleryExamples/SharedGallery_List.json +++ b/specification/compute/resource-manager/Microsoft.Compute/GalleryRP/stable/2022-08-03/examples/sharedGalleryExamples/SharedGallery_List.json @@ -13,6 +13,11 @@ "name": "galleryUniqueName", "identifier": { "uniqueId": "/SharedGalleries/galleryUniqueName" + }, + "properties": { + "artifactTags": { + "ShareTag-Official1PGallery": "Official1PGallery" + } } } ], diff --git a/specification/compute/resource-manager/Microsoft.Compute/GalleryRP/stable/2022-08-03/sharedGallery.json b/specification/compute/resource-manager/Microsoft.Compute/GalleryRP/stable/2022-08-03/sharedGallery.json index 1d741607885b..c979d5699af5 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/GalleryRP/stable/2022-08-03/sharedGallery.json +++ b/specification/compute/resource-manager/Microsoft.Compute/GalleryRP/stable/2022-08-03/sharedGallery.json @@ -413,6 +413,13 @@ ], "description": "Base information about the shared gallery resource in pir." }, + "SharedGalleryArtifactTags": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "The artifact tags of a shared gallery resource." + }, "SharedGalleryIdentifier": { "properties": { "uniqueId": { @@ -445,7 +452,12 @@ ] }, "SharedGallery": { - "properties": {}, + "properties": { + "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/SharedGalleryProperties" + } + }, "allOf": [ { "$ref": "#/definitions/PirSharedGalleryResource" @@ -453,6 +465,16 @@ ], "description": "Specifies information about the Shared Gallery that you want to create or update." }, + "SharedGalleryProperties": { + "type": "object", + "properties": { + "artifactTags": { + "readOnly": true, + "$ref": "#/definitions/SharedGalleryArtifactTags" + } + }, + "description": "Specifies the properties of a shared gallery" + }, "SharedGalleryImageList": { "description": "The List Shared Gallery Images operation response.", "properties": { @@ -562,6 +584,9 @@ "eula": { "type": "string", "description": "End-user license agreement for the current community gallery image." + }, + "artifactTags": { + "$ref": "#/definitions/SharedGalleryArtifactTags" } }, "required": [ @@ -624,6 +649,9 @@ "storageProfile": { "$ref": "./galleryRPCommon.json#/definitions/SharedGalleryImageVersionStorageProfile", "description": "Describes the storage profile of the image version." + }, + "artifactTags": { + "$ref": "#/definitions/SharedGalleryArtifactTags" } }, "description": "Describes the properties of a gallery image version." From ec4644f2fe62784a0b2159576b8ec8f4949c9526 Mon Sep 17 00:00:00 2001 From: Adam Sandor Date: Tue, 5 Sep 2023 15:15:40 -0400 Subject: [PATCH 2/3] cleanup --- .../SharedGalleryImageVersion_Get.json | 7 ++++--- .../SharedGalleryImageVersions_List.json | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/specification/compute/resource-manager/Microsoft.Compute/GalleryRP/stable/2022-08-03/examples/sharedGalleryExamples/SharedGalleryImageVersion_Get.json b/specification/compute/resource-manager/Microsoft.Compute/GalleryRP/stable/2022-08-03/examples/sharedGalleryExamples/SharedGalleryImageVersion_Get.json index 890144cea8bc..09bf1e7dc37f 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/GalleryRP/stable/2022-08-03/examples/sharedGalleryExamples/SharedGalleryImageVersion_Get.json +++ b/specification/compute/resource-manager/Microsoft.Compute/GalleryRP/stable/2022-08-03/examples/sharedGalleryExamples/SharedGalleryImageVersion_Get.json @@ -18,11 +18,12 @@ "osDiskImage": { "diskSizeGB": 29, "hostCaching": "None" - }, - "artifactTags": { - "ShareTag-Official1PGallery": "Official1PGallery" } }, + "artifactTags": { + "ShareTag-Official1PGallery": "Official1PGallery" + } + }, "location": "myLocation", "name": "myGalleryImageVersionName", "identifier": { diff --git a/specification/compute/resource-manager/Microsoft.Compute/GalleryRP/stable/2022-08-03/examples/sharedGalleryExamples/SharedGalleryImageVersions_List.json b/specification/compute/resource-manager/Microsoft.Compute/GalleryRP/stable/2022-08-03/examples/sharedGalleryExamples/SharedGalleryImageVersions_List.json index 94a34c0460af..326efc04af34 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/GalleryRP/stable/2022-08-03/examples/sharedGalleryExamples/SharedGalleryImageVersions_List.json +++ b/specification/compute/resource-manager/Microsoft.Compute/GalleryRP/stable/2022-08-03/examples/sharedGalleryExamples/SharedGalleryImageVersions_List.json @@ -19,11 +19,12 @@ "osDiskImage": { "diskSizeGB": 29, "hostCaching": "None" - }, - "artifactTags": { - "ShareTag-Official1PGallery": "Official1PGallery" } }, + "artifactTags": { + "ShareTag-Official1PGallery": "Official1PGallery" + } + }, "location": "myLocation", "name": "myGalleryImageVersionName", "identifier": { From 8350b3b95c5aeddfb1189de7a47086e4c196709b Mon Sep 17 00:00:00 2001 From: Adam Sandor Date: Tue, 5 Sep 2023 15:24:18 -0400 Subject: [PATCH 3/3] prettier --- .../SharedGalleryImages_List.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/specification/compute/resource-manager/Microsoft.Compute/GalleryRP/stable/2022-08-03/examples/sharedGalleryExamples/SharedGalleryImages_List.json b/specification/compute/resource-manager/Microsoft.Compute/GalleryRP/stable/2022-08-03/examples/sharedGalleryExamples/SharedGalleryImages_List.json index f1586602f198..d9ac8293278a 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/GalleryRP/stable/2022-08-03/examples/sharedGalleryExamples/SharedGalleryImages_List.json +++ b/specification/compute/resource-manager/Microsoft.Compute/GalleryRP/stable/2022-08-03/examples/sharedGalleryExamples/SharedGalleryImages_List.json @@ -21,14 +21,14 @@ }, "artifactTags": { "ShareTag-Official1PGallery": "Official1PGallery" - } - }, - "location": "myLocation", - "name": "myGalleryImageName", - "identifier": { - "uniqueId": "/SharedGalleries/galleryUniqueName/Images/myGalleryImageName" } + }, + "location": "myLocation", + "name": "myGalleryImageName", + "identifier": { + "uniqueId": "/SharedGalleries/galleryUniqueName/Images/myGalleryImageName" } + } ], "nextLink": "http://svchost:99/subscriptions/{subscription-Id}/providers/Microsoft.Compute/sharedGalleries/galleryUniqueName/images?$skiptoken={token}/Subscriptions/{subscription-Id}/galleries/galleryUniqueName/images/myGalleryImageName" }