From 06bb700a1df27c5acab35f9b895918d2f37092b0 Mon Sep 17 00:00:00 2001 From: Shreya Roy Chowdhury Date: Fri, 16 Oct 2020 16:08:30 -0700 Subject: [PATCH 01/13] Adding support for SqlPoolTransparentDataEncryptionActivity --- ...TransparentDataEncryptionActivityList.json | 28 ++++ .../preview/2019-06-01-preview/sqlPool.json | 127 ++++++++++++++++++ 2 files changed, 155 insertions(+) create mode 100644 specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/examples/SqlPoolTransparentDataEncryptionActivityList.json diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/examples/SqlPoolTransparentDataEncryptionActivityList.json b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/examples/SqlPoolTransparentDataEncryptionActivityList.json new file mode 100644 index 000000000000..eb2960c34f45 --- /dev/null +++ b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/examples/SqlPoolTransparentDataEncryptionActivityList.json @@ -0,0 +1,28 @@ +{ + "parameters": { + "subscriptionId": "00000000-1111-2222-3333-444444444444", + "resourceGroupName": "sqlcrudtest-6852", + "workspaceName": "sqlcrudtest-2080", + "sqlPoolName": "sqlcrudtest-9187", + "transparentDataEncryptionName": "current", + "api-version": "2019-06-01-preview" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "properties": { + "status": "Encrypting", + "percentComplete": 100 + }, + "name": "current", + "location": "West US", + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/sqlcrudtest-6852/providers/Microsoft.Synapse/workspaces/sqlcrudtest-2080/sqlPools/sqlcrudtest-9187/transparentDataEncryption/current/operationResults/current", + "type": "Microsoft.Synapse/workspaces/sqlPools/transparentDataEncryption/operationResults" + } + ] + } + } + } +} diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/sqlPool.json b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/sqlPool.json index 4529f02a7bcc..cd57eaa26f4c 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/sqlPool.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/sqlPool.json @@ -3833,6 +3833,59 @@ } } } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Synapse/workspaces/{workspaceName}/sqlPools/{sqlPoolName}/transparentDataEncryption/{transparentDataEncryptionName}/operationResults": { + "get": { + "tags": [ + "SqlPools, TransparentDataEncryption" + ], + "operationId": "TransparentDataEncryptionActivities_ListByConfiguration", + "description": "Returns a SqlPool's transparent data encryption operation result.", + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "./workspace.json#/parameters/workspaceNameParameter" + }, + { + "type": "string", + "in": "path", + "name": "sqlPoolName", + "description": "SQL pool name", + "required": true + }, + { + "$ref": "#/parameters/TransparentDataEncryptionNameParameter" + } + ], + "consumes": [], + "produces": [ + "application/json" + ], + "x-ms-examples": { + "List a Sql Pool's transparent data encryption activities": { + "$ref": "./examples/SqlPoolTransparentDataEncryptionActivityList.json" + } + }, + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/TransparentDataEncryptionActivityListResult" + } + } + }, + "x-ms-pageable": { + "nextLinkName": null + } + } } }, "definitions": { @@ -5752,6 +5805,65 @@ "code", "message" ] + }, + "TransparentDataEncryptionActivityProperties": { + "properties": { + "status": { + "readOnly": true, + "type": "string", + "description": "The status of the Sql Pool.", + "enum": [ + "Encrypting", + "Decrypting" + ], + "x-ms-enum": { + "name": "TransparentDataEncryptionActivityStatus", + "modelAsString": true + } + }, + "percentComplete": { + "readOnly": true, + "type": "number", + "format": "float", + "description": "The percent complete of the transparent data encryption scan for a Sql Pool." + } + }, + "description": "Represents the properties of a Sql pool transparent data encryption Scan." + }, + "TransparentDataEncryptionActivity": { + "properties": { + "location": { + "type": "string", + "readOnly": true, + "description": "Resource location." + }, + "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/TransparentDataEncryptionActivityProperties", + "description": "Represents the properties of the resource." + } + }, + "allOf": [ + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ProxyResource" + } + ], + "description": "Represents a database transparent data encryption Scan." + }, + "TransparentDataEncryptionActivityListResult": { + "properties": { + "value": { + "type": "array", + "items": { + "$ref": "#/definitions/TransparentDataEncryptionActivity" + }, + "description": "The list of Sql pool transparent data encryption activities." + } + }, + "required": [ + "value" + ], + "description": "Represents the response to a list sql pool transparent data encryption activity request." } }, "parameters": { @@ -5769,6 +5881,21 @@ }, "description": "The name of the data masking policy for which the masking rule applies.", "x-ms-parameter-location": "method" + }, + "TransparentDataEncryptionNameParameter": { + "name": "transparentDataEncryptionName", + "in": "path", + "required": true, + "type": "string", + "enum": [ + "current" + ], + "description": "The name of the transparent data encryption configuration.", + "x-ms-enum": { + "modelAsString": true, + "name": "TransparentDataEncryptionName" + }, + "x-ms-parameter-location": "method" } } } From d2bb062d6c5ad77f5240218ebeadd2eb86ac3f98 Mon Sep 17 00:00:00 2001 From: Shreya Roy Chowdhury Date: Fri, 16 Oct 2020 17:11:25 -0700 Subject: [PATCH 02/13] Added default response --- .../preview/2019-06-01-preview/sqlPool.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/sqlPool.json b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/sqlPool.json index cd57eaa26f4c..2c5ef0e60021 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/sqlPool.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/sqlPool.json @@ -3880,6 +3880,12 @@ "schema": { "$ref": "#/definitions/TransparentDataEncryptionActivityListResult" } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } } }, "x-ms-pageable": { From 7c98e363bd0cc88f5ca03c1bbfdebcb636cbfe1c Mon Sep 17 00:00:00 2001 From: Shreya Roy Chowdhury Date: Sat, 17 Oct 2020 17:25:57 -0700 Subject: [PATCH 03/13] Adding sqlPool restore points oeprations --- .../examples/SqlPoolRestorePointsDelete.json | 14 +++ .../examples/SqlPoolRestorePointsGet.json | 26 +++++ .../preview/2019-06-01-preview/sqlPool.json | 101 ++++++++++++++++++ 3 files changed, 141 insertions(+) create mode 100644 specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/examples/SqlPoolRestorePointsDelete.json create mode 100644 specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/examples/SqlPoolRestorePointsGet.json diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/examples/SqlPoolRestorePointsDelete.json b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/examples/SqlPoolRestorePointsDelete.json new file mode 100644 index 000000000000..0864a9c1dfbe --- /dev/null +++ b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/examples/SqlPoolRestorePointsDelete.json @@ -0,0 +1,14 @@ + { + "parameters": { + "subscriptionId": "00000000-1111-2222-3333-444444444444", + "resourceGroupName": "Default-SQL-SouthEastAsia", + "restorePointName": "131546477590000000", + "location": "japaneast", + "workspaceName": "testws", + "sqlPoolName": "testpool", + "api-version": "2019-06-01-preview" + }, + "responses": { + "200": {} + } + } diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/examples/SqlPoolRestorePointsGet.json b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/examples/SqlPoolRestorePointsGet.json new file mode 100644 index 000000000000..1050659f3a80 --- /dev/null +++ b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/examples/SqlPoolRestorePointsGet.json @@ -0,0 +1,26 @@ +{ + "parameters": { + "subscriptionId": "00000000-1111-2222-3333-444444444444", + "resourceGroupName": "Default-SQL-SouthEastAsia", + "restorePointName": "131546477590000000", + "location": "japaneast", + "workspaceName": "testws", + "sqlPoolName": "testpool", + "api-version": "2019-06-01-preview" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/providers/Microsoft.Synapse/workspaces/testws/sqlPools/testpool/restorePoints/131546477590000000", + "name": "131546477590000000", + "type": "Microsoft.Synapse/workspaces/sqlPools/restorePoints", + "location": "japaneast", + "properties": { + "restorePointType": "DISCRETE", + "restorePointCreationDate": "2017-03-10T08:00:00.000Z", + "restorePointLabel": "mylabel" + } + } + } + } +} diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/sqlPool.json b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/sqlPool.json index 2c5ef0e60021..d22b18de1cc6 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/sqlPool.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/sqlPool.json @@ -3892,6 +3892,107 @@ "nextLinkName": null } } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Synapse/workspaces/{workspaceName}/sqlPools/{sqlPoolName}/restorePoints/{restorePointName}": { + "get": { + "tags": [ + "SqlPools, RestorePoints" + ], + "description": "Gets a restore point.", + "operationId": "RestorePoints_Get", + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "./workspace.json#/parameters/workspaceNameParameter" + }, + { + "type": "string", + "in": "path", + "name": "sqlPoolName", + "description": "SQL pool name", + "required": true + }, + { + "name": "restorePointName", + "in": "path", + "description": "The name of the restore point.", + "required": true, + "type": "string" + } + ], + "responses": { + "200": { + "description": "Successfully returned the restore point.", + "schema": { + "$ref": "#/definitions/RestorePoint" + } + }, + "default": { + "description": "*** Error Responses: ***\n\n * 400 FeatureDisabledOnSelectedEdition - User attempted to use a feature which is disabled on current database edition.\n\n * 400 BackupNotAllowedOnDeactivatedDatabase - Cannot create restore point on a deactivated database.\n\n * 400 RestorePointLimitReached - A restore point cannot be created because database would exceed the allowed quota of restore points.\n\n * 400 RestorePointAttemptToDeleteSystemBackup - Cannot delete system restore point.\n\n * 404 DatabaseRestorePointNotFound - Can not find database restore point.\n\n * 404 SubscriptionDoesNotHaveServer - The requested server was not found\n\n * 404 DatabaseDoesNotExist - User has specified a database name that does not exist on this server instance.\n\n * 408 DatabaseRestorePointTimedOut - Create database restore point failed." + } + }, + "x-ms-examples": { + "Gets a Sql pool restore point.": { + "$ref": "./examples/SqlPoolRestorePointsGet.json" + } + } + }, + "delete": { + "tags": [ + "SqlPools, RestorePoints" + ], + "description": "Deletes a restore point.", + "operationId": "RestorePoints_Delete", + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "./workspace.json#/parameters/workspaceNameParameter" + }, + { + "type": "string", + "in": "path", + "name": "sqlPoolName", + "description": "SQL pool name", + "required": true + }, + { + "name": "restorePointName", + "in": "path", + "description": "The name of the restore point.", + "required": true, + "type": "string" + } + ], + "responses": { + "200": { + "description": "Successfully deleted the restore point." + }, + "default": { + "description": "*** Error Responses: ***\n\n * 400 FeatureDisabledOnSelectedEdition - User attempted to use a feature which is disabled on current database edition.\n\n * 400 BackupNotAllowedOnDeactivatedDatabase - Cannot create restore point on a deactivated database.\n\n * 400 RestorePointLimitReached - A restore point cannot be created because database would exceed the allowed quota of restore points.\n\n * 400 RestorePointAttemptToDeleteSystemBackup - Cannot delete system restore point.\n\n * 404 DatabaseRestorePointNotFound - Can not find database restore point.\n\n * 404 SubscriptionDoesNotHaveServer - The requested server was not found\n\n * 404 DatabaseDoesNotExist - User has specified a database name that does not exist on this server instance.\n\n * 408 DatabaseRestorePointTimedOut - Create database restore point failed." + } + }, + "x-ms-examples": { + "Deletes a restore point.": { + "$ref": "./examples/SqlPoolRestorePointsDelete.json" + } + } + } } }, "definitions": { From 6dba9da2ba82f45e4f452fa2d3c1357b5816d076 Mon Sep 17 00:00:00 2001 From: Shreya Roy Chowdhury Date: Sat, 17 Oct 2020 17:36:59 -0700 Subject: [PATCH 04/13] Added the response type --- .../Microsoft.Synapse/preview/2019-06-01-preview/sqlPool.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/sqlPool.json b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/sqlPool.json index d22b18de1cc6..176c242bf926 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/sqlPool.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/sqlPool.json @@ -3979,6 +3979,10 @@ "type": "string" } ], + "consumes": [], + "produces": [ + "application/json" + ], "responses": { "200": { "description": "Successfully deleted the restore point." From 12be3e5a3d6a463e697f2e88f1089d0feb1579e8 Mon Sep 17 00:00:00 2001 From: Shreya Roy Chowdhury Date: Sun, 18 Oct 2020 10:02:29 -0700 Subject: [PATCH 05/13] Fixed errors --- .../examples/SqlPoolRestorePointsDelete.json | 26 +++++++++---------- .../preview/2019-06-01-preview/sqlPool.json | 12 ++++++--- 2 files changed, 21 insertions(+), 17 deletions(-) diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/examples/SqlPoolRestorePointsDelete.json b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/examples/SqlPoolRestorePointsDelete.json index 0864a9c1dfbe..d822108f2419 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/examples/SqlPoolRestorePointsDelete.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/examples/SqlPoolRestorePointsDelete.json @@ -1,14 +1,14 @@ - { - "parameters": { - "subscriptionId": "00000000-1111-2222-3333-444444444444", - "resourceGroupName": "Default-SQL-SouthEastAsia", - "restorePointName": "131546477590000000", - "location": "japaneast", - "workspaceName": "testws", - "sqlPoolName": "testpool", - "api-version": "2019-06-01-preview" - }, - "responses": { - "200": {} - } +{ + "parameters": { + "subscriptionId": "00000000-1111-2222-3333-444444444444", + "resourceGroupName": "Default-SQL-SouthEastAsia", + "restorePointName": "131546477590000000", + "location": "japaneast", + "workspaceName": "testws", + "sqlPoolName": "testpool", + "api-version": "2019-06-01-preview" + }, + "responses": { + "200": {} } +} diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/sqlPool.json b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/sqlPool.json index 176c242bf926..cc7ab38dc6e8 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/sqlPool.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/sqlPool.json @@ -3928,6 +3928,10 @@ "type": "string" } ], + "consumes": [], + "produces": [ + "application/json" + ], "responses": { "200": { "description": "Successfully returned the restore point.", @@ -3979,10 +3983,6 @@ "type": "string" } ], - "consumes": [], - "produces": [ - "application/json" - ], "responses": { "200": { "description": "Successfully deleted the restore point." @@ -3991,6 +3991,10 @@ "description": "*** Error Responses: ***\n\n * 400 FeatureDisabledOnSelectedEdition - User attempted to use a feature which is disabled on current database edition.\n\n * 400 BackupNotAllowedOnDeactivatedDatabase - Cannot create restore point on a deactivated database.\n\n * 400 RestorePointLimitReached - A restore point cannot be created because database would exceed the allowed quota of restore points.\n\n * 400 RestorePointAttemptToDeleteSystemBackup - Cannot delete system restore point.\n\n * 404 DatabaseRestorePointNotFound - Can not find database restore point.\n\n * 404 SubscriptionDoesNotHaveServer - The requested server was not found\n\n * 404 DatabaseDoesNotExist - User has specified a database name that does not exist on this server instance.\n\n * 408 DatabaseRestorePointTimedOut - Create database restore point failed." } }, + "consumes": [], + "produces": [ + "application/json" + ], "x-ms-examples": { "Deletes a restore point.": { "$ref": "./examples/SqlPoolRestorePointsDelete.json" From 00a4a083516558a8035e29550e80fb73ef0c4182 Mon Sep 17 00:00:00 2001 From: Shreya Roy Chowdhury Date: Thu, 22 Oct 2020 23:48:13 -0700 Subject: [PATCH 06/13] removed transparent dataencryption API added in a previous iteration, added restorablesqlpools api --- .../examples/RestorableDroppedSqlPoolGet.json | 29 +++ .../RestorableDroppedSqlpoolList.json | 48 +++++ ...TransparentDataEncryptionActivityList.json | 28 --- .../preview/2019-06-01-preview/sqlPool.json | 133 ------------- .../preview/2019-06-01-preview/workspace.json | 185 ++++++++++++++++++ 5 files changed, 262 insertions(+), 161 deletions(-) create mode 100644 specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/examples/RestorableDroppedSqlPoolGet.json create mode 100644 specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/examples/RestorableDroppedSqlpoolList.json delete mode 100644 specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/examples/SqlPoolTransparentDataEncryptionActivityList.json diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/examples/RestorableDroppedSqlPoolGet.json b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/examples/RestorableDroppedSqlPoolGet.json new file mode 100644 index 000000000000..90af2ce77d95 --- /dev/null +++ b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/examples/RestorableDroppedSqlPoolGet.json @@ -0,0 +1,29 @@ +{ + "parameters": { + "subscriptionId": "00000000-1111-2222-3333-444444444444", + "resourceGroupName": "restorabledroppeddatabasetest-1257", + "workspaceName": "restorabledroppeddatabasetest-2389", + "restorableDroppededSqlPoolId": "restorabledroppeddatabasetest-7654,131403269876900000", + "api-version": "2019-06-01-preview" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/restorabledroppeddatabasetest-1257/providers/Microsoft.Synapse/workspaces/restorabledroppeddatabasetest-2389/restorableDroppedSqlpools/restorabledroppeddatabasetest-7654,131403269876900000", + "name": "restorabledroppeddatabasetest-7654,131403269876900000", + "type": "Microsoft.Synapse/workspaces/restorableDroppedSqlpools", + "location": "Japan East", + "properties": { + "databaseName": "restorabledroppeddatabasetest-7654", + "edition": "Datawarehouse", + "maxSizeBytes": "2147483648", + "serviceLevelObjective": "DW100c", + "elasticPoolName": null, + "creationDate": "2017-02-10T00:56:19.2Z", + "deletionDate": "2017-05-27T02:49:47.69Z", + "earliestRestoreDate": "2017-05-20T02:49:47.69Z" + } + } + } + } +} diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/examples/RestorableDroppedSqlpoolList.json b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/examples/RestorableDroppedSqlpoolList.json new file mode 100644 index 000000000000..8c674ff708ea --- /dev/null +++ b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/examples/RestorableDroppedSqlpoolList.json @@ -0,0 +1,48 @@ +{ + "parameters": { + "subscriptionId": "00000000-1111-2222-3333-444444444444", + "resourceGroupName": "restorabledroppeddatabasetest-1349", + "workspaceName": "restorabledroppeddatabasetest-1840", + "api-version": "2019-06-01-preview" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/restorabledroppeddatabasetest-1349/providers/Microsoft.Synapse/workspaces/restorabledroppeddatabasetest-1840/restorableDroppedSqlpools/restorabledroppeddatabasetest-1345,131403269876900000", + "name": "restorabledroppeddatabasetest-1345,131403269876900000", + "type": "Microsoft.Synapse/workspaces/restorableDroppedSqlpools", + "location": "Japan East", + "properties": { + "databaseName": "restorabledroppeddatabasetest-1345", + "edition": "Basic", + "maxSizeBytes": "2147483648", + "serviceLevelObjective": "Basic", + "elasticPoolName": null, + "creationDate": "2017-02-10T00:56:19.2Z", + "deletionDate": "2017-05-27T02:49:47.69Z", + "earliestRestoreDate": "2017-05-20T02:49:47.69Z" + } + }, + { + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/restorabledroppeddatabasetest-1349/providers/Microsoft.Synapse/workspaces/restorabledroppeddatabasetest-1840/restorableDroppedSqlpools/restorabledroppeddatabasetest-2764,131403249684030000", + "name": "restorabledroppeddatabasetest-2764,131403249684030000", + "type": "Microsoft.Synapse/workspaces/restorableDroppedSqlpools", + "location": "Japan East", + "properties": { + "databaseName": "restorabledroppeddatabasetest-2764", + "edition": "Standard", + "maxSizeBytes": "268435456000", + "serviceLevelObjective": "S0", + "elasticPoolName": null, + "creationDate": "2016-05-10T00:56:19.2Z", + "deletionDate": "2017-05-27T02:16:08.403Z", + "earliestRestoreDate": "2017-04-21T02:49:47.69Z" + } + } + ] + } + } + } +} diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/examples/SqlPoolTransparentDataEncryptionActivityList.json b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/examples/SqlPoolTransparentDataEncryptionActivityList.json deleted file mode 100644 index eb2960c34f45..000000000000 --- a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/examples/SqlPoolTransparentDataEncryptionActivityList.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "parameters": { - "subscriptionId": "00000000-1111-2222-3333-444444444444", - "resourceGroupName": "sqlcrudtest-6852", - "workspaceName": "sqlcrudtest-2080", - "sqlPoolName": "sqlcrudtest-9187", - "transparentDataEncryptionName": "current", - "api-version": "2019-06-01-preview" - }, - "responses": { - "200": { - "body": { - "value": [ - { - "properties": { - "status": "Encrypting", - "percentComplete": 100 - }, - "name": "current", - "location": "West US", - "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/sqlcrudtest-6852/providers/Microsoft.Synapse/workspaces/sqlcrudtest-2080/sqlPools/sqlcrudtest-9187/transparentDataEncryption/current/operationResults/current", - "type": "Microsoft.Synapse/workspaces/sqlPools/transparentDataEncryption/operationResults" - } - ] - } - } - } -} diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/sqlPool.json b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/sqlPool.json index cc7ab38dc6e8..1ce331b46ae8 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/sqlPool.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/sqlPool.json @@ -3834,65 +3834,6 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Synapse/workspaces/{workspaceName}/sqlPools/{sqlPoolName}/transparentDataEncryption/{transparentDataEncryptionName}/operationResults": { - "get": { - "tags": [ - "SqlPools, TransparentDataEncryption" - ], - "operationId": "TransparentDataEncryptionActivities_ListByConfiguration", - "description": "Returns a SqlPool's transparent data encryption operation result.", - "parameters": [ - { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" - }, - { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" - }, - { - "$ref": "./workspace.json#/parameters/workspaceNameParameter" - }, - { - "type": "string", - "in": "path", - "name": "sqlPoolName", - "description": "SQL pool name", - "required": true - }, - { - "$ref": "#/parameters/TransparentDataEncryptionNameParameter" - } - ], - "consumes": [], - "produces": [ - "application/json" - ], - "x-ms-examples": { - "List a Sql Pool's transparent data encryption activities": { - "$ref": "./examples/SqlPoolTransparentDataEncryptionActivityList.json" - } - }, - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/TransparentDataEncryptionActivityListResult" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "#/definitions/CloudError" - } - } - }, - "x-ms-pageable": { - "nextLinkName": null - } - } - }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Synapse/workspaces/{workspaceName}/sqlPools/{sqlPoolName}/restorePoints/{restorePointName}": { "get": { "tags": [ @@ -5920,65 +5861,6 @@ "code", "message" ] - }, - "TransparentDataEncryptionActivityProperties": { - "properties": { - "status": { - "readOnly": true, - "type": "string", - "description": "The status of the Sql Pool.", - "enum": [ - "Encrypting", - "Decrypting" - ], - "x-ms-enum": { - "name": "TransparentDataEncryptionActivityStatus", - "modelAsString": true - } - }, - "percentComplete": { - "readOnly": true, - "type": "number", - "format": "float", - "description": "The percent complete of the transparent data encryption scan for a Sql Pool." - } - }, - "description": "Represents the properties of a Sql pool transparent data encryption Scan." - }, - "TransparentDataEncryptionActivity": { - "properties": { - "location": { - "type": "string", - "readOnly": true, - "description": "Resource location." - }, - "properties": { - "x-ms-client-flatten": true, - "$ref": "#/definitions/TransparentDataEncryptionActivityProperties", - "description": "Represents the properties of the resource." - } - }, - "allOf": [ - { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ProxyResource" - } - ], - "description": "Represents a database transparent data encryption Scan." - }, - "TransparentDataEncryptionActivityListResult": { - "properties": { - "value": { - "type": "array", - "items": { - "$ref": "#/definitions/TransparentDataEncryptionActivity" - }, - "description": "The list of Sql pool transparent data encryption activities." - } - }, - "required": [ - "value" - ], - "description": "Represents the response to a list sql pool transparent data encryption activity request." } }, "parameters": { @@ -5996,21 +5878,6 @@ }, "description": "The name of the data masking policy for which the masking rule applies.", "x-ms-parameter-location": "method" - }, - "TransparentDataEncryptionNameParameter": { - "name": "transparentDataEncryptionName", - "in": "path", - "required": true, - "type": "string", - "enum": [ - "current" - ], - "description": "The name of the transparent data encryption configuration.", - "x-ms-enum": { - "modelAsString": true, - "name": "TransparentDataEncryptionName" - }, - "x-ms-parameter-location": "method" } } } diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json index 5a4a4feaabb0..ffca59a7d6a0 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json @@ -583,6 +583,108 @@ } } } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Synapse/workspaces/{workspaceName}/restorableDroppedSqlpools/{restorableDroppededSqlPoolId}": { + "get": { + "tags": [ + "RestorableDroppedSqlpools" + ], + "operationId": "RestorableDroppedSqlpools_Get", + "description": "Gets a deleted sql pool that can be restored", + "x-ms-examples": { + "Get a restorable dropped Sql pool": { + "$ref": "./examples/RestorableDroppedSqlPoolGet.json" + } + }, + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/workspaceNameParameter" + }, + { + "name": "restorableDroppededSqlPoolId", + "in": "path", + "required": true, + "type": "string", + "description": "The id of the deleted Sql Pool in the form of sqlPoolName,deletionTimeInFileTimeFormat" + } + ], + "consumes": [], + "produces": [ + "application/json" + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/RestorableDroppedSqlPool" + } + }, + "default": { + "schema": { + "$ref": "./workspace.json#/definitions/ErrorContract" + }, + "description": "Error" + } + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Synapse/workspaces/{workspaceName}/restorableDroppedSqlpools": { + "get": { + "tags": [ + "RestorableDroppedSqlpools" + ], + "operationId": "RestorableDroppedSqlPools_ListByWorkspace", + "description": "Gets a list of deleted Sql pools that can be restored", + "x-ms-examples": { + "Get list of restorable dropped Sql pools": { + "$ref": "./examples/RestorableDroppedSqlpoolList.json" + } + }, + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/workspaceNameParameter" + } + ], + "consumes": [], + "produces": [ + "application/json" + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/RestorableDroppedSqlPoolListResult" + } + }, + "default": { + "schema": { + "$ref": "./workspace.json#/definitions/ErrorContract" + }, + "description": "Error" + } + }, + "x-ms-pageable": { + "nextLinkName": null + } + } } }, "definitions": { @@ -929,6 +1031,89 @@ "x-ms-client-flatten": true } } + }, + "RestorableDroppedSqlPoolProperties": { + "properties": { + "databaseName": { + "readOnly": true, + "type": "string", + "description": "The name of the database" + }, + "edition": { + "readOnly": true, + "type": "string", + "description": "The edition of the database" + }, + "maxSizeBytes": { + "readOnly": true, + "type": "string", + "description": "The max size in bytes of the database" + }, + "serviceLevelObjective": { + "readOnly": true, + "type": "string", + "description": "The service level objective name of the database" + }, + "elasticPoolName": { + "readOnly": true, + "type": "string", + "description": "The elastic pool name of the database" + }, + "creationDate": { + "readOnly": true, + "type": "string", + "format": "date-time", + "description": "The creation date of the database (ISO8601 format)" + }, + "deletionDate": { + "readOnly": true, + "type": "string", + "format": "date-time", + "description": "The deletion date of the database (ISO8601 format)" + }, + "earliestRestoreDate": { + "readOnly": true, + "type": "string", + "format": "date-time", + "description": "The earliest restore date of the database (ISO8601 format)" + } + }, + "description": "The properties of a restorable dropped Sql pool" + }, + "RestorableDroppedSqlPool": { + "properties": { + "location": { + "type": "string", + "readOnly": true, + "description": "The geo-location where the resource lives" + }, + "properties": { + "$ref": "#/definitions/RestorableDroppedSqlPoolProperties", + "description": "The properties of a restorable dropped Sql pool", + "x-ms-client-flatten": true + } + }, + "allOf": [ + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ProxyResource" + } + ], + "description": "A restorable dropped Sql pool" + }, + "RestorableDroppedSqlPoolListResult": { + "properties": { + "value": { + "type": "array", + "items": { + "$ref": "#/definitions/RestorableDroppedSqlPool" + }, + "description": "A list of restorable dropped Sql pools" + } + }, + "required": [ + "value" + ], + "description": "The response to a list restorable dropped Sql pools request" } }, "parameters": { From d08db5d89126420a49703a47d4116accd7589340 Mon Sep 17 00:00:00 2001 From: Shreya Roy Chowdhury Date: Fri, 23 Oct 2020 08:41:09 -0700 Subject: [PATCH 07/13] Applied Dongwei's feedback --- .../preview/2019-06-01-preview/sqlPool.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/sqlPool.json b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/sqlPool.json index 1ce331b46ae8..8905b59f2f85 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/sqlPool.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/sqlPool.json @@ -3840,7 +3840,7 @@ "SqlPools, RestorePoints" ], "description": "Gets a restore point.", - "operationId": "RestorePoints_Get", + "operationId": "SqlPoolRestorePoints_Get", "parameters": [ { "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" @@ -3895,7 +3895,7 @@ "SqlPools, RestorePoints" ], "description": "Deletes a restore point.", - "operationId": "RestorePoints_Delete", + "operationId": "SqlPoolRestorePoints_Delete", "parameters": [ { "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" @@ -5880,4 +5880,4 @@ "x-ms-parameter-location": "method" } } -} +} \ No newline at end of file From fbba3fd2bdc5d3be8f89a7f08f6b92eac9e10611 Mon Sep 17 00:00:00 2001 From: Shreya Roy Chowdhury Date: Tue, 27 Oct 2020 11:42:55 -0700 Subject: [PATCH 08/13] Added suppression validation --- specification/synapse/resource-manager/readme.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/specification/synapse/resource-manager/readme.md b/specification/synapse/resource-manager/readme.md index 5ae9da8e960e..613e32c093ba 100644 --- a/specification/synapse/resource-manager/readme.md +++ b/specification/synapse/resource-manager/readme.md @@ -80,6 +80,12 @@ directive: suppress: - R4015 reason: SQL doesn't support 'list' operation everywhere, so we cannot support List for certain Sql pool operations + - from: Microsoft.Synapse/preview/2019-06-01-preview/sqlPool.json + where : + - $..paths[(/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Synapse/workspaces/{workspaceName}/sqlPools/{sqlPoolName}/restorePoints/{restorePointName}] + suppress: + - R4011 + reason: SQL Pools APIs are proxy APIs that call SQL DB APIs. The SQL DB delete restore points API only supports return method 200, so we cannot support 204. It is not possible for the SQL DB team to add 204 support for delete restore points. ``` --- From 4f4c296d5524d4b28292942d6d3846f021f79e73 Mon Sep 17 00:00:00 2001 From: Shreya Roy Chowdhury Date: Tue, 27 Oct 2020 14:14:00 -0700 Subject: [PATCH 09/13] Fixed the suppression synatx error --- specification/synapse/resource-manager/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/synapse/resource-manager/readme.md b/specification/synapse/resource-manager/readme.md index 613e32c093ba..2d4e2c0f21c1 100644 --- a/specification/synapse/resource-manager/readme.md +++ b/specification/synapse/resource-manager/readme.md @@ -82,7 +82,7 @@ directive: reason: SQL doesn't support 'list' operation everywhere, so we cannot support List for certain Sql pool operations - from: Microsoft.Synapse/preview/2019-06-01-preview/sqlPool.json where : - - $..paths[(/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Synapse/workspaces/{workspaceName}/sqlPools/{sqlPoolName}/restorePoints/{restorePointName}] + - '$.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Synapse/workspaces/{workspaceName}/sqlPools/{sqlPoolName}/restorePoints/{restorePointName}"].delete' suppress: - R4011 reason: SQL Pools APIs are proxy APIs that call SQL DB APIs. The SQL DB delete restore points API only supports return method 200, so we cannot support 204. It is not possible for the SQL DB team to add 204 support for delete restore points. From 31a91d0cb45e8218fafa6607c43c56ed4b94867e Mon Sep 17 00:00:00 2001 From: Shreya Roy Chowdhury Date: Tue, 27 Oct 2020 14:15:22 -0700 Subject: [PATCH 10/13] Fixed the suppression synatx error --- specification/synapse/resource-manager/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/synapse/resource-manager/readme.md b/specification/synapse/resource-manager/readme.md index 2d4e2c0f21c1..c911de71f820 100644 --- a/specification/synapse/resource-manager/readme.md +++ b/specification/synapse/resource-manager/readme.md @@ -82,7 +82,7 @@ directive: reason: SQL doesn't support 'list' operation everywhere, so we cannot support List for certain Sql pool operations - from: Microsoft.Synapse/preview/2019-06-01-preview/sqlPool.json where : - - '$.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Synapse/workspaces/{workspaceName}/sqlPools/{sqlPoolName}/restorePoints/{restorePointName}"].delete' + - '$.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Synapse/workspaces/{workspaceName}/sqlPools/{sqlPoolName}/restorePoints/{restorePointName}"].delete.responses' suppress: - R4011 reason: SQL Pools APIs are proxy APIs that call SQL DB APIs. The SQL DB delete restore points API only supports return method 200, so we cannot support 204. It is not possible for the SQL DB team to add 204 support for delete restore points. From 7f843dcbf14b852f9ffa6d49a243054021528b90 Mon Sep 17 00:00:00 2001 From: Shreya Roy Chowdhury Date: Tue, 27 Oct 2020 15:38:36 -0700 Subject: [PATCH 11/13] Fixed spelling errors flagged by spell checker --- .../examples/RestorableDroppedSqlPoolGet.json | 6 +++--- .../examples/RestorableDroppedSqlpoolList.json | 8 ++++---- .../preview/2019-06-01-preview/sqlPool.json | 2 +- .../preview/2019-06-01-preview/workspace.json | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/examples/RestorableDroppedSqlPoolGet.json b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/examples/RestorableDroppedSqlPoolGet.json index 90af2ce77d95..0c3fc6cb9104 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/examples/RestorableDroppedSqlPoolGet.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/examples/RestorableDroppedSqlPoolGet.json @@ -3,15 +3,15 @@ "subscriptionId": "00000000-1111-2222-3333-444444444444", "resourceGroupName": "restorabledroppeddatabasetest-1257", "workspaceName": "restorabledroppeddatabasetest-2389", - "restorableDroppededSqlPoolId": "restorabledroppeddatabasetest-7654,131403269876900000", + "restorableDroppedSqlPoolId": "restorabledroppeddatabasetest-7654,131403269876900000", "api-version": "2019-06-01-preview" }, "responses": { "200": { "body": { - "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/restorabledroppeddatabasetest-1257/providers/Microsoft.Synapse/workspaces/restorabledroppeddatabasetest-2389/restorableDroppedSqlpools/restorabledroppeddatabasetest-7654,131403269876900000", + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/restorabledroppeddatabasetest-1257/providers/Microsoft.Synapse/workspaces/restorabledroppeddatabasetest-2389/restorableDroppedSqlPools/restorabledroppeddatabasetest-7654,131403269876900000", "name": "restorabledroppeddatabasetest-7654,131403269876900000", - "type": "Microsoft.Synapse/workspaces/restorableDroppedSqlpools", + "type": "Microsoft.Synapse/workspaces/restorableDroppedSqlPools", "location": "Japan East", "properties": { "databaseName": "restorabledroppeddatabasetest-7654", diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/examples/RestorableDroppedSqlpoolList.json b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/examples/RestorableDroppedSqlpoolList.json index 8c674ff708ea..d62de7d3ef58 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/examples/RestorableDroppedSqlpoolList.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/examples/RestorableDroppedSqlpoolList.json @@ -10,9 +10,9 @@ "body": { "value": [ { - "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/restorabledroppeddatabasetest-1349/providers/Microsoft.Synapse/workspaces/restorabledroppeddatabasetest-1840/restorableDroppedSqlpools/restorabledroppeddatabasetest-1345,131403269876900000", + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/restorabledroppeddatabasetest-1349/providers/Microsoft.Synapse/workspaces/restorabledroppeddatabasetest-1840/restorableDroppedSqlPools/restorabledroppeddatabasetest-1345,131403269876900000", "name": "restorabledroppeddatabasetest-1345,131403269876900000", - "type": "Microsoft.Synapse/workspaces/restorableDroppedSqlpools", + "type": "Microsoft.Synapse/workspaces/restorableDroppedSqlPools", "location": "Japan East", "properties": { "databaseName": "restorabledroppeddatabasetest-1345", @@ -26,9 +26,9 @@ } }, { - "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/restorabledroppeddatabasetest-1349/providers/Microsoft.Synapse/workspaces/restorabledroppeddatabasetest-1840/restorableDroppedSqlpools/restorabledroppeddatabasetest-2764,131403249684030000", + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/restorabledroppeddatabasetest-1349/providers/Microsoft.Synapse/workspaces/restorabledroppeddatabasetest-1840/restorableDroppedSqlPools/restorabledroppeddatabasetest-2764,131403249684030000", "name": "restorabledroppeddatabasetest-2764,131403249684030000", - "type": "Microsoft.Synapse/workspaces/restorableDroppedSqlpools", + "type": "Microsoft.Synapse/workspaces/restorableDroppedSqlPools", "location": "Japan East", "properties": { "databaseName": "restorabledroppeddatabasetest-2764", diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/sqlPool.json b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/sqlPool.json index 8905b59f2f85..9360d544ef4b 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/sqlPool.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/sqlPool.json @@ -5880,4 +5880,4 @@ "x-ms-parameter-location": "method" } } -} \ No newline at end of file +} diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json index e463234a3c95..fb91da433657 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json @@ -584,7 +584,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Synapse/workspaces/{workspaceName}/restorableDroppedSqlpools/{restorableDroppededSqlPoolId}": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Synapse/workspaces/{workspaceName}/restorableDroppedSqlPools/{restorableDroppedSqlPoolId}": { "get": { "tags": [ "RestorableDroppedSqlpools" @@ -610,7 +610,7 @@ "$ref": "#/parameters/workspaceNameParameter" }, { - "name": "restorableDroppededSqlPoolId", + "name": "restorableDroppedSqlPoolId", "in": "path", "required": true, "type": "string", @@ -637,7 +637,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Synapse/workspaces/{workspaceName}/restorableDroppedSqlpools": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Synapse/workspaces/{workspaceName}/restorableDroppedSqlPools": { "get": { "tags": [ "RestorableDroppedSqlpools" From 80ee452b8b45110bfd6707b137b8525427945346 Mon Sep 17 00:00:00 2001 From: Shreya Roy Chowdhury Date: Tue, 27 Oct 2020 15:45:19 -0700 Subject: [PATCH 12/13] Fixed spelling errors flagged by spell checker --- .../preview/2019-06-01-preview/workspace.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json index fb91da433657..d23e772a3b10 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json @@ -587,9 +587,9 @@ "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Synapse/workspaces/{workspaceName}/restorableDroppedSqlPools/{restorableDroppedSqlPoolId}": { "get": { "tags": [ - "RestorableDroppedSqlpools" + "RestorableDroppedSqlPools" ], - "operationId": "RestorableDroppedSqlpools_Get", + "operationId": "RestorableDroppedSqlPools_Get", "description": "Gets a deleted sql pool that can be restored", "x-ms-examples": { "Get a restorable dropped Sql pool": { @@ -640,7 +640,7 @@ "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Synapse/workspaces/{workspaceName}/restorableDroppedSqlPools": { "get": { "tags": [ - "RestorableDroppedSqlpools" + "RestorableDroppedSqlPools" ], "operationId": "RestorableDroppedSqlPools_ListByWorkspace", "description": "Gets a list of deleted Sql pools that can be restored", @@ -1108,4 +1108,4 @@ "x-ms-parameter-location": "method" } } -} +} \ No newline at end of file From e9357dfaa743aa3a0463a9088d15fd733215a52b Mon Sep 17 00:00:00 2001 From: Shreya Roy Chowdhury Date: Tue, 27 Oct 2020 15:45:35 -0700 Subject: [PATCH 13/13] Fixed spelling errors flagged by spell checker --- .../Microsoft.Synapse/preview/2019-06-01-preview/workspace.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json index d23e772a3b10..1a5b26cc0c47 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json @@ -1108,4 +1108,4 @@ "x-ms-parameter-location": "method" } } -} \ No newline at end of file +}