From 0c7a261991b3eb2b5aadb1521361577aaffd8148 Mon Sep 17 00:00:00 2001 From: Nikhil Chaturvedi Date: Tue, 2 Feb 2021 16:44:13 -0800 Subject: [PATCH 1/9] Fixing the Default Error Response for 2020-06-01-preview APIs --- .../preview/2020-06-01-preview/cosmos-db.json | 47 ++++++++++++------- .../preview/2020-06-01-preview/rbac.json | 16 +++---- .../2020-06-01-preview/restorable.json | 12 ++--- 3 files changed, 44 insertions(+), 31 deletions(-) diff --git a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2020-06-01-preview/cosmos-db.json b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2020-06-01-preview/cosmos-db.json index 2be896766159..bf967512ef0c 100644 --- a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2020-06-01-preview/cosmos-db.json +++ b/specification/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" } } } @@ -4470,26 +4470,39 @@ }, "description": "The List operation response, that contains the graphs and their properties." }, - "ErrorResponse": { + "CloudError": { + "x-ms-external": true, "properties": { - "code": { - "description": "Error code.", - "type": "string" - }, - "message": { - "description": "Error message indicating why the operation failed.", - "type": "string" + "error": { + "$ref": "#/definitions/CloudErrorBody" } }, - "description": "Error Response." + "description": "An error response from the Storage service." }, - "DefaultErrorResponse": { - "description": "An error response from the service.", + "CloudErrorBody": { + "x-ms-external": true, "properties": { - "error": { - "$ref": "#/definitions/ErrorResponse" + "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." }, "FailoverPolicies": { "properties": { diff --git a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2020-06-01-preview/rbac.json b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2020-06-01-preview/rbac.json index cda13ff0d7e9..96468bc8af03 100644 --- a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2020-06-01-preview/rbac.json +++ b/specification/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/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2020-06-01-preview/restorable.json b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2020-06-01-preview/restorable.json index e09cb146dc48..af4afb28efbf 100644 --- a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2020-06-01-preview/restorable.json +++ b/specification/cosmos-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" } } }, From a955700e0bd21123dd89d85b3c0d7342140d4da1 Mon Sep 17 00:00:00 2001 From: Nikhil Chaturvedi Date: Tue, 2 Feb 2021 16:52:24 -0800 Subject: [PATCH 2/9] Removing refs to ErrorResponse and removing new props from CloudErrorBody --- .../preview/2020-06-01-preview/cosmos-db.json | 19 ++++--------------- .../preview/2020-06-01-preview/notebook.json | 14 +++++++------- 2 files changed, 11 insertions(+), 22 deletions(-) diff --git a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2020-06-01-preview/cosmos-db.json b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2020-06-01-preview/cosmos-db.json index bf967512ef0c..154e14725f13 100644 --- a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2020-06-01-preview/cosmos-db.json +++ b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2020-06-01-preview/cosmos-db.json @@ -405,7 +405,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/ErrorResponse" + "$ref": "#/definitions/CloudError" } } } @@ -454,7 +454,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/ErrorResponse" + "$ref": "#/definitions/CloudError" } } } @@ -4477,7 +4477,7 @@ "$ref": "#/definitions/CloudErrorBody" } }, - "description": "An error response from the Storage service." + "description": "An error response from the Cosmos DB service." }, "CloudErrorBody": { "x-ms-external": true, @@ -4489,20 +4489,9 @@ "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." + "description": "An error response from the Cosmos DB service." }, "FailoverPolicies": { "properties": { diff --git a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2020-06-01-preview/notebook.json b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2020-06-01-preview/notebook.json index caf426f3c4e1..87e7f77b67f7 100644 --- a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2020-06-01-preview/notebook.json +++ b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2020-06-01-preview/notebook.json @@ -68,7 +68,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../preview/2020-06-01-preview/cosmos-db.json#/definitions/ErrorResponse" + "$ref": "cosmos-db.json#/definitions/CloudError" } } }, @@ -113,7 +113,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../preview/2020-06-01-preview/cosmos-db.json#/definitions/ErrorResponse" + "$ref": "cosmos-db.json#/definitions/CloudError" } } }, @@ -166,7 +166,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../preview/2020-06-01-preview/cosmos-db.json#/definitions/ErrorResponse" + "$ref": "cosmos-db.json#/definitions/CloudError" } } }, @@ -210,7 +210,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../preview/2020-06-01-preview/cosmos-db.json#/definitions/ErrorResponse" + "$ref": "cosmos-db.json#/definitions/CloudError" } } }, @@ -260,7 +260,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../preview/2020-06-01-preview/cosmos-db.json#/definitions/ErrorResponse" + "$ref": "cosmos-db.json#/definitions/CloudError" } } } @@ -306,7 +306,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../preview/2020-06-01-preview/cosmos-db.json#/definitions/ErrorResponse" + "$ref": "cosmos-db.json#/definitions/CloudError" } } } @@ -352,7 +352,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../../preview/2020-06-01-preview/cosmos-db.json#/definitions/ErrorResponse" + "$ref": "cosmos-db.json#/definitions/CloudError" } } } From 33c05a3a5b303d3786ad4ffdecfc264d77fad274 Mon Sep 17 00:00:00 2001 From: Nikhil Chaturvedi Date: Tue, 2 Feb 2021 17:01:34 -0800 Subject: [PATCH 3/9] Revert "Removing refs to ErrorResponse and removing new props from CloudErrorBody" This reverts commit a955700e0bd21123dd89d85b3c0d7342140d4da1. --- .../preview/2020-06-01-preview/cosmos-db.json | 19 +++++++++++++++---- .../preview/2020-06-01-preview/notebook.json | 14 +++++++------- 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2020-06-01-preview/cosmos-db.json b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2020-06-01-preview/cosmos-db.json index 154e14725f13..bf967512ef0c 100644 --- a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2020-06-01-preview/cosmos-db.json +++ b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2020-06-01-preview/cosmos-db.json @@ -405,7 +405,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/CloudError" + "$ref": "#/definitions/ErrorResponse" } } } @@ -454,7 +454,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/CloudError" + "$ref": "#/definitions/ErrorResponse" } } } @@ -4477,7 +4477,7 @@ "$ref": "#/definitions/CloudErrorBody" } }, - "description": "An error response from the Cosmos DB service." + "description": "An error response from the Storage service." }, "CloudErrorBody": { "x-ms-external": true, @@ -4489,9 +4489,20 @@ "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 Cosmos DB service." + "description": "An error response from the Storage service." }, "FailoverPolicies": { "properties": { diff --git a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2020-06-01-preview/notebook.json b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2020-06-01-preview/notebook.json index 87e7f77b67f7..caf426f3c4e1 100644 --- a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2020-06-01-preview/notebook.json +++ b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2020-06-01-preview/notebook.json @@ -68,7 +68,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "cosmos-db.json#/definitions/CloudError" + "$ref": "../../preview/2020-06-01-preview/cosmos-db.json#/definitions/ErrorResponse" } } }, @@ -113,7 +113,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "cosmos-db.json#/definitions/CloudError" + "$ref": "../../preview/2020-06-01-preview/cosmos-db.json#/definitions/ErrorResponse" } } }, @@ -166,7 +166,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "cosmos-db.json#/definitions/CloudError" + "$ref": "../../preview/2020-06-01-preview/cosmos-db.json#/definitions/ErrorResponse" } } }, @@ -210,7 +210,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "cosmos-db.json#/definitions/CloudError" + "$ref": "../../preview/2020-06-01-preview/cosmos-db.json#/definitions/ErrorResponse" } } }, @@ -260,7 +260,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "cosmos-db.json#/definitions/CloudError" + "$ref": "../../preview/2020-06-01-preview/cosmos-db.json#/definitions/ErrorResponse" } } } @@ -306,7 +306,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "cosmos-db.json#/definitions/CloudError" + "$ref": "../../preview/2020-06-01-preview/cosmos-db.json#/definitions/ErrorResponse" } } } @@ -352,7 +352,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "cosmos-db.json#/definitions/CloudError" + "$ref": "../../preview/2020-06-01-preview/cosmos-db.json#/definitions/ErrorResponse" } } } From b94689304c6d71a4e7d816b9377893cfa4d1c6bd Mon Sep 17 00:00:00 2001 From: Nikhil Chaturvedi Date: Tue, 2 Feb 2021 17:04:23 -0800 Subject: [PATCH 4/9] Adding ErrorResponse back to avoid breaking change --- .../preview/2020-06-01-preview/cosmos-db.json | 28 ++++++++++--------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2020-06-01-preview/cosmos-db.json b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2020-06-01-preview/cosmos-db.json index bf967512ef0c..f2b92a035acc 100644 --- a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2020-06-01-preview/cosmos-db.json +++ b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2020-06-01-preview/cosmos-db.json @@ -4470,6 +4470,19 @@ }, "description": "The List operation response, that contains the graphs and their properties." }, + "ErrorResponse": { + "properties": { + "code": { + "description": "Error code.", + "type": "string" + }, + "message": { + "description": "Error message indicating why the operation failed.", + "type": "string" + } + }, + "description": "Error Response." + }, "CloudError": { "x-ms-external": true, "properties": { @@ -4477,7 +4490,7 @@ "$ref": "#/definitions/CloudErrorBody" } }, - "description": "An error response from the Storage service." + "description": "An error response from the Cosmos DB service." }, "CloudErrorBody": { "x-ms-external": true, @@ -4489,20 +4502,9 @@ "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." + "description": "An error response from the Cosmos DB service." }, "FailoverPolicies": { "properties": { From 8876e200a74c9032c7447f0590ff1b85debd9f1b Mon Sep 17 00:00:00 2001 From: Nikhil Chaturvedi Date: Tue, 2 Feb 2021 17:09:31 -0800 Subject: [PATCH 5/9] Removing CloudErrorBody --- .../preview/2020-06-01-preview/cosmos-db.json | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2020-06-01-preview/cosmos-db.json b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2020-06-01-preview/cosmos-db.json index f2b92a035acc..e20912bde897 100644 --- a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2020-06-01-preview/cosmos-db.json +++ b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2020-06-01-preview/cosmos-db.json @@ -4487,21 +4487,7 @@ "x-ms-external": true, "properties": { "error": { - "$ref": "#/definitions/CloudErrorBody" - } - }, - "description": "An error response from the Cosmos DB 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." + "$ref": "#/definitions/ErrorResponse" } }, "description": "An error response from the Cosmos DB service." From 2dcc5bef3b839f7b0e627aca7cc7da1e06985b95 Mon Sep 17 00:00:00 2001 From: Nikhil Chaturvedi Date: Wed, 3 Feb 2021 11:48:30 -0800 Subject: [PATCH 6/9] Making change as minimal as possible --- .../preview/2020-06-01-preview/cosmos-db.json | 9 +++++---- .../preview/2020-06-01-preview/rbac.json | 16 ++++++++-------- .../preview/2020-06-01-preview/restorable.json | 12 ++++++------ 3 files changed, 19 insertions(+), 18 deletions(-) diff --git a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2020-06-01-preview/cosmos-db.json b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2020-06-01-preview/cosmos-db.json index 2be896766159..d5e1a5a8fee5 100644 --- a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2020-06-01-preview/cosmos-db.json +++ b/specification/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/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2020-06-01-preview/rbac.json b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2020-06-01-preview/rbac.json index cda13ff0d7e9..96468bc8af03 100644 --- a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2020-06-01-preview/rbac.json +++ b/specification/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/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2020-06-01-preview/restorable.json b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2020-06-01-preview/restorable.json index e09cb146dc48..af4afb28efbf 100644 --- a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2020-06-01-preview/restorable.json +++ b/specification/cosmos-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" } } }, From 3f0e5ea243adb1a937d2e063d4d05e3dc7c3f595 Mon Sep 17 00:00:00 2001 From: Nikhil Chaturvedi Date: Thu, 4 Feb 2021 09:44:20 -0800 Subject: [PATCH 7/9] Trigger Build From 077a807bd1d1a37b9f97b4501f967a3a558cc2dd Mon Sep 17 00:00:00 2001 From: Nikhil Chaturvedi Date: Fri, 5 Feb 2021 10:27:08 -0800 Subject: [PATCH 8/9] Adding model duplication leniency --- specification/cosmos-db/resource-manager/readme.python.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/specification/cosmos-db/resource-manager/readme.python.md b/specification/cosmos-db/resource-manager/readme.python.md index fa84ff038f42..6fb564598261 100644 --- a/specification/cosmos-db/resource-manager/readme.python.md +++ b/specification/cosmos-db/resource-manager/readme.python.md @@ -24,6 +24,8 @@ namespace: azure.mgmt.cosmosdb package-name: azure-mgmt-cosmosdb package-version: 0.7.0 clear-output-folder: false +modelerfour: + lenient-model-deduplication: true ``` ``` yaml $(python) && $(python-mode) == 'update' From 57f2a4e9df61fa0d15d13f266290e1ed84949c8c Mon Sep 17 00:00:00 2001 From: Nikhil Chaturvedi Date: Fri, 5 Feb 2021 10:39:40 -0800 Subject: [PATCH 9/9] Lenient Dedup --- specification/cosmos-db/resource-manager/readme.md | 2 ++ specification/cosmos-db/resource-manager/readme.python.md | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/cosmos-db/resource-manager/readme.md b/specification/cosmos-db/resource-manager/readme.md index cb05de45e9c4..c201c7d23c88 100644 --- 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 diff --git a/specification/cosmos-db/resource-manager/readme.python.md b/specification/cosmos-db/resource-manager/readme.python.md index 6fb564598261..fa84ff038f42 100644 --- a/specification/cosmos-db/resource-manager/readme.python.md +++ b/specification/cosmos-db/resource-manager/readme.python.md @@ -24,8 +24,6 @@ namespace: azure.mgmt.cosmosdb package-name: azure-mgmt-cosmosdb package-version: 0.7.0 clear-output-folder: false -modelerfour: - lenient-model-deduplication: true ``` ``` yaml $(python) && $(python-mode) == 'update'