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.

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

Use common Resource & Sku definitions in all Sql specs #3134

Merged
merged 7 commits into from
May 25, 2018
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Don't use common Sku definition
  • Loading branch information
jaredmoo committed May 24, 2018
commit 74554df187ba8177b3778ac1d92f649e1e50b338
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,7 @@
]
},
"sku": {
"$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/Sku",
"$ref": "../../../common/v1/types.json#/definitions/Sku",
"description": "Managed instance sku"
},
"properties": {
Expand All @@ -419,7 +419,7 @@
"type": "object",
"properties": {
"sku": {
"$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/Sku",
"$ref": "../../../common/v1/types.json#/definitions/Sku",
"description": "Managed instance sku"
},
"properties": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -704,7 +704,7 @@
],
"properties": {
"sku": {
"$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/Sku",
"$ref": "../../../common/v1/types.json#/definitions/Sku",
"description": "The name and tier of the SKU."
},
"kind": {
Expand All @@ -724,7 +724,7 @@
"type": "object",
"properties": {
"sku": {
"$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/Sku",
"$ref": "../../../common/v1/types.json#/definitions/Sku",
"description": "The name and tier of the SKU."
},
"properties": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2465,7 +2465,7 @@
],
"properties": {
"sku": {
"$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/Sku",
"$ref": "../../../common/v1/types.json#/definitions/Sku",
"description": "The name and tier of the SKU."
},
"properties": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@
"readOnly": true
},
"sku": {
"$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/Sku",
"$ref": "../../../common/v1/types.json#/definitions/Sku",
"description": "The sku.",
"readOnly": true
},
Expand Down Expand Up @@ -403,7 +403,7 @@
"readOnly": true
},
"sku": {
"$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/Sku",
"$ref": "../../../common/v1/types.json#/definitions/Sku",
"description": "The sku.",
"readOnly": true
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -782,7 +782,7 @@
]
},
"currentSku": {
"$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/Sku",
"$ref": "../../../common/v1/types.json#/definitions/Sku",
"description": "The name and tier of the SKU.",
"readOnly": true
}
Expand All @@ -801,7 +801,7 @@
],
"properties": {
"sku": {
"$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/Sku",
"$ref": "../../../common/v1/types.json#/definitions/Sku",
"description": "The name and tier of the SKU."
},
"kind": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@
],
"properties": {
"sku": {
"$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/Sku"
"$ref": "../../../common/v1/types.json#/definitions/Sku"
},
"kind": {
"description": "Kind of elastic pool. This is metadata used for the Azure portal experience.",
Expand All @@ -405,7 +405,7 @@
"type": "object",
"properties": {
"sku": {
"$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/Sku"
"$ref": "../../../common/v1/types.json#/definitions/Sku"
},
"properties": {
"$ref": "#/definitions/ElasticPoolUpdateProperties",
Expand Down
41 changes: 41 additions & 0 deletions specification/sql/resource-manager/common/v1/types.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
{
"swagger": "2.0",
"info": {
"version": "1.0",
"title": "Common types"
},
"paths": {},
"definitions": {
"Sku": {
"description": "The resource model definition representing SKU",
"properties": {
"name": {
"type": "string",
"description": "The name of the SKU. Ex - P3. It is typically a letter+number code"
},
"tier": {
"type": "string",
"description": "This field is required to be implemented by the Resource Provider if the service has more than one tier, but is not required on a PUT."
},
"size": {
"type": "string",
"description": "The SKU size. When the name field is the combination of tier and some other value, this would be the standalone code. "
},
"family": {
"type": "string",
"description": "If the service has different generations of hardware, for the same SKU, then that can be captured here."
},
"capacity": {
"type": "integer",
"format": "int32",
"description": "If the SKU supports scale out/in then the capacity integer should be included. If scale out/in is not possible for the resource this may be omitted."
}
},
"required": [
"name"
]
}
},
"parameters": {
}
}