Updated the models to include systemData and removed the supression f… (

#13354) * Updated the models to include systemData and removed the supression for systemData * removed the deleted account examples and the package-lock.json * ran prettier locally to try and fix prettier validation error when making a PR * removing unecessary changes from last commit * Revert "removed the deleted account examples and the package-lock.json" This reverts commit 9a0b368. * Revert "ran prettier locally to try and fix prettier validation error when making a PR" This reverts commit 3f11b97. * Revert "ran prettier locally to try and fix prettier validation error when making a PR" This reverts commit 3f11b97. * reverted the package-lock.json and .vscode/launch.json * reverted older commit * Removed unecessary files This reverts commit 708bc87. * Revert "Removed unecessary files" This reverts commit a27ce01. * Removed deleted account examples and package-lock.json * Ran prettier to format the json files Co-authored-by: Melvin Bosnjak <[email protected]>
Azure · Apr 6, 2021 · 45e04eb · 45e04eb
1 parent 2331a63
commit 45e04eb
Show file tree

Hide file tree

Showing 2 changed files with 93 additions and 116 deletions.
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
@@ -428,7 +428,7 @@
           "DefaultAccount"
         ],
         "summary": "Sets the default account for the scope.",
-        "description": "Set the default account for the scope.",
+        "description": "Sets the default account for the scope.",
         "operationId": "DefaultAccounts_Set",
         "parameters": [
           {
@@ -471,7 +471,7 @@
           "DefaultAccount"
         ],
         "summary": "Removes the default account from the scope.",
-        "description": "Remove the default account from the scope.",
+        "description": "Removes the default account from the scope.",
         "operationId": "DefaultAccounts_Remove",
         "parameters": [
           {
@@ -1083,6 +1083,15 @@
             "name": "publicNetworkAccess",
             "modelAsString": true
           }
+        },
+        "systemData": {
+          "description": "Metadata pertaining to creation and last modification of the resource.",
+          "allOf": [
+            {
+              "$ref": "#/definitions/SystemData"
+            }
+          ],
+          "readOnly": true
         }
       }
     },
@@ -1114,7 +1123,6 @@
       }
     },
     "CloudConnectors": {
-      "description": "Properties for configuring third party cloud connections.",
       "type": "object",
       "properties": {
         "awsExternalId": {
@@ -1182,6 +1190,58 @@
         }
       }
     },
+    "SystemData": {
+      "description": "Metadata pertaining to creation and last modification of the resource.",
+      "type": "object",
+      "properties": {
+        "createdAt": {
+          "format": "date-time",
+          "description": "The timestamp of resource creation (UTC).",
+          "type": "string"
+        },
+        "createdBy": {
+          "description": "The identity that created the resource.",
+          "type": "string"
+        },
+        "createdByType": {
+          "description": "The type of identity that created the resource.",
+          "enum": [
+            "User",
+            "Application",
+            "ManagedIdentity",
+            "Key"
+          ],
+          "type": "string",
+          "x-ms-enum": {
+            "name": "createdByType",
+            "modelAsString": true
+          }
+        },
+        "lastModifiedAt": {
+          "format": "date-time",
+          "description": "The timestamp of the last modification the resource (UTC).",
+          "type": "string"
+        },
+        "lastModifiedBy": {
+          "description": "The identity that last modified the resource.",
+          "type": "string"
+        },
+        "lastModifiedByType": {
+          "description": "The type of identity that last modified the resource.",
+          "enum": [
+            "User",
+            "Application",
+            "ManagedIdentity",
+            "Key"
+          ],
+          "type": "string",
+          "x-ms-enum": {
+            "name": "lastModifiedByType",
+            "modelAsString": true
+          }
+        }
+      }
+    },
     "PrivateEndpointConnectionProperties": {
       "description": "A private endpoint connection properties class.",
       "type": "object",
@@ -1291,8 +1351,7 @@
       "properties": {
         "properties": {
           "$ref": "#/definitions/AccountProperties",
-          "description": "The account properties.",
-          "x-ms-client-flatten": true
+          "description": "The account properties."
         },
         "tags": {
           "description": "Tags on the azure resource.",
@@ -1355,94 +1414,6 @@
         }
       }
     },
-    "DeletedAccountList": {
-      "description": "Paged list of soft deleted account resources",
-      "required": [
-        "value"
-      ],
-      "type": "object",
-      "properties": {
-        "count": {
-          "format": "int64",
-          "description": "Total item count.",
-          "type": "integer"
-        },
-        "nextLink": {
-          "description": "The Url of next result page.",
-          "type": "string"
-        },
-        "value": {
-          "description": "Collection of items of type results.",
-          "uniqueItems": false,
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/DeletedAccount"
-          }
-        }
-      }
-    },
-    "DeletedAccount": {
-      "description": "Soft Deleted Account resource",
-      "type": "object",
-      "allOf": [
-        {
-          "$ref": "#/definitions/ProxyResource"
-        }
-      ],
-      "properties": {
-        "properties": {
-          "description": "Gets or sets the properties.",
-          "allOf": [
-            {
-              "$ref": "#/definitions/DeletedAccountProperties"
-            }
-          ],
-          "readOnly": true,
-          "x-ms-client-flatten": true
-        }
-      }
-    },
-    "DeletedAccountProperties": {
-      "description": "The soft deleted account properties",
-      "type": "object",
-      "properties": {
-        "accountId": {
-          "description": "Gets the account identifier associated with resource.",
-          "type": "string",
-          "readOnly": true
-        },
-        "deletedBy": {
-          "description": "Gets the user identifier that deleted resource.",
-          "type": "string",
-          "readOnly": true
-        },
-        "deletionDate": {
-          "format": "date-time",
-          "description": "Gets the time at which the resource was soft deleted.",
-          "type": "string",
-          "readOnly": true
-        },
-        "location": {
-          "description": "Gets the resource location.",
-          "type": "string",
-          "readOnly": true
-        },
-        "scheduledPurgeDate": {
-          "format": "date-time",
-          "description": "Gets the scheduled purge datetime.",
-          "type": "string",
-          "readOnly": true
-        },
-        "tags": {
-          "description": "Gets the account tags.",
-          "type": "object",
-          "additionalProperties": {
-            "type": "string"
-          },
-          "readOnly": true
-        }
-      }
-    },
     "OperationList": {
       "description": "Paged list of operation resources",
       "required": [
@@ -1707,17 +1678,26 @@
     "PrivateLinkResource": {
       "description": "A privately linkable resource.",
       "type": "object",
-      "allOf": [
-        {
-          "$ref": "#/definitions/ProxyResource"
-        }
-      ],
       "properties": {
+        "id": {
+          "description": "The private link resource identifier.",
+          "type": "string",
+          "readOnly": true
+        },
+        "name": {
+          "description": "The private link resource name.",
+          "type": "string",
+          "readOnly": true
+        },
         "properties": {
           "$ref": "#/definitions/PrivateLinkResourceProperties",
           "description": "The private link resource properties.",
-          "readOnly": true,
-          "x-ms-client-flatten": true
+          "readOnly": true
+        },
+        "type": {
+          "description": "The private link resource type.",
+          "type": "string",
+          "readOnly": true
         }
       }
     },
@@ -1851,19 +1831,27 @@
     }
   },
   "parameters": {
+    "subscriptionId": {
+      "name": "subscriptionId",
+      "in": "path",
+      "description": "The subscription identifier",
+      "required": true,
+      "type": "string"
+    },
     "api-version": {
       "name": "api-version",
       "in": "query",
       "description": "The api version to use.",
       "required": true,
       "type": "string"
     },
-    "subscriptionId": {
-      "name": "subscriptionId",
+    "accountName": {
+      "name": "accountName",
       "in": "path",
-      "description": "The subscription identifier",
+      "description": "The name of the account.",
       "required": true,
-      "type": "string"
+      "type": "string",
+      "x-ms-parameter-location": "method"
     },
     "resourceGroupName": {
       "name": "resourceGroupName",
@@ -1872,14 +1860,6 @@
       "required": true,
       "type": "string",
       "x-ms-parameter-location": "method"
-    },
-    "accountName": {
-      "name": "accountName",
-      "in": "path",
-      "description": "The name of the account.",
-      "required": true,
-      "type": "string",
-      "x-ms-parameter-location": "method"
     }
   },
   "securityDefinitions": {

diff --git a/specification/purview/resource-manager/readme.go.md b/specification/purview/resource-manager/readme.go.md
@@ -17,10 +17,7 @@ directive:
       - $.definitions.CheckNameAvailabilityResult.properties.nameAvailable
       - $.definitions.DimensionProperties.properties.toBeExportedForCustomer
     reason:
-      - Check name model is set by ARM team https://github.com/Azure/azure-resource-manager-rpc/blob/master/v1.0/proxy-api-reference.md#check-name-availability-requests  
-  - suppress: R4009  # RequiredSystemDataInNewApiVersions
-    reason:
-      - We do not yet support systemdata
+      - Check name model is set by ARM team https://github.com/Azure/azure-resource-manager-rpc/blob/master/v1.0/proxy-api-reference.md#check-name-availability-requests
 ```
 
 ### Go multi-api