Fixing the Default Error Response for 2020-06-01-preview APIs (#12800)

* Fixing the Default Error Response for 2020-06-01-preview APIs * Removing refs to ErrorResponse and removing new props from CloudErrorBody * Revert "Removing refs to ErrorResponse and removing new props from CloudErrorBody" This reverts commit a955700. * Adding ErrorResponse back to avoid breaking change * Removing CloudErrorBody * Making change as minimal as possible * Trigger Build * Adding model duplication leniency * Lenient Dedup
Azure · Feb 7, 2021 · 2515952 · 2515952
1 parent 7f8d6e1
commit 2515952
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 18 deletions.
diff --git a/...cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2020-06-01-preview/cosmos-db.json b/...cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2020-06-01-preview/cosmos-db.json
@@ -4215,7 +4215,7 @@
           "default": {
             "description": "Error response describing why the operation failed.",
             "schema": {
-              "$ref": "#/definitions/DefaultErrorResponse"
+              "$ref": "#/definitions/CloudError"
             }
           }
         },
@@ -4251,7 +4251,7 @@
           "default": {
             "description": "Error response describing why the operation failed.",
             "schema": {
-              "$ref": "#/definitions/DefaultErrorResponse"
+              "$ref": "#/definitions/CloudError"
             }
           }
         },
@@ -4293,7 +4293,7 @@
           "default": {
             "description": "Error response describing why the operation failed.",
             "schema": {
-              "$ref": "#/definitions/DefaultErrorResponse"
+              "$ref": "#/definitions/CloudError"
             }
           }
         }
@@ -4483,7 +4483,8 @@
       },
       "description": "Error Response."
     },
-    "DefaultErrorResponse": {
+    "CloudError": {
+      "x-ms-external": true,
       "description": "An error response from the service.",
       "properties": {
         "error": {

diff --git a/...tion/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2020-06-01-preview/rbac.json b/...tion/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2020-06-01-preview/rbac.json
@@ -70,7 +70,7 @@
           "default": {
             "description": "Error response describing why the operation failed.",
             "schema": {
-              "$ref": "cosmos-db.json#/definitions/DefaultErrorResponse"
+              "$ref": "cosmos-db.json#/definitions/CloudError"
             }
           }
         }
@@ -123,7 +123,7 @@
           "default": {
             "description": "Error response describing why the operation failed.",
             "schema": {
-              "$ref": "cosmos-db.json#/definitions/DefaultErrorResponse"
+              "$ref": "cosmos-db.json#/definitions/CloudError"
             }
           }
         }
@@ -167,7 +167,7 @@
           "default": {
             "description": "Error response describing why the operation failed.",
             "schema": {
-              "$ref": "cosmos-db.json#/definitions/DefaultErrorResponse"
+              "$ref": "cosmos-db.json#/definitions/CloudError"
             }
           }
         }
@@ -209,7 +209,7 @@
           "default": {
             "description": "Error response describing why the operation failed.",
             "schema": {
-              "$ref": "cosmos-db.json#/definitions/DefaultErrorResponse"
+              "$ref": "cosmos-db.json#/definitions/CloudError"
             }
           }
         }
@@ -251,7 +251,7 @@
           "default": {
             "description": "Error response describing why the operation failed.",
             "schema": {
-              "$ref": "cosmos-db.json#/definitions/DefaultErrorResponse"
+              "$ref": "cosmos-db.json#/definitions/CloudError"
             }
           }
         }
@@ -304,7 +304,7 @@
           "default": {
             "description": "Error response describing why the operation failed.",
             "schema": {
-              "$ref": "cosmos-db.json#/definitions/DefaultErrorResponse"
+              "$ref": "cosmos-db.json#/definitions/CloudError"
             }
           }
         }
@@ -348,7 +348,7 @@
           "default": {
             "description": "Error response describing why the operation failed.",
             "schema": {
-              "$ref": "cosmos-db.json#/definitions/DefaultErrorResponse"
+              "$ref": "cosmos-db.json#/definitions/CloudError"
             }
           }
         }
@@ -390,7 +390,7 @@
           "default": {
             "description": "Error response describing why the operation failed.",
             "schema": {
-              "$ref": "cosmos-db.json#/definitions/DefaultErrorResponse"
+              "$ref": "cosmos-db.json#/definitions/CloudError"
             }
           }
         }

diff --git a/...osmos-db/resource-manager/Microsoft.DocumentDB/preview/2020-06-01-preview/restorable.json b/...osmos-db/resource-manager/Microsoft.DocumentDB/preview/2020-06-01-preview/restorable.json
@@ -67,7 +67,7 @@
           "default": {
             "description": "Error response describing why the operation failed.",
             "schema": {
-              "$ref": "../../preview/2020-06-01-preview/cosmos-db.json#/definitions/DefaultErrorResponse"
+              "$ref": "cosmos-db.json#/definitions/CloudError"
             }
           }
         },
@@ -112,7 +112,7 @@
           "default": {
             "description": "Error response describing why the operation failed.",
             "schema": {
-              "$ref": "../../preview/2020-06-01-preview/cosmos-db.json#/definitions/DefaultErrorResponse"
+              "$ref": "cosmos-db.json#/definitions/CloudError"
             }
           }
         },
@@ -160,7 +160,7 @@
           "default": {
             "description": "Error response describing why the operation failed.",
             "schema": {
-              "$ref": "../../preview/2020-06-01-preview/cosmos-db.json#/definitions/DefaultErrorResponse"
+              "$ref": "cosmos-db.json#/definitions/CloudError"
             }
           }
         },
@@ -202,7 +202,7 @@
           "default": {
             "description": "Error response describing why the operation failed.",
             "schema": {
-              "$ref": "../../preview/2020-06-01-preview/cosmos-db.json#/definitions/DefaultErrorResponse"
+              "$ref": "cosmos-db.json#/definitions/CloudError"
             }
           }
         },
@@ -247,7 +247,7 @@
           "default": {
             "description": "Error response describing why the operation failed.",
             "schema": {
-              "$ref": "../../preview/2020-06-01-preview/cosmos-db.json#/definitions/DefaultErrorResponse"
+              "$ref": "cosmos-db.json#/definitions/CloudError"
             }
           }
         },
@@ -295,7 +295,7 @@
           "default": {
             "description": "Error response describing why the operation failed.",
             "schema": {
-              "$ref": "../../preview/2020-06-01-preview/cosmos-db.json#/definitions/DefaultErrorResponse"
+              "$ref": "cosmos-db.json#/definitions/CloudError"
             }
           }
         },

diff --git a/specification/cosmos-db/resource-manager/readme.md b/specification/cosmos-db/resource-manager/readme.md
@@ -54,6 +54,8 @@ input-file:
 - Microsoft.DocumentDB/preview/2020-06-01-preview/restorable.json
 - Microsoft.DocumentDB/preview/2019-08-01-preview/privateLinkResources.json
 - Microsoft.DocumentDB/preview/2019-08-01-preview/privateEndpointConnection.json
+modelerfour:
+  lenient-model-deduplication: true
 ```
 
 ### Tag: package-2020-04