From f756788799f5681f7ccc10d0e2ec15a41f030bfe Mon Sep 17 00:00:00 2001 From: Yiliu Date: Thu, 14 Mar 2019 15:56:38 +0800 Subject: [PATCH 1/4] Modify the public swagger by reference to private swagger --- .../2018-06-01/entityTypes/Dataset.json | 514 ++++++++---------- 1 file changed, 233 insertions(+), 281 deletions(-) diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Dataset.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Dataset.json index 294ad19ca54d..b300fbe474f9 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Dataset.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Dataset.json @@ -398,10 +398,7 @@ "x-ms-client-flatten": true, "$ref": "#/definitions/AzureBlobDatasetTypeProperties" } - }, - "required": [ - "typeProperties" - ] + } }, "AzureBlobDatasetTypeProperties": { "description": "Azure Blob dataset properties.", @@ -483,10 +480,7 @@ "x-ms-client-flatten": true, "$ref": "#/definitions/AzureSqlTableDatasetTypeProperties" } - }, - "required": [ - "typeProperties" - ] + } }, "AzureSqlTableDatasetTypeProperties": { "description": "Azure SQL dataset properties.", @@ -515,10 +509,7 @@ "x-ms-client-flatten": true, "$ref": "#/definitions/AzureSqlDWTableDatasetTypeProperties" } - }, - "required": [ - "typeProperties" - ] + } }, "AzureSqlDWTableDatasetTypeProperties": { "description": "Azure SQL Data Warehouse dataset properties.", @@ -547,10 +538,7 @@ "x-ms-client-flatten": true, "$ref": "#/definitions/CassandraTableDatasetTypeProperties" } - }, - "required": [ - "typeProperties" - ] + } }, "CassandraTableDatasetTypeProperties": { "description": "Cassandra dataset properties.", @@ -579,10 +567,7 @@ "x-ms-client-flatten": true, "type": "object" } - }, - "required": [ - "typeProperties" - ] + } }, "DocumentDbCollectionDataset": { "x-ms-discriminator-value": "DocumentDbCollection", @@ -631,10 +616,7 @@ "x-ms-client-flatten": true, "$ref": "#/definitions/DynamicsEntityDatasetTypeProperties" } - }, - "required": [ - "typeProperties" - ] + } }, "DynamicsEntityDatasetTypeProperties": { "description": "Dynamics entity dataset properties.", @@ -660,10 +642,7 @@ "x-ms-client-flatten": true, "$ref": "#/definitions/AzureDataLakeStoreDatasetTypeProperties" } - }, - "required": [ - "typeProperties" - ] + } }, "AzureDataLakeStoreDatasetTypeProperties": { "description": "Azure Data Lake Store dataset properties.", @@ -684,10 +663,7 @@ "description": "The data compression method used for the item(s) in the Azure Data Lake Store.", "$ref": "#/definitions/DatasetCompression" } - }, - "required": [ - "folderPath" - ] + } }, "AzureBlobFSDataset": { "x-ms-discriminator-value": "AzureBlobFSFile", @@ -819,10 +795,7 @@ "x-ms-client-flatten": true, "$ref": "#/definitions/FileShareDatasetTypeProperties" } - }, - "required": [ - "typeProperties" - ] + } }, "FileShareDatasetTypeProperties": { "description": "On-premises file system dataset properties.", @@ -968,10 +941,7 @@ "x-ms-client-flatten": true, "$ref": "#/definitions/ODataResourceDatasetTypeProperties" } - }, - "required": [ - "typeProperties" - ] + } }, "ODataResourceDatasetTypeProperties": { "description": "OData dataset properties.", @@ -997,10 +967,7 @@ "x-ms-client-flatten": true, "$ref": "#/definitions/OracleTableDatasetTypeProperties" } - }, - "required": [ - "typeProperties" - ] + } }, "OracleTableDatasetTypeProperties": { "description": "On-premises Oracle dataset properties.", @@ -1009,10 +976,7 @@ "type": "object", "description": "The table name of the on-premises Oracle database. Type: string (or Expression with resultType string)." } - }, - "required": [ - "tableName" - ] + } }, "AzureMySqlTableDataset": { "x-ms-discriminator-value": "AzureMySqlTable", @@ -1058,10 +1022,7 @@ "x-ms-client-flatten": true, "$ref": "#/definitions/RelationalTableDatasetTypeProperties" } - }, - "required": [ - "typeProperties" - ] + } }, "RelationalTableDatasetTypeProperties": { "description": "Relational table dataset properties.", @@ -1087,10 +1048,7 @@ "x-ms-client-flatten": true, "$ref": "#/definitions/SalesforceObjectDatasetTypeProperties" } - }, - "required": [ - "typeProperties" - ] + } }, "SalesforceObjectDatasetTypeProperties": { "description": "Salesforce object dataset properties.", @@ -1220,10 +1178,7 @@ "x-ms-client-flatten": true, "$ref": "#/definitions/SqlServerTableDatasetTypeProperties" } - }, - "required": [ - "typeProperties" - ] + } }, "SqlServerTableDatasetTypeProperties": { "description": "On-premises SQL Server dataset properties.", @@ -1362,10 +1317,7 @@ "x-ms-client-flatten": true, "$ref": "#/definitions/HttpDatasetTypeProperties" } - }, - "required": [ - "typeProperties" - ] + } }, "HttpDatasetTypeProperties": { "description": "Properties specific to this dataset type.", @@ -1406,14 +1358,14 @@ } }, "AmazonMWSObjectDataset" : { - "x-ms-discriminator-value": "AmazonMWSObject", - "description": "Amazon Marketplace Web Service dataset.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/Dataset" - } - ], + "x-ms-discriminator-value": "AmazonMWSObject", + "description": "Amazon Marketplace Web Service dataset.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/Dataset" + } + ], "properties": { "typeProperties": { "description": "Properties specific to this dataset type.", @@ -1424,13 +1376,13 @@ }, "AzurePostgreSqlTableDataset" : { "x-ms-discriminator-value": "AzurePostgreSqlTable", - "description": "Azure PostgreSQL dataset.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/Dataset" - } - ], + "description": "Azure PostgreSQL dataset.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/Dataset" + } + ], "properties": { "typeProperties": { "description": "Properties specific to this dataset type.", @@ -1440,14 +1392,14 @@ } }, "ConcurObjectDataset" : { - "x-ms-discriminator-value": "ConcurObject", - "description": "Concur Service dataset.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/Dataset" - } - ], + "x-ms-discriminator-value": "ConcurObject", + "description": "Concur Service dataset.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/Dataset" + } + ], "properties": { "typeProperties": { "description": "Properties specific to this dataset type.", @@ -1458,13 +1410,13 @@ }, "CouchbaseTableDataset" : { "x-ms-discriminator-value": "CouchbaseTable", - "description": "Couchbase server dataset.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/Dataset" - } - ], + "description": "Couchbase server dataset.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/Dataset" + } + ], "properties": { "typeProperties": { "description": "Properties specific to this dataset type.", @@ -1475,13 +1427,13 @@ }, "DrillTableDataset" : { "x-ms-discriminator-value": "DrillTable", - "description": "Drill server dataset.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/Dataset" - } - ], + "description": "Drill server dataset.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/Dataset" + } + ], "properties": { "typeProperties": { "description": "Properties specific to this dataset type.", @@ -1491,14 +1443,14 @@ } }, "EloquaObjectDataset" : { - "x-ms-discriminator-value": "EloquaObject", - "description": "Eloqua server dataset.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/Dataset" - } - ], + "x-ms-discriminator-value": "EloquaObject", + "description": "Eloqua server dataset.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/Dataset" + } + ], "properties": { "typeProperties": { "description": "Properties specific to this dataset type.", @@ -1508,14 +1460,14 @@ } }, "GoogleBigQueryObjectDataset" : { - "x-ms-discriminator-value": "GoogleBigQueryObject", - "description": "Google BigQuery service dataset.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/Dataset" - } - ], + "x-ms-discriminator-value": "GoogleBigQueryObject", + "description": "Google BigQuery service dataset.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/Dataset" + } + ], "properties": { "typeProperties": { "description": "Properties specific to this dataset type.", @@ -1526,13 +1478,13 @@ }, "GreenplumTableDataset" : { "x-ms-discriminator-value": "GreenplumTable", - "description": "Greenplum Database dataset.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/Dataset" - } - ], + "description": "Greenplum Database dataset.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/Dataset" + } + ], "properties": { "typeProperties": { "description": "Properties specific to this dataset type.", @@ -1542,14 +1494,14 @@ } }, "HBaseObjectDataset" : { - "x-ms-discriminator-value": "HBaseObject", - "description": "HBase server dataset.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/Dataset" - } - ], + "x-ms-discriminator-value": "HBaseObject", + "description": "HBase server dataset.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/Dataset" + } + ], "properties": { "typeProperties": { "description": "Properties specific to this dataset type.", @@ -1559,14 +1511,14 @@ } }, "HiveObjectDataset" : { - "x-ms-discriminator-value": "HiveObject", - "description": "Hive Server dataset.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/Dataset" - } - ], + "x-ms-discriminator-value": "HiveObject", + "description": "Hive Server dataset.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/Dataset" + } + ], "properties": { "typeProperties": { "description": "Properties specific to this dataset type.", @@ -1576,14 +1528,14 @@ } }, "HubspotObjectDataset" : { - "x-ms-discriminator-value": "HubspotObject", - "description": "Hubspot Service dataset.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/Dataset" - } - ], + "x-ms-discriminator-value": "HubspotObject", + "description": "Hubspot Service dataset.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/Dataset" + } + ], "properties": { "typeProperties": { "description": "Properties specific to this dataset type.", @@ -1593,14 +1545,14 @@ } }, "ImpalaObjectDataset" : { - "x-ms-discriminator-value": "ImpalaObject", - "description": "Impala server dataset.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/Dataset" - } - ], + "x-ms-discriminator-value": "ImpalaObject", + "description": "Impala server dataset.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/Dataset" + } + ], "properties": { "typeProperties": { "description": "Properties specific to this dataset type.", @@ -1610,14 +1562,14 @@ } }, "JiraObjectDataset" : { - "x-ms-discriminator-value": "JiraObject", - "description": "Jira Service dataset.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/Dataset" - } - ], + "x-ms-discriminator-value": "JiraObject", + "description": "Jira Service dataset.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/Dataset" + } + ], "properties": { "typeProperties": { "description": "Properties specific to this dataset type.", @@ -1627,14 +1579,14 @@ } }, "MagentoObjectDataset" : { - "x-ms-discriminator-value": "MagentoObject", - "description": "Magento server dataset.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/Dataset" - } - ], + "x-ms-discriminator-value": "MagentoObject", + "description": "Magento server dataset.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/Dataset" + } + ], "properties": { "typeProperties": { "description": "Properties specific to this dataset type.", @@ -1645,13 +1597,13 @@ }, "MariaDBTableDataset" : { "x-ms-discriminator-value": "MariaDBTable", - "description": "MariaDB server dataset.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/Dataset" - } - ], + "description": "MariaDB server dataset.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/Dataset" + } + ], "properties": { "typeProperties": { "description": "Properties specific to this dataset type.", @@ -1661,14 +1613,14 @@ } }, "MarketoObjectDataset" : { - "x-ms-discriminator-value": "MarketoObject", - "description": "Marketo server dataset.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/Dataset" - } - ], + "x-ms-discriminator-value": "MarketoObject", + "description": "Marketo server dataset.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/Dataset" + } + ], "properties": { "typeProperties": { "description": "Properties specific to this dataset type.", @@ -1678,14 +1630,14 @@ } }, "PaypalObjectDataset" : { - "x-ms-discriminator-value": "PaypalObject", - "description": "Paypal Service dataset.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/Dataset" - } - ], + "x-ms-discriminator-value": "PaypalObject", + "description": "Paypal Service dataset.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/Dataset" + } + ], "properties": { "typeProperties": { "description": "Properties specific to this dataset type.", @@ -1695,14 +1647,14 @@ } }, "PhoenixObjectDataset" : { - "x-ms-discriminator-value": "PhoenixObject", - "description": "Phoenix server dataset.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/Dataset" - } - ], + "x-ms-discriminator-value": "PhoenixObject", + "description": "Phoenix server dataset.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/Dataset" + } + ], "properties": { "typeProperties": { "description": "Properties specific to this dataset type.", @@ -1712,14 +1664,14 @@ } }, "PrestoObjectDataset" : { - "x-ms-discriminator-value": "PrestoObject", - "description": "Presto server dataset.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/Dataset" - } - ], + "x-ms-discriminator-value": "PrestoObject", + "description": "Presto server dataset.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/Dataset" + } + ], "properties": { "typeProperties": { "description": "Properties specific to this dataset type.", @@ -1729,14 +1681,14 @@ } }, "QuickBooksObjectDataset" : { - "x-ms-discriminator-value": "QuickBooksObject", - "description": "QuickBooks server dataset.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/Dataset" - } - ], + "x-ms-discriminator-value": "QuickBooksObject", + "description": "QuickBooks server dataset.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/Dataset" + } + ], "properties": { "typeProperties": { "description": "Properties specific to this dataset type.", @@ -1746,14 +1698,14 @@ } }, "ServiceNowObjectDataset" : { - "x-ms-discriminator-value": "ServiceNowObject", - "description": "ServiceNow server dataset.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/Dataset" - } - ], + "x-ms-discriminator-value": "ServiceNowObject", + "description": "ServiceNow server dataset.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/Dataset" + } + ], "properties": { "typeProperties": { "description": "Properties specific to this dataset type.", @@ -1763,14 +1715,14 @@ } }, "ShopifyObjectDataset" : { - "x-ms-discriminator-value": "ShopifyObject", - "description": "Shopify Service dataset.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/Dataset" - } - ], + "x-ms-discriminator-value": "ShopifyObject", + "description": "Shopify Service dataset.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/Dataset" + } + ], "properties": { "typeProperties": { "description": "Properties specific to this dataset type.", @@ -1780,14 +1732,14 @@ } }, "SparkObjectDataset" : { - "x-ms-discriminator-value": "SparkObject", - "description": "Spark Server dataset.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/Dataset" - } - ], + "x-ms-discriminator-value": "SparkObject", + "description": "Spark Server dataset.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/Dataset" + } + ], "properties": { "typeProperties": { "description": "Properties specific to this dataset type.", @@ -1797,14 +1749,14 @@ } }, "SquareObjectDataset" : { - "x-ms-discriminator-value": "SquareObject", - "description": "Square Service dataset.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/Dataset" - } - ], + "x-ms-discriminator-value": "SquareObject", + "description": "Square Service dataset.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/Dataset" + } + ], "properties": { "typeProperties": { "description": "Properties specific to this dataset type.", @@ -1814,14 +1766,14 @@ } }, "XeroObjectDataset" : { - "x-ms-discriminator-value": "XeroObject", - "description": "Xero Service dataset.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/Dataset" - } - ], + "x-ms-discriminator-value": "XeroObject", + "description": "Xero Service dataset.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/Dataset" + } + ], "properties": { "typeProperties": { "description": "Properties specific to this dataset type.", @@ -1831,14 +1783,14 @@ } }, "ZohoObjectDataset" : { - "x-ms-discriminator-value": "ZohoObject", - "description": "Zoho server dataset.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/Dataset" - } - ], + "x-ms-discriminator-value": "ZohoObject", + "description": "Zoho server dataset.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/Dataset" + } + ], "properties": { "typeProperties": { "description": "Properties specific to this dataset type.", @@ -1849,13 +1801,13 @@ }, "NetezzaTableDataset" : { "x-ms-discriminator-value": "NetezzaTable", - "description": "Netezza dataset.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/Dataset" - } - ], + "description": "Netezza dataset.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/Dataset" + } + ], "properties": { "typeProperties": { "description": "Properties specific to this dataset type.", @@ -1866,13 +1818,13 @@ }, "VerticaTableDataset" : { "x-ms-discriminator-value": "VerticaTable", - "description": "Vertica dataset.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/Dataset" - } - ], + "description": "Vertica dataset.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/Dataset" + } + ], "properties": { "typeProperties": { "description": "Properties specific to this dataset type.", From aedfef37a3dd1954647fb0cd9995ead7c730e812 Mon Sep 17 00:00:00 2001 From: Yiliu Date: Wed, 19 Jun 2019 16:41:53 +0800 Subject: [PATCH 2/4] July2th --- .../2017-09-01-preview/entityTypes/Pipeline.json | 3 ++- .../stable/2018-06-01/entityTypes/Pipeline.json | 14 ++++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/entityTypes/Pipeline.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/entityTypes/Pipeline.json index 3d0b863ca2d4..18078f1bbd4d 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/entityTypes/Pipeline.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/entityTypes/Pipeline.json @@ -78,7 +78,8 @@ "properties": { "activity": { "description": "Activity name.", - "type": "string" + "type": "string", + "minLength": 1 }, "dependencyConditions": { "type": "array", diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json index bb458397a52c..ceecb9ec292b 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json @@ -117,7 +117,8 @@ "properties": { "activity": { "description": "Activity name.", - "type": "string" + "type": "string", + "minLength": 1 }, "dependencyConditions": { "type": "array", @@ -824,6 +825,10 @@ "maxConcurrentConnections": { "type": "object", "description": "The maximum concurrent connection count for the source data store. Type: integer (or Expression with resultType integer)." + }, + "disableMetricsCollection": { + "type": "object", + "description": "Specifies whether to disable collecting data source metrics. Type: boolean (or Expression with resultType boolean)." } }, "additionalProperties": { @@ -1051,7 +1056,8 @@ "PartitionOnInt", "PartitionOnCalendarYear", "PartitionOnCalendarMonth", - "PartitionOnCalendarDate" + "PartitionOnCalendarDate", + "PartitionOnTime" ], "x-ms-enum": { "name": "TabularPartitionOption", @@ -2158,6 +2164,10 @@ "maxConcurrentConnections": { "type": "object", "description": "The maximum concurrent connection count for the sink data store. Type: integer (or Expression with resultType integer)." + }, + "disableMetricsCollection": { + "type": "object", + "description": "Specifies whether to disable collecting data source metrics. Type: boolean (or Expression with resultType boolean)." } }, "additionalProperties": { From a8c996b0e7d76ddfa01e928e62871af518e37c8a Mon Sep 17 00:00:00 2001 From: Yiliu Date: Wed, 19 Jun 2019 17:32:31 +0800 Subject: [PATCH 3/4] July2th --- .../2018-06-01/entityTypes/Dataset.json | 29 +++++++++++++++++++ .../2018-06-01/entityTypes/Pipeline.json | 15 ++++++++++ 2 files changed, 44 insertions(+) diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Dataset.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Dataset.json index 95e57e75352a..439ea0d2aaab 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Dataset.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Dataset.json @@ -634,6 +634,35 @@ "location" ] }, + "BinaryDataset": { + "x-ms-discriminator-value": "Binary", + "description": "Binary dataset.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/Dataset" + } + ], + "properties": { + "typeProperties": { + "description": "Binary dataset properties.", + "x-ms-client-flatten": true, + "$ref": "#/definitions/Binary" + } + } + }, + "BinaryDatasetTypeProperties": { + "description": "Binary dataset properties.", + "properties": { + "location": { + "$ref": "#/definitions/DatasetLocation", + "description": "The location of the Binary storage." + } + }, + "required": [ + "location" + ] + }, "AzureBlobDataset": { "x-ms-discriminator-value": "AzureBlob", "description": "The Azure Blob storage.", diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json index ceecb9ec292b..59494e26334c 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json @@ -838,6 +838,21 @@ "type" ] }, + "BinarySource": { + "description": "A copy activity Binary source.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/CopySource" + } + ], + "properties": { + "storeSettings": { + "$ref": "#/definitions/ConnectorReadSetting", + "description": "Binary store settings." + } + } + }, "AzureTableSource": { "description": "A copy activity Azure Table source.", "type": "object", From 15aa824a6debcd4fd205a8d7b3e5d2ad48eff51b Mon Sep 17 00:00:00 2001 From: Yiliu Date: Wed, 19 Jun 2019 17:53:56 +0800 Subject: [PATCH 4/4] back Binary --- .../2018-06-01/entityTypes/Dataset.json | 29 ------------------- .../2018-06-01/entityTypes/Pipeline.json | 15 ---------- 2 files changed, 44 deletions(-) diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Dataset.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Dataset.json index 439ea0d2aaab..95e57e75352a 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Dataset.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Dataset.json @@ -634,35 +634,6 @@ "location" ] }, - "BinaryDataset": { - "x-ms-discriminator-value": "Binary", - "description": "Binary dataset.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/Dataset" - } - ], - "properties": { - "typeProperties": { - "description": "Binary dataset properties.", - "x-ms-client-flatten": true, - "$ref": "#/definitions/Binary" - } - } - }, - "BinaryDatasetTypeProperties": { - "description": "Binary dataset properties.", - "properties": { - "location": { - "$ref": "#/definitions/DatasetLocation", - "description": "The location of the Binary storage." - } - }, - "required": [ - "location" - ] - }, "AzureBlobDataset": { "x-ms-discriminator-value": "AzureBlob", "description": "The Azure Blob storage.", diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json index 59494e26334c..ceecb9ec292b 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json @@ -838,21 +838,6 @@ "type" ] }, - "BinarySource": { - "description": "A copy activity Binary source.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/CopySource" - } - ], - "properties": { - "storeSettings": { - "$ref": "#/definitions/ConnectorReadSetting", - "description": "Binary store settings." - } - } - }, "AzureTableSource": { "description": "A copy activity Azure Table source.", "type": "object",