From b8ef5e3eb4a60631146cdc10d6aa90fae99ffcef Mon Sep 17 00:00:00 2001 From: Swagat Mishra Date: Sun, 11 Jul 2021 17:57:17 -0700 Subject: [PATCH 1/7] initial actual changes --- .../preview/2021-05-01-preview/botservice.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/specification/botservice/resource-manager/Microsoft.BotService/preview/2021-05-01-preview/botservice.json b/specification/botservice/resource-manager/Microsoft.BotService/preview/2021-05-01-preview/botservice.json index 772e0a1c5d47..6fbbb0d512e9 100644 --- a/specification/botservice/resource-manager/Microsoft.BotService/preview/2021-05-01-preview/botservice.json +++ b/specification/botservice/resource-manager/Microsoft.BotService/preview/2021-05-01-preview/botservice.json @@ -1612,6 +1612,14 @@ "schemaTransformationVersion": { "type": "string", "description": "The channel schema transformation version for the bot" + }, + "privateEndpointConnections": { + "type": "array", + "readonly": true, + "description":"List of Private Endpoint Connections configured for the bot", + "items": { + "$ref": "./privatelinks.json#/definitions/PrivateEndpointConnection" + } } }, "description": "The parameters to provide for the Bot.", From 4fa428eee5c9eca0ae1bb3ce566b13dde8a189ef Mon Sep 17 00:00:00 2001 From: Swagat Mishra Date: Tue, 13 Jul 2021 13:56:31 -0700 Subject: [PATCH 2/7] added example --- .../2021-05-01-preview/examples/GetBot.json | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/specification/botservice/resource-manager/Microsoft.BotService/preview/2021-05-01-preview/examples/GetBot.json b/specification/botservice/resource-manager/Microsoft.BotService/preview/2021-05-01-preview/examples/GetBot.json index 478fbb23654d..76e73726093a 100644 --- a/specification/botservice/resource-manager/Microsoft.BotService/preview/2021-05-01-preview/examples/GetBot.json +++ b/specification/botservice/resource-manager/Microsoft.BotService/preview/2021-05-01-preview/examples/GetBot.json @@ -41,7 +41,23 @@ "isCmekEnabled": true, "cmekKeyVaultUrl": "https://myCmekKey", "isIsolated": false, - "schemaTransformationVersion": "1.0" + "schemaTransformationVersion": "1.0", + "privateEndpointConnections": [ + { + "id": "/subscriptions/subscription-id/resourceGroups/OneResourceGroupName/providers/Microsoft.BotService/botServices/samplebotname/privateEndpointConnections/privatelink", + "properties": { + "provisioningState": "Succeeded", + "privateEndpoint": { + "id": "/subscriptions/subscription-id/resourceGroups/OneResourceGroupName/providers/Microsoft.Network/privateEndpoints/privatelink" + }, + "privateLinkServiceConnectionState": { + "status": "Approved", + "description": "Auto-Approved", + "actionsRequired": "None" + } + } + } + ] } } } From babcdb75a67ee9a9494eb7a68aef031af295d2fb Mon Sep 17 00:00:00 2001 From: Swagat Mishra Date: Tue, 13 Jul 2021 14:18:27 -0700 Subject: [PATCH 3/7] corrected mistake in previous contract --- .../preview/2021-05-01-preview/privatelinks.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/botservice/resource-manager/Microsoft.BotService/preview/2021-05-01-preview/privatelinks.json b/specification/botservice/resource-manager/Microsoft.BotService/preview/2021-05-01-preview/privatelinks.json index 03d65e67e1b3..974e0dfb111d 100644 --- a/specification/botservice/resource-manager/Microsoft.BotService/preview/2021-05-01-preview/privatelinks.json +++ b/specification/botservice/resource-manager/Microsoft.BotService/preview/2021-05-01-preview/privatelinks.json @@ -83,7 +83,7 @@ "type": "string", "description": "The reason for approval/rejection of the connection." }, - "actionRequired": { + "actionsRequired": { "type": "string", "description": "A message indicating if changes on the service provider require any updates on the consumer." } From 5c769c04255b68c268be63e5dae828dfaacfeef5 Mon Sep 17 00:00:00 2001 From: Swagat Mishra Date: Tue, 13 Jul 2021 14:24:46 -0700 Subject: [PATCH 4/7] fix prettier changes --- .../preview/2021-05-01-preview/botservice.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/botservice/resource-manager/Microsoft.BotService/preview/2021-05-01-preview/botservice.json b/specification/botservice/resource-manager/Microsoft.BotService/preview/2021-05-01-preview/botservice.json index 6fbbb0d512e9..4753424043af 100644 --- a/specification/botservice/resource-manager/Microsoft.BotService/preview/2021-05-01-preview/botservice.json +++ b/specification/botservice/resource-manager/Microsoft.BotService/preview/2021-05-01-preview/botservice.json @@ -1616,7 +1616,7 @@ "privateEndpointConnections": { "type": "array", "readonly": true, - "description":"List of Private Endpoint Connections configured for the bot", + "description": "List of Private Endpoint Connections configured for the bot", "items": { "$ref": "./privatelinks.json#/definitions/PrivateEndpointConnection" } From b4342431dafd8381eb37cf5a34f482a7a77d9093 Mon Sep 17 00:00:00 2001 From: Swagat Mishra Date: Tue, 13 Jul 2021 14:39:31 -0700 Subject: [PATCH 5/7] fix model validation errors --- .../examples/GetPrivateEndpointConnection.json | 2 +- .../examples/ListPrivateEndpointConnections.json | 4 ++-- .../examples/PutPrivateEndpointConnection.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/specification/botservice/resource-manager/Microsoft.BotService/preview/2021-05-01-preview/examples/GetPrivateEndpointConnection.json b/specification/botservice/resource-manager/Microsoft.BotService/preview/2021-05-01-preview/examples/GetPrivateEndpointConnection.json index 99cfb5068631..080872d4aa88 100644 --- a/specification/botservice/resource-manager/Microsoft.BotService/preview/2021-05-01-preview/examples/GetPrivateEndpointConnection.json +++ b/specification/botservice/resource-manager/Microsoft.BotService/preview/2021-05-01-preview/examples/GetPrivateEndpointConnection.json @@ -20,7 +20,7 @@ "privateLinkServiceConnectionState": { "status": "Approved", "description": "Auto-Approved", - "actionRequired": "None" + "actionsRequired": "None" } } } diff --git a/specification/botservice/resource-manager/Microsoft.BotService/preview/2021-05-01-preview/examples/ListPrivateEndpointConnections.json b/specification/botservice/resource-manager/Microsoft.BotService/preview/2021-05-01-preview/examples/ListPrivateEndpointConnections.json index 7408d6fa87c6..ed58760cd1e4 100644 --- a/specification/botservice/resource-manager/Microsoft.BotService/preview/2021-05-01-preview/examples/ListPrivateEndpointConnections.json +++ b/specification/botservice/resource-manager/Microsoft.BotService/preview/2021-05-01-preview/examples/ListPrivateEndpointConnections.json @@ -21,7 +21,7 @@ "privateLinkServiceConnectionState": { "status": "Approved", "description": "Auto-Approved", - "actionRequired": "None" + "actionsRequired": "None" } } }, @@ -37,7 +37,7 @@ "privateLinkServiceConnectionState": { "status": "Approved", "description": "Auto-Approved", - "actionRequired": "None" + "actionsRequired": "None" } } } diff --git a/specification/botservice/resource-manager/Microsoft.BotService/preview/2021-05-01-preview/examples/PutPrivateEndpointConnection.json b/specification/botservice/resource-manager/Microsoft.BotService/preview/2021-05-01-preview/examples/PutPrivateEndpointConnection.json index 0b79af4523d6..6c254cfbc054 100644 --- a/specification/botservice/resource-manager/Microsoft.BotService/preview/2021-05-01-preview/examples/PutPrivateEndpointConnection.json +++ b/specification/botservice/resource-manager/Microsoft.BotService/preview/2021-05-01-preview/examples/PutPrivateEndpointConnection.json @@ -28,7 +28,7 @@ "privateLinkServiceConnectionState": { "status": "Approved", "description": "Auto-Approved", - "actionRequired": "None" + "actionsRequired": "None" } } } From c03f400e6447ad6f635b54e0efd6920e00d62a52 Mon Sep 17 00:00:00 2001 From: Swagat Mishra Date: Tue, 20 Jul 2021 23:58:45 -0700 Subject: [PATCH 6/7] fix readonly --- .../preview/2021-05-01-preview/botservice.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/botservice/resource-manager/Microsoft.BotService/preview/2021-05-01-preview/botservice.json b/specification/botservice/resource-manager/Microsoft.BotService/preview/2021-05-01-preview/botservice.json index 4753424043af..8a973ac2dde7 100644 --- a/specification/botservice/resource-manager/Microsoft.BotService/preview/2021-05-01-preview/botservice.json +++ b/specification/botservice/resource-manager/Microsoft.BotService/preview/2021-05-01-preview/botservice.json @@ -1615,7 +1615,7 @@ }, "privateEndpointConnections": { "type": "array", - "readonly": true, + "readOnly": true, "description": "List of Private Endpoint Connections configured for the bot", "items": { "$ref": "./privatelinks.json#/definitions/PrivateEndpointConnection" From 5a71e15acf1522515faf6a76d2efa0ae59fd3111 Mon Sep 17 00:00:00 2001 From: Swagat Mishra Date: Wed, 21 Jul 2021 00:09:03 -0700 Subject: [PATCH 7/7] fix prettier issue --- .../preview/2021-05-01-preview/examples/GetBot.json | 1 - 1 file changed, 1 deletion(-) diff --git a/specification/botservice/resource-manager/Microsoft.BotService/preview/2021-05-01-preview/examples/GetBot.json b/specification/botservice/resource-manager/Microsoft.BotService/preview/2021-05-01-preview/examples/GetBot.json index 1b3c1f2e7fbc..89db63ec9e5f 100644 --- a/specification/botservice/resource-manager/Microsoft.BotService/preview/2021-05-01-preview/examples/GetBot.json +++ b/specification/botservice/resource-manager/Microsoft.BotService/preview/2021-05-01-preview/examples/GetBot.json @@ -59,7 +59,6 @@ } } ] - } } }