Updated SKU property to be read only (Azure#15965)

* Updated SKU property to be read only * Added missing x-ms-secret attribute * Update readme.python.md Co-authored-by: Shailesh Kelkar <shkelkar@microsoft.com> Co-authored-by: msyyc <70930885+msyyc@users.noreply.github.com>
iscai-msft · Sep 10, 2021 · b75f081 · b75f081
1 parent 33435f8
commit b75f081
Show file tree

Hide file tree

Showing 13 changed files with 73 additions and 50 deletions.
diff --git a/...anager/Microsoft.Purview/preview/2020-12-01-preview/examples/Accounts_CreateOrUpdate.json b/...anager/Microsoft.Purview/preview/2020-12-01-preview/examples/Accounts_CreateOrUpdate.json
@@ -6,10 +6,6 @@
     "api-version": "2018-12-01-preview",
     "account": {
       "location": "West US 2",
-      "sku": {
-        "name": "Standard",
-        "capacity": 4
-      },
       "properties": {
         "managedResourceGroupName": "custom-rgname"
       }
@@ -29,6 +25,10 @@
         "id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/SampleResourceGroup/providers/Microsoft.Purview/accounts/account1",
         "name": "account1",
         "type": "Microsoft.Purview/accounts",
+        "sku": {
+          "name": "Standard",
+          "capacity": 1
+        },
         "properties": {
           "friendlyName": "friendly-account1",
           "createdBy": "client-name",
@@ -57,6 +57,10 @@
         "id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/SampleResourceGroup/providers/Microsoft.Purview/accounts/account1",
         "name": "account1",
         "type": "Microsoft.Purview/accounts",
+        "sku": {
+          "name": "Standard",
+          "capacity": 1
+        },
         "properties": {
           "friendlyName": "friendly-account1",
           "createdBy": "client-name",

diff --git a/.../resource-manager/Microsoft.Purview/preview/2020-12-01-preview/examples/Accounts_Get.json b/.../resource-manager/Microsoft.Purview/preview/2020-12-01-preview/examples/Accounts_Get.json
@@ -21,7 +21,7 @@
         "type": "Microsoft.Purview/accounts",
         "sku": {
           "name": "Standard",
-          "capacity": 4
+          "capacity": 1
         },
         "properties": {
           "friendlyName": "friendly-account1",

diff --git a/...r/Microsoft.Purview/preview/2020-12-01-preview/examples/Accounts_ListByResourceGroup.json b/...r/Microsoft.Purview/preview/2020-12-01-preview/examples/Accounts_ListByResourceGroup.json
@@ -22,7 +22,7 @@
             "type": "Microsoft.Purview/accounts",
             "sku": {
               "name": "Standard",
-              "capacity": 4
+              "capacity": 1
             },
             "properties": {
               "friendlyName": "friendly-account1",
@@ -53,7 +53,7 @@
             "type": "Microsoft.Purview/accounts",
             "sku": {
               "name": "Standard",
-              "capacity": 4
+              "capacity": 1
             },
             "properties": {
               "friendlyName": "friendly-account1",

diff --git a/...er/Microsoft.Purview/preview/2020-12-01-preview/examples/Accounts_ListBySubscription.json b/...er/Microsoft.Purview/preview/2020-12-01-preview/examples/Accounts_ListBySubscription.json
@@ -21,7 +21,7 @@
             "type": "Microsoft.Purview/accounts",
             "sku": {
               "name": "Standard",
-              "capacity": 4
+              "capacity": 1
             },
             "properties": {
               "friendlyName": "friendly-account1",
@@ -52,7 +52,7 @@
             "type": "Microsoft.Purview/accounts",
             "sku": {
               "name": "Standard",
-              "capacity": 4
+              "capacity": 1
             },
             "properties": {
               "friendlyName": "friendly-account1",

diff --git a/...source-manager/Microsoft.Purview/preview/2020-12-01-preview/examples/Accounts_Update.json b/...source-manager/Microsoft.Purview/preview/2020-12-01-preview/examples/Accounts_Update.json
@@ -26,7 +26,7 @@
         "type": "Microsoft.Purview/accounts",
         "sku": {
           "name": "Standard",
-          "capacity": 4
+          "capacity": 1
         },
         "properties": {
           "friendlyName": "friendly-account1",
@@ -76,7 +76,7 @@
         "type": "Microsoft.Purview/accounts",
         "sku": {
           "name": "Standard",
-          "capacity": 4
+          "capacity": 1
         },
         "properties": {
           "friendlyName": "friendly-account1",

diff --git a/...cation/purview/resource-manager/Microsoft.Purview/preview/2020-12-01-preview/purview.json b/...cation/purview/resource-manager/Microsoft.Purview/preview/2020-12-01-preview/purview.json
@@ -970,8 +970,13 @@
           "x-ms-client-flatten": true
         },
         "sku": {
-          "$ref": "#/definitions/AccountSku",
-          "description": "Gets or sets the Sku."
+          "description": "Gets or sets the Sku.",
+          "allOf": [
+            {
+              "$ref": "#/definitions/AccountSku"
+            }
+          ],
+          "readOnly": true
         }
       }
     },
@@ -981,7 +986,7 @@
       "properties": {
         "capacity": {
           "format": "int32",
-          "description": "Gets or sets the sku capacity. Possible values include: 4, 16",
+          "description": "Gets or sets the sku capacity.",
           "type": "integer"
         },
         "name": {
@@ -1848,10 +1853,10 @@
     }
   },
   "parameters": {
-    "api-version": {
-      "name": "api-version",
-      "in": "query",
-      "description": "The api version to use.",
+    "subscriptionId": {
+      "name": "subscriptionId",
+      "in": "path",
+      "description": "The subscription identifier",
       "required": true,
       "type": "string"
     },
@@ -1863,20 +1868,20 @@
       "type": "string",
       "x-ms-parameter-location": "method"
     },
+    "api-version": {
+      "name": "api-version",
+      "in": "query",
+      "description": "The api version to use.",
+      "required": true,
+      "type": "string"
+    },
     "resourceGroupName": {
       "name": "resourceGroupName",
       "in": "path",
       "description": "The resource group name.",
       "required": true,
       "type": "string",
       "x-ms-parameter-location": "method"
-    },
-    "subscriptionId": {
-      "name": "subscriptionId",
-      "in": "path",
-      "description": "The subscription identifier",
-      "required": true,
-      "type": "string"
     }
   },
   "securityDefinitions": {

diff --git a/...esource-manager/Microsoft.Purview/stable/2021-07-01/examples/Accounts_CreateOrUpdate.json b/...esource-manager/Microsoft.Purview/stable/2021-07-01/examples/Accounts_CreateOrUpdate.json
@@ -6,10 +6,6 @@
     "api-version": "2021-07-01",
     "account": {
       "location": "West US 2",
-      "sku": {
-        "name": "Standard",
-        "capacity": 4
-      },
       "properties": {
         "managedResourceGroupName": "custom-rgname"
       }
@@ -29,6 +25,10 @@
         "id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/SampleResourceGroup/providers/Microsoft.Purview/accounts/account1",
         "name": "account1",
         "type": "Microsoft.Purview/accounts",
+        "sku": {
+          "name": "Standard",
+          "capacity": 1
+        },
         "properties": {
           "friendlyName": "friendly-account1",
           "createdBy": "client-name",
@@ -57,6 +57,10 @@
         "id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/SampleResourceGroup/providers/Microsoft.Purview/accounts/account1",
         "name": "account1",
         "type": "Microsoft.Purview/accounts",
+        "sku": {
+          "name": "Standard",
+          "capacity": 1
+        },
         "systemData": {
           "createdBy": "client-name",
           "createdByType": "User",

diff --git a/...n/purview/resource-manager/Microsoft.Purview/stable/2021-07-01/examples/Accounts_Get.json b/...n/purview/resource-manager/Microsoft.Purview/stable/2021-07-01/examples/Accounts_Get.json
@@ -21,7 +21,7 @@
         "type": "Microsoft.Purview/accounts",
         "sku": {
           "name": "Standard",
-          "capacity": 4
+          "capacity": 1
         },
         "systemData": {
           "createdBy": "client-name",

diff --git a/...ce-manager/Microsoft.Purview/stable/2021-07-01/examples/Accounts_ListByResourceGroup.json b/...ce-manager/Microsoft.Purview/stable/2021-07-01/examples/Accounts_ListByResourceGroup.json
@@ -22,7 +22,7 @@
             "type": "Microsoft.Purview/accounts",
             "sku": {
               "name": "Standard",
-              "capacity": 4
+              "capacity": 1
             },
             "systemData": {
               "createdBy": "client-name",
@@ -53,7 +53,7 @@
             "type": "Microsoft.Purview/accounts",
             "sku": {
               "name": "Standard",
-              "capacity": 4
+              "capacity": 1
             },
             "systemData": {
               "createdBy": "client-name",

diff --git a/...rce-manager/Microsoft.Purview/stable/2021-07-01/examples/Accounts_ListBySubscription.json b/...rce-manager/Microsoft.Purview/stable/2021-07-01/examples/Accounts_ListBySubscription.json
@@ -21,7 +21,7 @@
             "type": "Microsoft.Purview/accounts",
             "sku": {
               "name": "Standard",
-              "capacity": 4
+              "capacity": 1
             },
             "systemData": {
               "createdBy": "client-name",
@@ -52,7 +52,7 @@
             "type": "Microsoft.Purview/accounts",
             "sku": {
               "name": "Standard",
-              "capacity": 4
+              "capacity": 1
             },
             "systemData": {
               "createdBy": "client-name",

diff --git a/...urview/resource-manager/Microsoft.Purview/stable/2021-07-01/examples/Accounts_Update.json b/...urview/resource-manager/Microsoft.Purview/stable/2021-07-01/examples/Accounts_Update.json
@@ -26,7 +26,7 @@
         "type": "Microsoft.Purview/accounts",
         "sku": {
           "name": "Standard",
-          "capacity": 4
+          "capacity": 1
         },
         "systemData": {
           "createdBy": "client-name",
@@ -76,7 +76,7 @@
         "type": "Microsoft.Purview/accounts",
         "sku": {
           "name": "Standard",
-          "capacity": 4
+          "capacity": 1
         },
         "systemData": {
           "createdBy": "client-name",

diff --git a/specification/purview/resource-manager/Microsoft.Purview/stable/2021-07-01/purview.json b/specification/purview/resource-manager/Microsoft.Purview/stable/2021-07-01/purview.json
@@ -1019,8 +1019,13 @@
           "x-ms-client-flatten": true
         },
         "sku": {
-          "$ref": "#/definitions/AccountSku",
-          "description": "Gets or sets the Sku."
+          "description": "Gets or sets the Sku.",
+          "allOf": [
+            {
+              "$ref": "#/definitions/AccountSku"
+            }
+          ],
+          "readOnly": true
         }
       }
     },
@@ -1030,7 +1035,7 @@
       "properties": {
         "capacity": {
           "format": "int32",
-          "description": "Gets or sets the sku capacity. Possible values include: 4, 16",
+          "description": "Gets or sets the sku capacity.",
           "type": "integer"
         },
         "name": {
@@ -1916,13 +1921,12 @@
       "required": true,
       "type": "string"
     },
-    "accountName": {
-      "name": "accountName",
-      "in": "path",
-      "description": "The name of the account.",
+    "api-version": {
+      "name": "api-version",
+      "in": "query",
+      "description": "The api version to use.",
       "required": true,
-      "type": "string",
-      "x-ms-parameter-location": "method"
+      "type": "string"
     },
     "resourceGroupName": {
       "name": "resourceGroupName",
@@ -1932,12 +1936,13 @@
       "type": "string",
       "x-ms-parameter-location": "method"
     },
-    "api-version": {
-      "name": "api-version",
-      "in": "query",
-      "description": "The api version to use.",
+    "accountName": {
+      "name": "accountName",
+      "in": "path",
+      "description": "The name of the account.",
       "required": true,
-      "type": "string"
+      "type": "string",
+      "x-ms-parameter-location": "method"
     }
   },
   "securityDefinitions": {

diff --git a/specification/purview/resource-manager/readme.python.md b/specification/purview/resource-manager/readme.python.md
@@ -21,3 +21,8 @@ output-folder: $(python-sdks-folder)/purview/azure-mgmt-purview/azure/mgmt/purvi
 basic-setup-py: true
 output-folder: $(python-sdks-folder)/purview/azure-mgmt-purview
 ```
+
+``` yaml $(python) && $(track2)
+modelerfour:
+  lenient-model-deduplication: true
+```