From d8f7ac974426d96c1f3bcb79a28b6b86fcaa69b5 Mon Sep 17 00:00:00 2001
From: Chris Stackhouse <cstack@microsoft.com>
Date: Fri, 22 Apr 2022 14:44:53 -0700
Subject: [PATCH] Refactor v3 common type ResourceModelWithAllowedPropertySet
 definition to include systemData and reuse propertiy definitions.

---
 .../resource-management/v3/types.json         | 46 ++-----------------
 1 file changed, 5 insertions(+), 41 deletions(-)

diff --git a/specification/common-types/resource-management/v3/types.json b/specification/common-types/resource-management/v3/types.json
index f7a519b41239..7885efc272b1 100644
--- a/specification/common-types/resource-management/v3/types.json
+++ b/specification/common-types/resource-management/v3/types.json
@@ -102,35 +102,6 @@
       "description": "The resource model definition containing the full set of allowed properties for a resource. Except properties bag, there cannot be a top level property outside of this set.",
       "type": "object",
       "properties": {
-        "id": {
-          "readOnly": true,
-          "type": "string",
-          "x-ms-mutability": [
-            "read"
-          ],
-          "description": "Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}"
-        },
-        "name": {
-          "readOnly": true,
-          "type": "string",
-          "description": "The name of the resource"
-        },
-        "type": {
-          "readOnly": true,
-          "type": "string",
-          "x-ms-mutability": [
-            "read"
-          ],
-          "description": "The type of the resource. E.g. \"Microsoft.Compute/virtualMachines\" or \"Microsoft.Storage/storageAccounts\""
-        },
-        "location": {
-          "type": "string",
-          "x-ms-mutability": [
-            "read",
-            "create"
-          ],
-          "description": "The geo-location where the resource lives"
-        },
         "managedBy": {
           "type": "string",
           "x-ms-mutability": [
@@ -154,18 +125,6 @@
           "type": "string",
           "description": "The etag field is *not* required. If it is provided in the response body, it must also be provided as a header per the normal etag convention.  Entity tags are used for comparing two or more entities from the same requested resource. HTTP/1.1 uses entity tags in the etag (section 14.19), If-Match (section 14.24), If-None-Match (section 14.26), and If-Range (section 14.27) header fields. "
         },
-        "tags": {
-          "type": "object",
-          "additionalProperties": {
-            "type": "string"
-          },
-          "x-ms-mutability": [
-            "read",
-            "create",
-            "update"
-          ],
-          "description": "Resource tags."
-        },
         "identity": {
           "allOf": [
             {
@@ -188,6 +147,11 @@
           ]
         }
       },
+      "allOf": [
+        {
+          "$ref": "#/definitions/TrackedResource"
+        }
+      ],
       "x-ms-azure-resource": true
     },
     "SkuTier": {