Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Internal Network resource - all properties are top level (PrivateEndpointConnectionProxy) #16628

Merged
merged 9 commits into from
Nov 2, 2021
Merged

Internal Network resource - all properties are top level (PrivateEndpointConnectionProxy) #16628

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4007b67
Removed property bags from NRP proxy definition
darkoa-msft Nov 1, 2021
114f4b1
Merge branch 'Azure:main' into main
darkoa-msft Nov 1, 2021
b4f5390
Added top level suppression
darkoa-msft Nov 1, 2021
9e48748
Merge branch 'main' of https://github.com/darkoa-msft/azure-rest-api-…
darkoa-msft Nov 1, 2021
fbf9e91
Added provisioning state because of RPaaS validation
darkoa-msft Nov 1, 2021
3c8facf
Another try at supressions
darkoa-msft Nov 1, 2021
d5f1827
square #1
darkoa-msft Nov 1, 2021
cc0f392
square #0
darkoa-msft Nov 1, 2021
c43e5cc
another try
darkoa-msft Nov 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 3 additions & 9 deletions ...date/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/deviceupdate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.",
Expand Down
70 changes: 33 additions & 37 deletions ...mples/PrivateEndpointConnectionProxies/PrivateEndpointConnectionProxy_CreateOrUpdate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
],
Expand All @@ -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"
}
]
}
]
}
}
}
}
}
}
46 changes: 22 additions & 24 deletions ...preview/examples/PrivateEndpointConnectionProxies/PrivateEndpointConnectionProxy_Get.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
]
}
]
}
}
}
Expand Down
46 changes: 22 additions & 24 deletions ...amples/PrivateEndpointConnectionProxies/PrivateEndpointConnectionProxy_ListByAccount.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
]
}
]
}
}
]
Expand Down
36 changes: 17 additions & 19 deletions ...ew/examples/PrivateEndpointConnectionProxies/PrivateEndpointConnectionProxy_Validate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": []
}
]
}
}
},
Expand Down
4 changes: 4 additions & 0 deletions specification/deviceupdate/resource-manager/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
```

---
Expand Down