From 47521efaccd1eaed2684a448f9e0f0b0746b1b3a Mon Sep 17 00:00:00 2001 From: HaoZhang Date: Wed, 28 Feb 2024 08:35:00 +0000 Subject: [PATCH 1/4] add 'enablePrivateLinks' to ServiceResource.properties.vnetAddons --- .../preview/2024-05-01-preview/appplatform.json | 5 +++++ .../Services_CreateOrUpdate_VNetInjection.json | 12 ++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2024-05-01-preview/appplatform.json b/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2024-05-01-preview/appplatform.json index 30bd16a66cbc..962b865d2b37 100644 --- a/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2024-05-01-preview/appplatform.json +++ b/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2024-05-01-preview/appplatform.json @@ -10981,6 +10981,11 @@ "description": "Indicates whether the data plane components(log stream, app connect, remote debugging) in vnet injection instance could be accessed from internet.", "type": "boolean", "default": false + }, + "enablePrivateLinks": { + "description": "Indicates whether the vnet injection service enables private links for backend storage account and container registry.", + "type": "boolean", + "default": false } } }, diff --git a/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2024-05-01-preview/examples/Services_CreateOrUpdate_VNetInjection.json b/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2024-05-01-preview/examples/Services_CreateOrUpdate_VNetInjection.json index 3942943bae0c..d2bc104ef152 100644 --- a/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2024-05-01-preview/examples/Services_CreateOrUpdate_VNetInjection.json +++ b/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2024-05-01-preview/examples/Services_CreateOrUpdate_VNetInjection.json @@ -14,7 +14,8 @@ }, "vnetAddons": { "logStreamPublicEndpoint": true, - "dataPlanePublicEndpoint": true + "dataPlanePublicEndpoint": true, + "enablePrivateLinks": true } }, "sku": { @@ -79,7 +80,8 @@ }, "vnetAddons": { "logStreamPublicEndpoint": true, - "dataPlanePublicEndpoint": true + "dataPlanePublicEndpoint": true, + "enablePrivateLinks": true }, "serviceId": "12345678abcd1234abcd12345678abcd" }, @@ -151,7 +153,8 @@ }, "vnetAddons": { "logStreamPublicEndpoint": true, - "dataPlanePublicEndpoint": true + "dataPlanePublicEndpoint": true, + "enablePrivateLinks": true }, "serviceId": "12345678abcd1234abcd12345678abcd" }, @@ -223,7 +226,8 @@ }, "vnetAddons": { "logStreamPublicEndpoint": true, - "dataPlanePublicEndpoint": true + "dataPlanePublicEndpoint": true, + "enablePrivateLinks": true }, "serviceId": "12345678abcd1234abcd12345678abcd" }, From 14251bff499c2f1bb14038a7282af7db9205d8b4 Mon Sep 17 00:00:00 2001 From: HaoZhang Date: Wed, 28 Feb 2024 09:39:06 +0000 Subject: [PATCH 2/4] fix comment --- .../preview/2024-05-01-preview/appplatform.json | 13 ++++++++++--- .../Services_CreateOrUpdate_VNetInjection.json | 8 ++++---- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2024-05-01-preview/appplatform.json b/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2024-05-01-preview/appplatform.json index 962b865d2b37..6a1c8cb3ecc3 100644 --- a/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2024-05-01-preview/appplatform.json +++ b/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2024-05-01-preview/appplatform.json @@ -10982,10 +10982,17 @@ "type": "boolean", "default": false }, - "enablePrivateLinks": { + "privateLinkState": { "description": "Indicates whether the vnet injection service enables private links for backend storage account and container registry.", - "type": "boolean", - "default": false + "enum": [ + "Enabled", + "Disabled" + ], + "type": "string", + "x-ms-enum": { + "name": "PrivateLinkState", + "modelAsString": true + } } } }, diff --git a/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2024-05-01-preview/examples/Services_CreateOrUpdate_VNetInjection.json b/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2024-05-01-preview/examples/Services_CreateOrUpdate_VNetInjection.json index d2bc104ef152..370a051f9416 100644 --- a/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2024-05-01-preview/examples/Services_CreateOrUpdate_VNetInjection.json +++ b/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2024-05-01-preview/examples/Services_CreateOrUpdate_VNetInjection.json @@ -15,7 +15,7 @@ "vnetAddons": { "logStreamPublicEndpoint": true, "dataPlanePublicEndpoint": true, - "enablePrivateLinks": true + "privateLinkState": "Enabled" } }, "sku": { @@ -81,7 +81,7 @@ "vnetAddons": { "logStreamPublicEndpoint": true, "dataPlanePublicEndpoint": true, - "enablePrivateLinks": true + "privateLinkState": "Enabled" }, "serviceId": "12345678abcd1234abcd12345678abcd" }, @@ -154,7 +154,7 @@ "vnetAddons": { "logStreamPublicEndpoint": true, "dataPlanePublicEndpoint": true, - "enablePrivateLinks": true + "privateLinkState": "Enabled" }, "serviceId": "12345678abcd1234abcd12345678abcd" }, @@ -227,7 +227,7 @@ "vnetAddons": { "logStreamPublicEndpoint": true, "dataPlanePublicEndpoint": true, - "enablePrivateLinks": true + "privateLinkState": "Enabled" }, "serviceId": "12345678abcd1234abcd12345678abcd" }, From 02aac2bb5480f9b1e3b3b3d7cf83d5ebcc047599 Mon Sep 17 00:00:00 2001 From: HaoZhang Date: Mon, 18 Mar 2024 03:04:09 +0000 Subject: [PATCH 3/4] rename as 'privateStorageAccess' --- .../preview/2024-05-01-preview/appplatform.json | 5 +++-- .../examples/Services_CreateOrUpdate_VNetInjection.json | 8 ++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2024-05-01-preview/appplatform.json b/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2024-05-01-preview/appplatform.json index 6a1c8cb3ecc3..77b477de0dd6 100644 --- a/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2024-05-01-preview/appplatform.json +++ b/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2024-05-01-preview/appplatform.json @@ -10982,15 +10982,16 @@ "type": "boolean", "default": false }, - "privateLinkState": { + "privateStorageAccess": { "description": "Indicates whether the vnet injection service enables private links for backend storage account and container registry.", "enum": [ "Enabled", "Disabled" ], + "default": "Disabled", "type": "string", "x-ms-enum": { - "name": "PrivateLinkState", + "name": "PrivateStorageAccess", "modelAsString": true } } diff --git a/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2024-05-01-preview/examples/Services_CreateOrUpdate_VNetInjection.json b/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2024-05-01-preview/examples/Services_CreateOrUpdate_VNetInjection.json index 370a051f9416..85ce5758a24e 100644 --- a/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2024-05-01-preview/examples/Services_CreateOrUpdate_VNetInjection.json +++ b/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2024-05-01-preview/examples/Services_CreateOrUpdate_VNetInjection.json @@ -15,7 +15,7 @@ "vnetAddons": { "logStreamPublicEndpoint": true, "dataPlanePublicEndpoint": true, - "privateLinkState": "Enabled" + "privateStorageAccess": "Enabled" } }, "sku": { @@ -81,7 +81,7 @@ "vnetAddons": { "logStreamPublicEndpoint": true, "dataPlanePublicEndpoint": true, - "privateLinkState": "Enabled" + "privateStorageAccess": "Enabled" }, "serviceId": "12345678abcd1234abcd12345678abcd" }, @@ -154,7 +154,7 @@ "vnetAddons": { "logStreamPublicEndpoint": true, "dataPlanePublicEndpoint": true, - "privateLinkState": "Enabled" + "privateStorageAccess": "Enabled" }, "serviceId": "12345678abcd1234abcd12345678abcd" }, @@ -227,7 +227,7 @@ "vnetAddons": { "logStreamPublicEndpoint": true, "dataPlanePublicEndpoint": true, - "privateLinkState": "Enabled" + "privateStorageAccess": "Enabled" }, "serviceId": "12345678abcd1234abcd12345678abcd" }, From 27f4aeebf9a6535b2b0411f9d1108449125c318a Mon Sep 17 00:00:00 2001 From: HaoZhang Date: Mon, 18 Mar 2024 03:24:33 +0000 Subject: [PATCH 4/4] remove default value --- .../preview/2024-05-01-preview/appplatform.json | 1 - 1 file changed, 1 deletion(-) diff --git a/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2024-05-01-preview/appplatform.json b/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2024-05-01-preview/appplatform.json index 77b477de0dd6..f21001b3136f 100644 --- a/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2024-05-01-preview/appplatform.json +++ b/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2024-05-01-preview/appplatform.json @@ -10988,7 +10988,6 @@ "Enabled", "Disabled" ], - "default": "Disabled", "type": "string", "x-ms-enum": { "name": "PrivateStorageAccess",