Skip to content

Commit cb2676d

Browse files
annoakesannoakes
authored
Purview update public network access and patch API (#12511)
* Purview update network acls and patch API * Update prettier
1 parent c12de2a commit cb2676d

File tree

7 files changed

+77
-53
lines changed

7 files changed

+77
-53
lines changed

‎specification/purview/resource-manager/Microsoft.Purview/preview/2020-12-01-preview/examples/Accounts_CreateOrUpdate.json‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,7 @@
3737
"scan": "https://account1.scan.purview.azure-test.com",
3838
"guardian": "https://account1.guardian.purview.azure-test.com"
3939
},
40-
"networkAcls": {
41-
"defaultAction": "Allow"
42-
}
40+
"publicNetworkAccess": "Enabled"
4341
}
4442
}
4543
},
@@ -67,9 +65,7 @@
6765
"scan": "https://account1.scan.purview.azure-test.com",
6866
"guardian": "https://account1.guardian.purview.azure-test.com"
6967
},
70-
"networkAcls": {
71-
"defaultAction": "Allow"
72-
},
68+
"publicNetworkAccess": "Enabled",
7369
"managedResources": {
7470
"resourceGroup": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/managed-rg-mwjotkl",
7571
"storageAccount": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/managed-rg-mwjotkl/providers/Microsoft.Storage/storageAccounts/scanwestustzaagzr",

‎specification/purview/resource-manager/Microsoft.Purview/preview/2020-12-01-preview/examples/Accounts_Delete.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"x-ms-ratelimit-remaining-tenant-reads": "14999",
2424
"x-ms-correlation-request-id": "25c78f97-0b0a-4fe9-ad39-883a482265cd",
2525
"x-ms-long-running-operation": true,
26-
"Azure-AsyncOperation": "https://management.azure.com/subscriptions34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/SampleResourceGroup/providers/Microsoft.Purview/accounts/account1/operationResults/dad6baec-3a39-41df-a469-843a9ee94213?api-version=2019-10-01-preview"
26+
"Azure-AsyncOperation": "https://management.azure.com/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/SampleResourceGroup/providers/Microsoft.Purview/accounts/account1/operationResults/dad6baec-3a39-41df-a469-843a9ee94213?api-version=2019-10-01-preview"
2727
}
2828
},
2929
"204": {

‎specification/purview/resource-manager/Microsoft.Purview/preview/2020-12-01-preview/examples/Accounts_Get.json‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,7 @@
5252
"type": "Microsoft.Purview/accounts/privateEndpointConnections"
5353
}
5454
],
55-
"networkAcls": {
56-
"defaultAction": "Allow"
57-
},
55+
"publicNetworkAccess": "Enabled",
5856
"managedResources": {
5957
"resourceGroup": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/managed-rg-mwjotkl",
6058
"storageAccount": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/managed-rg-mwjotkl/providers/Microsoft.Storage/storageAccounts/scanwestustzaagzr",

‎specification/purview/resource-manager/Microsoft.Purview/preview/2020-12-01-preview/examples/Accounts_ListByResourceGroup.json‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,7 @@
3535
"scan": "https://account1.scan.purview.azure-test.com",
3636
"guardian": "https://account1.guardian.purview.azure-test.com"
3737
},
38-
"networkAcls": {
39-
"defaultAction": "Allow"
40-
}
38+
"publicNetworkAccess": "Enabled"
4139
}
4240
},
4341
{
@@ -60,9 +58,7 @@
6058
"scan": "https://account2.scan.purview.azure-test.com",
6159
"guardian": "https://account1.guardian.purview.azure-test.com"
6260
},
63-
"networkAcls": {
64-
"defaultAction": "Allow"
65-
}
61+
"publicNetworkAccess": "Enabled"
6662
}
6763
}
6864
]

‎specification/purview/resource-manager/Microsoft.Purview/preview/2020-12-01-preview/examples/Accounts_ListBySubscription.json‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,7 @@
3434
"scan": "https://account1.scan.purview.azure-test.com",
3535
"guardian": "https://account1.guardian.purview.azure-test.com"
3636
},
37-
"networkAcls": {
38-
"defaultAction": "Allow"
39-
}
37+
"publicNetworkAccess": "Enabled"
4038
}
4139
},
4240
{
@@ -59,9 +57,7 @@
5957
"scan": "https://account2.scan.purview.azure-test.com",
6058
"guardian": "https://account1.guardian.purview.azure-test.com"
6159
},
62-
"networkAcls": {
63-
"defaultAction": "Allow"
64-
}
60+
"publicNetworkAccess": "Enabled"
6561
}
6662
}
6763
]

‎specification/purview/resource-manager/Microsoft.Purview/preview/2020-12-01-preview/examples/Accounts_Update.json‎

Lines changed: 42 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,49 @@
3939
"scan": "https://account2.scan.purview.azure-test.com",
4040
"guardian": "https://account1.guardian.purview.azure-test.com"
4141
},
42-
"networkAcls": {
43-
"defaultAction": "Allow"
42+
"publicNetworkAccess": "Enabled",
43+
"managedResources": {
44+
"resourceGroup": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/managed-rg-mwjotkl",
45+
"storageAccount": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/managed-rg-mwjotkl/providers/Microsoft.Storage/storageAccounts/scanwestustzaagzr",
46+
"eventHubNamespace": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/managed-rg-mwjotkl/providers/Microsoft.EventHub/namespaces/atlas-westusdddnbtp"
47+
}
48+
},
49+
"tags": {
50+
"newTag": "New tag value."
51+
}
52+
}
53+
},
54+
"202": {
55+
"headers": {
56+
"Date": "Wed, 13 Sep 2017 18:04:32 GMT",
57+
"x-ms-request-id": "d5496da4-9c52-402f-b067-83cc9ddea888",
58+
"X-Content-Type-Options": "nosniff",
59+
"x-ms-ratelimit-remaining-tenant-reads": "14999",
60+
"x-ms-correlation-request-id": "25c78f97-0b0a-4fe9-ad39-883a482265cd",
61+
"x-ms-long-running-operation": true,
62+
"Azure-AsyncOperation": "https://management.azure.com/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/SampleResourceGroup/providers/Microsoft.Purview/accounts/account1/operationResults/dad6baec-3a39-41df-a469-843a9ee94213?api-version=2020-12-01-preview"
63+
},
64+
"body": {
65+
"location": "West US 2",
66+
"id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/SampleResourceGroup/providers/Microsoft.Purview/accounts/account1",
67+
"name": "account1",
68+
"type": "Microsoft.Purview/accounts",
69+
"sku": {
70+
"name": "Standard",
71+
"capacity": 4
72+
},
73+
"properties": {
74+
"friendlyName": "friendly-account1",
75+
"createdBy": "client-name",
76+
"createdByObjectId": "client-objectId",
77+
"createdAt": "2019-11-22T18:39:58.6929344Z",
78+
"provisioningState": "Succeeded",
79+
"endpoints": {
80+
"catalog": "https://account2.catalog.purview.azure-test.com",
81+
"scan": "https://account2.scan.purview.azure-test.com",
82+
"guardian": "https://account1.guardian.purview.azure-test.com"
4483
},
84+
"publicNetworkAccess": "Enabled",
4585
"managedResources": {
4686
"resourceGroup": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/managed-rg-mwjotkl",
4787
"storageAccount": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/managed-rg-mwjotkl/providers/Microsoft.Storage/storageAccounts/scanwestustzaagzr",

‎specification/purview/resource-manager/Microsoft.Purview/preview/2020-12-01-preview/purview.json‎

Lines changed: 27 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -294,13 +294,20 @@
294294
"$ref": "#/definitions/Account"
295295
}
296296
},
297+
"202": {
298+
"description": "Accepted",
299+
"schema": {
300+
"$ref": "#/definitions/Account"
301+
}
302+
},
297303
"default": {
298304
"description": "An error response received from the provider.",
299305
"schema": {
300306
"$ref": "#/definitions/ErrorResponseModel"
301307
}
302308
}
303309
},
310+
"x-ms-long-running-operation": true,
304311
"x-ms-examples": {
305312
"Accounts_Update": {
306313
"$ref": "./examples/Accounts_Update.json"
@@ -1036,10 +1043,6 @@
10361043
],
10371044
"readOnly": true
10381045
},
1039-
"networkAcls": {
1040-
"$ref": "#/definitions/NetworkAcls",
1041-
"description": "Get the network ACLs."
1042-
},
10431046
"privateEndpointConnections": {
10441047
"description": "Gets the private endpoint connections information.",
10451048
"uniqueItems": false,
@@ -1067,6 +1070,19 @@
10671070
"name": "provisioningState",
10681071
"modelAsString": true
10691072
}
1073+
},
1074+
"publicNetworkAccess": {
1075+
"description": "Gets or sets the public network access.",
1076+
"enum": [
1077+
"NotSpecified",
1078+
"Enabled",
1079+
"Disabled"
1080+
],
1081+
"type": "string",
1082+
"x-ms-enum": {
1083+
"name": "publicNetworkAccess",
1084+
"modelAsString": true
1085+
}
10701086
}
10711087
}
10721088
},
@@ -1166,24 +1182,6 @@
11661182
}
11671183
}
11681184
},
1169-
"NetworkAcls": {
1170-
"description": "The Network ACLs",
1171-
"type": "object",
1172-
"properties": {
1173-
"defaultAction": {
1174-
"description": "Gets or sets the default behavior of network ACLs.",
1175-
"enum": [
1176-
"Allow",
1177-
"Deny"
1178-
],
1179-
"type": "string",
1180-
"x-ms-enum": {
1181-
"name": "defaultAction",
1182-
"modelAsString": true
1183-
}
1184-
}
1185-
}
1186-
},
11871185
"PrivateEndpointConnectionProperties": {
11881186
"description": "A private endpoint connection properties class.",
11891187
"type": "object",
@@ -1853,6 +1851,13 @@
18531851
}
18541852
},
18551853
"parameters": {
1854+
"api-version": {
1855+
"name": "api-version",
1856+
"in": "query",
1857+
"description": "The api version to use.",
1858+
"required": true,
1859+
"type": "string"
1860+
},
18561861
"subscriptionId": {
18571862
"name": "subscriptionId",
18581863
"in": "path",
@@ -1868,13 +1873,6 @@
18681873
"type": "string",
18691874
"x-ms-parameter-location": "method"
18701875
},
1871-
"api-version": {
1872-
"name": "api-version",
1873-
"in": "query",
1874-
"description": "The api version to use.",
1875-
"required": true,
1876-
"type": "string"
1877-
},
18781876
"accountName": {
18791877
"name": "accountName",
18801878
"in": "path",

0 commit comments

Comments
 (0)