Skip to content

Commit

Permalink
Revert "Revert "Added GA API version (2021-07-01) (#14937)" (#15129)"
Browse files Browse the repository at this point in the history
This reverts commit 654c237.
  • Loading branch information
jianyexi authored Jul 18, 2021
1 parent 259766b commit f95110f
Show file tree
Hide file tree
Showing 23 changed files with 2,996 additions and 18 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -725,6 +725,7 @@
}
}
},
"x-ms-long-running-operation": true,
"x-ms-examples": {
"PrivateEndpointConnections_CreateOrUpdate": {
"$ref": "./examples/PrivateEndpointConnections_CreateOrUpdate.json"
Expand Down Expand Up @@ -1070,7 +1071,8 @@
"SoftDeleting",
"SoftDeleted",
"Failed",
"Succeeded"
"Succeeded",
"Canceled"
],
"type": "string",
"readOnly": true,
Expand Down Expand Up @@ -1846,21 +1848,6 @@
}
},
"parameters": {
"resourceGroupName": {
"name": "resourceGroupName",
"in": "path",
"description": "The resource group name.",
"required": true,
"type": "string",
"x-ms-parameter-location": "method"
},
"subscriptionId": {
"name": "subscriptionId",
"in": "path",
"description": "The subscription identifier",
"required": true,
"type": "string"
},
"api-version": {
"name": "api-version",
"in": "query",
Expand All @@ -1875,6 +1862,21 @@
"required": true,
"type": "string",
"x-ms-parameter-location": "method"
},
"resourceGroupName": {
"name": "resourceGroupName",
"in": "path",
"description": "The resource group name.",
"required": true,
"type": "string",
"x-ms-parameter-location": "method"
},
"subscriptionId": {
"name": "subscriptionId",
"in": "path",
"description": "The subscription identifier",
"required": true,
"type": "string"
}
},
"securityDefinitions": {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"parameters": {
"subscriptionId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345",
"resourceGroupName": "SampleResourceGroup",
"accountName": "account1",
"api-version": "2021-07-01",
"collectionAdminUpdate": {
"objectId": "7e8de0e7-2bfc-4e1f-9659-2a5785e4356f"
}
},
"responses": {
"200": {
"headers": {
"Date": "Wed, 13 Sep 2017 18:04:32 GMT",
"x-ms-request-id": "d5496da4-9c52-402f-b067-83cc9ddea888",
"X-Content-Type-Options": "nosniff",
"x-ms-ratelimit-remaining-tenant-reads": "14999",
"x-ms-correlation-request-id": "25c78f97-0b0a-4fe9-ad39-883a482265cd"
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"parameters": {
"checkNameAvailabilityRequest": {
"name": "account1",
"type": "Microsoft.Purview/accounts"
},
"api-version": "2021-07-01",
"subscriptionId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345"
},
"responses": {
"200": {
"headers": {
"Date": "Wed, 13 Sep 2017 18:04:32 GMT",
"x-ms-request-id": "d5496da4-9c52-402f-b067-83cc9ddea888",
"X-Content-Type-Options": "nosniff",
"x-ms-ratelimit-remaining-tenant-reads": "14999",
"x-ms-correlation-request-id": "25c78f97-0b0a-4fe9-ad39-883a482265cd"
},
"body": {
"nameAvailable": true
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
{
"parameters": {
"subscriptionId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345",
"resourceGroupName": "SampleResourceGroup",
"accountName": "account1",
"api-version": "2021-07-01",
"account": {
"location": "West US 2",
"sku": {
"name": "Standard",
"capacity": 4
},
"properties": {
"managedResourceGroupName": "custom-rgname"
}
}
},
"responses": {
"201": {
"headers": {
"Date": "Wed, 13 Sep 2017 18:04:32 GMT",
"x-ms-request-id": "d5496da4-9c52-402f-b067-83cc9ddea888",
"X-Content-Type-Options": "nosniff",
"x-ms-ratelimit-remaining-tenant-reads": "14999",
"x-ms-correlation-request-id": "25c78f97-0b0a-4fe9-ad39-883a482265cd"
},
"body": {
"location": "West US 2",
"id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/SampleResourceGroup/providers/Microsoft.Purview/accounts/account1",
"name": "account1",
"type": "Microsoft.Purview/accounts",
"properties": {
"friendlyName": "friendly-account1",
"createdBy": "client-name",
"createdByObjectId": "client-objectId",
"createdAt": "2019-11-22T18:39:58.6929344Z",
"provisioningState": "Creating",
"endpoints": {
"catalog": "https://account1.catalog.purview.azure-test.com",
"scan": "https://account1.scan.purview.azure-test.com",
"guardian": "https://account1.guardian.purview.azure-test.com"
},
"publicNetworkAccess": "Enabled"
}
}
},
"200": {
"headers": {
"Date": "Wed, 13 Sep 2017 18:04:32 GMT",
"x-ms-request-id": "d5496da4-9c52-402f-b067-83cc9ddea888",
"X-Content-Type-Options": "nosniff",
"x-ms-ratelimit-remaining-tenant-reads": "14999",
"x-ms-correlation-request-id": "25c78f97-0b0a-4fe9-ad39-883a482265cd"
},
"body": {
"location": "West US 2",
"id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/SampleResourceGroup/providers/Microsoft.Purview/accounts/account1",
"name": "account1",
"type": "Microsoft.Purview/accounts",
"systemData": {
"createdBy": "client-name",
"createdByType": "User",
"createdAt": "2019-11-22T18:39:58.6929344Z",
"lastModifiedBy": "client-name",
"lastModifiedByType": "User",
"lastModifiedAt": "2021-03-16T23:24:34.3430059Z"
},
"properties": {
"friendlyName": "friendly-account1",
"createdBy": "client-name",
"createdByObjectId": "client-objectId",
"createdAt": "2019-11-22T18:39:58.6929344Z",
"provisioningState": "Succeeded",
"endpoints": {
"catalog": "https://account1.catalog.purview.azure-test.com",
"scan": "https://account1.scan.purview.azure-test.com",
"guardian": "https://account1.guardian.purview.azure-test.com"
},
"publicNetworkAccess": "Enabled",
"managedResourceGroupName": "custom-rgname",
"managedResources": {
"resourceGroup": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/custom-rgname",
"storageAccount": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/custom-rgname/providers/Microsoft.Storage/storageAccounts/scanwestustzaagzr",
"eventHubNamespace": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/custom-rgname/providers/Microsoft.EventHub/namespaces/atlas-westusdddnbtp"
}
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
{
"parameters": {
"subscriptionId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345",
"resourceGroupName": "SampleResourceGroup",
"accountName": "account1",
"api-version": "2021-07-01"
},
"responses": {
"200": {
"headers": {
"Date": "Wed, 13 Sep 2017 18:04:32 GMT",
"x-ms-request-id": "d5496da4-9c52-402f-b067-83cc9ddea888",
"X-Content-Type-Options": "nosniff",
"x-ms-ratelimit-remaining-tenant-reads": "14999",
"x-ms-correlation-request-id": "25c78f97-0b0a-4fe9-ad39-883a482265cd"
}
},
"202": {
"headers": {
"Date": "Wed, 13 Sep 2017 18:04:32 GMT",
"x-ms-request-id": "d5496da4-9c52-402f-b067-83cc9ddea888",
"X-Content-Type-Options": "nosniff",
"x-ms-ratelimit-remaining-tenant-reads": "14999",
"x-ms-correlation-request-id": "25c78f97-0b0a-4fe9-ad39-883a482265cd",
"x-ms-long-running-operation": true,
"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"
}
},
"204": {
"headers": {
"Date": "Wed, 13 Sep 2017 18:04:32 GMT",
"x-ms-request-id": "d5496da4-9c52-402f-b067-83cc9ddea888",
"X-Content-Type-Options": "nosniff",
"x-ms-ratelimit-remaining-tenant-reads": "14999",
"x-ms-correlation-request-id": "25c78f97-0b0a-4fe9-ad39-883a482265cd"
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
{
"parameters": {
"subscriptionId": "12345678-1234-1234-12345678abc",
"resourceGroupName": "SampleResourceGroup",
"accountName": "account1",
"api-version": "2021-07-01"
},
"responses": {
"200": {
"headers": {
"Date": "Wed, 13 Sep 2017 18:04:32 GMT",
"x-ms-request-id": "d5496da4-9c52-402f-b067-83cc9ddea888",
"X-Content-Type-Options": "nosniff",
"x-ms-ratelimit-remaining-tenant-reads": "14999",
"x-ms-correlation-request-id": "25c78f97-0b0a-4fe9-ad39-883a482265cd"
},
"body": {
"location": "West US 2",
"id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/SampleResourceGroup/providers/Microsoft.Purview/accounts/account1",
"name": "account1",
"type": "Microsoft.Purview/accounts",
"sku": {
"name": "Standard",
"capacity": 4
},
"systemData": {
"createdBy": "client-name",
"createdByType": "User",
"createdAt": "2019-11-22T18:39:58.6929344Z",
"lastModifiedBy": "client-name",
"lastModifiedByType": "User",
"lastModifiedAt": "2021-03-16T23:24:34.3430059Z"
},
"properties": {
"friendlyName": "friendly-account1",
"createdBy": "client-name",
"createdByObjectId": "client-objectId",
"createdAt": "2019-11-22T18:39:58.6929344Z",
"provisioningState": "Succeeded",
"endpoints": {
"catalog": "https://account1.catalog.purview.azure-test.com",
"scan": "https://account1.scan.purview.azure-test.com",
"guardian": "https://account1.guardian.purview.azure-test.com"
},
"privateEndpointConnections": [
{
"properties": {
"provisioningState": "Succeeded",
"privateEndpoint": {
"id": "/subscriptions/baca8a88-4527-4c35-a13e-b2775ce0d7fc/resourceGroups/nrpResourceGroupName/providers/Microsoft.Network/privateEndpoints/peName"
},
"privateLinkServiceConnectionState": {
"status": "Pending",
"description": "Please approve my connection, thanks.",
"actionsRequired": "None"
}
},
"id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/SampleResourceGroup/providers/Microsoft.Purview/accounts/account1/privateEndpointConnections/peName-8536c337-7b36-4d67-a7ce-081655baf59e",
"name": "peName-8536c337-7b36-4d67-a7ce-081655baf59e",
"type": "Microsoft.Purview/accounts/privateEndpointConnections"
}
],
"publicNetworkAccess": "Enabled",
"managedResourceGroupName": "managed-rg-mwjotkl",
"managedResources": {
"resourceGroup": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/managed-rg-mwjotkl",
"storageAccount": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/managed-rg-mwjotkl/providers/Microsoft.Storage/storageAccounts/scanwestustzaagzr",
"eventHubNamespace": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/managed-rg-mwjotkl/providers/Microsoft.EventHub/namespaces/atlas-westusdddnbtp"
}
}
}
}
}
}
Loading

0 comments on commit f95110f

Please sign in to comment.