From 467afe850ec9f7dd60c09b34ead7b60388c89d8a Mon Sep 17 00:00:00 2001 From: Dongwei Wang Date: Tue, 29 Jun 2021 17:00:34 +0800 Subject: [PATCH] [Synapse] - Update sql pool v3 specs (#14839) * [Synapse] - Update sql pool v3 specs * Address comments Co-authored-by: Dongwei Wang --- specification/synapse/common/v1/types.json | 17 --------- .../2020-04-01-preview/operations.json | 8 ++--- .../2020-04-01-preview/sqlDatabase.json | 10 +++--- .../preview/2020-04-01-preview/sqlPool.json | 35 ++++++++++++++----- 4 files changed, 35 insertions(+), 35 deletions(-) diff --git a/specification/synapse/common/v1/types.json b/specification/synapse/common/v1/types.json index fd2acd86d045..7dc6ee3062dd 100644 --- a/specification/synapse/common/v1/types.json +++ b/specification/synapse/common/v1/types.json @@ -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", diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2020-04-01-preview/operations.json b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2020-04-01-preview/operations.json index a2613b074b1b..6e2645f1f92c 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2020-04-01-preview/operations.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2020-04-01-preview/operations.json @@ -46,7 +46,7 @@ }, "default": { "schema": { - "$ref": "../../../../common/v1/types.json#/definitions/ErrorContract" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" }, "description": "" } @@ -101,7 +101,7 @@ }, "default": { "schema": { - "$ref": "../../../../common/v1/types.json#/definitions/ErrorContract" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" }, "description": "" } @@ -156,7 +156,7 @@ }, "default": { "schema": { - "$ref": "../../../../common/v1/types.json#/definitions/ErrorContract" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" }, "description": "" } @@ -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": { diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2020-04-01-preview/sqlDatabase.json b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2020-04-01-preview/sqlDatabase.json index 1dc7d5f58bc5..090d4d3744ce 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2020-04-01-preview/sqlDatabase.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2020-04-01-preview/sqlDatabase.json @@ -49,7 +49,7 @@ }, "default": { "schema": { - "$ref": "../../../../common/v1/types.json#/definitions/ErrorContract" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" }, "description": "" } @@ -110,7 +110,7 @@ }, "default": { "schema": { - "$ref": "../../../../common/v1/types.json#/definitions/ErrorContract" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" }, "description": "" } @@ -157,7 +157,7 @@ }, "default": { "schema": { - "$ref": "../../../../common/v1/types.json#/definitions/ErrorContract" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" }, "description": "" } @@ -213,7 +213,7 @@ }, "default": { "schema": { - "$ref": "../../../../common/v1/types.json#/definitions/ErrorContract" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" }, "description": "" } @@ -256,7 +256,7 @@ }, "default": { "schema": { - "$ref": "../../../../common/v1/types.json#/definitions/ErrorContract" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" }, "description": "" } diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2020-04-01-preview/sqlPool.json b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2020-04-01-preview/sqlPool.json index 0362ce667c44..16dc27efb091 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2020-04-01-preview/sqlPool.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2020-04-01-preview/sqlPool.json @@ -49,7 +49,7 @@ }, "default": { "schema": { - "$ref": "../../../../common/v1/types.json#/definitions/ErrorContract" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" }, "description": "" } @@ -110,7 +110,7 @@ }, "default": { "schema": { - "$ref": "../../../../common/v1/types.json#/definitions/ErrorContract" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" }, "description": "" } @@ -157,7 +157,7 @@ }, "default": { "schema": { - "$ref": "../../../../common/v1/types.json#/definitions/ErrorContract" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" }, "description": "" } @@ -213,7 +213,7 @@ }, "default": { "schema": { - "$ref": "../../../../common/v1/types.json#/definitions/ErrorContract" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" }, "description": "" } @@ -259,7 +259,7 @@ }, "default": { "schema": { - "$ref": "../../../../common/v1/types.json#/definitions/ErrorContract" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" }, "description": "" } @@ -305,7 +305,7 @@ }, "default": { "schema": { - "$ref": "../../../../common/v1/types.json#/definitions/ErrorContract" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" }, "description": "" } @@ -348,7 +348,7 @@ }, "default": { "schema": { - "$ref": "../../../../common/v1/types.json#/definitions/ErrorContract" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" }, "description": "" } @@ -436,7 +436,7 @@ ], "properties": { "sku": { - "$ref": "../../../../common/v1/types.json#/definitions/Sku", + "$ref": "#/definitions/SkuV3", "description": "The sql pool SKU. The list of SKUs may vary by region and support offer." }, "kind": { @@ -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": {