From f21c1d6c923d4c01a0b268a2604071a26f457042 Mon Sep 17 00:00:00 2001 From: "VamshiKrishna Chirra (Quadrant Resource)" Date: Tue, 16 Aug 2022 18:10:50 +0530 Subject: [PATCH 01/12] Added trustedServiceByPassConfiguration to workspace --- ...dateTrustedServiceByPassConfiguration.json | 28 ++++++ .../preview/2021-06-01-preview/workspace.json | 98 ++++++++++++++++++- 2 files changed, 125 insertions(+), 1 deletion(-) create mode 100644 specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/CreateOrUpdateTrustedServiceByPassConfiguration.json diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/CreateOrUpdateTrustedServiceByPassConfiguration.json b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/CreateOrUpdateTrustedServiceByPassConfiguration.json new file mode 100644 index 000000000000..dc776fd36017 --- /dev/null +++ b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/CreateOrUpdateTrustedServiceByPassConfiguration.json @@ -0,0 +1,28 @@ +{ + "parameters": { + "subscriptionId": "cde3513f-fbc4-414d-abc2-c4b2ad011bd8", + "resourceGroupName": "kedodd2021synrg1", + "workspaceName": "kedoddsynprodws", + "api-version": "2021-06-01-preview" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/cde3513f-fbc4-414d-abc2-c4b2ad011bd8/resourceGroups/kedodd2021synrg1/providers/Microsoft.Synapse/workspaces/kedoddsynprodws/trustedServiceByPassConfiguration/default", + "type": "Microsoft.Synapse/workspaces/trustedServiceByPassConfiguration", + "name": "default", + "location": "null", + "properties": { + "subscriptionId": "cde3513f-fbc4-414d-abc2-c4b2ad011bd8", + "resourceGroup": "kedodd2021synrg1", + "workspaceName": "kedoddsynprodws", + "trustedServiceBypassConfigurationInfo": false + } + } + ] + } + } + } +} diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/workspace.json b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/workspace.json index c9f615abb39b..004badc71acf 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/workspace.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/workspace.json @@ -878,6 +878,61 @@ "nextLinkName": null } } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Synapse/workspaces/{workspaceName}/trustedServiceByPassConfiguration/default": { + "put": { + "operationId": "WorkspaceTrustedServiceByPassConfiguration_CreateOrUpdate", + "summary": "Create or update Trusted Service By Pass Configuration", + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "../../../../common/v1/types.json../../../../common/v1/types.json#/parameters/WorkspaceNameParameter" + }, + { + "description": "Trusted Service By Pass Configuration", + "schema": { + "$ref": "#/definitions/TrustedServiceByPassConfiguration" + }, + "in": "body", + "name": "trustedServiceByPassConfiguration", + "required": true + } + ], + "responses": { + "200": { + "schema": { + "$ref": "#/definitions/TrustedServiceByPassConfiguration" + }, + "description": "OK" + }, + "201": { + "description": "Created" + }, + "default": { + "schema": { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + }, + "description": "Error" + } + }, + "produces": [ + "application/json" + ], + "x-ms-long-running-operation": true, + "x-ms-examples": { + "Create or update managed identity sql control settings": { + "$ref": "./examples/CreateOrUpdateTrustedServiceByPassConfiguration.json" + } + } + } } }, "definitions": { @@ -1512,6 +1567,47 @@ "value" ], "description": "The response to a list restorable dropped Sql pools request" + }, + "TrustedServiceByPassConfiguration": { + "description": "Trusted Service By Pass Configuration", + "type": "object", + "allOf": [ + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/TrackedResource" + } + ], + "properties": { + "properties": { + "description": "Trusted Service By Pass Configuration properties", + "$ref": "#/definitions/TrustedServiceByPassConfigurationProperties", + "x-ms-client-flatten": true + } + } + }, + "TrustedServiceByPassConfigurationProperties": { + "description": "Trusted Service By Pass Configuration properties", + "type": "object", + "properties": { + "subscriptionId": { + "description": "Requested subscriptionId. of Trusted Service By Pass Configuration Workspace", + "type": "string", + "readOnly": true + }, + "resourceGroup": { + "description": "Requested resourceGroup. of Trusted Service By Pass Configuration Workspace", + "type": "string", + "readOnly": true + }, + "workspaceName": { + "description": "Requested workspaceName. of Trusted Service By Pass Configuration ", + "type": "string", + "readOnly": true + }, + "trustedServiceBypassConfigurationInfo": { + "description": "Trusted Service By Pass Configuration Info.", + "type": "boolean" + } + } + } } } -} From 51b43777a8e9e076036b52231b5fca537273342b Mon Sep 17 00:00:00 2001 From: "VamshiKrishna Chirra (Quadrant Resource)" Date: Sat, 20 Aug 2022 19:08:45 +0530 Subject: [PATCH 02/12] Model Validation Fix --- .../CreateOrUpdateTrustedServiceByPassConfiguration.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/CreateOrUpdateTrustedServiceByPassConfiguration.json b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/CreateOrUpdateTrustedServiceByPassConfiguration.json index dc776fd36017..6a5b9f8ce061 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/CreateOrUpdateTrustedServiceByPassConfiguration.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/CreateOrUpdateTrustedServiceByPassConfiguration.json @@ -3,6 +3,7 @@ "subscriptionId": "cde3513f-fbc4-414d-abc2-c4b2ad011bd8", "resourceGroupName": "kedodd2021synrg1", "workspaceName": "kedoddsynprodws", + "trustedServiceByPassConfiguration": {}, "api-version": "2021-06-01-preview" }, "responses": { @@ -13,7 +14,6 @@ "id": "/subscriptions/cde3513f-fbc4-414d-abc2-c4b2ad011bd8/resourceGroups/kedodd2021synrg1/providers/Microsoft.Synapse/workspaces/kedoddsynprodws/trustedServiceByPassConfiguration/default", "type": "Microsoft.Synapse/workspaces/trustedServiceByPassConfiguration", "name": "default", - "location": "null", "properties": { "subscriptionId": "cde3513f-fbc4-414d-abc2-c4b2ad011bd8", "resourceGroup": "kedodd2021synrg1", @@ -23,6 +23,7 @@ } ] } - } + }, + "201": {} } } From e2aec41170bd8e7afb48e9e2f644156d9e712477 Mon Sep 17 00:00:00 2001 From: "VamshiKrishna Chirra (Quadrant Resource)" Date: Sun, 21 Aug 2022 13:37:10 +0530 Subject: [PATCH 03/12] Example changes --- .../CreateOrUpdateTrustedServiceByPassConfiguration.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/CreateOrUpdateTrustedServiceByPassConfiguration.json b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/CreateOrUpdateTrustedServiceByPassConfiguration.json index 6a5b9f8ce061..7cdcb1f783be 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/CreateOrUpdateTrustedServiceByPassConfiguration.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/CreateOrUpdateTrustedServiceByPassConfiguration.json @@ -12,8 +12,9 @@ "value": [ { "id": "/subscriptions/cde3513f-fbc4-414d-abc2-c4b2ad011bd8/resourceGroups/kedodd2021synrg1/providers/Microsoft.Synapse/workspaces/kedoddsynprodws/trustedServiceByPassConfiguration/default", - "type": "Microsoft.Synapse/workspaces/trustedServiceByPassConfiguration", + "type": "Microsoft.Synapse/workspaces/trustedServiceByPassConfiguration/default", "name": "default", + "location": "null", "properties": { "subscriptionId": "cde3513f-fbc4-414d-abc2-c4b2ad011bd8", "resourceGroup": "kedodd2021synrg1", From 400d9ab730a3e3969539ce82973f48e820accb5e Mon Sep 17 00:00:00 2001 From: "VamshiKrishna Chirra (Quadrant Resource)" Date: Sun, 21 Aug 2022 14:27:29 +0530 Subject: [PATCH 04/12] Added properties --- ...dateTrustedServiceByPassConfiguration.json | 24 +++++++-- .../preview/2021-06-01-preview/workspace.json | 52 ++++++++----------- 2 files changed, 40 insertions(+), 36 deletions(-) diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/CreateOrUpdateTrustedServiceByPassConfiguration.json b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/CreateOrUpdateTrustedServiceByPassConfiguration.json index 7cdcb1f783be..73592e09b4ce 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/CreateOrUpdateTrustedServiceByPassConfiguration.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/CreateOrUpdateTrustedServiceByPassConfiguration.json @@ -3,7 +3,20 @@ "subscriptionId": "cde3513f-fbc4-414d-abc2-c4b2ad011bd8", "resourceGroupName": "kedodd2021synrg1", "workspaceName": "kedoddsynprodws", - "trustedServiceByPassConfiguration": {}, + "trustedServiceByPassConfiguration": { + "properties": { + "properties": { + "type": "object", + "description": "TrustedServiceBypassConfigurationProperties", + "properties": { + "trustedServiceBypassEnabled": { + "description": "TrustedServiceBypassEnabled", + "type": "boolean" + } + } + } + } + }, "api-version": "2021-06-01-preview" }, "responses": { @@ -16,10 +29,11 @@ "name": "default", "location": "null", "properties": { - "subscriptionId": "cde3513f-fbc4-414d-abc2-c4b2ad011bd8", - "resourceGroup": "kedodd2021synrg1", - "workspaceName": "kedoddsynprodws", - "trustedServiceBypassConfigurationInfo": false + "properties": { + "properties": { + "trustedServiceBypassEnabled": false + } + } } } ] diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/workspace.json b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/workspace.json index 004badc71acf..a80bcb387cb5 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/workspace.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/workspace.json @@ -897,38 +897,35 @@ "$ref": "../../../../common/v1/types.json../../../../common/v1/types.json#/parameters/WorkspaceNameParameter" }, { - "description": "Trusted Service By Pass Configuration", - "schema": { - "$ref": "#/definitions/TrustedServiceByPassConfiguration" - }, - "in": "body", "name": "trustedServiceByPassConfiguration", - "required": true + "in": "path", + "description": "Trusted Service By Pass Configuration", + "required": true, + "type": "string" } ], "responses": { "200": { "schema": { - "$ref": "#/definitions/TrustedServiceByPassConfiguration" + "type": "object", + "items": { + "$ref": "#/definitions/TrustedServiceByPassConfiguration" + } }, "description": "OK" }, - "201": { - "description": "Created" - }, "default": { "schema": { "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" }, - "description": "Error" + "description": "" } }, "produces": [ "application/json" ], - "x-ms-long-running-operation": true, "x-ms-examples": { - "Create or update managed identity sql control settings": { + "Create or update trusted service by passcConfiguration": { "$ref": "./examples/CreateOrUpdateTrustedServiceByPassConfiguration.json" } } @@ -1588,24 +1585,17 @@ "description": "Trusted Service By Pass Configuration properties", "type": "object", "properties": { - "subscriptionId": { - "description": "Requested subscriptionId. of Trusted Service By Pass Configuration Workspace", - "type": "string", - "readOnly": true - }, - "resourceGroup": { - "description": "Requested resourceGroup. of Trusted Service By Pass Configuration Workspace", - "type": "string", - "readOnly": true - }, - "workspaceName": { - "description": "Requested workspaceName. of Trusted Service By Pass Configuration ", - "type": "string", - "readOnly": true - }, - "trustedServiceBypassConfigurationInfo": { - "description": "Trusted Service By Pass Configuration Info.", - "type": "boolean" + "properties": { + "properties": { + "type": "object", + "description": "TrustedServiceBypassConfigurationProperties", + "properties": { + "trustedServiceBypassEnabled": { + "description": "TrustedServiceBypassEnabled", + "type": "boolean" + } + } + } } } } From 9edc8229607a6cce98fe9ceb64d641ecb8f00465 Mon Sep 17 00:00:00 2001 From: "VamshiKrishna Chirra (Quadrant Resource)" Date: Sun, 21 Aug 2022 14:49:58 +0530 Subject: [PATCH 05/12] Properties changes --- .../CreateOrUpdateTrustedServiceByPassConfiguration.json | 7 +------ .../preview/2021-06-01-preview/workspace.json | 6 +----- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/CreateOrUpdateTrustedServiceByPassConfiguration.json b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/CreateOrUpdateTrustedServiceByPassConfiguration.json index 73592e09b4ce..64fb8f28c16d 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/CreateOrUpdateTrustedServiceByPassConfiguration.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/CreateOrUpdateTrustedServiceByPassConfiguration.json @@ -8,13 +8,11 @@ "properties": { "type": "object", "description": "TrustedServiceBypassConfigurationProperties", - "properties": { "trustedServiceBypassEnabled": { "description": "TrustedServiceBypassEnabled", "type": "boolean" } } - } } }, "api-version": "2021-06-01-preview" @@ -30,15 +28,12 @@ "location": "null", "properties": { "properties": { - "properties": { "trustedServiceBypassEnabled": false - } } } } ] } - }, - "201": {} + } } } diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/workspace.json b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/workspace.json index a80bcb387cb5..e80f6bc6e26c 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/workspace.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/workspace.json @@ -925,7 +925,7 @@ "application/json" ], "x-ms-examples": { - "Create or update trusted service by passcConfiguration": { + "Create or update trusted service by pass configuration": { "$ref": "./examples/CreateOrUpdateTrustedServiceByPassConfiguration.json" } } @@ -1586,16 +1586,12 @@ "type": "object", "properties": { "properties": { - "properties": { "type": "object", "description": "TrustedServiceBypassConfigurationProperties", - "properties": { "trustedServiceBypassEnabled": { "description": "TrustedServiceBypassEnabled", "type": "boolean" } - } - } } } } From 999a8762896d7caddc7aaf6744cc0afa03075111 Mon Sep 17 00:00:00 2001 From: "VamshiKrishna Chirra (Quadrant Resource)" Date: Sun, 21 Aug 2022 18:23:05 +0530 Subject: [PATCH 06/12] Changes in workspace --- ...rUpdateTrustedServiceByPassConfiguration.json | 14 +++----------- .../preview/2021-06-01-preview/workspace.json | 16 ++++++++-------- 2 files changed, 11 insertions(+), 19 deletions(-) diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/CreateOrUpdateTrustedServiceByPassConfiguration.json b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/CreateOrUpdateTrustedServiceByPassConfiguration.json index 64fb8f28c16d..2171f29c68a3 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/CreateOrUpdateTrustedServiceByPassConfiguration.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/CreateOrUpdateTrustedServiceByPassConfiguration.json @@ -3,17 +3,9 @@ "subscriptionId": "cde3513f-fbc4-414d-abc2-c4b2ad011bd8", "resourceGroupName": "kedodd2021synrg1", "workspaceName": "kedoddsynprodws", - "trustedServiceByPassConfiguration": { - "properties": { - "properties": { - "type": "object", - "description": "TrustedServiceBypassConfigurationProperties", - "trustedServiceBypassEnabled": { - "description": "TrustedServiceBypassEnabled", - "type": "boolean" - } - } - } + "trustedServiceBypassEnabled": { + "description": "TrustedServiceBypassEnabled", + "type": "boolean" }, "api-version": "2021-06-01-preview" }, diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/workspace.json b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/workspace.json index e80f6bc6e26c..72a7641e7c00 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/workspace.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/workspace.json @@ -1582,16 +1582,16 @@ } }, "TrustedServiceByPassConfigurationProperties": { - "description": "Trusted Service By Pass Configuration properties", - "type": "object", + "title": "Trusted Service By Pass Configuration properties", + "description": "Workspace Trusted Service By Pass Configuration properties", "properties": { "properties": { - "type": "object", - "description": "TrustedServiceBypassConfigurationProperties", - "trustedServiceBypassEnabled": { - "description": "TrustedServiceBypassEnabled", - "type": "boolean" - } + "type": "object", + "description": "TrustedServiceBypassConfigurationProperties", + "trustedServiceBypassEnabled": { + "description": "TrustedServiceBypassEnabled", + "type": "boolean" + } } } } From c30a471a05f046924363a38f7b52000c30861ce0 Mon Sep 17 00:00:00 2001 From: "VamshiKrishna Chirra (Quadrant Resource)" Date: Sun, 21 Aug 2022 19:30:48 +0530 Subject: [PATCH 07/12] Semantic validation fix --- ...pdateTrustedServiceByPassConfiguration.json | 9 ++++++--- .../preview/2021-06-01-preview/workspace.json | 18 ++++++++++-------- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/CreateOrUpdateTrustedServiceByPassConfiguration.json b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/CreateOrUpdateTrustedServiceByPassConfiguration.json index 2171f29c68a3..581b99b9c544 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/CreateOrUpdateTrustedServiceByPassConfiguration.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/CreateOrUpdateTrustedServiceByPassConfiguration.json @@ -3,9 +3,12 @@ "subscriptionId": "cde3513f-fbc4-414d-abc2-c4b2ad011bd8", "resourceGroupName": "kedodd2021synrg1", "workspaceName": "kedoddsynprodws", - "trustedServiceBypassEnabled": { - "description": "TrustedServiceBypassEnabled", - "type": "boolean" + "trustedServiceByPassConfiguration": { + "properties": { + "properties": { + "trustedServiceBypassEnabled": false + } + } }, "api-version": "2021-06-01-preview" }, diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/workspace.json b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/workspace.json index 72a7641e7c00..6a1b0bccde35 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/workspace.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/workspace.json @@ -897,11 +897,13 @@ "$ref": "../../../../common/v1/types.json../../../../common/v1/types.json#/parameters/WorkspaceNameParameter" }, { + "schema": { + "$ref": "#/definitions/TrustedServiceByPassConfiguration" + }, "name": "trustedServiceByPassConfiguration", - "in": "path", + "in": "body", "description": "Trusted Service By Pass Configuration", - "required": true, - "type": "string" + "required": true } ], "responses": { @@ -918,12 +920,16 @@ "schema": { "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" }, - "description": "" + "description": "Error" } }, "produces": [ "application/json" ], + "x-ms-long-running-operation": true, + "x-ms-long-running-operation-options": { + "final-state-via": "azure-async-operation" + }, "x-ms-examples": { "Create or update trusted service by pass configuration": { "$ref": "./examples/CreateOrUpdateTrustedServiceByPassConfiguration.json" @@ -1585,9 +1591,6 @@ "title": "Trusted Service By Pass Configuration properties", "description": "Workspace Trusted Service By Pass Configuration properties", "properties": { - "properties": { - "type": "object", - "description": "TrustedServiceBypassConfigurationProperties", "trustedServiceBypassEnabled": { "description": "TrustedServiceBypassEnabled", "type": "boolean" @@ -1595,5 +1598,4 @@ } } } - } } From 4ca25658632549dfcd56e181201efec81a08aae6 Mon Sep 17 00:00:00 2001 From: "VamshiKrishna Chirra (Quadrant Resource)" Date: Sun, 21 Aug 2022 20:44:47 +0530 Subject: [PATCH 08/12] Properties changes --- ...dateTrustedServiceByPassConfiguration.json | 11 +++---- .../preview/2021-06-01-preview/workspace.json | 31 ++++++++++--------- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/CreateOrUpdateTrustedServiceByPassConfiguration.json b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/CreateOrUpdateTrustedServiceByPassConfiguration.json index 581b99b9c544..59e37a372f75 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/CreateOrUpdateTrustedServiceByPassConfiguration.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/CreateOrUpdateTrustedServiceByPassConfiguration.json @@ -5,9 +5,9 @@ "workspaceName": "kedoddsynprodws", "trustedServiceByPassConfiguration": { "properties": { - "properties": { - "trustedServiceBypassEnabled": false - } + "trustedServiceBypassConfigurationInfo": { + "trustedServiceBypassEnabled": false + } } }, "api-version": "2021-06-01-preview" @@ -20,10 +20,9 @@ "id": "/subscriptions/cde3513f-fbc4-414d-abc2-c4b2ad011bd8/resourceGroups/kedodd2021synrg1/providers/Microsoft.Synapse/workspaces/kedoddsynprodws/trustedServiceByPassConfiguration/default", "type": "Microsoft.Synapse/workspaces/trustedServiceByPassConfiguration/default", "name": "default", - "location": "null", "properties": { - "properties": { - "trustedServiceBypassEnabled": false + "trustedServiceBypassConfigurationInfo": { + "trustedServiceBypassEnabled": false } } } diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/workspace.json b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/workspace.json index 6a1b0bccde35..a05c19d6161b 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/workspace.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/workspace.json @@ -1572,30 +1572,33 @@ "description": "The response to a list restorable dropped Sql pools request" }, "TrustedServiceByPassConfiguration": { - "description": "Trusted Service By Pass Configuration", "type": "object", + "title": "Trusted Service By Pass Configuration properties", + "description": "Trusted Service By Pass Configuration", "allOf": [ { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/TrackedResource" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ProxyResource" } ], "properties": { "properties": { + "title": "Trusted Service By Pass Configuration properties", "description": "Trusted Service By Pass Configuration properties", - "$ref": "#/definitions/TrustedServiceByPassConfigurationProperties", + "properties": { + "trustedServiceBypassConfigurationInfo": { + "description": "Trusted Service By pass Configuration Info", + "type": "object", + "properties": { + "trustedServiceBypassEnabled": { + "description": "TrustedServiceBypassEnabled", + "type": "boolean" + } + } + } + }, "x-ms-client-flatten": true } } - }, - "TrustedServiceByPassConfigurationProperties": { - "title": "Trusted Service By Pass Configuration properties", - "description": "Workspace Trusted Service By Pass Configuration properties", - "properties": { - "trustedServiceBypassEnabled": { - "description": "TrustedServiceBypassEnabled", - "type": "boolean" - } - } - } } } +} From 3f26749a2340ee3cd70176b7d19d9ea5063eab88 Mon Sep 17 00:00:00 2001 From: "VamshiKrishna Chirra (Quadrant Resource)" Date: Sun, 21 Aug 2022 20:59:29 +0530 Subject: [PATCH 09/12] Added Object --- .../preview/2021-06-01-preview/workspace.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/workspace.json b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/workspace.json index a05c19d6161b..dc5cdfde2c78 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/workspace.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/workspace.json @@ -1584,13 +1584,14 @@ "properties": { "title": "Trusted Service By Pass Configuration properties", "description": "Trusted Service By Pass Configuration properties", + "type": "object", "properties": { "trustedServiceBypassConfigurationInfo": { "description": "Trusted Service By pass Configuration Info", "type": "object", "properties": { "trustedServiceBypassEnabled": { - "description": "TrustedServiceBypassEnabled", + "description": "Trusted Service By pass Enabled", "type": "boolean" } } From 32387e8d798858a6632487aa9fa3342b71aa1d90 Mon Sep 17 00:00:00 2001 From: "VamshiKrishna Chirra (Quadrant Resource)" Date: Sun, 21 Aug 2022 21:08:19 +0530 Subject: [PATCH 10/12] Schema changes --- .../preview/2021-06-01-preview/workspace.json | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/workspace.json b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/workspace.json index dc5cdfde2c78..82db2cc3c225 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/workspace.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/workspace.json @@ -898,7 +898,10 @@ }, { "schema": { - "$ref": "#/definitions/TrustedServiceByPassConfiguration" + "type": "object", + "items": { + "$ref": "#/definitions/TrustedServiceByPassConfiguration" + } }, "name": "trustedServiceByPassConfiguration", "in": "body", @@ -926,10 +929,6 @@ "produces": [ "application/json" ], - "x-ms-long-running-operation": true, - "x-ms-long-running-operation-options": { - "final-state-via": "azure-async-operation" - }, "x-ms-examples": { "Create or update trusted service by pass configuration": { "$ref": "./examples/CreateOrUpdateTrustedServiceByPassConfiguration.json" From 968dd18dd2dc556a6e4d3192e1afd77104f6a79b Mon Sep 17 00:00:00 2001 From: "VamshiKrishna Chirra (Quadrant Resource)" Date: Mon, 22 Aug 2022 10:25:26 +0530 Subject: [PATCH 11/12] response changes --- ...UpdateTrustedServiceByPassConfiguration.json | 3 ++- .../preview/2021-06-01-preview/workspace.json | 17 +++++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/CreateOrUpdateTrustedServiceByPassConfiguration.json b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/CreateOrUpdateTrustedServiceByPassConfiguration.json index 59e37a372f75..8a6fb1253e10 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/CreateOrUpdateTrustedServiceByPassConfiguration.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/CreateOrUpdateTrustedServiceByPassConfiguration.json @@ -28,6 +28,7 @@ } ] } - } + }, + "201": {} } } diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/workspace.json b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/workspace.json index 82db2cc3c225..217cfe72cfc0 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/workspace.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/workspace.json @@ -898,10 +898,7 @@ }, { "schema": { - "type": "object", - "items": { - "$ref": "#/definitions/TrustedServiceByPassConfiguration" - } + "$ref": "#/definitions/TrustedServiceByPassConfiguration" }, "name": "trustedServiceByPassConfiguration", "in": "body", @@ -912,13 +909,13 @@ "responses": { "200": { "schema": { - "type": "object", - "items": { - "$ref": "#/definitions/TrustedServiceByPassConfiguration" - } + "$ref": "#/definitions/TrustedServiceByPassConfiguration" }, "description": "OK" }, + "201": { + "description": "Created" + }, "default": { "schema": { "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" @@ -929,6 +926,10 @@ "produces": [ "application/json" ], + "x-ms-long-running-operation": true, + "x-ms-long-running-operation-options": { + "final-state-via": "azure-async-operation" + }, "x-ms-examples": { "Create or update trusted service by pass configuration": { "$ref": "./examples/CreateOrUpdateTrustedServiceByPassConfiguration.json" From 646b466844b5400602dc84764cda10fc411e9c38 Mon Sep 17 00:00:00 2001 From: "VamshiKrishna Chirra (Quadrant Resource)" Date: Mon, 22 Aug 2022 10:55:30 +0530 Subject: [PATCH 12/12] Response revert --- ...UpdateTrustedServiceByPassConfiguration.json | 3 +-- .../preview/2021-06-01-preview/workspace.json | 17 ++++++++--------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/CreateOrUpdateTrustedServiceByPassConfiguration.json b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/CreateOrUpdateTrustedServiceByPassConfiguration.json index 8a6fb1253e10..59e37a372f75 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/CreateOrUpdateTrustedServiceByPassConfiguration.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/CreateOrUpdateTrustedServiceByPassConfiguration.json @@ -28,7 +28,6 @@ } ] } - }, - "201": {} + } } } diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/workspace.json b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/workspace.json index 217cfe72cfc0..82db2cc3c225 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/workspace.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/workspace.json @@ -898,7 +898,10 @@ }, { "schema": { - "$ref": "#/definitions/TrustedServiceByPassConfiguration" + "type": "object", + "items": { + "$ref": "#/definitions/TrustedServiceByPassConfiguration" + } }, "name": "trustedServiceByPassConfiguration", "in": "body", @@ -909,13 +912,13 @@ "responses": { "200": { "schema": { - "$ref": "#/definitions/TrustedServiceByPassConfiguration" + "type": "object", + "items": { + "$ref": "#/definitions/TrustedServiceByPassConfiguration" + } }, "description": "OK" }, - "201": { - "description": "Created" - }, "default": { "schema": { "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" @@ -926,10 +929,6 @@ "produces": [ "application/json" ], - "x-ms-long-running-operation": true, - "x-ms-long-running-operation-options": { - "final-state-via": "azure-async-operation" - }, "x-ms-examples": { "Create or update trusted service by pass configuration": { "$ref": "./examples/CreateOrUpdateTrustedServiceByPassConfiguration.json"