Add 'artifactTags' and 'disclaimer' field for shared gallery and comm…

…unity gallery (#25659) * all discalimer and previous arm updates * cleanup * prettier
Azure · Sep 5, 2023 · d22af1c · d22af1c
1 parent 7a11a69
commit d22af1c
Show file tree

Hide file tree

Showing 13 changed files with 172 additions and 13 deletions.
diff --git a/...pute/resource-manager/Microsoft.Compute/GalleryRP/stable/2022-08-03/communityGallery.json b/...pute/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,15 +315,64 @@
       },
       "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"
         }
       ],
       "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/...stable/2022-08-03/examples/communityGalleryExamples/CommunityGalleryImageVersion_Get.json b/...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/...table/2022-08-03/examples/communityGalleryExamples/CommunityGalleryImageVersion_List.json b/...table/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/...leryRP/stable/2022-08-03/examples/communityGalleryExamples/CommunityGalleryImage_Get.json b/...leryRP/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/...eryRP/stable/2022-08-03/examples/communityGalleryExamples/CommunityGalleryImage_List.json b/...eryRP/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/...e/GalleryRP/stable/2022-08-03/examples/communityGalleryExamples/CommunityGallery_Get.json b/...e/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/...eryRP/stable/2022-08-03/examples/sharedGalleryExamples/SharedGalleryImageVersion_Get.json b/...eryRP/stable/2022-08-03/examples/sharedGalleryExamples/SharedGalleryImageVersion_Get.json
@@ -19,6 +19,9 @@
               "diskSizeGB": 29,
               "hostCaching": "None"
             }
+          },
+          "artifactTags": {
+            "ShareTag-Official1PGallery": "Official1PGallery"
           }
         },
         "location": "myLocation",

diff --git a/...yRP/stable/2022-08-03/examples/sharedGalleryExamples/SharedGalleryImageVersions_List.json b/...yRP/stable/2022-08-03/examples/sharedGalleryExamples/SharedGalleryImageVersions_List.json
@@ -20,6 +20,9 @@
                   "diskSizeGB": 29,
                   "hostCaching": "None"
                 }
+              },
+              "artifactTags": {
+                "ShareTag-Official1PGallery": "Official1PGallery"
               }
             },
             "location": "myLocation",

diff --git a/...te/GalleryRP/stable/2022-08-03/examples/sharedGalleryExamples/SharedGalleryImage_Get.json b/...te/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/.../GalleryRP/stable/2022-08-03/examples/sharedGalleryExamples/SharedGalleryImages_List.json b/.../GalleryRP/stable/2022-08-03/examples/sharedGalleryExamples/SharedGalleryImages_List.json
@@ -18,6 +18,9 @@
                 "publisher": "myPublisherName",
                 "offer": "myOfferName",
                 "sku": "mySkuName"
+              },
+              "artifactTags": {
+                "ShareTag-Official1PGallery": "Official1PGallery"
               }
             },
             "location": "myLocation",

diff --git a/...Compute/GalleryRP/stable/2022-08-03/examples/sharedGalleryExamples/SharedGallery_Get.json b/...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/...ompute/GalleryRP/stable/2022-08-03/examples/sharedGalleryExamples/SharedGallery_List.json b/...ompute/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/...compute/resource-manager/Microsoft.Compute/GalleryRP/stable/2022-08-03/sharedGallery.json b/...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,14 +452,29 @@
       ]
     },
     "SharedGallery": {
-      "properties": {},
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/SharedGalleryProperties"
+        }
+      },
       "allOf": [
         {
           "$ref": "#/definitions/PirSharedGalleryResource"
         }
       ],
       "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."