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

[Synapse] - Update sql pool v3 specs #14839

Merged
merged 2 commits into from
Jun 29, 2021
Merged

[Synapse] - Update sql pool v3 specs #14839

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
30c3de7
[Synapse] - Update sql pool v3 specs
Jun 16, 2021
e645d31
Address comments
Jun 17, 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
17 changes: 0 additions & 17 deletions specification/synapse/common/v1/types.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,23 +57,6 @@
}
]
},
"Sku": {
"description": "An ARM Resource SKU.",
"required": [
"name"
],
"type": "object",
"properties": {
"name": {
"description": "The name of the SKU, typically, a letter + Number code, e.g. P3.",
"type": "string"
},
"tier": {
"description": "The tier or edition of the particular SKU, e.g. Basic, Premium.",
"type": "string"
}
}
},
"SystemData": {
"description": "ARM System Data.",
"type": "object",
Expand Down
8 changes: 4 additions & 4 deletions ...ion/synapse/resource-manager/Microsoft.Synapse/preview/2020-04-01-preview/operations.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
},
"default": {
"schema": {
"$ref": "../../../../common/v1/types.json#/definitions/ErrorContract"
"$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
},
"description": ""
}
Expand Down Expand Up @@ -101,7 +101,7 @@
},
"default": {
"schema": {
"$ref": "../../../../common/v1/types.json#/definitions/ErrorContract"
"$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
},
"description": ""
}
Expand Down Expand Up @@ -156,7 +156,7 @@
},
"default": {
"schema": {
"$ref": "../../../../common/v1/types.json#/definitions/ErrorContract"
"$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
},
"description": ""
}
Expand Down Expand Up @@ -229,7 +229,7 @@
"x-ms-client-flatten": true
},
"error": {
"$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ErrorResponse",
"$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse",
"description": "Errors from the operation"
},
"startTime": {
Expand Down
10 changes: 5 additions & 5 deletions ...on/synapse/resource-manager/Microsoft.Synapse/preview/2020-04-01-preview/sqlDatabase.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
},
"default": {
"schema": {
"$ref": "../../../../common/v1/types.json#/definitions/ErrorContract"
"$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
},
"description": ""
}
Expand Down Expand Up @@ -110,7 +110,7 @@
},
"default": {
"schema": {
"$ref": "../../../../common/v1/types.json#/definitions/ErrorContract"
"$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
},
"description": ""
}
Expand Down Expand Up @@ -157,7 +157,7 @@
},
"default": {
"schema": {
"$ref": "../../../../common/v1/types.json#/definitions/ErrorContract"
"$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
},
"description": ""
}
Expand Down Expand Up @@ -213,7 +213,7 @@
},
"default": {
"schema": {
"$ref": "../../../../common/v1/types.json#/definitions/ErrorContract"
"$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
},
"description": ""
}
Expand Down Expand Up @@ -256,7 +256,7 @@
},
"default": {
"schema": {
"$ref": "../../../../common/v1/types.json#/definitions/ErrorContract"
"$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
},
"description": ""
}
Expand Down
35 changes: 26 additions & 9 deletions ...cation/synapse/resource-manager/Microsoft.Synapse/preview/2020-04-01-preview/sqlPool.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
},
"default": {
"schema": {
"$ref": "../../../../common/v1/types.json#/definitions/ErrorContract"
"$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
},
"description": ""
}
Expand Down Expand Up @@ -110,7 +110,7 @@
},
"default": {
"schema": {
"$ref": "../../../../common/v1/types.json#/definitions/ErrorContract"
"$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
},
"description": ""
}
Expand Down Expand Up @@ -157,7 +157,7 @@
},
"default": {
"schema": {
"$ref": "../../../../common/v1/types.json#/definitions/ErrorContract"
"$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
},
"description": ""
}
Expand Down Expand Up @@ -213,7 +213,7 @@
},
"default": {
"schema": {
"$ref": "../../../../common/v1/types.json#/definitions/ErrorContract"
"$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
},
"description": ""
}
Expand Down Expand Up @@ -259,7 +259,7 @@
},
"default": {
"schema": {
"$ref": "../../../../common/v1/types.json#/definitions/ErrorContract"
"$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
},
"description": ""
}
Expand Down Expand Up @@ -305,7 +305,7 @@
},
"default": {
"schema": {
"$ref": "../../../../common/v1/types.json#/definitions/ErrorContract"
"$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
},
"description": ""
}
Expand Down Expand Up @@ -348,7 +348,7 @@
},
"default": {
"schema": {
"$ref": "../../../../common/v1/types.json#/definitions/ErrorContract"
"$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
},
"description": ""
}
Expand Down Expand Up @@ -436,7 +436,7 @@
],
"properties": {
"sku": {
"$ref": "../../../../common/v1/types.json#/definitions/Sku",
Copy link
Contributor

@chzachar chzachar Jun 16, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we remove the old Synapse-specific definitions/Sku object that is in this file now (appears to not be used anywhere else), to avoid confusion in future? https://github.com/Azure/azure-rest-api-specs/blob/master/specification/synapse/common/v1/types.json

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed

"$ref": "#/definitions/SkuV3",
"description": "The sql pool SKU. The list of SKUs may vary by region and support offer."
},
"kind": {
Expand All @@ -456,12 +456,29 @@
}
}
},
"SkuV3": {
"description": "An ARM Resource SKU.",
"required": [
"name"
],
"type": "object",
"properties": {
"name": {
"description": "The name of the SKU, typically, a letter + Number code, e.g. P3.",
"type": "string"
},
"tier": {
"description": "The tier or edition of the particular SKU, e.g. Basic, Premium.",
"type": "string"
}
}
},
"SqlPoolUpdate": {
"description": "A sql pool resource.",
"type": "object",
"properties": {
"sku": {
"$ref": "../../../../common/v1/types.json#/definitions/Sku",
"$ref": "#/definitions/SkuV3",
"description": "The name and tier of the SKU."
},
"properties": {
Expand Down