Skip to content

Commit da3e8f8

Browse files
darkoa-msftLeiwang3SQL
authored andcommitted
[Microsoft.DeviceUpdate] Private Link - Added Network RP required properties (Azure#17042)
* Added group IDs array to PrivateEndpointConnection in v4 common type * Added private endpoint connections to the top level resource * Updated examples * Added types.json to commopn-types/v4 * Moved new version of privatelinks.json into our directory * Wrong level * Added period to the end of description for consistency * Updated version in privatelinks.json * Removed duplicate resource from privatelinks.json * Made PrivateEndpointConnection.properties required, added PEC payload to examples * Added Operations List example * Referenced Operations example file from the swagger * Reduce number of operations in the Operations_List example * Fixed Operations List example * Removed PrivateEnpointConnection from Account update example
1 parent 8512daa commit da3e8f8

File tree

10 files changed

+337
-18
lines changed

10 files changed

+337
-18
lines changed

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

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -675,7 +675,7 @@
675675
"200": {
676676
"description": "The request was successful; the request was well-formed and received properly.",
677677
"schema": {
678-
"$ref": "../../../../../common-types/resource-management/v3/privatelinks.json#/definitions/PrivateEndpointConnectionListResult"
678+
"$ref": "./privatelinks.json#/definitions/PrivateEndpointConnectionListResult"
679679
}
680680
},
681681
"default": {
@@ -716,14 +716,14 @@
716716
"$ref": "#/parameters/AccountNameParameter"
717717
},
718718
{
719-
"$ref": "../../../../../common-types/resource-management/v3/privatelinks.json#/parameters/PrivateEndpointConnectionName"
719+
"$ref": "./privatelinks.json#/parameters/PrivateEndpointConnectionName"
720720
}
721721
],
722722
"responses": {
723723
"200": {
724724
"description": "The request was successful; the request was well-formed and received properly.",
725725
"schema": {
726-
"$ref": "../../../../../common-types/resource-management/v3/privatelinks.json#/definitions/PrivateEndpointConnection"
726+
"$ref": "./privatelinks.json#/definitions/PrivateEndpointConnection"
727727
}
728728
},
729729
"default": {
@@ -759,23 +759,23 @@
759759
"$ref": "#/parameters/AccountNameParameter"
760760
},
761761
{
762-
"$ref": "../../../../../common-types/resource-management/v3/privatelinks.json#/parameters/PrivateEndpointConnectionName"
762+
"$ref": "./privatelinks.json#/parameters/PrivateEndpointConnectionName"
763763
},
764764
{
765765
"name": "privateEndpointConnection",
766766
"in": "body",
767767
"description": "The parameters for creating a private endpoint connection.",
768768
"required": true,
769769
"schema": {
770-
"$ref": "../../../../../common-types/resource-management/v3/privatelinks.json#/definitions/PrivateEndpointConnection"
770+
"$ref": "./privatelinks.json#/definitions/PrivateEndpointConnection"
771771
}
772772
}
773773
],
774774
"responses": {
775775
"201": {
776776
"description": "The request was successful; the operation will complete asynchronously.",
777777
"schema": {
778-
"$ref": "../../../../../common-types/resource-management/v3/privatelinks.json#/definitions/PrivateEndpointConnection"
778+
"$ref": "./privatelinks.json#/definitions/PrivateEndpointConnection"
779779
}
780780
},
781781
"default": {
@@ -815,7 +815,7 @@
815815
"$ref": "#/parameters/AccountNameParameter"
816816
},
817817
{
818-
"$ref": "../../../../../common-types/resource-management/v3/privatelinks.json#/parameters/PrivateEndpointConnectionName"
818+
"$ref": "./privatelinks.json#/parameters/PrivateEndpointConnectionName"
819819
}
820820
],
821821
"responses": {
@@ -1207,6 +1207,11 @@
12071207
"deprecated": false,
12081208
"x-ms-pageable": {
12091209
"nextLinkName": "nextLink"
1210+
},
1211+
"x-ms-examples": {
1212+
"Gets list of Operations": {
1213+
"$ref": "./examples/Operations_List.json"
1214+
}
12101215
}
12111216
}
12121217
}
@@ -1249,7 +1254,7 @@
12491254
"readOnly": true
12501255
},
12511256
"publicNetworkAccess": {
1252-
"description": "Whether or not public network access is allowed for the container registry.",
1257+
"description": "Whether or not public network access is allowed for the account.",
12531258
"default": "Enabled",
12541259
"enum": [
12551260
"Enabled",
@@ -1260,6 +1265,13 @@
12601265
"name": "PublicNetworkAccess",
12611266
"modelAsString": true
12621267
}
1268+
},
1269+
"privateEndpointConnections": {
1270+
"description": "List of private endpoint connections associated with the account.",
1271+
"type": "array",
1272+
"items": {
1273+
"$ref": "./privatelinks.json#/definitions/PrivateEndpointConnection"
1274+
}
12631275
}
12641276
}
12651277
},
@@ -1489,7 +1501,7 @@
14891501
"type": "object",
14901502
"allOf": [
14911503
{
1492-
"$ref": "../../../../../common-types/resource-management/v3/privatelinks.json#/definitions/PrivateLinkResourceProperties"
1504+
"$ref": "./privatelinks.json#/definitions/PrivateLinkResourceProperties"
14931505
}
14941506
],
14951507
"properties": {
@@ -1636,7 +1648,7 @@
16361648
},
16371649
"remotePrivateLinkServiceConnectionState": {
16381650
"description": "Remote private link service connection state",
1639-
"$ref": "../../../../../common-types/resource-management/v3/privatelinks.json#/definitions/PrivateLinkServiceConnectionState"
1651+
"$ref": "./privatelinks.json#/definitions/PrivateLinkServiceConnectionState"
16401652
},
16411653
"remotePrivateEndpointConnection": {
16421654
"description": "Remote private endpoint connection details.",

specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/Accounts/Accounts_Create.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818
"type": "Microsoft.DeviceUpdate/accounts",
1919
"properties": {
2020
"provisioningState": "Accepted",
21-
"hostName": "contoso.api.adu.microsoft.com"
21+
"hostName": "contoso.api.adu.microsoft.com",
22+
"privateEndpointConnections": []
2223
}
2324
}
2425
}

specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/Accounts/Accounts_Get.json

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,28 @@
1414
"type": "Microsoft.DeviceUpdate/accounts",
1515
"properties": {
1616
"provisioningState": "Succeeded",
17-
"hostName": "contoso.api.adu.microsoft.com"
17+
"hostName": "contoso.api.adu.microsoft.com",
18+
"privateEndpointConnections": [
19+
{
20+
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.DeviceUpdate/accounts/contoso/privateEndpointConnections/peexample01",
21+
"name": "peexample01",
22+
"type": "Microsoft.DeviceUpdate/accounts/privateEndpointConnections",
23+
"properties": {
24+
"provisioningState": "Succeeded",
25+
"privateEndpoint": {
26+
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.Network/privateEndpoints/peexample01"
27+
},
28+
"privateLinkServiceConnectionState": {
29+
"status": "Approved",
30+
"description": "Auto-Approved",
31+
"actionsRequired": "None"
32+
},
33+
"groupIds": [
34+
"groupId"
35+
]
36+
}
37+
}
38+
]
1839
}
1940
}
2041
}

specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/Accounts/Accounts_List.json

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,28 @@
1616
"type": "Microsoft.DeviceUpdate/accounts",
1717
"properties": {
1818
"provisioningState": "Succeeded",
19-
"hostName": "contoso.api.adu.microsoft.com"
19+
"hostName": "contoso.api.adu.microsoft.com",
20+
"privateEndpointConnections": [
21+
{
22+
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.DeviceUpdate/accounts/contoso/privateEndpointConnections/peexample01",
23+
"name": "peexample01",
24+
"type": "Microsoft.DeviceUpdate/accounts/privateEndpointConnections",
25+
"properties": {
26+
"provisioningState": "Succeeded",
27+
"privateEndpoint": {
28+
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.Network/privateEndpoints/peexample01"
29+
},
30+
"privateLinkServiceConnectionState": {
31+
"status": "Approved",
32+
"description": "Auto-Approved",
33+
"actionsRequired": "None"
34+
},
35+
"groupIds": [
36+
"groupId"
37+
]
38+
}
39+
}
40+
]
2041
}
2142
}
2243
]

specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/Accounts/Accounts_Update.json

Lines changed: 44 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,28 @@
1919
"type": "Microsoft.DeviceUpdate/accounts",
2020
"properties": {
2121
"provisioningState": "Succeeded",
22-
"hostName": "contoso.api.adu.microsoft.com"
22+
"hostName": "contoso.api.adu.microsoft.com",
23+
"privateEndpointConnections": [
24+
{
25+
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.DeviceUpdate/accounts/contoso/privateEndpointConnections/peexample01",
26+
"name": "peexample01",
27+
"type": "Microsoft.DeviceUpdate/accounts/privateEndpointConnections",
28+
"properties": {
29+
"provisioningState": "Succeeded",
30+
"privateEndpoint": {
31+
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.Network/privateEndpoints/peexample01"
32+
},
33+
"privateLinkServiceConnectionState": {
34+
"status": "Approved",
35+
"description": "Auto-Approved",
36+
"actionsRequired": "None"
37+
},
38+
"groupIds": [
39+
"groupId"
40+
]
41+
}
42+
}
43+
]
2344
},
2445
"tags": {
2546
"tagKey": "tagValue"
@@ -39,7 +60,28 @@
3960
},
4061
"properties": {
4162
"provisioningState": "Created",
42-
"hostName": "contoso.api.adu.microsoft.com"
63+
"hostName": "contoso.api.adu.microsoft.com",
64+
"privateEndpointConnections": [
65+
{
66+
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.DeviceUpdate/accounts/contoso/privateEndpointConnections/peexample01",
67+
"name": "peexample01",
68+
"type": "Microsoft.DeviceUpdate/accounts/privateEndpointConnections",
69+
"properties": {
70+
"provisioningState": "Succeeded",
71+
"privateEndpoint": {
72+
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg/providers/Microsoft.Network/privateEndpoints/peexample01"
73+
},
74+
"privateLinkServiceConnectionState": {
75+
"status": "Approved",
76+
"description": "Auto-Approved",
77+
"actionsRequired": "None"
78+
},
79+
"groupIds": [
80+
"groupId"
81+
]
82+
}
83+
}
84+
]
4385
},
4486
"tags": {
4587
"tagKey": "tagValue"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
{
2+
"parameters": {
3+
"api-version": "2020-03-01-preview"
4+
},
5+
"responses": {
6+
"200": {
7+
"body": {
8+
"nextLink": "string",
9+
"value": [
10+
{
11+
"name": "Microsoft.DeviceUpdate/accounts/read",
12+
"isDataAction": false,
13+
"display": {
14+
"provider": "Microsoft.DeviceUpdate",
15+
"resource": "Device Update Account",
16+
"operation": "Get/List Accounts",
17+
"description": "Returns the list of Device Update Accounts"
18+
}
19+
},
20+
{
21+
"name": "Microsoft.DeviceUpdate/accounts/write",
22+
"isDataAction": false,
23+
"display": {
24+
"provider": "Microsoft.DeviceUpdate",
25+
"resource": "Device Update Account",
26+
"operation": "Create/Update Account",
27+
"description": "Creates or updates a Device Update Account"
28+
}
29+
}
30+
]
31+
}
32+
}
33+
}
34+
}

specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/PrivateEndpointConnections/PrivateEndpointConnection_CreateOrUpdate.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,10 @@
2929
"status": "Approved",
3030
"description": "Auto-Approved",
3131
"actionsRequired": "None"
32-
}
32+
},
33+
"groupIds": [
34+
"groupId"
35+
]
3336
}
3437
}
3538
}

specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/PrivateEndpointConnections/PrivateEndpointConnection_Get.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,10 @@
2121
"status": "Approved",
2222
"description": "Auto-Approved",
2323
"actionsRequired": "None"
24-
}
24+
},
25+
"groupIds": [
26+
"groupId"
27+
]
2528
}
2629
}
2730
}

specification/deviceupdate/resource-manager/Microsoft.DeviceUpdate/preview/2020-03-01-preview/examples/PrivateEndpointConnections/PrivateEndpointConnection_ListByAccount.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,10 @@
2222
"status": "Approved",
2323
"description": "Auto-Approved",
2424
"actionsRequired": "None"
25-
}
25+
},
26+
"groupIds": [
27+
"groupId"
28+
]
2629
}
2730
}
2831
]

0 commit comments

Comments
 (0)