Fix Duplicated model name with non-identical definitions build error

This reverts commit 616851d and commits fixes.
Azure · Jun 1, 2018 · d1c40f7 · d1c40f7
1 parent c7c452a
commit d1c40f7
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 111 deletions.
diff --git a/...icationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/components_API.json b/...icationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/components_API.json
@@ -289,40 +289,6 @@
     }
   },
   "definitions": {
-    "Resource": {
-      "properties": {
-        "id": {
-          "type": "string",
-          "readOnly": true,
-          "description": "Azure resource Id"
-        },
-        "name": {
-          "type": "string",
-          "description": "Azure resource name",
-          "readOnly": true
-        },
-        "type": {
-          "type": "string",
-          "readOnly": true,
-          "description": "Azure resource type"
-        },
-        "location": {
-          "type": "string",
-          "description": "Resource location"
-        },
-        "tags": {
-          "additionalProperties": {
-            "type": "string"
-          },
-          "description": "Resource tags"
-        }
-      },
-      "required": [
-        "location"
-      ],
-      "x-ms-azure-resource": true,
-      "description": "An azure resource object"
-    },
     "TagsResource": {
       "properties": {
         "tags": {
@@ -348,7 +314,7 @@
       },
       "allOf": [
         {
-          "$ref": "#/definitions/Resource"
+          "$ref": "../../../common/v1/types.json#/definitions/Resource"
         }
       ],
       "required": [

diff --git a/...plicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/webTests_API.json b/...plicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/webTests_API.json
@@ -282,44 +282,6 @@
     }
   },
   "definitions": {
-    "Resource": {
-      "properties": {
-        "id": {
-          "type": "string",
-          "readOnly": true,
-          "description": "Azure resource Id"
-        },
-        "name": {
-          "type": "string",
-          "description": "Azure resource name",
-          "readOnly": true
-        },
-        "type": {
-          "type": "string",
-          "readOnly": true,
-          "description": "Azure resource type"
-        },
-        "location": {
-          "type": "string",
-          "description": "Resource location",
-          "x-ms-mutability": [
-            "create",
-            "read"
-          ]
-        },
-        "tags": {
-          "additionalProperties": {
-            "type": "string"
-          },
-          "description": "Resource tags"
-        }
-      },
-      "required": [
-        "location"
-      ],
-      "x-ms-azure-resource": true,
-      "description": "An azure resource object"
-    },
     "TagsResource": {
       "properties": {
         "tags": {
@@ -354,7 +316,7 @@
       "description": "An Application Insights web test definition.",
       "allOf": [
         {
-          "$ref": "#/definitions/Resource"
+          "$ref": "../../../common/v1/types.json#/definitions/Resource"
         }
       ],
       "properties": {

diff --git a/...licationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/workbooks_API.json b/...licationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/workbooks_API.json
@@ -255,41 +255,6 @@
     }
   },
   "definitions": {
-    "Resource": {
-      "properties": {
-        "id": {
-          "type": "string",
-          "readOnly": true,
-          "description": "Azure resource Id"
-        },
-        "name": {
-          "type": "string",
-          "description": "Azure resource name",
-          "readOnly": true
-        },
-        "type": {
-          "type": "string",
-          "readOnly": true,
-          "description": "Azure resource type"
-        },
-        "location": {
-          "type": "string",
-          "description": "Resource location",
-          "x-ms-mutability": [
-            "create",
-            "read"
-          ]
-        },
-        "tags": {
-          "additionalProperties": {
-            "type": "string"
-          },
-          "description": "Resource tags"
-        }
-      },
-      "x-ms-azure-resource": true,
-      "description": "An azure resource object"
-    },
     "Workbooks": {
       "properties": {
         "value": {
@@ -306,7 +271,7 @@
       "description": "An Application Insights workbook definition.",
       "allOf": [
         {
-          "$ref": "#/definitions/Resource"
+          "$ref": "../../../common/v1/types.json#/definitions/Resource"
         }
       ],
       "properties": {

diff --git a/specification/applicationinsights/resource-manager/common/v1/types.json b/specification/applicationinsights/resource-manager/common/v1/types.json
@@ -0,0 +1,50 @@
+{
+    "swagger":"2.0",
+    "info":{
+       "version":"1.0",
+       "title":"Common types"
+    },
+    "paths":{
+
+    },
+  "definitions": {
+    "Resource": {
+      "properties": {
+        "id": {
+          "type": "string",
+          "readOnly": true,
+          "description": "Azure resource Id"
+        },
+        "name": {
+          "type": "string",
+          "description": "Azure resource name",
+          "readOnly": true
+        },
+        "type": {
+          "type": "string",
+          "readOnly": true,
+          "description": "Azure resource type"
+        },
+        "location": {
+          "type": "string",
+          "description": "Resource location",
+          "x-ms-mutability": [
+            "create",
+            "read"
+          ]
+        },
+        "tags": {
+          "additionalProperties": {
+            "type": "string"
+          },
+          "description": "Resource tags"
+        }
+      },
+      "x-ms-azure-resource": true,
+      "description": "An azure resource object"
+    }
+  },
+    "parameters":{
+
+    }
+ }
diff --git a/specification/sql/resource-manager/readme.md b/specification/sql/resource-manager/readme.md
@@ -268,7 +268,6 @@ input-file:
 - Microsoft.Sql/2015-05-01-preview/blobAuditingPolicies.json
 - Microsoft.Sql/2015-05-01-preview/encryptionProtectors.json
 - Microsoft.Sql/2015-05-01-preview/failoverGroups.json
-- Microsoft.Sql/2015-05-01-preview/operations.json
 - Microsoft.Sql/2015-05-01-preview/serverKeys.json
 - Microsoft.Sql/2015-05-01-preview/servers.json
 - Microsoft.Sql/2015-05-01-preview/syncAgents.json