From c4bc95d6f727f0702a8b3a588c22dddf69d3ee1c Mon Sep 17 00:00:00 2001 From: Santhosh Rajangam Date: Tue, 22 Oct 2019 10:21:47 -0700 Subject: [PATCH] Update data set related documentation comments --- .../preview/2018-11-01-preview/DataShare.json | 176 +++++++++--------- .../examples/DataSetMappings_Create.json | 4 +- .../examples/DataSetMappings_Get.json | 3 +- ...taSetMappings_ListByShareSubscription.json | 4 +- .../DataSetMappings_SqlDB_Create.json | 10 +- ...gs_SqlDWDataSetToAdlsGen2File_Create.json} | 4 +- .../DataSetMappings_SqlDW_Create.json | 10 +- .../examples/DataSets_Create.json | 2 +- .../examples/DataSets_Get.json | 2 +- .../examples/DataSets_ListByShare.json | 2 +- .../examples/DataSets_SqlDBTable_Create.json | 2 +- .../examples/DataSets_SqlDWTable_Create.json | 8 +- ...roviderShareSubscriptions_ListByShare.json | 2 +- .../datashare/resource-manager/readme.md | 1 - 14 files changed, 124 insertions(+), 106 deletions(-) rename specification/datashare/resource-manager/Microsoft.DataShare/preview/2018-11-01-preview/examples/{DataSetMappings_AdlsGen2File_Create.json => DataSetMappings_SqlDWDataSetToAdlsGen2File_Create.json} (95%) diff --git a/specification/datashare/resource-manager/Microsoft.DataShare/preview/2018-11-01-preview/DataShare.json b/specification/datashare/resource-manager/Microsoft.DataShare/preview/2018-11-01-preview/DataShare.json index a92e0d96e8e5..ef2eb3b00daa 100644 --- a/specification/datashare/resource-manager/Microsoft.DataShare/preview/2018-11-01-preview/DataShare.json +++ b/specification/datashare/resource-manager/Microsoft.DataShare/preview/2018-11-01-preview/DataShare.json @@ -784,7 +784,7 @@ { "name": "dataSetMappingName", "in": "path", - "description": "The Id of the source data set being mapped.", + "description": "The name of the data set mapping to be created.", "required": true, "type": "string" }, @@ -831,8 +831,8 @@ "DataSetMappings_SqlDB_Create": { "$ref": "./examples/DataSetMappings_SqlDB_Create.json" }, - "DataSetMappings_AdlsGen2File_Create": { - "$ref": "./examples/DataSetMappings_AdlsGen2File_Create.json" + "DataSetMappings_SqlDWDataSetToAdlsGen2File_Create": { + "$ref": "./examples/DataSetMappings_SqlDWDataSetToAdlsGen2File_Create.json" } } }, @@ -3256,7 +3256,7 @@ ], "properties": { "kind": { - "description": "Kind of dataset.", + "description": "Kind of data set.", "enum": [ "Blob", "Container", @@ -3300,7 +3300,7 @@ } }, "DataSetMapping": { - "description": "A dataset mapping data transfer object.", + "description": "A data set mapping data transfer object.", "type": "object", "allOf": [ { @@ -3309,7 +3309,7 @@ ], "properties": { "kind": { - "description": "Kind of dataset mapping.", + "description": "Kind of data set mapping.", "enum": [ "Blob", "Container", @@ -3807,7 +3807,7 @@ } }, "SynchronizationDetails": { - "description": "Synchronization details at dataset level", + "description": "Synchronization details at data set level", "type": "object", "properties": { "dataSetId": { @@ -3838,25 +3838,25 @@ }, "durationMs": { "format": "int32", - "description": "duration of dataset level copy", + "description": "duration of data set level copy", "type": "integer", "readOnly": true }, "endTime": { "format": "date-time", - "description": "End time of dataset level copy", + "description": "End time of data set level copy", "type": "string", "readOnly": true }, "filesRead": { "format": "int64", - "description": "The number of files read from the source dataset.", + "description": "The number of files read from the source data set.", "type": "integer", "readOnly": true }, "filesWritten": { "format": "int64", - "description": "The number of files written into the sink dataset.", + "description": "The number of files written into the sink data set.", "type": "integer", "readOnly": true }, @@ -3872,31 +3872,31 @@ }, "rowsCopied": { "format": "int64", - "description": "The number of files copied into the sink dataset.", + "description": "The number of files copied into the sink data set.", "type": "integer", "readOnly": true }, "rowsRead": { "format": "int64", - "description": "The number of rows read from the source dataset.", + "description": "The number of rows read from the source data set.", "type": "integer", "readOnly": true }, "sizeRead": { "format": "int64", - "description": "The size of the data read from the source dataset in bytes.", + "description": "The size of the data read from the source data set in bytes.", "type": "integer", "readOnly": true }, "sizeWritten": { "format": "int64", - "description": "The size of the data written into the sink dataset in bytes.", + "description": "The size of the data written into the sink data set in bytes.", "type": "integer", "readOnly": true }, "startTime": { "format": "date-time", - "description": "start time of dataset level copy", + "description": "start time of data set level copy", "type": "string", "readOnly": true }, @@ -3907,7 +3907,7 @@ }, "vCore": { "format": "int64", - "description": "The vCore units consumed for the dataset synchronization.", + "description": "The vCore units consumed for the data set synchronization.", "type": "integer", "readOnly": true } @@ -4592,7 +4592,7 @@ } }, "BlobDataSet": { - "description": "An Azure storage blob dataset.", + "description": "An Azure storage blob data set.", "required": [ "properties" ], @@ -4605,7 +4605,7 @@ "properties": { "properties": { "$ref": "#/definitions/BlobProperties", - "description": "Blob dataset properties.", + "description": "Blob data set properties.", "x-ms-client-flatten": true } }, @@ -4650,7 +4650,7 @@ } }, "BlobFolderDataSet": { - "description": "An Azure storage blob folder dataset.", + "description": "An Azure storage blob folder data set.", "required": [ "properties" ], @@ -4663,7 +4663,7 @@ "properties": { "properties": { "$ref": "#/definitions/BlobFolderProperties", - "description": "Blob folder dataset properties.", + "description": "Blob folder data set properties.", "x-ms-client-flatten": true } }, @@ -4708,7 +4708,7 @@ } }, "BlobContainerDataSet": { - "description": "An Azure storage blob container dataset.", + "description": "An Azure storage blob container data set.", "required": [ "properties" ], @@ -4721,7 +4721,7 @@ "properties": { "properties": { "$ref": "#/definitions/BlobContainerProperties", - "description": "Blob container dataset properties.", + "description": "Blob container data set properties.", "x-ms-client-flatten": true } }, @@ -4761,7 +4761,7 @@ } }, "ADLSGen2FileDataSet": { - "description": "An ADLS Gen 2 file dataset.", + "description": "An ADLS Gen 2 file data set.", "required": [ "properties" ], @@ -4774,7 +4774,7 @@ "properties": { "properties": { "$ref": "#/definitions/ADLSGen2FileProperties", - "description": "ADLS Gen 2 file dataset properties.", + "description": "ADLS Gen 2 file data set properties.", "x-ms-client-flatten": true } }, @@ -4819,7 +4819,7 @@ } }, "ADLSGen2FolderDataSet": { - "description": "An ADLS Gen 2 folder dataset.", + "description": "An ADLS Gen 2 folder data set.", "required": [ "properties" ], @@ -4832,7 +4832,7 @@ "properties": { "properties": { "$ref": "#/definitions/ADLSGen2FolderProperties", - "description": "ADLS Gen 2 folder dataset properties.", + "description": "ADLS Gen 2 folder data set properties.", "x-ms-client-flatten": true } }, @@ -4877,7 +4877,7 @@ } }, "ADLSGen2FileSystemDataSet": { - "description": "An ADLS Gen 2 file system dataset.", + "description": "An ADLS Gen 2 file system data set.", "required": [ "properties" ], @@ -4890,7 +4890,7 @@ "properties": { "properties": { "$ref": "#/definitions/ADLSGen2FileSystemProperties", - "description": "ADLS Gen 2 file system dataset properties.", + "description": "ADLS Gen 2 file system data set properties.", "x-ms-client-flatten": true } }, @@ -4930,7 +4930,7 @@ } }, "ADLSGen1FolderDataSet": { - "description": "An ADLS Gen 1 folder dataset.", + "description": "An ADLS Gen 1 folder data set.", "required": [ "properties" ], @@ -4943,7 +4943,7 @@ "properties": { "properties": { "$ref": "#/definitions/ADLSGen1FolderProperties", - "description": "ADLS Gen 1 folder dataset properties.", + "description": "ADLS Gen 1 folder data set properties.", "x-ms-client-flatten": true } }, @@ -4983,7 +4983,7 @@ } }, "ADLSGen1FileDataSet": { - "description": "An ADLS Gen 1 file dataset.", + "description": "An ADLS Gen 1 file data set.", "required": [ "properties" ], @@ -4996,7 +4996,7 @@ "properties": { "properties": { "$ref": "#/definitions/ADLSGen1FileProperties", - "description": "ADLS Gen 1 file dataset properties.", + "description": "ADLS Gen 1 file data set properties.", "x-ms-client-flatten": true } }, @@ -5041,7 +5041,7 @@ } }, "SqlDWTableDataSet": { - "description": "A SQL DW table dataset.", + "description": "A SQL DW table data set.", "type": "object", "allOf": [ { @@ -5051,7 +5051,7 @@ "properties": { "properties": { "$ref": "#/definitions/SqlDWTableProperties", - "description": "SQL DW table dataset properties.", + "description": "SQL DW table data set properties.", "x-ms-client-flatten": true } }, @@ -5081,7 +5081,7 @@ } }, "SqlDBTableDataSet": { - "description": "A SQL DB table dataset.", + "description": "A SQL DB table data set.", "type": "object", "allOf": [ { @@ -5091,7 +5091,7 @@ "properties": { "properties": { "$ref": "#/definitions/SqlDBTableProperties", - "description": "SQL DB table dataset properties.", + "description": "SQL DB table data set properties.", "x-ms-client-flatten": true } }, @@ -5121,7 +5121,7 @@ } }, "BlobDataSetMapping": { - "description": "A Blob dataset mapping.", + "description": "A Blob data set mapping.", "required": [ "properties" ], @@ -5134,20 +5134,21 @@ "properties": { "properties": { "$ref": "#/definitions/BlobMappingProperties", - "description": "Blob dataset mapping properties.", + "description": "Blob data set mapping properties.", "x-ms-client-flatten": true } }, "x-ms-discriminator-value": "Blob" }, "BlobMappingProperties": { - "description": "Azure storage Blob dataset mapping property bag.", + "description": "Azure storage Blob data set mapping property bag.", "required": [ "containerName", "filePath", "subscriptionId", "resourceGroup", - "storageAccountName" + "storageAccountName", + "dataSetId" ], "type": "object", "properties": { @@ -5156,11 +5157,11 @@ "type": "string" }, "dataSetId": { - "description": "Gets the id of source dataset.", + "description": "The id of the source data set.", "type": "string" }, "dataSetMappingStatus": { - "description": "Gets the status of the dataset mapping.", + "description": "Gets the status of the data set mapping.", "enum": [ "Ok", "Broken" @@ -5202,7 +5203,7 @@ } }, "BlobFolderDataSetMapping": { - "description": "A Blob folder dataset mapping.", + "description": "A Blob folder data set mapping.", "required": [ "properties" ], @@ -5215,20 +5216,21 @@ "properties": { "properties": { "$ref": "#/definitions/BlobFolderMappingProperties", - "description": "Blob folder dataset mapping properties.", + "description": "Blob folder data set mapping properties.", "x-ms-client-flatten": true } }, "x-ms-discriminator-value": "BlobFolder" }, "BlobFolderMappingProperties": { - "description": "Azure storage Blob folder dataset mapping property bag.", + "description": "Azure storage Blob folder data set mapping property bag.", "required": [ "containerName", "prefix", "subscriptionId", "resourceGroup", - "storageAccountName" + "storageAccountName", + "dataSetId" ], "type": "object", "properties": { @@ -5237,11 +5239,11 @@ "type": "string" }, "dataSetId": { - "description": "Gets the id of source dataset.", + "description": "The id of the source data set.", "type": "string" }, "dataSetMappingStatus": { - "description": "Gets the status of the dataset mapping.", + "description": "Gets the status of the data set mapping.", "enum": [ "Ok", "Broken" @@ -5271,7 +5273,7 @@ } }, "BlobContainerDataSetMapping": { - "description": "A Blob container dataset mapping.", + "description": "A Blob container data set mapping.", "required": [ "properties" ], @@ -5284,19 +5286,20 @@ "properties": { "properties": { "$ref": "#/definitions/BlobContainerMappingProperties", - "description": "Blob container dataset mapping properties.", + "description": "Blob container data set mapping properties.", "x-ms-client-flatten": true } }, "x-ms-discriminator-value": "Container" }, "BlobContainerMappingProperties": { - "description": "Azure storage Blob container dataset mapping property bag.", + "description": "Azure storage Blob container data set mapping property bag.", "required": [ "containerName", "subscriptionId", "resourceGroup", - "storageAccountName" + "storageAccountName", + "dataSetId" ], "type": "object", "properties": { @@ -5305,11 +5308,11 @@ "type": "string" }, "dataSetId": { - "description": "Gets the id of source dataset.", + "description": "The id of the source data set.", "type": "string" }, "dataSetMappingStatus": { - "description": "Gets the status of the dataset mapping.", + "description": "Gets the status of the data set mapping.", "enum": [ "Ok", "Broken" @@ -5335,7 +5338,7 @@ } }, "ADLSGen2FileDataSetMapping": { - "description": "An ADLS Gen2 file dataset mapping.", + "description": "An ADLS Gen2 file data set mapping.", "required": [ "properties" ], @@ -5348,29 +5351,30 @@ "properties": { "properties": { "$ref": "#/definitions/ADLSGen2FileDataSetMappingProperties", - "description": "ADLS Gen2 file dataset mapping properties.", + "description": "ADLS Gen2 file data set mapping properties.", "x-ms-client-flatten": true } }, "x-ms-discriminator-value": "AdlsGen2File" }, "ADLSGen2FileDataSetMappingProperties": { - "description": "ADLS Gen 2 file dataset mapping property bag.", + "description": "ADLS Gen 2 file data set mapping property bag.", "required": [ "fileSystem", "filePath", "subscriptionId", "resourceGroup", - "storageAccountName" + "storageAccountName", + "dataSetId" ], "type": "object", "properties": { "dataSetId": { - "description": "Gets the id of source dataset.", + "description": "The id of the source data set.", "type": "string" }, "dataSetMappingStatus": { - "description": "Gets the status of the dataset mapping.", + "description": "Gets the status of the data set mapping.", "enum": [ "Ok", "Broken" @@ -5416,7 +5420,7 @@ } }, "ADLSGen2FolderDataSetMapping": { - "description": "An ADLS Gen2 folder dataset mapping.", + "description": "An ADLS Gen2 folder data set mapping.", "required": [ "properties" ], @@ -5429,29 +5433,30 @@ "properties": { "properties": { "$ref": "#/definitions/ADLSGen2FolderDataSetMappingProperties", - "description": "ADLS Gen2 folder dataset mapping properties.", + "description": "ADLS Gen2 folder data set mapping properties.", "x-ms-client-flatten": true } }, "x-ms-discriminator-value": "AdlsGen2Folder" }, "ADLSGen2FolderDataSetMappingProperties": { - "description": "ADLS Gen 2 folder dataset mapping property bag.", + "description": "ADLS Gen 2 folder data set mapping property bag.", "required": [ "fileSystem", "folderPath", "subscriptionId", "resourceGroup", - "storageAccountName" + "storageAccountName", + "dataSetId" ], "type": "object", "properties": { "dataSetId": { - "description": "Gets the id of source dataset.", + "description": "The id of the source data set.", "type": "string" }, "dataSetMappingStatus": { - "description": "Gets the status of the dataset mapping.", + "description": "Gets the status of the data set mapping.", "enum": [ "Ok", "Broken" @@ -5485,7 +5490,7 @@ } }, "ADLSGen2FileSystemDataSetMapping": { - "description": "An ADLS Gen2 file system dataset mapping.", + "description": "An ADLS Gen2 file system data set mapping.", "required": [ "properties" ], @@ -5498,28 +5503,29 @@ "properties": { "properties": { "$ref": "#/definitions/ADLSGen2FileSystemDataSetMappingProperties", - "description": "ADLS Gen2 file system dataset mapping properties.", + "description": "ADLS Gen2 file system data set mapping properties.", "x-ms-client-flatten": true } }, "x-ms-discriminator-value": "AdlsGen2FileSystem" }, "ADLSGen2FileSystemDataSetMappingProperties": { - "description": "ADLS Gen 2 file system dataset mapping property bag.", + "description": "ADLS Gen 2 file system data set mapping property bag.", "required": [ "fileSystem", "subscriptionId", "resourceGroup", - "storageAccountName" + "storageAccountName", + "dataSetId" ], "type": "object", "properties": { "dataSetId": { - "description": "Gets the id of source dataset.", + "description": "The id of the source data set.", "type": "string" }, "dataSetMappingStatus": { - "description": "Gets the status of the dataset mapping.", + "description": "Gets the status of the data set mapping.", "enum": [ "Ok", "Broken" @@ -5549,7 +5555,7 @@ } }, "SqlDWTableDataSetMapping": { - "description": "A SQL DW Table dataset mapping.", + "description": "A SQL DW Table data set mapping.", "required": [ "properties" ], @@ -5562,7 +5568,7 @@ "properties": { "properties": { "$ref": "#/definitions/SqlDWTableDataSetMappingProperties", - "description": "Sql DW dataset mapping properties.", + "description": "Sql DW data set mapping properties.", "x-ms-client-flatten": true } }, @@ -5573,16 +5579,17 @@ "required": [ "dataWarehouseName", "tableName", - "sqlServerResourceId" + "sqlServerResourceId", + "dataSetId" ], "type": "object", "properties": { "dataSetId": { - "description": "Gets the id of source dataset.", + "description": "The id of the source data set.", "type": "string" }, "dataSetMappingStatus": { - "description": "Gets the status of the dataset mapping.", + "description": "Gets the status of the data set mapping.", "enum": [ "Ok", "Broken" @@ -5608,7 +5615,7 @@ } }, "SqlDBTableDataSetMapping": { - "description": "A SQL DB Table dataset mapping.", + "description": "A SQL DB Table data set mapping.", "required": [ "properties" ], @@ -5621,7 +5628,7 @@ "properties": { "properties": { "$ref": "#/definitions/SqlDBTableDataSetMappingProperties", - "description": "Sql DB dataset mapping properties.", + "description": "Sql DB data set mapping properties.", "x-ms-client-flatten": true } }, @@ -5632,7 +5639,8 @@ "required": [ "databaseName", "tableName", - "sqlServerResourceId" + "sqlServerResourceId", + "dataSetId" ], "type": "object", "properties": { @@ -5641,11 +5649,11 @@ "type": "string" }, "dataSetId": { - "description": "Gets the id of source dataset.", + "description": "The id of the source data set.", "type": "string" }, "dataSetMappingStatus": { - "description": "Gets the status of the dataset mapping.", + "description": "Gets the status of the data set mapping.", "enum": [ "Ok", "Broken" @@ -5813,4 +5821,4 @@ } ], "tags": [] -} +} \ No newline at end of file diff --git a/specification/datashare/resource-manager/Microsoft.DataShare/preview/2018-11-01-preview/examples/DataSetMappings_Create.json b/specification/datashare/resource-manager/Microsoft.DataShare/preview/2018-11-01-preview/examples/DataSetMappings_Create.json index bc26387cf309..7d5624e94759 100644 --- a/specification/datashare/resource-manager/Microsoft.DataShare/preview/2018-11-01-preview/examples/DataSetMappings_Create.json +++ b/specification/datashare/resource-manager/Microsoft.DataShare/preview/2018-11-01-preview/examples/DataSetMappings_Create.json @@ -9,6 +9,7 @@ "dataSetMapping": { "kind": "Blob", "properties": { + "dataSetId": "a08f184b-0567-4b11-ba22-a1199336d226", "storageAccountName": "storage2", "filePath": "file21", "containerName": "C1", @@ -52,6 +53,7 @@ "body": { "kind": "Blob", "properties": { + "dataSetId": "a08f184b-0567-4b11-ba22-a1199336d227", "storageAccountName": "storage2", "filePath": "file21", "containerName": "C1", @@ -64,4 +66,4 @@ } } } -} +} \ No newline at end of file diff --git a/specification/datashare/resource-manager/Microsoft.DataShare/preview/2018-11-01-preview/examples/DataSetMappings_Get.json b/specification/datashare/resource-manager/Microsoft.DataShare/preview/2018-11-01-preview/examples/DataSetMappings_Get.json index ef410eac4cd0..042b82b80e9e 100644 --- a/specification/datashare/resource-manager/Microsoft.DataShare/preview/2018-11-01-preview/examples/DataSetMappings_Get.json +++ b/specification/datashare/resource-manager/Microsoft.DataShare/preview/2018-11-01-preview/examples/DataSetMappings_Get.json @@ -19,6 +19,7 @@ "body": { "kind": "Blob", "properties": { + "dataSetId": "a08f184b-0567-4b11-ba22-a1199336d226", "storageAccountName": "storage2", "filePath": "file21", "containerName": "C1", @@ -31,4 +32,4 @@ } } } -} +} \ No newline at end of file diff --git a/specification/datashare/resource-manager/Microsoft.DataShare/preview/2018-11-01-preview/examples/DataSetMappings_ListByShareSubscription.json b/specification/datashare/resource-manager/Microsoft.DataShare/preview/2018-11-01-preview/examples/DataSetMappings_ListByShareSubscription.json index bab66acde4ce..bafa2b3b3773 100644 --- a/specification/datashare/resource-manager/Microsoft.DataShare/preview/2018-11-01-preview/examples/DataSetMappings_ListByShareSubscription.json +++ b/specification/datashare/resource-manager/Microsoft.DataShare/preview/2018-11-01-preview/examples/DataSetMappings_ListByShareSubscription.json @@ -20,6 +20,7 @@ { "kind": "Blob", "properties": { + "dataSetId": "a08f184b-0567-4b11-ba22-a1199336d226", "storageAccountName": "storage2", "filePath": "file21", "containerName": "C1", @@ -33,6 +34,7 @@ { "kind": "Blob", "properties": { + "dataSetId": "a08f184b-0567-4b11-ba22-a1199336d227", "storageAccountName": "storage2", "filePath": "file21", "containerName": "C1", @@ -47,4 +49,4 @@ } } } -} +} \ No newline at end of file diff --git a/specification/datashare/resource-manager/Microsoft.DataShare/preview/2018-11-01-preview/examples/DataSetMappings_SqlDB_Create.json b/specification/datashare/resource-manager/Microsoft.DataShare/preview/2018-11-01-preview/examples/DataSetMappings_SqlDB_Create.json index ab622f7c7c1f..43eaa8fa5c7e 100644 --- a/specification/datashare/resource-manager/Microsoft.DataShare/preview/2018-11-01-preview/examples/DataSetMappings_SqlDB_Create.json +++ b/specification/datashare/resource-manager/Microsoft.DataShare/preview/2018-11-01-preview/examples/DataSetMappings_SqlDB_Create.json @@ -9,7 +9,8 @@ "dataSetMapping": { "kind": "SqlDBTable", "properties": { - "sqlServerResourceId": "/subscriptions/433a8dfd-e5d5-4e77-ad86-90acdc75eb1a/resourceGroups/SampleResourceGroup/providers/Microsoft.Sql/servers/Server1", + "dataSetId": "a08f184b-0567-4b11-ba22-a1199336d226", + "sqlServerResourceId": "/subscriptions/433a8dfd-e5d5-4e77-ad86-90acdc75eb1a/resourceGroups/SampleResourceGroup/providers/Microsoft.Sql/servers/Server1", "databaseName": "Database1", "tableName": "Table1" } @@ -28,7 +29,7 @@ "kind": "SqlDBTable", "properties": { "dataSetId": "a08f184b-0567-4b11-ba22-a1199336d226", - "sqlServerResourceId": "/subscriptions/433a8dfd-e5d5-4e77-ad86-90acdc75eb1a/resourceGroups/SampleResourceGroup/providers/Microsoft.Sql/servers/Server1", + "sqlServerResourceId": "/subscriptions/433a8dfd-e5d5-4e77-ad86-90acdc75eb1a/resourceGroups/SampleResourceGroup/providers/Microsoft.Sql/servers/Server1", "databaseName": "Database1", "tableName": "Table1" }, @@ -48,7 +49,8 @@ "body": { "kind": "SqlDBTable", "properties": { - "sqlServerResourceId": "/subscriptions/433a8dfd-e5d5-4e77-ad86-90acdc75eb1a/resourceGroups/SampleResourceGroup/providers/Microsoft.Sql/servers/Server1", + "dataSetId": "a08f184b-0567-4b11-ba22-a1199336d226", + "sqlServerResourceId": "/subscriptions/433a8dfd-e5d5-4e77-ad86-90acdc75eb1a/resourceGroups/SampleResourceGroup/providers/Microsoft.Sql/servers/Server1", "databaseName": "Database1", "tableName": "Table1" }, @@ -58,4 +60,4 @@ } } } -} +} \ No newline at end of file diff --git a/specification/datashare/resource-manager/Microsoft.DataShare/preview/2018-11-01-preview/examples/DataSetMappings_AdlsGen2File_Create.json b/specification/datashare/resource-manager/Microsoft.DataShare/preview/2018-11-01-preview/examples/DataSetMappings_SqlDWDataSetToAdlsGen2File_Create.json similarity index 95% rename from specification/datashare/resource-manager/Microsoft.DataShare/preview/2018-11-01-preview/examples/DataSetMappings_AdlsGen2File_Create.json rename to specification/datashare/resource-manager/Microsoft.DataShare/preview/2018-11-01-preview/examples/DataSetMappings_SqlDWDataSetToAdlsGen2File_Create.json index e0dda92a81aa..d51bdd02a23a 100644 --- a/specification/datashare/resource-manager/Microsoft.DataShare/preview/2018-11-01-preview/examples/DataSetMappings_AdlsGen2File_Create.json +++ b/specification/datashare/resource-manager/Microsoft.DataShare/preview/2018-11-01-preview/examples/DataSetMappings_SqlDWDataSetToAdlsGen2File_Create.json @@ -9,6 +9,7 @@ "dataSetMapping": { "kind": "AdlsGen2File", "properties": { + "dataSetId": "a08f184b-0567-4b11-ba22-a1199336d226", "storageAccountName": "storage2", "filePath": "file21", "fileSystem": "fileSystem", @@ -54,6 +55,7 @@ "body": { "kind": "AdlsGen2File", "properties": { + "dataSetId": "a08f184b-0567-4b11-ba22-a1199336d226", "storageAccountName": "storage2", "filePath": "file21", "fileSystem": "fileSystem", @@ -67,4 +69,4 @@ } } } -} +} \ No newline at end of file diff --git a/specification/datashare/resource-manager/Microsoft.DataShare/preview/2018-11-01-preview/examples/DataSetMappings_SqlDW_Create.json b/specification/datashare/resource-manager/Microsoft.DataShare/preview/2018-11-01-preview/examples/DataSetMappings_SqlDW_Create.json index 53febb414601..d7461ffdffee 100644 --- a/specification/datashare/resource-manager/Microsoft.DataShare/preview/2018-11-01-preview/examples/DataSetMappings_SqlDW_Create.json +++ b/specification/datashare/resource-manager/Microsoft.DataShare/preview/2018-11-01-preview/examples/DataSetMappings_SqlDW_Create.json @@ -9,7 +9,8 @@ "dataSetMapping": { "kind": "SqlDWTable", "properties": { - "sqlServerResourceId": "/subscriptions/433a8dfd-e5d5-4e77-ad86-90acdc75eb1a/resourceGroups/SampleResourceGroup/providers/Microsoft.Sql/servers/Server1", + "dataSetId": "a08f184b-0567-4b11-ba22-a1199336d226", + "sqlServerResourceId": "/subscriptions/433a8dfd-e5d5-4e77-ad86-90acdc75eb1a/resourceGroups/SampleResourceGroup/providers/Microsoft.Sql/servers/Server1", "dataWarehouseName": "DataWarehouse1", "tableName": "Table1" } @@ -28,7 +29,7 @@ "kind": "SqlDWTable", "properties": { "dataSetId": "a08f184b-0567-4b11-ba22-a1199336d226", - "sqlServerResourceId": "/subscriptions/433a8dfd-e5d5-4e77-ad86-90acdc75eb1a/resourceGroups/SampleResourceGroup/providers/Microsoft.Sql/servers/Server1", + "sqlServerResourceId": "/subscriptions/433a8dfd-e5d5-4e77-ad86-90acdc75eb1a/resourceGroups/SampleResourceGroup/providers/Microsoft.Sql/servers/Server1", "dataWarehouseName": "DataWarehouse1", "tableName": "Table1" }, @@ -48,7 +49,8 @@ "body": { "kind": "SqlDWTable", "properties": { - "sqlServerResourceId": "/subscriptions/433a8dfd-e5d5-4e77-ad86-90acdc75eb1a/resourceGroups/SampleResourceGroup/providers/Microsoft.Sql/servers/Server1", + "dataSetId": "a08f184b-0567-4b11-ba22-a1199336d226", + "sqlServerResourceId": "/subscriptions/433a8dfd-e5d5-4e77-ad86-90acdc75eb1a/resourceGroups/SampleResourceGroup/providers/Microsoft.Sql/servers/Server1", "dataWarehouseName": "DataWarehouse1", "tableName": "Table1" }, @@ -58,4 +60,4 @@ } } } -} +} \ No newline at end of file diff --git a/specification/datashare/resource-manager/Microsoft.DataShare/preview/2018-11-01-preview/examples/DataSets_Create.json b/specification/datashare/resource-manager/Microsoft.DataShare/preview/2018-11-01-preview/examples/DataSets_Create.json index 654f0e8d3194..9569da347267 100644 --- a/specification/datashare/resource-manager/Microsoft.DataShare/preview/2018-11-01-preview/examples/DataSets_Create.json +++ b/specification/datashare/resource-manager/Microsoft.DataShare/preview/2018-11-01-preview/examples/DataSets_Create.json @@ -64,4 +64,4 @@ } } } -} +} \ No newline at end of file diff --git a/specification/datashare/resource-manager/Microsoft.DataShare/preview/2018-11-01-preview/examples/DataSets_Get.json b/specification/datashare/resource-manager/Microsoft.DataShare/preview/2018-11-01-preview/examples/DataSets_Get.json index 794ade8c14ef..e31bab0c773f 100644 --- a/specification/datashare/resource-manager/Microsoft.DataShare/preview/2018-11-01-preview/examples/DataSets_Get.json +++ b/specification/datashare/resource-manager/Microsoft.DataShare/preview/2018-11-01-preview/examples/DataSets_Get.json @@ -31,4 +31,4 @@ } } } -} +} \ No newline at end of file diff --git a/specification/datashare/resource-manager/Microsoft.DataShare/preview/2018-11-01-preview/examples/DataSets_ListByShare.json b/specification/datashare/resource-manager/Microsoft.DataShare/preview/2018-11-01-preview/examples/DataSets_ListByShare.json index 377709df3724..76ac50a8787c 100644 --- a/specification/datashare/resource-manager/Microsoft.DataShare/preview/2018-11-01-preview/examples/DataSets_ListByShare.json +++ b/specification/datashare/resource-manager/Microsoft.DataShare/preview/2018-11-01-preview/examples/DataSets_ListByShare.json @@ -47,4 +47,4 @@ } } } -} +} \ No newline at end of file diff --git a/specification/datashare/resource-manager/Microsoft.DataShare/preview/2018-11-01-preview/examples/DataSets_SqlDBTable_Create.json b/specification/datashare/resource-manager/Microsoft.DataShare/preview/2018-11-01-preview/examples/DataSets_SqlDBTable_Create.json index a01248d5ae12..dfae36d27bc8 100644 --- a/specification/datashare/resource-manager/Microsoft.DataShare/preview/2018-11-01-preview/examples/DataSets_SqlDBTable_Create.json +++ b/specification/datashare/resource-manager/Microsoft.DataShare/preview/2018-11-01-preview/examples/DataSets_SqlDBTable_Create.json @@ -59,4 +59,4 @@ } } } -} +} \ No newline at end of file diff --git a/specification/datashare/resource-manager/Microsoft.DataShare/preview/2018-11-01-preview/examples/DataSets_SqlDWTable_Create.json b/specification/datashare/resource-manager/Microsoft.DataShare/preview/2018-11-01-preview/examples/DataSets_SqlDWTable_Create.json index 3560759e22f7..2758b144c390 100644 --- a/specification/datashare/resource-manager/Microsoft.DataShare/preview/2018-11-01-preview/examples/DataSets_SqlDWTable_Create.json +++ b/specification/datashare/resource-manager/Microsoft.DataShare/preview/2018-11-01-preview/examples/DataSets_SqlDWTable_Create.json @@ -9,7 +9,7 @@ "dataSet": { "kind": "SqlDWTable", "properties": { - "sqlServerResourceId": "/subscriptions/433a8dfd-e5d5-4e77-ad86-90acdc75eb1a/resourceGroups/SampleResourceGroup/providers/Microsoft.Sql/servers/Server1", + "sqlServerResourceId": "/subscriptions/433a8dfd-e5d5-4e77-ad86-90acdc75eb1a/resourceGroups/SampleResourceGroup/providers/Microsoft.Sql/servers/Server1", "dataWarehouseName": "DataWarehouse1", "tableName": "Table1" } @@ -28,7 +28,7 @@ "kind": "SqlDWTable", "properties": { "dataSetId": "a08f184b-0567-4b11-ba22-a1199336d226", - "sqlServerResourceId": "/subscriptions/433a8dfd-e5d5-4e77-ad86-90acdc75eb1a/resourceGroups/SampleResourceGroup/providers/Microsoft.Sql/servers/Server1", + "sqlServerResourceId": "/subscriptions/433a8dfd-e5d5-4e77-ad86-90acdc75eb1a/resourceGroups/SampleResourceGroup/providers/Microsoft.Sql/servers/Server1", "dataWarehouseName": "DataWarehouse1", "tableName": "Table1" }, @@ -49,7 +49,7 @@ "kind": "SqlDWTable", "properties": { "dataSetId": "a08f184b-0567-4b11-ba22-a1199336d226", - "sqlServerResourceId": "/subscriptions/433a8dfd-e5d5-4e77-ad86-90acdc75eb1a/resourceGroups/SampleResourceGroup/providers/Microsoft.Sql/servers/Server1", + "sqlServerResourceId": "/subscriptions/433a8dfd-e5d5-4e77-ad86-90acdc75eb1a/resourceGroups/SampleResourceGroup/providers/Microsoft.Sql/servers/Server1", "dataWarehouseName": "DataWarehouse1", "tableName": "Table1" }, @@ -59,4 +59,4 @@ } } } -} +} \ No newline at end of file diff --git a/specification/datashare/resource-manager/Microsoft.DataShare/preview/2018-11-01-preview/examples/ProviderShareSubscriptions_ListByShare.json b/specification/datashare/resource-manager/Microsoft.DataShare/preview/2018-11-01-preview/examples/ProviderShareSubscriptions_ListByShare.json index 8ef6f9840cb6..ba84858c928d 100644 --- a/specification/datashare/resource-manager/Microsoft.DataShare/preview/2018-11-01-preview/examples/ProviderShareSubscriptions_ListByShare.json +++ b/specification/datashare/resource-manager/Microsoft.DataShare/preview/2018-11-01-preview/examples/ProviderShareSubscriptions_ListByShare.json @@ -34,4 +34,4 @@ } } } -} +} \ No newline at end of file diff --git a/specification/datashare/resource-manager/readme.md b/specification/datashare/resource-manager/readme.md index ca584ab208dd..542497a94be1 100644 --- a/specification/datashare/resource-manager/readme.md +++ b/specification/datashare/resource-manager/readme.md @@ -125,4 +125,3 @@ uncomment the `exclude-file` section below and add the file paths. #exclude-file: # - $(this-folder)/Microsoft.Example/stable/2010-01-01/somefile.json ``` -