Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 10 commits into from
Feb 7, 2021
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
0c7a261
Fixing the Default Error Response for 2020-06-01-preview APIs
nichatur Feb 3, 2021
a955700
Removing refs to ErrorResponse and removing new props from CloudError…
nichatur Feb 3, 2021
33c05a3
Revert "Removing refs to ErrorResponse and removing new props from Cl…
nichatur Feb 3, 2021
b946893
Adding ErrorResponse back to avoid breaking change
nichatur Feb 3, 2021
8876e20
Removing CloudErrorBody
nichatur Feb 3, 2021
2dcc5be
Making change as minimal as possible
nichatur Feb 3, 2021
07a4e72
Merge branch 'nichatur-error-fix' of https://github.com/nichatur/azur…
nichatur Feb 3, 2021
3f0e5ea
Trigger Build
nichatur Feb 4, 2021
077a807
Adding model duplication leniency
nichatur Feb 5, 2021
57f2a4e
Lenient Dedup
nichatur Feb 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions ...cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2020-06-01-preview/cosmos-db.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4215,7 +4215,7 @@
"default": {
"description": "Error response describing why the operation failed.",
"schema": {
"$ref": "#/definitions/DefaultErrorResponse"
"$ref": "#/definitions/CloudError"
}
}
},
Expand Down Expand Up @@ -4251,7 +4251,7 @@
"default": {
"description": "Error response describing why the operation failed.",
"schema": {
"$ref": "#/definitions/DefaultErrorResponse"
"$ref": "#/definitions/CloudError"
}
}
},
Expand Down Expand Up @@ -4293,7 +4293,7 @@
"default": {
"description": "Error response describing why the operation failed.",
"schema": {
"$ref": "#/definitions/DefaultErrorResponse"
"$ref": "#/definitions/CloudError"
}
}
}
Expand Down Expand Up @@ -4483,7 +4483,8 @@
},
"description": "Error Response."
},
"DefaultErrorResponse": {
"CloudError": {
"x-ms-external": true,
"description": "An error response from the service.",
"properties": {
"error": {
Expand Down
16 changes: 8 additions & 8 deletions ...tion/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2020-06-01-preview/rbac.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
}
Expand Down Expand Up @@ -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"
}
}
}
Expand Down Expand Up @@ -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"
}
}
}
Expand Down Expand Up @@ -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"
}
}
}
Expand Down Expand Up @@ -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"
}
}
}
Expand Down Expand Up @@ -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"
}
}
}
Expand Down Expand Up @@ -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"
}
}
}
Expand Down Expand Up @@ -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"
}
}
}
Expand Down
12 changes: 6 additions & 6 deletions ...osmos-db/resource-manager/Microsoft.DocumentDB/preview/2020-06-01-preview/restorable.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
},
Expand Down Expand Up @@ -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"
}
}
},
Expand Down Expand Up @@ -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"
}
}
},
Expand Down Expand Up @@ -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"
}
}
},
Expand Down Expand Up @@ -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"
}
}
},
Expand Down Expand Up @@ -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"
}
}
},
Expand Down
2 changes: 2 additions & 0 deletions specification/cosmos-db/resource-manager/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down