Skip to content

Commit ab4df5f

Browse files
darkoa-msftdarkoa-msft
authored
Internal Network resource - all properties are top level (PrivateEndpointConnectionProxy) (Azure#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
1 parent c4838f2 commit ab4df5f

File tree

6 files changed

+101
-113
lines changed

6 files changed

+101
-113
lines changed

‎specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/deviceupdate.json‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1532,22 +1532,16 @@
15321532
"allOf": [
15331533
{
15341534
"$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/ProxyResource"
1535-
}
1536-
],
1537-
"properties": {
1538-
"properties": {
1539-
"description": "Private endpoint connection proxy object properties.",
1540-
"x-ms-client-flatten": true,
1535+
},
1536+
{
15411537
"$ref": "#/definitions/PrivateEndpointConnectionProxyProperties"
15421538
}
1543-
},
1544-
"required": [
1545-
"properties"
15461539
]
15471540
},
15481541
"PrivateEndpointConnectionProxyProperties": {
15491542
"description": "Private endpoint connection proxy object properties.",
15501543
"type": "object",
1544+
"x-ms-client-flatten": true,
15511545
"properties": {
15521546
"eTag": {
15531547
"description": "ETag from NRP.",

‎specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/PrivateEndpointConnectionProxies/PrivateEndpointConnectionProxy_CreateOrUpdate.json‎

Lines changed: 33 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,37 @@
66
"privateEndpointConnectionProxyId": "peexample01",
77
"api-version": "2020-03-01-preview",
88
"privateEndpointConnectionProxy": {
9-
"properties": {
9+
"remotePrivateEndpoint": {
10+
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.Network/privateEndpoints/{privateEndpointConnectionProxyId}",
11+
"manualPrivateLinkServiceConnections": [
12+
{
13+
"name": "{privateEndpointConnectionProxyId}",
14+
"groupIds": [
15+
"DeviceUpdate"
16+
],
17+
"requestMessage": "Please approve my connection, thanks."
18+
}
19+
],
20+
"privateLinkServiceProxies": [
21+
{
22+
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.Network/privateEndpoints/{privateEndpointConnectionProxyId}/privateLinkServiceProxies/{privateEndpointConnectionProxyId}",
23+
"groupConnectivityInformation": []
24+
}
25+
]
26+
}
27+
}
28+
},
29+
"responses": {
30+
"201": {
31+
"body": {
32+
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.DeviceUpdate/accounts/contoso/privateEndpointConnectionProxies/peexample01",
33+
"name": "peexample01",
34+
"type": "Microsoft.DeviceUpdate/accounts/privateEndpointConnectionProxies",
1035
"remotePrivateEndpoint": {
1136
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.Network/privateEndpoints/{privateEndpointConnectionProxyId}",
1237
"manualPrivateLinkServiceConnections": [
1338
{
14-
"name": "{privateEndpointConnectionProxyId}",
39+
"name": "{plsConnectionName}",
1540
"groupIds": [
1641
"DeviceUpdate"
1742
],
@@ -21,45 +46,16 @@
2146
"privateLinkServiceProxies": [
2247
{
2348
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.Network/privateEndpoints/{privateEndpointConnectionProxyId}/privateLinkServiceProxies/{privateEndpointConnectionProxyId}",
24-
"groupConnectivityInformation": []
49+
"groupConnectivityInformation": [
50+
{
51+
"groupId": "DeviceUpdate",
52+
"memberName": "adu"
53+
}
54+
]
2555
}
2656
]
2757
}
2858
}
2959
}
30-
},
31-
"responses": {
32-
"201": {
33-
"body": {
34-
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.DeviceUpdate/accounts/contoso/privateEndpointConnectionProxies/peexample01",
35-
"name": "peexample01",
36-
"type": "Microsoft.DeviceUpdate/accounts/privateEndpointConnectionProxies",
37-
"properties": {
38-
"remotePrivateEndpoint": {
39-
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.Network/privateEndpoints/{privateEndpointConnectionProxyId}",
40-
"manualPrivateLinkServiceConnections": [
41-
{
42-
"name": "{plsConnectionName}",
43-
"groupIds": [
44-
"DeviceUpdate"
45-
],
46-
"requestMessage": "Please approve my connection, thanks."
47-
}
48-
],
49-
"privateLinkServiceProxies": [
50-
{
51-
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.Network/privateEndpoints/{privateEndpointConnectionProxyId}/privateLinkServiceProxies/{privateEndpointConnectionProxyId}",
52-
"groupConnectivityInformation": [
53-
{
54-
"groupId": "DeviceUpdate",
55-
"memberName": "adu"
56-
}
57-
]
58-
}
59-
]
60-
}
61-
}
62-
}
63-
}
6460
}
6561
}

‎specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/PrivateEndpointConnectionProxies/PrivateEndpointConnectionProxy_Get.json‎

Lines changed: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -12,30 +12,28 @@
1212
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.DeviceUpdate/accounts/contoso/privateEndpointConnectionProxies/peexample01",
1313
"name": "peexample01",
1414
"type": "Microsoft.DeviceUpdate/accounts/privateEndpointConnectionProxies",
15-
"properties": {
16-
"remotePrivateEndpoint": {
17-
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.Network/privateEndpoints/{privateEndpointConnectionProxyId}",
18-
"manualPrivateLinkServiceConnections": [
19-
{
20-
"name": "{plsConnectionName}",
21-
"groupIds": [
22-
"DeviceUpdate"
23-
],
24-
"requestMessage": "Please approve my connection, thanks."
25-
}
26-
],
27-
"privateLinkServiceProxies": [
28-
{
29-
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.Network/privateEndpoints/{privateEndpointConnectionProxyId}/privateLinkServiceProxies/{privateEndpointConnectionProxyId}",
30-
"groupConnectivityInformation": [
31-
{
32-
"groupId": "DeviceUpdate",
33-
"memberName": "adu"
34-
}
35-
]
36-
}
37-
]
38-
}
15+
"remotePrivateEndpoint": {
16+
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.Network/privateEndpoints/{privateEndpointConnectionProxyId}",
17+
"manualPrivateLinkServiceConnections": [
18+
{
19+
"name": "{plsConnectionName}",
20+
"groupIds": [
21+
"DeviceUpdate"
22+
],
23+
"requestMessage": "Please approve my connection, thanks."
24+
}
25+
],
26+
"privateLinkServiceProxies": [
27+
{
28+
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.Network/privateEndpoints/{privateEndpointConnectionProxyId}/privateLinkServiceProxies/{privateEndpointConnectionProxyId}",
29+
"groupConnectivityInformation": [
30+
{
31+
"groupId": "DeviceUpdate",
32+
"memberName": "adu"
33+
}
34+
]
35+
}
36+
]
3937
}
4038
}
4139
}

‎specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/PrivateEndpointConnectionProxies/PrivateEndpointConnectionProxy_ListByAccount.json‎

Lines changed: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -13,30 +13,28 @@
1313
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.DeviceUpdate/accounts/contoso/privateEndpointConnectionProxies/peexample01",
1414
"name": "peexample01",
1515
"type": "Microsoft.DeviceUpdate/accounts/privateEndpointConnectionProxies",
16-
"properties": {
17-
"remotePrivateEndpoint": {
18-
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.Network/privateEndpoints/{privateEndpointConnectionProxyId}",
19-
"manualPrivateLinkServiceConnections": [
20-
{
21-
"name": "{plsConnectionName}",
22-
"groupIds": [
23-
"DeviceUpdate"
24-
],
25-
"requestMessage": "Please approve my connection, thanks."
26-
}
27-
],
28-
"privateLinkServiceProxies": [
29-
{
30-
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.Network/privateEndpoints/{privateEndpointConnectionProxyId}/privateLinkServiceProxies/{privateEndpointConnectionProxyId}",
31-
"groupConnectivityInformation": [
32-
{
33-
"groupId": "DeviceUpdate",
34-
"memberName": "adu"
35-
}
36-
]
37-
}
38-
]
39-
}
16+
"remotePrivateEndpoint": {
17+
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.Network/privateEndpoints/{privateEndpointConnectionProxyId}",
18+
"manualPrivateLinkServiceConnections": [
19+
{
20+
"name": "{plsConnectionName}",
21+
"groupIds": [
22+
"DeviceUpdate"
23+
],
24+
"requestMessage": "Please approve my connection, thanks."
25+
}
26+
],
27+
"privateLinkServiceProxies": [
28+
{
29+
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.Network/privateEndpoints/{privateEndpointConnectionProxyId}/privateLinkServiceProxies/{privateEndpointConnectionProxyId}",
30+
"groupConnectivityInformation": [
31+
{
32+
"groupId": "DeviceUpdate",
33+
"memberName": "adu"
34+
}
35+
]
36+
}
37+
]
4038
}
4139
}
4240
]

‎specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/PrivateEndpointConnectionProxies/PrivateEndpointConnectionProxy_Validate.json‎

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,23 @@
66
"privateEndpointConnectionProxyId": "peexample01",
77
"api-version": "2020-03-01-preview",
88
"privateEndpointConnectionProxy": {
9-
"properties": {
10-
"remotePrivateEndpoint": {
11-
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.Network/privateEndpoints/{privateEndpointConnectionProxyId}",
12-
"manualPrivateLinkServiceConnections": [
13-
{
14-
"name": "{privateEndpointConnectionProxyId}",
15-
"groupIds": [
16-
"DeviceUpdate"
17-
],
18-
"requestMessage": "Please approve my connection, thanks."
19-
}
20-
],
21-
"privateLinkServiceProxies": [
22-
{
23-
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.Network/privateEndpoints/{privateEndpointConnectionProxyId}/privateLinkServiceProxies/{privateEndpointConnectionProxyId}",
24-
"groupConnectivityInformation": []
25-
}
26-
]
27-
}
9+
"remotePrivateEndpoint": {
10+
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.Network/privateEndpoints/{privateEndpointConnectionProxyId}",
11+
"manualPrivateLinkServiceConnections": [
12+
{
13+
"name": "{privateEndpointConnectionProxyId}",
14+
"groupIds": [
15+
"DeviceUpdate"
16+
],
17+
"requestMessage": "Please approve my connection, thanks."
18+
}
19+
],
20+
"privateLinkServiceProxies": [
21+
{
22+
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.Network/privateEndpoints/{privateEndpointConnectionProxyId}/privateLinkServiceProxies/{privateEndpointConnectionProxyId}",
23+
"groupConnectivityInformation": []
24+
}
25+
]
2826
}
2927
}
3028
},

‎specification/deviceupdate/resource-manager/readme.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,10 @@ directive:
4747
where: $.definitions.Identity.properties.type
4848
from: deviceupdate.json
4949
reason: Managed Identity type can be case in-sensitive
50+
- suppress: BodyTopLevelProperties
51+
from: deviceupdate.json
52+
where: $.definitions.PrivateEndpointConnectionProxy
53+
reason: Internal NRP resource, all properties are top level properties
5054
```
5155

5256
---

0 commit comments

Comments
 (0)