From ab4df5f2d9c23273442c5b2029a08f2014533dd2 Mon Sep 17 00:00:00 2001 From: darkoa-msft <61987922+darkoa-msft@users.noreply.github.com> Date: Mon, 1 Nov 2021 20:07:41 -0700 Subject: [PATCH] Internal Network resource - all properties are top level (PrivateEndpointConnectionProxy) (#16628) * Removed property bags from NRP proxy definition * Added top level suppression * Added provisioning state because of RPaaS validation * Another try at supressions * square #1 * square #0 * another try --- .../2020-03-01-preview/deviceupdate.json | 12 +--- ...ndpointConnectionProxy_CreateOrUpdate.json | 70 +++++++++---------- .../PrivateEndpointConnectionProxy_Get.json | 46 ++++++------ ...EndpointConnectionProxy_ListByAccount.json | 46 ++++++------ ...ivateEndpointConnectionProxy_Validate.json | 36 +++++----- .../deviceupdate/resource-manager/readme.md | 4 ++ 6 files changed, 101 insertions(+), 113 deletions(-) diff --git a/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/deviceupdate.json b/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/deviceupdate.json index 4f05b95f5010..f1b95b19b932 100644 --- a/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/deviceupdate.json +++ b/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/deviceupdate.json @@ -1532,22 +1532,16 @@ "allOf": [ { "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/ProxyResource" - } - ], - "properties": { - "properties": { - "description": "Private endpoint connection proxy object properties.", - "x-ms-client-flatten": true, + }, + { "$ref": "#/definitions/PrivateEndpointConnectionProxyProperties" } - }, - "required": [ - "properties" ] }, "PrivateEndpointConnectionProxyProperties": { "description": "Private endpoint connection proxy object properties.", "type": "object", + "x-ms-client-flatten": true, "properties": { "eTag": { "description": "ETag from NRP.", diff --git a/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/PrivateEndpointConnectionProxies/PrivateEndpointConnectionProxy_CreateOrUpdate.json b/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/PrivateEndpointConnectionProxies/PrivateEndpointConnectionProxy_CreateOrUpdate.json index 6ffd47be39b8..93a28ec2f88c 100644 --- a/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/PrivateEndpointConnectionProxies/PrivateEndpointConnectionProxy_CreateOrUpdate.json +++ b/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/PrivateEndpointConnectionProxies/PrivateEndpointConnectionProxy_CreateOrUpdate.json @@ -6,12 +6,37 @@ "privateEndpointConnectionProxyId": "peexample01", "api-version": "2020-03-01-preview", "privateEndpointConnectionProxy": { - "properties": { + "remotePrivateEndpoint": { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.Network/privateEndpoints/{privateEndpointConnectionProxyId}", + "manualPrivateLinkServiceConnections": [ + { + "name": "{privateEndpointConnectionProxyId}", + "groupIds": [ + "DeviceUpdate" + ], + "requestMessage": "Please approve my connection, thanks." + } + ], + "privateLinkServiceProxies": [ + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.Network/privateEndpoints/{privateEndpointConnectionProxyId}/privateLinkServiceProxies/{privateEndpointConnectionProxyId}", + "groupConnectivityInformation": [] + } + ] + } + } + }, + "responses": { + "201": { + "body": { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.DeviceUpdate/accounts/contoso/privateEndpointConnectionProxies/peexample01", + "name": "peexample01", + "type": "Microsoft.DeviceUpdate/accounts/privateEndpointConnectionProxies", "remotePrivateEndpoint": { "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.Network/privateEndpoints/{privateEndpointConnectionProxyId}", "manualPrivateLinkServiceConnections": [ { - "name": "{privateEndpointConnectionProxyId}", + "name": "{plsConnectionName}", "groupIds": [ "DeviceUpdate" ], @@ -21,45 +46,16 @@ "privateLinkServiceProxies": [ { "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.Network/privateEndpoints/{privateEndpointConnectionProxyId}/privateLinkServiceProxies/{privateEndpointConnectionProxyId}", - "groupConnectivityInformation": [] + "groupConnectivityInformation": [ + { + "groupId": "DeviceUpdate", + "memberName": "adu" + } + ] } ] } } } - }, - "responses": { - "201": { - "body": { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.DeviceUpdate/accounts/contoso/privateEndpointConnectionProxies/peexample01", - "name": "peexample01", - "type": "Microsoft.DeviceUpdate/accounts/privateEndpointConnectionProxies", - "properties": { - "remotePrivateEndpoint": { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.Network/privateEndpoints/{privateEndpointConnectionProxyId}", - "manualPrivateLinkServiceConnections": [ - { - "name": "{plsConnectionName}", - "groupIds": [ - "DeviceUpdate" - ], - "requestMessage": "Please approve my connection, thanks." - } - ], - "privateLinkServiceProxies": [ - { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.Network/privateEndpoints/{privateEndpointConnectionProxyId}/privateLinkServiceProxies/{privateEndpointConnectionProxyId}", - "groupConnectivityInformation": [ - { - "groupId": "DeviceUpdate", - "memberName": "adu" - } - ] - } - ] - } - } - } - } } } diff --git a/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/PrivateEndpointConnectionProxies/PrivateEndpointConnectionProxy_Get.json b/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/PrivateEndpointConnectionProxies/PrivateEndpointConnectionProxy_Get.json index 72b93aa0907b..1ae43f3d3a1f 100644 --- a/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/PrivateEndpointConnectionProxies/PrivateEndpointConnectionProxy_Get.json +++ b/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/PrivateEndpointConnectionProxies/PrivateEndpointConnectionProxy_Get.json @@ -12,30 +12,28 @@ "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.DeviceUpdate/accounts/contoso/privateEndpointConnectionProxies/peexample01", "name": "peexample01", "type": "Microsoft.DeviceUpdate/accounts/privateEndpointConnectionProxies", - "properties": { - "remotePrivateEndpoint": { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.Network/privateEndpoints/{privateEndpointConnectionProxyId}", - "manualPrivateLinkServiceConnections": [ - { - "name": "{plsConnectionName}", - "groupIds": [ - "DeviceUpdate" - ], - "requestMessage": "Please approve my connection, thanks." - } - ], - "privateLinkServiceProxies": [ - { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.Network/privateEndpoints/{privateEndpointConnectionProxyId}/privateLinkServiceProxies/{privateEndpointConnectionProxyId}", - "groupConnectivityInformation": [ - { - "groupId": "DeviceUpdate", - "memberName": "adu" - } - ] - } - ] - } + "remotePrivateEndpoint": { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.Network/privateEndpoints/{privateEndpointConnectionProxyId}", + "manualPrivateLinkServiceConnections": [ + { + "name": "{plsConnectionName}", + "groupIds": [ + "DeviceUpdate" + ], + "requestMessage": "Please approve my connection, thanks." + } + ], + "privateLinkServiceProxies": [ + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.Network/privateEndpoints/{privateEndpointConnectionProxyId}/privateLinkServiceProxies/{privateEndpointConnectionProxyId}", + "groupConnectivityInformation": [ + { + "groupId": "DeviceUpdate", + "memberName": "adu" + } + ] + } + ] } } } diff --git a/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/PrivateEndpointConnectionProxies/PrivateEndpointConnectionProxy_ListByAccount.json b/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/PrivateEndpointConnectionProxies/PrivateEndpointConnectionProxy_ListByAccount.json index 5c1b3f45b264..c02dec9714ca 100644 --- a/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/PrivateEndpointConnectionProxies/PrivateEndpointConnectionProxy_ListByAccount.json +++ b/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/PrivateEndpointConnectionProxies/PrivateEndpointConnectionProxy_ListByAccount.json @@ -13,30 +13,28 @@ "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.DeviceUpdate/accounts/contoso/privateEndpointConnectionProxies/peexample01", "name": "peexample01", "type": "Microsoft.DeviceUpdate/accounts/privateEndpointConnectionProxies", - "properties": { - "remotePrivateEndpoint": { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.Network/privateEndpoints/{privateEndpointConnectionProxyId}", - "manualPrivateLinkServiceConnections": [ - { - "name": "{plsConnectionName}", - "groupIds": [ - "DeviceUpdate" - ], - "requestMessage": "Please approve my connection, thanks." - } - ], - "privateLinkServiceProxies": [ - { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.Network/privateEndpoints/{privateEndpointConnectionProxyId}/privateLinkServiceProxies/{privateEndpointConnectionProxyId}", - "groupConnectivityInformation": [ - { - "groupId": "DeviceUpdate", - "memberName": "adu" - } - ] - } - ] - } + "remotePrivateEndpoint": { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.Network/privateEndpoints/{privateEndpointConnectionProxyId}", + "manualPrivateLinkServiceConnections": [ + { + "name": "{plsConnectionName}", + "groupIds": [ + "DeviceUpdate" + ], + "requestMessage": "Please approve my connection, thanks." + } + ], + "privateLinkServiceProxies": [ + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.Network/privateEndpoints/{privateEndpointConnectionProxyId}/privateLinkServiceProxies/{privateEndpointConnectionProxyId}", + "groupConnectivityInformation": [ + { + "groupId": "DeviceUpdate", + "memberName": "adu" + } + ] + } + ] } } ] diff --git a/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/PrivateEndpointConnectionProxies/PrivateEndpointConnectionProxy_Validate.json b/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/PrivateEndpointConnectionProxies/PrivateEndpointConnectionProxy_Validate.json index a06b274c950a..30a2a6a8dfbd 100644 --- a/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/PrivateEndpointConnectionProxies/PrivateEndpointConnectionProxy_Validate.json +++ b/specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/PrivateEndpointConnectionProxies/PrivateEndpointConnectionProxy_Validate.json @@ -6,25 +6,23 @@ "privateEndpointConnectionProxyId": "peexample01", "api-version": "2020-03-01-preview", "privateEndpointConnectionProxy": { - "properties": { - "remotePrivateEndpoint": { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.Network/privateEndpoints/{privateEndpointConnectionProxyId}", - "manualPrivateLinkServiceConnections": [ - { - "name": "{privateEndpointConnectionProxyId}", - "groupIds": [ - "DeviceUpdate" - ], - "requestMessage": "Please approve my connection, thanks." - } - ], - "privateLinkServiceProxies": [ - { - "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.Network/privateEndpoints/{privateEndpointConnectionProxyId}/privateLinkServiceProxies/{privateEndpointConnectionProxyId}", - "groupConnectivityInformation": [] - } - ] - } + "remotePrivateEndpoint": { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.Network/privateEndpoints/{privateEndpointConnectionProxyId}", + "manualPrivateLinkServiceConnections": [ + { + "name": "{privateEndpointConnectionProxyId}", + "groupIds": [ + "DeviceUpdate" + ], + "requestMessage": "Please approve my connection, thanks." + } + ], + "privateLinkServiceProxies": [ + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.Network/privateEndpoints/{privateEndpointConnectionProxyId}/privateLinkServiceProxies/{privateEndpointConnectionProxyId}", + "groupConnectivityInformation": [] + } + ] } } }, diff --git a/specification/deviceupdate/resource-manager/readme.md b/specification/deviceupdate/resource-manager/readme.md index 1b7049f092ce..eb2d3fc10e5e 100644 --- a/specification/deviceupdate/resource-manager/readme.md +++ b/specification/deviceupdate/resource-manager/readme.md @@ -47,6 +47,10 @@ directive: where: $.definitions.Identity.properties.type from: deviceupdate.json reason: Managed Identity type can be case in-sensitive + - suppress: BodyTopLevelProperties + from: deviceupdate.json + where: $.definitions.PrivateEndpointConnectionProxy + reason: Internal NRP resource, all properties are top level properties ``` ---