From 420d368c07e73a55fb493604ccec064bfae3f709 Mon Sep 17 00:00:00 2001 From: vnvaditya Date: Mon, 5 Apr 2021 18:38:07 -0700 Subject: [PATCH] Support Inplace phase 2 API's for AzureDataShare (#13647) Co-authored-by: Aditya Vutukuri --- .../preview/2020-10-01-preview/DataShare.json | 508 ++++++++++++------ ...appings_ADLSGen2StorageAccount_Create.json | 72 +++ ...etMappings_BlobStorageAccount_Create.json} | 14 +- ...ataSets_ADLSGen2StorageAccount_Create.json | 79 +++ ...> DataSets_BlobStorageAccount_Create.json} | 6 +- 5 files changed, 508 insertions(+), 171 deletions(-) create mode 100644 specification/datashare/resource-manager/Microsoft.DataShare/preview/2020-10-01-preview/examples/DataSetMappings_ADLSGen2StorageAccount_Create.json rename specification/datashare/resource-manager/Microsoft.DataShare/preview/2020-10-01-preview/examples/{DataSetMappings_StorageAccount_Create.json => DataSetMappings_BlobStorageAccount_Create.json} (88%) create mode 100644 specification/datashare/resource-manager/Microsoft.DataShare/preview/2020-10-01-preview/examples/DataSets_ADLSGen2StorageAccount_Create.json rename specification/datashare/resource-manager/Microsoft.DataShare/preview/2020-10-01-preview/examples/{DataSets_StorageAccount_Create.json => DataSets_BlobStorageAccount_Create.json} (96%) diff --git a/specification/datashare/resource-manager/Microsoft.DataShare/preview/2020-10-01-preview/DataShare.json b/specification/datashare/resource-manager/Microsoft.DataShare/preview/2020-10-01-preview/DataShare.json index 51794992a778..9cf0ba03e641 100644 --- a/specification/datashare/resource-manager/Microsoft.DataShare/preview/2020-10-01-preview/DataShare.json +++ b/specification/datashare/resource-manager/Microsoft.DataShare/preview/2020-10-01-preview/DataShare.json @@ -589,8 +589,11 @@ "DataSets_SqlDBTable_Create": { "$ref": "./examples/DataSets_SqlDBTable_Create.json" }, - "DataSets_StorageAccount_Create": { - "$ref": "./examples/DataSets_StorageAccount_Create.json" + "DataSets_ADLSGen2StorageAccount_Create": { + "$ref": "./examples/DataSets_ADLSGen2StorageAccount_Create.json" + }, + "DataSets_BlobStorageAccount_Create": { + "$ref": "./examples/DataSets_BlobStorageAccount_Create.json" }, "DataSets_SynapseWorkspaceSqlPoolTable_Create": { "$ref": "./examples/DataSets_SynapseWorkspaceSqlPoolTable_Create.json" @@ -864,8 +867,11 @@ "DataSetMappings_SqlDWDataSetToAdlsGen2File_Create": { "$ref": "./examples/DataSetMappings_SqlDWDataSetToAdlsGen2File_Create.json" }, - "DataSetMappings_StorageAccount_Create": { - "$ref": "./examples/DataSetMappings_StorageAccount_Create.json" + "DataSetMappings_ADLSGen2StorageAccount_Create": { + "$ref": "./examples/DataSetMappings_ADLSGen2StorageAccount_Create.json" + }, + "DataSetMappings_BlobStorageAccount_Create": { + "$ref": "./examples/DataSetMappings_BlobStorageAccount_Create.json" }, "DataSetMappings_SynapseWorkspaceSqlPoolTable_Create": { "$ref": "./examples/DataSetMappings_SynapseWorkspaceSqlPoolTable_Create.json" @@ -3805,6 +3811,167 @@ } } }, + "ADLSGen2StorageAccountDataSet": { + "description": "An ADLSGen2 storage account data set.", + "required": [ + "properties", + "kind" + ], + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/DataSet" + } + ], + "properties": { + "properties": { + "$ref": "#/definitions/ADLSGen2StorageAccountDataSetProperties", + "description": "ADLSGen2 storage account data set properties.", + "x-ms-client-flatten": true + } + }, + "x-ms-discriminator-value": "AdlsGen2StorageAccount" + }, + "ADLSGen2StorageAccountDataSetMapping": { + "description": "ADLSGen2 storage account data set mapping.", + "required": [ + "properties", + "kind" + ], + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/DataSetMapping" + } + ], + "properties": { + "properties": { + "$ref": "#/definitions/ADLSGen2StorageAccountDataSetMappingProperties", + "description": "ADLSGen2 Storage account data set mapping properties.", + "x-ms-client-flatten": true + } + }, + "x-ms-discriminator-value": "AdlsGen2StorageAccount" + }, + "ADLSGen2StorageAccountDataSetMappingProperties": { + "description": "Properties of the ADLSGen2 storage account data set.", + "required": [ + "storageAccountResourceId", + "containerName", + "folder", + "dataSetId" + ], + "type": "object", + "properties": { + "containerName": { + "description": "Gets or sets the container name.", + "type": "string" + }, + "dataSetId": { + "description": "The id of the source data set.", + "type": "string" + }, + "dataSetMappingStatus": { + "description": "Gets the status of the data set mapping.", + "enum": [ + "Ok", + "Broken" + ], + "type": "string", + "readOnly": true, + "x-ms-enum": { + "name": "dataSetMappingStatus", + "modelAsString": true + } + }, + "folder": { + "description": "Gets or sets the path to folder within the container.", + "type": "string" + }, + "location": { + "description": "Location of the sink storage account.", + "type": "string", + "readOnly": true + }, + "mountPath": { + "description": "Gets or sets the mount path", + "type": "string" + }, + "provisioningState": { + "description": "Provisioning state of the data set mapping.", + "enum": [ + "Succeeded", + "Creating", + "Deleting", + "Moving", + "Failed" + ], + "type": "string", + "readOnly": true, + "x-ms-enum": { + "name": "provisioningState", + "modelAsString": true + } + }, + "storageAccountResourceId": { + "description": "Resource id of the sink storage account", + "type": "string" + } + } + }, + "ADLSGen2StorageAccountDataSetProperties": { + "description": "Properties of the ADLSGen2 storage account data set.", + "required": [ + "storageAccountResourceId", + "paths" + ], + "type": "object", + "properties": { + "dataSetId": { + "description": "Unique id for identifying a data set resource", + "type": "string", + "readOnly": true + }, + "location": { + "description": "Location of the ADLSGen2 storage account.", + "type": "string", + "readOnly": true + }, + "paths": { + "description": "A list of ADLSGen2 storage account paths.", + "uniqueItems": false, + "type": "array", + "items": { + "$ref": "#/definitions/ADLSGen2StorageAccountPath" + } + }, + "storageAccountResourceId": { + "description": "Resource id of the ADLSGen2 storage account.", + "type": "string" + } + } + }, + "ADLSGen2StorageAccountPath": { + "description": "Defines a single ADLS Gen2 storage account path.", + "required": [ + "containerName" + ], + "type": "object", + "properties": { + "consumerPath": { + "description": "Gets or sets the path on the consumer side where the dataset is to be mapped.", + "type": "string" + }, + "containerName": { + "description": "Gets or sets the container name to share.", + "type": "string" + }, + "providerPath": { + "description": "Gets or sets the path to file/folder within the container.", + "type": "string" + } + } + }, "BlobContainerDataSet": { "description": "An Azure storage blob container data set.", "required": [ @@ -4248,6 +4415,167 @@ } } }, + "BlobStorageAccountDataSet": { + "description": "An Azure blob storage account data set.", + "required": [ + "properties", + "kind" + ], + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/DataSet" + } + ], + "properties": { + "properties": { + "$ref": "#/definitions/BlobStorageAccountDataSetProperties", + "description": "Storage account data set properties.", + "x-ms-client-flatten": true + } + }, + "x-ms-discriminator-value": "BlobStorageAccount" + }, + "BlobStorageAccountDataSetMapping": { + "description": "A blob storage account data set mapping.", + "required": [ + "properties", + "kind" + ], + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/DataSetMapping" + } + ], + "properties": { + "properties": { + "$ref": "#/definitions/BlobStorageAccountDataSetMappingProperties", + "description": "Blob Storage account data set mapping properties.", + "x-ms-client-flatten": true + } + }, + "x-ms-discriminator-value": "BlobStorageAccount" + }, + "BlobStorageAccountDataSetMappingProperties": { + "description": "Properties of the blob storage account data set.", + "required": [ + "storageAccountResourceId", + "containerName", + "folder", + "dataSetId" + ], + "type": "object", + "properties": { + "containerName": { + "description": "Gets or sets the container name.", + "type": "string" + }, + "dataSetId": { + "description": "The id of the source data set.", + "type": "string" + }, + "dataSetMappingStatus": { + "description": "Gets the status of the data set mapping.", + "enum": [ + "Ok", + "Broken" + ], + "type": "string", + "readOnly": true, + "x-ms-enum": { + "name": "dataSetMappingStatus", + "modelAsString": true + } + }, + "folder": { + "description": "Gets or sets the path to folder within the container.", + "type": "string" + }, + "location": { + "description": "Location of the sink storage account.", + "type": "string", + "readOnly": true + }, + "mountPath": { + "description": "Gets or sets the mount path on the consumer side where the dataset is to be mapped.", + "type": "string" + }, + "provisioningState": { + "description": "Provisioning state of the data set mapping.", + "enum": [ + "Succeeded", + "Creating", + "Deleting", + "Moving", + "Failed" + ], + "type": "string", + "readOnly": true, + "x-ms-enum": { + "name": "provisioningState", + "modelAsString": true + } + }, + "storageAccountResourceId": { + "description": "Resource id of the sink storage account", + "type": "string" + } + } + }, + "BlobStorageAccountDataSetProperties": { + "description": "Properties of the blob storage account data set.", + "required": [ + "storageAccountResourceId", + "paths" + ], + "type": "object", + "properties": { + "dataSetId": { + "description": "Unique id for identifying a data set resource", + "type": "string", + "readOnly": true + }, + "location": { + "description": "Location of the storage account.", + "type": "string", + "readOnly": true + }, + "paths": { + "description": "A list of storage account paths.", + "uniqueItems": false, + "type": "array", + "items": { + "$ref": "#/definitions/BlobStorageAccountPath" + } + }, + "storageAccountResourceId": { + "description": "Resource id of the storage account.", + "type": "string" + } + } + }, + "BlobStorageAccountPath": { + "description": "Defines a single blob storage account path.", + "required": [ + "containerName" + ], + "type": "object", + "properties": { + "consumerPath": { + "description": "Gets or sets the path on the consumer side where the dataset is to be mapped.", + "type": "string" + }, + "containerName": { + "description": "Gets or sets the container name to share.", + "type": "string" + }, + "providerPath": { + "description": "Gets or sets the path to file/folder within the container.", + "type": "string" + } + } + }, "ConsumerInvitation": { "description": "A consumer Invitation data transfer object.", "required": [ @@ -4457,12 +4785,13 @@ "AdlsGen2File", "AdlsGen1Folder", "AdlsGen1File", - "StorageAccount", + "AdlsGen2StorageAccount", "KustoCluster", "KustoDatabase", "SqlDBTable", "SqlDWTable", - "SynapseWorkspaceSqlPoolTable" + "SynapseWorkspaceSqlPoolTable", + "BlobStorageAccount" ], "type": "string", "readOnly": true, @@ -4496,12 +4825,13 @@ "AdlsGen2File", "AdlsGen1Folder", "AdlsGen1File", - "StorageAccount", + "AdlsGen2StorageAccount", "KustoCluster", "KustoDatabase", "SqlDBTable", "SqlDWTable", - "SynapseWorkspaceSqlPoolTable" + "SynapseWorkspaceSqlPoolTable", + "BlobStorageAccount" ], "type": "string", "x-ms-enum": { @@ -4554,12 +4884,13 @@ "AdlsGen2FileSystem", "AdlsGen2Folder", "AdlsGen2File", - "StorageAccount", + "AdlsGen2StorageAccount", "KustoCluster", "KustoDatabase", "SqlDBTable", "SqlDWTable", - "SynapseWorkspaceSqlPoolTable" + "SynapseWorkspaceSqlPoolTable", + "BlobStorageAccount" ], "type": "string", "x-ms-enum": { @@ -6353,158 +6684,6 @@ } } }, - "StorageAccountDataSet": { - "description": "An Azure storage account data set.", - "required": [ - "properties", - "kind" - ], - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/DataSet" - } - ], - "properties": { - "properties": { - "$ref": "#/definitions/StorageAccountDataSetProperties", - "description": "Storage account data set properties.", - "x-ms-client-flatten": true - } - }, - "x-ms-discriminator-value": "StorageAccount" - }, - "StorageAccountDataSetMapping": { - "description": "A storage account data set mapping.", - "required": [ - "properties", - "kind" - ], - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/DataSetMapping" - } - ], - "properties": { - "properties": { - "$ref": "#/definitions/StorageAccountDataSetMappingProperties", - "description": "Storage account data set mapping properties.", - "x-ms-client-flatten": true - } - }, - "x-ms-discriminator-value": "StorageAccount" - }, - "StorageAccountDataSetMappingProperties": { - "description": "Properties of the storage account data set.", - "required": [ - "storageAccountResourceId", - "containerName", - "dataSetId" - ], - "type": "object", - "properties": { - "containerName": { - "description": "Container that has the file path.", - "type": "string" - }, - "dataSetId": { - "description": "The id of the source data set.", - "type": "string" - }, - "dataSetMappingStatus": { - "description": "Gets the status of the data set mapping.", - "enum": [ - "Ok", - "Broken" - ], - "type": "string", - "readOnly": true, - "x-ms-enum": { - "name": "dataSetMappingStatus", - "modelAsString": true - } - }, - "location": { - "description": "Location of the sink storage account.", - "type": "string", - "readOnly": true - }, - "provisioningState": { - "description": "Provisioning state of the data set mapping.", - "enum": [ - "Succeeded", - "Creating", - "Deleting", - "Moving", - "Failed" - ], - "type": "string", - "readOnly": true, - "x-ms-enum": { - "name": "provisioningState", - "modelAsString": true - } - }, - "storageAccountResourceId": { - "description": "Resource id of the sink storage account", - "type": "string" - } - } - }, - "StorageAccountDataSetProperties": { - "description": "Properties of the storage account data set.", - "required": [ - "storageAccountResourceId", - "paths" - ], - "type": "object", - "properties": { - "dataSetId": { - "description": "Unique id for identifying a data set resource", - "type": "string", - "readOnly": true - }, - "location": { - "description": "Location of the storage account.", - "type": "string", - "readOnly": true - }, - "paths": { - "description": "A list of storage account paths.", - "uniqueItems": false, - "type": "array", - "items": { - "$ref": "#/definitions/StorageAccountPath" - } - }, - "storageAccountResourceId": { - "description": "Resource id of the storage account.", - "type": "string" - } - } - }, - "StorageAccountPath": { - "description": "Defines a single storage account path.", - "required": [ - "containerName" - ], - "type": "object", - "properties": { - "consumerPath": { - "description": "Gets or sets the path on the consumer side where the dataset is to be mapped.", - "type": "string" - }, - "containerName": { - "description": "Gets or sets the container name to share.", - "type": "string" - }, - "providerPath": { - "description": "Gets or sets the path to file/folder within the container.", - "type": "string" - } - } - }, "SynapseWorkspaceSqlPoolTableDataSet": { "description": "A Synapse Workspace Sql Pool Table data set.", "required": [ @@ -6632,12 +6811,13 @@ "AdlsGen2File", "AdlsGen1Folder", "AdlsGen1File", - "StorageAccount", + "AdlsGen2StorageAccount", "KustoCluster", "KustoDatabase", "SqlDBTable", "SqlDWTable", - "SynapseWorkspaceSqlPoolTable" + "SynapseWorkspaceSqlPoolTable", + "BlobStorageAccount" ], "type": "string", "readOnly": true, diff --git a/specification/datashare/resource-manager/Microsoft.DataShare/preview/2020-10-01-preview/examples/DataSetMappings_ADLSGen2StorageAccount_Create.json b/specification/datashare/resource-manager/Microsoft.DataShare/preview/2020-10-01-preview/examples/DataSetMappings_ADLSGen2StorageAccount_Create.json new file mode 100644 index 000000000000..c6f1b67492e3 --- /dev/null +++ b/specification/datashare/resource-manager/Microsoft.DataShare/preview/2020-10-01-preview/examples/DataSetMappings_ADLSGen2StorageAccount_Create.json @@ -0,0 +1,72 @@ +{ + "parameters": { + "subscriptionId": "433a8dfd-e5d5-4e77-ad86-90acdc75eb1a", + "resourceGroupName": "SampleResourceGroup", + "accountName": "Account1", + "shareSubscriptionName": "ShareSubscription1", + "dataSetMappingName": "DatasetMapping1", + "api-version": "2020-10-01-preview", + "dataSetMapping": { + "kind": "AdlsGen2StorageAccount", + "properties": { + "dataSetId": "a08f184b-0567-4b11-ba22-a1199336d226", + "storageAccountResourceId": "/subscriptions/433a8dfd-e5d5-4e77-ad86-90acdc75eb1a/resourceGroups/SampleResourceGroup/providers/Microsoft.Storage/storageaccounts/storageaccount1", + "containerName": "Container1", + "mountPath": "foldera/folderd1", + "folder": "destinationFolder" + } + } + }, + "responses": { + "200": { + "headers": { + "Date": "Wed, 28 Oct 2020 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": { + "kind": "AdlsGen2StorageAccount", + "properties": { + "dataSetId": "a08f184b-0567-4b11-ba22-a1199336d226", + "storageAccountResourceId": "/subscriptions/433a8dfd-e5d5-4e77-ad86-90acdc75eb1a/resourceGroups/SampleResourceGroup/providers/Microsoft.Storage/storageaccounts/storageaccount1", + "containerName": "Container1", + "mountPath": "foldera/folderd1", + "folder": "destinationFolder", + "location": "centraluseuap", + "dataSetMappingStatus": "Ok", + "provisioningState": "Succeeded" + }, + "id": "/subscriptions/433a8dfd-e5d5-4e77-ad86-90acdc75eb1a/resourceGroups/SampleResourceGroup/providers/Microsoft.DataShare/accounts/Account1/shareSubscriptions/ShareSubscription1/dataSetMappings/DatasetMapping1", + "name": "DatasetMapping1", + "type": "Microsoft.DataShare/accounts/shareSubscriptions/dataSetMappings" + } + }, + "201": { + "headers": { + "Date": "Wed, 28 Oct 2020 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": { + "kind": "AdlsGen2StorageAccount", + "properties": { + "dataSetId": "a08f184b-0567-4b11-ba22-a1199336d226", + "storageAccountResourceId": "/subscriptions/433a8dfd-e5d5-4e77-ad86-90acdc75eb1a/resourceGroups/SampleResourceGroup/providers/Microsoft.Storage/storageaccounts/storageaccount1", + "containerName": "Container1", + "mountPath": "foldera/folderd1", + "folder": "destinationFolder", + "location": "centraluseuap", + "dataSetMappingStatus": "Ok", + "provisioningState": "Succeeded" + }, + "id": "/subscriptions/433a8dfd-e5d5-4e77-ad86-90acdc75eb1a/resourceGroups/SampleResourceGroup/providers/Microsoft.DataShare/accounts/Account1/shareSubscriptions/ShareSubscription1/dataSetMappings/DatasetMapping1", + "name": "DatasetMapping1", + "type": "Microsoft.DataShare/accounts/shareSubscriptions/dataSetMappings" + } + } + } +} diff --git a/specification/datashare/resource-manager/Microsoft.DataShare/preview/2020-10-01-preview/examples/DataSetMappings_StorageAccount_Create.json b/specification/datashare/resource-manager/Microsoft.DataShare/preview/2020-10-01-preview/examples/DataSetMappings_BlobStorageAccount_Create.json similarity index 88% rename from specification/datashare/resource-manager/Microsoft.DataShare/preview/2020-10-01-preview/examples/DataSetMappings_StorageAccount_Create.json rename to specification/datashare/resource-manager/Microsoft.DataShare/preview/2020-10-01-preview/examples/DataSetMappings_BlobStorageAccount_Create.json index d92a1aced2fa..4c2fef478418 100644 --- a/specification/datashare/resource-manager/Microsoft.DataShare/preview/2020-10-01-preview/examples/DataSetMappings_StorageAccount_Create.json +++ b/specification/datashare/resource-manager/Microsoft.DataShare/preview/2020-10-01-preview/examples/DataSetMappings_BlobStorageAccount_Create.json @@ -7,11 +7,13 @@ "dataSetMappingName": "DatasetMapping1", "api-version": "2020-10-01-preview", "dataSetMapping": { - "kind": "StorageAccount", + "kind": "BlobStorageAccount", "properties": { "dataSetId": "a08f184b-0567-4b11-ba22-a1199336d226", "storageAccountResourceId": "/subscriptions/433a8dfd-e5d5-4e77-ad86-90acdc75eb1a/resourceGroups/SampleResourceGroup/providers/Microsoft.Storage/storageaccounts/storageaccount1", - "containerName": "Container1" + "containerName": "Container1", + "mountPath": "foldera/folderd1", + "folder": "destinationFolder" } } }, @@ -25,11 +27,13 @@ "x-ms-correlation-request-id": "25c78f97-0b0a-4fe9-ad39-883a482265cd" }, "body": { - "kind": "StorageAccount", + "kind": "BlobStorageAccount", "properties": { "dataSetId": "a08f184b-0567-4b11-ba22-a1199336d226", "storageAccountResourceId": "/subscriptions/433a8dfd-e5d5-4e77-ad86-90acdc75eb1a/resourceGroups/SampleResourceGroup/providers/Microsoft.Storage/storageaccounts/storageaccount1", "containerName": "Container1", + "mountPath": "foldera/folderd1", + "folder": "destinationFolder", "location": "centraluseuap", "dataSetMappingStatus": "Ok", "provisioningState": "Succeeded" @@ -48,11 +52,13 @@ "x-ms-correlation-request-id": "25c78f97-0b0a-4fe9-ad39-883a482265cd" }, "body": { - "kind": "StorageAccount", + "kind": "BlobStorageAccount", "properties": { "dataSetId": "a08f184b-0567-4b11-ba22-a1199336d226", "storageAccountResourceId": "/subscriptions/433a8dfd-e5d5-4e77-ad86-90acdc75eb1a/resourceGroups/SampleResourceGroup/providers/Microsoft.Storage/storageaccounts/storageaccount1", "containerName": "Container1", + "mountPath": "foldera/folderd1", + "folder": "destinationFolder", "location": "centraluseuap", "dataSetMappingStatus": "Ok", "provisioningState": "Succeeded" diff --git a/specification/datashare/resource-manager/Microsoft.DataShare/preview/2020-10-01-preview/examples/DataSets_ADLSGen2StorageAccount_Create.json b/specification/datashare/resource-manager/Microsoft.DataShare/preview/2020-10-01-preview/examples/DataSets_ADLSGen2StorageAccount_Create.json new file mode 100644 index 000000000000..f10b29370d95 --- /dev/null +++ b/specification/datashare/resource-manager/Microsoft.DataShare/preview/2020-10-01-preview/examples/DataSets_ADLSGen2StorageAccount_Create.json @@ -0,0 +1,79 @@ +{ + "parameters": { + "subscriptionId": "433a8dfd-e5d5-4e77-ad86-90acdc75eb1a", + "resourceGroupName": "SampleResourceGroup", + "accountName": "Account1", + "shareName": "Share1", + "dataSetName": "Dataset1", + "api-version": "2020-10-01-preview", + "dataSet": { + "kind": "AdlsGen2StorageAccount", + "properties": { + "storageAccountResourceId": "/subscriptions/0f3dcfc3-18f8-4099-b381-8353e19d43a7/resourceGroups/resourceGroup1/providers/Microsoft.Storage/storageAccounts/storageAccount1", + "paths": [ + { + "containerName": "container1", + "providerPath": "samplefile.txt", + "consumerPath": "/samplefolder1" + } + ] + } + } + }, + "responses": { + "200": { + "headers": { + "Date": "Wed, 28 Oct 2020 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": { + "properties": { + "storageAccountResourceId": "/subscriptions/0f3dcfc3-18f8-4099-b381-8353e19d43a7/resourceGroups/resourceGroup1/providers/Microsoft.Storage/storageAccounts/storageAccount1", + "paths": [ + { + "containerName": "container1", + "providerPath": "samplefile.txt", + "consumerPath": "/samplefolder1" + } + ], + "location": "centraluseuap", + "dataSetId": "66be0fd3-8669-465c-a3d3-2442a7345e48" + }, + "kind": "AdlsGen2StorageAccount", + "id": "/subscriptions/433a8dfd-e5d5-4e77-ad86-90acdc75eb1a/resourceGroups/SampleResourceGroup/providers/Microsoft.DataShare/accounts/Account1/shares/Share1/dataSets/DataSet1", + "name": "DataSet1", + "type": "Microsoft.DataShare/accounts/shares/dataSets" + } + }, + "201": { + "headers": { + "Date": "Wed, 28 Oct 2020 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": { + "properties": { + "storageAccountResourceId": "/subscriptions/0f3dcfc3-18f8-4099-b381-8353e19d43a7/resourceGroups/resourceGroup1/providers/Microsoft.Storage/storageAccounts/storageAccount1", + "paths": [ + { + "containerName": "container1", + "providerPath": "samplefile.txt", + "consumerPath": "/samplefolder1" + } + ], + "location": "centraluseuap", + "dataSetId": "66be0fd3-8669-465c-a3d3-2442a7345e48" + }, + "kind": "AdlsGen2StorageAccount", + "id": "/subscriptions/433a8dfd-e5d5-4e77-ad86-90acdc75eb1a/resourceGroups/SampleResourceGroup/providers/Microsoft.DataShare/accounts/Account1/shares/Share1/dataSets/DataSet1", + "name": "DataSet1", + "type": "Microsoft.DataShare/accounts/shares/dataSets" + } + } + } +} diff --git a/specification/datashare/resource-manager/Microsoft.DataShare/preview/2020-10-01-preview/examples/DataSets_StorageAccount_Create.json b/specification/datashare/resource-manager/Microsoft.DataShare/preview/2020-10-01-preview/examples/DataSets_BlobStorageAccount_Create.json similarity index 96% rename from specification/datashare/resource-manager/Microsoft.DataShare/preview/2020-10-01-preview/examples/DataSets_StorageAccount_Create.json rename to specification/datashare/resource-manager/Microsoft.DataShare/preview/2020-10-01-preview/examples/DataSets_BlobStorageAccount_Create.json index fb516759cb9f..b621369853aa 100644 --- a/specification/datashare/resource-manager/Microsoft.DataShare/preview/2020-10-01-preview/examples/DataSets_StorageAccount_Create.json +++ b/specification/datashare/resource-manager/Microsoft.DataShare/preview/2020-10-01-preview/examples/DataSets_BlobStorageAccount_Create.json @@ -7,7 +7,7 @@ "dataSetName": "Dataset1", "api-version": "2020-10-01-preview", "dataSet": { - "kind": "StorageAccount", + "kind": "BlobStorageAccount", "properties": { "storageAccountResourceId": "/subscriptions/0f3dcfc3-18f8-4099-b381-8353e19d43a7/resourceGroups/resourceGroup1/providers/Microsoft.Storage/storageAccounts/storageAccount1", "paths": [ @@ -42,7 +42,7 @@ "location": "centraluseuap", "dataSetId": "66be0fd3-8669-465c-a3d3-2442a7345e48" }, - "kind": "StorageAccount", + "kind": "BlobStorageAccount", "id": "/subscriptions/433a8dfd-e5d5-4e77-ad86-90acdc75eb1a/resourceGroups/SampleResourceGroup/providers/Microsoft.DataShare/accounts/Account1/shares/Share1/dataSets/DataSet1", "name": "DataSet1", "type": "Microsoft.DataShare/accounts/shares/dataSets" @@ -69,7 +69,7 @@ "location": "centraluseuap", "dataSetId": "66be0fd3-8669-465c-a3d3-2442a7345e48" }, - "kind": "StorageAccount", + "kind": "BlobStorageAccount", "id": "/subscriptions/433a8dfd-e5d5-4e77-ad86-90acdc75eb1a/resourceGroups/SampleResourceGroup/providers/Microsoft.DataShare/accounts/Account1/shares/Share1/dataSets/DataSet1", "name": "DataSet1", "type": "Microsoft.DataShare/accounts/shares/dataSets"