Skip to content

Commit ebe90b1

Browse files
shaileshsk94Shailesh Kelkar
shaileshsk94
and
Shailesh Kelkar
authored
Revert "Revert "Added GA API version (2021-07-01) (#14937)" (#15129)" (#15245)
This reverts commit 654c237. Co-authored-by: Shailesh Kelkar <[email protected]>
1 parent 259766b commit ebe90b1

23 files changed

+2996
-18
lines changed

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

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -725,6 +725,7 @@
725725
}
726726
}
727727
},
728+
"x-ms-long-running-operation": true,
728729
"x-ms-examples": {
729730
"PrivateEndpointConnections_CreateOrUpdate": {
730731
"$ref": "./examples/PrivateEndpointConnections_CreateOrUpdate.json"
@@ -1070,7 +1071,8 @@
10701071
"SoftDeleting",
10711072
"SoftDeleted",
10721073
"Failed",
1073-
"Succeeded"
1074+
"Succeeded",
1075+
"Canceled"
10741076
],
10751077
"type": "string",
10761078
"readOnly": true,
@@ -1846,21 +1848,6 @@
18461848
}
18471849
},
18481850
"parameters": {
1849-
"resourceGroupName": {
1850-
"name": "resourceGroupName",
1851-
"in": "path",
1852-
"description": "The resource group name.",
1853-
"required": true,
1854-
"type": "string",
1855-
"x-ms-parameter-location": "method"
1856-
},
1857-
"subscriptionId": {
1858-
"name": "subscriptionId",
1859-
"in": "path",
1860-
"description": "The subscription identifier",
1861-
"required": true,
1862-
"type": "string"
1863-
},
18641851
"api-version": {
18651852
"name": "api-version",
18661853
"in": "query",
@@ -1875,6 +1862,21 @@
18751862
"required": true,
18761863
"type": "string",
18771864
"x-ms-parameter-location": "method"
1865+
},
1866+
"resourceGroupName": {
1867+
"name": "resourceGroupName",
1868+
"in": "path",
1869+
"description": "The resource group name.",
1870+
"required": true,
1871+
"type": "string",
1872+
"x-ms-parameter-location": "method"
1873+
},
1874+
"subscriptionId": {
1875+
"name": "subscriptionId",
1876+
"in": "path",
1877+
"description": "The subscription identifier",
1878+
"required": true,
1879+
"type": "string"
18781880
}
18791881
},
18801882
"securityDefinitions": {

‎specification/purview/resource-manager/Microsoft.Purview/stable/2021-07-01/examples/Accounts_AddRootCollectionAdmin.json

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345",
4+
"resourceGroupName": "SampleResourceGroup",
5+
"accountName": "account1",
6+
"api-version": "2021-07-01",
7+
"collectionAdminUpdate": {
8+
"objectId": "7e8de0e7-2bfc-4e1f-9659-2a5785e4356f"
9+
}
10+
},
11+
"responses": {
12+
"200": {
13+
"headers": {
14+
"Date": "Wed, 13 Sep 2017 18:04:32 GMT",
15+
"x-ms-request-id": "d5496da4-9c52-402f-b067-83cc9ddea888",
16+
"X-Content-Type-Options": "nosniff",
17+
"x-ms-ratelimit-remaining-tenant-reads": "14999",
18+
"x-ms-correlation-request-id": "25c78f97-0b0a-4fe9-ad39-883a482265cd"
19+
}
20+
}
21+
}
22+
}

‎specification/purview/resource-manager/Microsoft.Purview/stable/2021-07-01/examples/Accounts_CheckNameAvailability.json

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
{
2+
"parameters": {
3+
"checkNameAvailabilityRequest": {
4+
"name": "account1",
5+
"type": "Microsoft.Purview/accounts"
6+
},
7+
"api-version": "2021-07-01",
8+
"subscriptionId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345"
9+
},
10+
"responses": {
11+
"200": {
12+
"headers": {
13+
"Date": "Wed, 13 Sep 2017 18:04:32 GMT",
14+
"x-ms-request-id": "d5496da4-9c52-402f-b067-83cc9ddea888",
15+
"X-Content-Type-Options": "nosniff",
16+
"x-ms-ratelimit-remaining-tenant-reads": "14999",
17+
"x-ms-correlation-request-id": "25c78f97-0b0a-4fe9-ad39-883a482265cd"
18+
},
19+
"body": {
20+
"nameAvailable": true
21+
}
22+
}
23+
}
24+
}

‎specification/purview/resource-manager/Microsoft.Purview/stable/2021-07-01/examples/Accounts_CreateOrUpdate.json

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345",
4+
"resourceGroupName": "SampleResourceGroup",
5+
"accountName": "account1",
6+
"api-version": "2021-07-01",
7+
"account": {
8+
"location": "West US 2",
9+
"sku": {
10+
"name": "Standard",
11+
"capacity": 4
12+
},
13+
"properties": {
14+
"managedResourceGroupName": "custom-rgname"
15+
}
16+
}
17+
},
18+
"responses": {
19+
"201": {
20+
"headers": {
21+
"Date": "Wed, 13 Sep 2017 18:04:32 GMT",
22+
"x-ms-request-id": "d5496da4-9c52-402f-b067-83cc9ddea888",
23+
"X-Content-Type-Options": "nosniff",
24+
"x-ms-ratelimit-remaining-tenant-reads": "14999",
25+
"x-ms-correlation-request-id": "25c78f97-0b0a-4fe9-ad39-883a482265cd"
26+
},
27+
"body": {
28+
"location": "West US 2",
29+
"id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/SampleResourceGroup/providers/Microsoft.Purview/accounts/account1",
30+
"name": "account1",
31+
"type": "Microsoft.Purview/accounts",
32+
"properties": {
33+
"friendlyName": "friendly-account1",
34+
"createdBy": "client-name",
35+
"createdByObjectId": "client-objectId",
36+
"createdAt": "2019-11-22T18:39:58.6929344Z",
37+
"provisioningState": "Creating",
38+
"endpoints": {
39+
"catalog": "https://account1.catalog.purview.azure-test.com",
40+
"scan": "https://account1.scan.purview.azure-test.com",
41+
"guardian": "https://account1.guardian.purview.azure-test.com"
42+
},
43+
"publicNetworkAccess": "Enabled"
44+
}
45+
}
46+
},
47+
"200": {
48+
"headers": {
49+
"Date": "Wed, 13 Sep 2017 18:04:32 GMT",
50+
"x-ms-request-id": "d5496da4-9c52-402f-b067-83cc9ddea888",
51+
"X-Content-Type-Options": "nosniff",
52+
"x-ms-ratelimit-remaining-tenant-reads": "14999",
53+
"x-ms-correlation-request-id": "25c78f97-0b0a-4fe9-ad39-883a482265cd"
54+
},
55+
"body": {
56+
"location": "West US 2",
57+
"id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/SampleResourceGroup/providers/Microsoft.Purview/accounts/account1",
58+
"name": "account1",
59+
"type": "Microsoft.Purview/accounts",
60+
"systemData": {
61+
"createdBy": "client-name",
62+
"createdByType": "User",
63+
"createdAt": "2019-11-22T18:39:58.6929344Z",
64+
"lastModifiedBy": "client-name",
65+
"lastModifiedByType": "User",
66+
"lastModifiedAt": "2021-03-16T23:24:34.3430059Z"
67+
},
68+
"properties": {
69+
"friendlyName": "friendly-account1",
70+
"createdBy": "client-name",
71+
"createdByObjectId": "client-objectId",
72+
"createdAt": "2019-11-22T18:39:58.6929344Z",
73+
"provisioningState": "Succeeded",
74+
"endpoints": {
75+
"catalog": "https://account1.catalog.purview.azure-test.com",
76+
"scan": "https://account1.scan.purview.azure-test.com",
77+
"guardian": "https://account1.guardian.purview.azure-test.com"
78+
},
79+
"publicNetworkAccess": "Enabled",
80+
"managedResourceGroupName": "custom-rgname",
81+
"managedResources": {
82+
"resourceGroup": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/custom-rgname",
83+
"storageAccount": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/custom-rgname/providers/Microsoft.Storage/storageAccounts/scanwestustzaagzr",
84+
"eventHubNamespace": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/custom-rgname/providers/Microsoft.EventHub/namespaces/atlas-westusdddnbtp"
85+
}
86+
}
87+
}
88+
}
89+
}
90+
}

‎specification/purview/resource-manager/Microsoft.Purview/stable/2021-07-01/examples/Accounts_Delete.json

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345",
4+
"resourceGroupName": "SampleResourceGroup",
5+
"accountName": "account1",
6+
"api-version": "2021-07-01"
7+
},
8+
"responses": {
9+
"200": {
10+
"headers": {
11+
"Date": "Wed, 13 Sep 2017 18:04:32 GMT",
12+
"x-ms-request-id": "d5496da4-9c52-402f-b067-83cc9ddea888",
13+
"X-Content-Type-Options": "nosniff",
14+
"x-ms-ratelimit-remaining-tenant-reads": "14999",
15+
"x-ms-correlation-request-id": "25c78f97-0b0a-4fe9-ad39-883a482265cd"
16+
}
17+
},
18+
"202": {
19+
"headers": {
20+
"Date": "Wed, 13 Sep 2017 18:04:32 GMT",
21+
"x-ms-request-id": "d5496da4-9c52-402f-b067-83cc9ddea888",
22+
"X-Content-Type-Options": "nosniff",
23+
"x-ms-ratelimit-remaining-tenant-reads": "14999",
24+
"x-ms-correlation-request-id": "25c78f97-0b0a-4fe9-ad39-883a482265cd",
25+
"x-ms-long-running-operation": true,
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=2021-07-01"
27+
}
28+
},
29+
"204": {
30+
"headers": {
31+
"Date": "Wed, 13 Sep 2017 18:04:32 GMT",
32+
"x-ms-request-id": "d5496da4-9c52-402f-b067-83cc9ddea888",
33+
"X-Content-Type-Options": "nosniff",
34+
"x-ms-ratelimit-remaining-tenant-reads": "14999",
35+
"x-ms-correlation-request-id": "25c78f97-0b0a-4fe9-ad39-883a482265cd"
36+
}
37+
}
38+
}
39+
}

‎specification/purview/resource-manager/Microsoft.Purview/stable/2021-07-01/examples/Accounts_Get.json

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "12345678-1234-1234-12345678abc",
4+
"resourceGroupName": "SampleResourceGroup",
5+
"accountName": "account1",
6+
"api-version": "2021-07-01"
7+
},
8+
"responses": {
9+
"200": {
10+
"headers": {
11+
"Date": "Wed, 13 Sep 2017 18:04:32 GMT",
12+
"x-ms-request-id": "d5496da4-9c52-402f-b067-83cc9ddea888",
13+
"X-Content-Type-Options": "nosniff",
14+
"x-ms-ratelimit-remaining-tenant-reads": "14999",
15+
"x-ms-correlation-request-id": "25c78f97-0b0a-4fe9-ad39-883a482265cd"
16+
},
17+
"body": {
18+
"location": "West US 2",
19+
"id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/SampleResourceGroup/providers/Microsoft.Purview/accounts/account1",
20+
"name": "account1",
21+
"type": "Microsoft.Purview/accounts",
22+
"sku": {
23+
"name": "Standard",
24+
"capacity": 4
25+
},
26+
"systemData": {
27+
"createdBy": "client-name",
28+
"createdByType": "User",
29+
"createdAt": "2019-11-22T18:39:58.6929344Z",
30+
"lastModifiedBy": "client-name",
31+
"lastModifiedByType": "User",
32+
"lastModifiedAt": "2021-03-16T23:24:34.3430059Z"
33+
},
34+
"properties": {
35+
"friendlyName": "friendly-account1",
36+
"createdBy": "client-name",
37+
"createdByObjectId": "client-objectId",
38+
"createdAt": "2019-11-22T18:39:58.6929344Z",
39+
"provisioningState": "Succeeded",
40+
"endpoints": {
41+
"catalog": "https://account1.catalog.purview.azure-test.com",
42+
"scan": "https://account1.scan.purview.azure-test.com",
43+
"guardian": "https://account1.guardian.purview.azure-test.com"
44+
},
45+
"privateEndpointConnections": [
46+
{
47+
"properties": {
48+
"provisioningState": "Succeeded",
49+
"privateEndpoint": {
50+
"id": "/subscriptions/baca8a88-4527-4c35-a13e-b2775ce0d7fc/resourceGroups/nrpResourceGroupName/providers/Microsoft.Network/privateEndpoints/peName"
51+
},
52+
"privateLinkServiceConnectionState": {
53+
"status": "Pending",
54+
"description": "Please approve my connection, thanks.",
55+
"actionsRequired": "None"
56+
}
57+
},
58+
"id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/SampleResourceGroup/providers/Microsoft.Purview/accounts/account1/privateEndpointConnections/peName-8536c337-7b36-4d67-a7ce-081655baf59e",
59+
"name": "peName-8536c337-7b36-4d67-a7ce-081655baf59e",
60+
"type": "Microsoft.Purview/accounts/privateEndpointConnections"
61+
}
62+
],
63+
"publicNetworkAccess": "Enabled",
64+
"managedResourceGroupName": "managed-rg-mwjotkl",
65+
"managedResources": {
66+
"resourceGroup": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/managed-rg-mwjotkl",
67+
"storageAccount": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/managed-rg-mwjotkl/providers/Microsoft.Storage/storageAccounts/scanwestustzaagzr",
68+
"eventHubNamespace": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/managed-rg-mwjotkl/providers/Microsoft.EventHub/namespaces/atlas-westusdddnbtp"
69+
}
70+
}
71+
}
72+
}
73+
}
74+
}

0 commit comments

Comments
 (0)