[Storage] move CloudError to common.json to resolve the duplicate schema issue (Azure#17336)

ArcturusZhang · mstrisoline · commit 763d299e4208 · 2022-02-01T16:22:54.000-05:00
* move cloud error to common.json

* remove definition of Clouderror
diff --git a/specification/storage/resource-manager/Microsoft.Storage/stable/2021-08-01/blob.json b/specification/storage/resource-manager/Microsoft.Storage/stable/2021-08-01/blob.json
@@ -867,7 +867,7 @@
           "default": {
             "description": "Error response describing why the operation failed.",
             "schema": {
-              "$ref": "#/definitions/CloudError"
+              "$ref": "./common.json#/definitions/CloudError"
             }
           }
         },
@@ -1508,40 +1508,6 @@
         }
       },
       "description": "Lease Container response schema."
-    },
-    "CloudError": {
-      "x-ms-external": true,
-      "properties": {
-        "error": {
-          "$ref": "#/definitions/CloudErrorBody"
-        }
-      },
-      "description": "An error response from the Storage service."
-    },
-    "CloudErrorBody": {
-      "x-ms-external": true,
-      "properties": {
-        "code": {
-          "type": "string",
-          "description": "An identifier for the error. Codes are invariant and are intended to be consumed programmatically."
-        },
-        "message": {
-          "type": "string",
-          "description": "A message describing the error, intended to be suitable for display in a user interface."
-        },
-        "target": {
-          "type": "string",
-          "description": "The target of the particular error. For example, the name of the property in error."
-        },
-        "details": {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/CloudErrorBody"
-          },
-          "description": "A list of additional details about the error."
-        }
-      },
-      "description": "An error response from the Storage service."
     }
   },
   "parameters": {
diff --git a/specification/storage/resource-manager/Microsoft.Storage/stable/2021-08-01/common.json b/specification/storage/resource-manager/Microsoft.Storage/stable/2021-08-01/common.json
@@ -132,6 +132,40 @@
         "name": "SkuTier",
         "modelAsString": false
       }
+    },
+    "CloudError": {
+      "x-ms-external": true,
+      "properties": {
+        "error": {
+          "$ref": "#/definitions/CloudErrorBody"
+        }
+      },
+      "description": "An error response from the Storage service."
+    },
+    "CloudErrorBody": {
+      "x-ms-external": true,
+      "properties": {
+        "code": {
+          "type": "string",
+          "description": "An identifier for the error. Codes are invariant and are intended to be consumed programmatically."
+        },
+        "message": {
+          "type": "string",
+          "description": "A message describing the error, intended to be suitable for display in a user interface."
+        },
+        "target": {
+          "type": "string",
+          "description": "The target of the particular error. For example, the name of the property in error."
+        },
+        "details": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/CloudErrorBody"
+          },
+          "description": "A list of additional details about the error."
+        }
+      },
+      "description": "An error response from the Storage service."
     }
   }
 }
diff --git a/specification/storage/resource-manager/Microsoft.Storage/stable/2021-08-01/file.json b/specification/storage/resource-manager/Microsoft.Storage/stable/2021-08-01/file.json
@@ -52,7 +52,7 @@
           "default": {
             "description": "Error response describing why the operation failed.",
             "schema": {
-              "$ref": "#/definitions/CloudError"
+              "$ref": "./common.json#/definitions/CloudError"
             }
           }
         }
@@ -112,7 +112,7 @@
           "default": {
             "description": "Error response describing why the operation failed.",
             "schema": {
-              "$ref": "#/definitions/CloudError"
+              "$ref": "./common.json#/definitions/CloudError"
             }
           }
         }
@@ -155,7 +155,7 @@
           "default": {
             "description": "Error response describing why the operation failed.",
             "schema": {
-              "$ref": "#/definitions/CloudError"
+              "$ref": "./common.json#/definitions/CloudError"
             }
           }
         }
@@ -222,7 +222,7 @@
           "default": {
             "description": "Error response describing why the operation failed.",
             "schema": {
-              "$ref": "#/definitions/CloudError"
+              "$ref": "./common.json#/definitions/CloudError"
             }
           }
         },
@@ -298,7 +298,7 @@
           "default": {
             "description": "Error response describing why the operation failed.",
             "schema": {
-              "$ref": "#/definitions/CloudError"
+              "$ref": "./common.json#/definitions/CloudError"
             }
           }
         }
@@ -354,7 +354,7 @@
           "default": {
             "description": "Error response describing why the operation failed.",
             "schema": {
-              "$ref": "#/definitions/CloudError"
+              "$ref": "./common.json#/definitions/CloudError"
             }
           }
         }
@@ -414,7 +414,7 @@
           "default": {
             "description": "Error response describing why the operation failed.",
             "schema": {
-              "$ref": "#/definitions/CloudError"
+              "$ref": "./common.json#/definitions/CloudError"
             }
           }
         }
@@ -471,7 +471,7 @@
           "default": {
             "description": "Error response describing why the operation failed.",
             "schema": {
-              "$ref": "#/definitions/CloudError"
+              "$ref": "./common.json#/definitions/CloudError"
             }
           }
         }
@@ -521,7 +521,7 @@
           "default": {
             "description": "Error response describing why the operation failed.",
             "schema": {
-              "$ref": "#/definitions/CloudError"
+              "$ref": "./common.json#/definitions/CloudError"
             }
           }
         }
@@ -590,7 +590,7 @@
           "default": {
             "description": "Error response describing why the operation failed.",
             "schema": {
-              "$ref": "#/definitions/CloudError"
+              "$ref": "./common.json#/definitions/CloudError"
             }
           }
         }
@@ -996,40 +996,6 @@
           "description": "List of abbreviated permissions."
         }
       }
-    },
-    "CloudError": {
-      "x-ms-external": true,
-      "properties": {
-        "error": {
-          "$ref": "#/definitions/CloudErrorBody"
-        }
-      },
-      "description": "An error response from the Storage service."
-    },
-    "CloudErrorBody": {
-      "x-ms-external": true,
-      "properties": {
-        "code": {
-          "type": "string",
-          "description": "An identifier for the error. Codes are invariant and are intended to be consumed programmatically."
-        },
-        "message": {
-          "type": "string",
-          "description": "A message describing the error, intended to be suitable for display in a user interface."
-        },
-        "target": {
-          "type": "string",
-          "description": "The target of the particular error. For example, the name of the property in error."
-        },
-        "details": {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/CloudErrorBody"
-          },
-          "description": "A list of additional details about the error."
-        }
-      },
-      "description": "An error response from the Storage service."
     }
   },
   "parameters": {
diff --git a/specification/storage/resource-manager/Microsoft.Storage/stable/2021-08-01/queue.json b/specification/storage/resource-manager/Microsoft.Storage/stable/2021-08-01/queue.json
@@ -52,7 +52,7 @@
           "default": {
             "description": "Error response describing why the operation failed.",
             "schema": {
-              "$ref": "./file.json#/definitions/CloudError"
+              "$ref": "./common.json#/definitions/CloudError"
             }
           }
         }
@@ -106,7 +106,7 @@
           "default": {
             "description": "Error response describing why the operation failed.",
             "schema": {
-              "$ref": "./file.json#/definitions/CloudError"
+              "$ref": "./common.json#/definitions/CloudError"
             }
           }
         }
@@ -149,7 +149,7 @@
           "default": {
             "description": "Error response describing why the operation failed.",
             "schema": {
-              "$ref": "./file.json#/definitions/CloudError"
+              "$ref": "./common.json#/definitions/CloudError"
             }
           }
         }
@@ -206,7 +206,7 @@
           "default": {
             "description": "Error response describing why the operation failed.",
             "schema": {
-              "$ref": "./file.json#/definitions/CloudError"
+              "$ref": "./common.json#/definitions/CloudError"
             }
           }
         }
@@ -258,7 +258,7 @@
           "default": {
             "description": "Error response describing why the operation failed.",
             "schema": {
-              "$ref": "./file.json#/definitions/CloudError"
+              "$ref": "./common.json#/definitions/CloudError"
             }
           }
         }
@@ -301,7 +301,7 @@
           "default": {
             "description": "Error response describing why the operation failed.",
             "schema": {
-              "$ref": "./file.json#/definitions/CloudError"
+              "$ref": "./common.json#/definitions/CloudError"
             }
           }
         }
@@ -341,7 +341,7 @@
           "default": {
             "description": "Error response describing why the operation failed.",
             "schema": {
-              "$ref": "./file.json#/definitions/CloudError"
+              "$ref": "./common.json#/definitions/CloudError"
             }
           }
         }
@@ -395,7 +395,7 @@
           "default": {
             "description": "Error response describing why the operation failed.",
             "schema": {
-              "$ref": "./file.json#/definitions/CloudError"
+              "$ref": "./common.json#/definitions/CloudError"
             }
           }
         },
diff --git a/specification/storage/resource-manager/Microsoft.Storage/stable/2021-08-01/table.json b/specification/storage/resource-manager/Microsoft.Storage/stable/2021-08-01/table.json
@@ -52,7 +52,7 @@
           "default": {
             "description": "Error response describing why the operation failed.",
             "schema": {
-              "$ref": "./file.json#/definitions/CloudError"
+              "$ref": "./common.json#/definitions/CloudError"
             }
           }
         }
@@ -106,7 +106,7 @@
           "default": {
             "description": "Error response describing why the operation failed.",
             "schema": {
-              "$ref": "./file.json#/definitions/CloudError"
+              "$ref": "./common.json#/definitions/CloudError"
             }
           }
         }
@@ -149,7 +149,7 @@
           "default": {
             "description": "Error response describing why the operation failed.",
             "schema": {
-              "$ref": "./file.json#/definitions/CloudError"
+              "$ref": "./common.json#/definitions/CloudError"
             }
           }
         }
@@ -194,7 +194,7 @@
           "default": {
             "description": "Error response describing why the operation failed.",
             "schema": {
-              "$ref": "./file.json#/definitions/CloudError"
+              "$ref": "./common.json#/definitions/CloudError"
             }
           }
         }
@@ -237,7 +237,7 @@
           "default": {
             "description": "Error response describing why the operation failed.",
             "schema": {
-              "$ref": "./file.json#/definitions/CloudError"
+              "$ref": "./common.json#/definitions/CloudError"
             }
           }
         }
@@ -280,7 +280,7 @@
           "default": {
             "description": "Error response describing why the operation failed.",
             "schema": {
-              "$ref": "./file.json#/definitions/CloudError"
+              "$ref": "./common.json#/definitions/CloudError"
             }
           }
         }
@@ -320,7 +320,7 @@
           "default": {
             "description": "Error response describing why the operation failed.",
             "schema": {
-              "$ref": "./file.json#/definitions/CloudError"
+              "$ref": "./common.json#/definitions/CloudError"
             }
           }
         }
@@ -362,7 +362,7 @@
           "default": {
             "description": "Error response describing why the operation failed.",
             "schema": {
-              "$ref": "./file.json#/definitions/CloudError"
+              "$ref": "./common.json#/definitions/CloudError"
             }
           }
         },

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@`
`52`	`52`	`"default": {`
`53`	`53`	`"description": "Error response describing why the operation failed.",`
`54`	`54`	`"schema": {`
`55`		`- "$ref": "#/definitions/CloudError"`
	`55`	`+ "$ref": "./common.json#/definitions/CloudError"`
`56`	`56`	`}`
`57`	`57`	`}`
`58`	`58`	`}`
`@@ -112,7 +112,7 @@`
`112`	`112`	`"default": {`
`113`	`113`	`"description": "Error response describing why the operation failed.",`
`114`	`114`	`"schema": {`
`115`		`- "$ref": "#/definitions/CloudError"`
	`115`	`+ "$ref": "./common.json#/definitions/CloudError"`
`116`	`116`	`}`
`117`	`117`	`}`
`118`	`118`	`}`
`@@ -155,7 +155,7 @@`
`155`	`155`	`"default": {`
`156`	`156`	`"description": "Error response describing why the operation failed.",`
`157`	`157`	`"schema": {`
`158`		`- "$ref": "#/definitions/CloudError"`
	`158`	`+ "$ref": "./common.json#/definitions/CloudError"`
`159`	`159`	`}`
`160`	`160`	`}`
`161`	`161`	`}`
`@@ -222,7 +222,7 @@`
`222`	`222`	`"default": {`
`223`	`223`	`"description": "Error response describing why the operation failed.",`
`224`	`224`	`"schema": {`
`225`		`- "$ref": "#/definitions/CloudError"`
	`225`	`+ "$ref": "./common.json#/definitions/CloudError"`
`226`	`226`	`}`
`227`	`227`	`}`
`228`	`228`	`},`
`@@ -298,7 +298,7 @@`
`298`	`298`	`"default": {`
`299`	`299`	`"description": "Error response describing why the operation failed.",`
`300`	`300`	`"schema": {`
`301`		`- "$ref": "#/definitions/CloudError"`
	`301`	`+ "$ref": "./common.json#/definitions/CloudError"`
`302`	`302`	`}`
`303`	`303`	`}`
`304`	`304`	`}`
`@@ -354,7 +354,7 @@`
`354`	`354`	`"default": {`
`355`	`355`	`"description": "Error response describing why the operation failed.",`
`356`	`356`	`"schema": {`
`357`		`- "$ref": "#/definitions/CloudError"`
	`357`	`+ "$ref": "./common.json#/definitions/CloudError"`
`358`	`358`	`}`
`359`	`359`	`}`
`360`	`360`	`}`
`@@ -414,7 +414,7 @@`
`414`	`414`	`"default": {`
`415`	`415`	`"description": "Error response describing why the operation failed.",`
`416`	`416`	`"schema": {`
`417`		`- "$ref": "#/definitions/CloudError"`
	`417`	`+ "$ref": "./common.json#/definitions/CloudError"`
`418`	`418`	`}`
`419`	`419`	`}`
`420`	`420`	`}`
`@@ -471,7 +471,7 @@`
`471`	`471`	`"default": {`
`472`	`472`	`"description": "Error response describing why the operation failed.",`
`473`	`473`	`"schema": {`
`474`		`- "$ref": "#/definitions/CloudError"`
	`474`	`+ "$ref": "./common.json#/definitions/CloudError"`
`475`	`475`	`}`
`476`	`476`	`}`
`477`	`477`	`}`
`@@ -521,7 +521,7 @@`
`521`	`521`	`"default": {`
`522`	`522`	`"description": "Error response describing why the operation failed.",`
`523`	`523`	`"schema": {`
`524`		`- "$ref": "#/definitions/CloudError"`
	`524`	`+ "$ref": "./common.json#/definitions/CloudError"`
`525`	`525`	`}`
`526`	`526`	`}`
`527`	`527`	`}`
`@@ -590,7 +590,7 @@`
`590`	`590`	`"default": {`
`591`	`591`	`"description": "Error response describing why the operation failed.",`
`592`	`592`	`"schema": {`
`593`		`- "$ref": "#/definitions/CloudError"`
	`593`	`+ "$ref": "./common.json#/definitions/CloudError"`
`594`	`594`	`}`
`595`	`595`	`}`
`596`	`596`	`}`
`@@ -996,40 +996,6 @@`
`996`	`996`	`"description": "List of abbreviated permissions."`
`997`	`997`	`}`
`998`	`998`	`}`
`999`		`- },`
`1000`		`- "CloudError": {`
`1001`		`- "x-ms-external": true,`
`1002`		`- "properties": {`
`1003`		`- "error": {`
`1004`		`- "$ref": "#/definitions/CloudErrorBody"`
`1005`		`- }`
`1006`		`- },`
`1007`		`- "description": "An error response from the Storage service."`
`1008`		`- },`
`1009`		`- "CloudErrorBody": {`
`1010`		`- "x-ms-external": true,`
`1011`		`- "properties": {`
`1012`		`- "code": {`
`1013`		`- "type": "string",`
`1014`		`- "description": "An identifier for the error. Codes are invariant and are intended to be consumed programmatically."`
`1015`		`- },`
`1016`		`- "message": {`
`1017`		`- "type": "string",`
`1018`		`- "description": "A message describing the error, intended to be suitable for display in a user interface."`
`1019`		`- },`
`1020`		`- "target": {`
`1021`		`- "type": "string",`
`1022`		`- "description": "The target of the particular error. For example, the name of the property in error."`
`1023`		`- },`
`1024`		`- "details": {`
`1025`		`- "type": "array",`
`1026`		`- "items": {`
`1027`		`- "$ref": "#/definitions/CloudErrorBody"`
`1028`		`- },`
`1029`		`- "description": "A list of additional details about the error."`
`1030`		`- }`
`1031`		`- },`
`1032`		`- "description": "An error response from the Storage service."`
`1033`	`999`	`}`
`1034`	`1000`	`},`
`1035`	`1001`	`"parameters": {`