diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/artifacts.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/artifacts.json index 544ca679e441..c79b02126869 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/artifacts.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/artifacts.json @@ -2661,6 +2661,7 @@ }, "SubResourceDebugResource": { "description": "Azure Synapse nested debug resource.", + "type": "object", "properties": { "name": { "type": "string", @@ -2756,6 +2757,7 @@ }, "IntegrationRuntimeReference": { "description": "Integration runtime reference type.", + "type": "object", "properties": { "type": { "type": "string", @@ -3349,6 +3351,7 @@ }, "PipelineReference": { "description": "Pipeline reference type.", + "type": "object", "properties": { "type": { "type": "string", @@ -3377,6 +3380,7 @@ }, "TriggerPipelineReference": { "description": "Pipeline that needs to be triggered with the given parameters.", + "type": "object", "properties": { "pipelineReference": { "description": "Pipeline reference.", @@ -3390,6 +3394,7 @@ }, "TriggerResource": { "description": "Trigger resource type.", + "type": "object", "allOf": [ { "$ref": "#/definitions/SubResource" @@ -3434,6 +3439,7 @@ }, "WorkspaceUpdateParameters": { "description": "Parameters for updating a workspace resource.", + "type": "object", "properties": { "tags": { "type": "object", @@ -3450,6 +3456,7 @@ }, "WorkspaceIdentity": { "description": "Identity properties of the workspace resource.", + "type": "object", "properties": { "type": { "type": "string", @@ -3479,6 +3486,7 @@ }, "DatasetReference": { "description": "Dataset reference type.", + "type": "object", "properties": { "type": { "type": "string", @@ -3507,6 +3515,7 @@ }, "DatasetResource": { "description": "Dataset resource type.", + "type": "object", "allOf": [ { "$ref": "#/definitions/SubResource" @@ -3524,6 +3533,7 @@ }, "DatasetDebugResource": { "description": "Dataset debug resource.", + "type": "object", "allOf": [ { "$ref": "#/definitions/SubResourceDebugResource" @@ -3541,6 +3551,7 @@ }, "LinkedServiceReference": { "description": "Linked service reference type.", + "type": "object", "properties": { "type": { "type": "string", @@ -3569,6 +3580,7 @@ }, "LinkedServiceResource": { "description": "Linked service resource type.", + "type": "object", "allOf": [ { "$ref": "#/definitions/SubResource" @@ -3586,6 +3598,7 @@ }, "LinkedServiceDebugResource": { "description": "Linked service debug resource.", + "type": "object", "allOf": [ { "$ref": "#/definitions/SubResourceDebugResource" @@ -3623,6 +3636,7 @@ }, "SqlScriptResource": { "description": "Sql Script resource type.", + "type": "object", "properties": { "id": { "readOnly": true, @@ -3675,6 +3689,7 @@ }, "SparkJobDefinitionResource": { "description": "Spark job definition resource type.", + "type": "object", "allOf": [ { "$ref": "#/definitions/SubResource" @@ -3712,6 +3727,7 @@ }, "NotebookResource": { "description": "Notebook resource type.", + "type": "object", "properties": { "id": { "readOnly": true, @@ -3744,6 +3760,7 @@ }, "DataFlowResource": { "description": "Data flow resource type.", + "type": "object", "allOf": [ { "$ref": "#/definitions/SubResource" @@ -3761,6 +3778,7 @@ }, "DataFlowReference": { "description": "Data flow reference type.", + "type": "object", "properties": { "type": { "type": "string", @@ -3792,6 +3810,7 @@ }, "DataFlowStagingInfo": { "description": "Staging info for execute data flow activity.", + "type": "object", "properties": { "linkedService": { "description": "Staging linked service reference.", @@ -3878,6 +3897,7 @@ }, "DataFlowDebugResource": { "description": "Data flow debug resource.", + "type": "object", "allOf": [ { "$ref": "#/definitions/SubResourceDebugResource" @@ -4398,6 +4418,7 @@ }, "RerunTriggerResource": { "description": "RerunTrigger resource type.", + "type": "object", "allOf": [ { "$ref": "#/definitions/SubResource" @@ -4477,6 +4498,7 @@ }, "SynapseNotebookReference": { "description": "Synapse notebook reference type.", + "type": "object", "properties": { "type": { "type": "string", @@ -4501,6 +4523,7 @@ }, "SynapseSparkJobReference": { "description": "Synapse spark job reference type.", + "type": "object", "properties": { "type": { "type": "string", @@ -4525,6 +4548,7 @@ }, "SqlPoolReference": { "description": "SQL pool reference type.", + "type": "object", "properties": { "type": { "type": "string", diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/entityTypes/DataFlow.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/entityTypes/DataFlow.json index cc6adc44e2fd..fddcd5499885 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/entityTypes/DataFlow.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/entityTypes/DataFlow.json @@ -60,6 +60,7 @@ }, "MappingDataFlowTypeProperties": { "description": "Mapping data flow type properties.", + "type": "object", "properties": { "sources": { "type": "array", @@ -107,6 +108,7 @@ }, "DataFlowSource": { "description": "Transformation for data flow source.", + "type": "object", "allOf": [ { "$ref": "#/definitions/Transformation" @@ -116,11 +118,20 @@ "dataset": { "description": "Dataset reference.", "$ref": "../artifacts.json#/definitions/DatasetReference" + }, + "linkedService": { + "description": "Linked service reference.", + "$ref": "../artifacts.json#/definitions/LinkedServiceReference" + }, + "schemaLinkedService": { + "description": "Schema linked service reference.", + "$ref": "../artifacts.json#/definitions/LinkedServiceReference" } } }, "DataFlowSink": { "description": "Transformation for data flow sink.", + "type": "object", "allOf": [ { "$ref": "#/definitions/Transformation" @@ -130,6 +141,14 @@ "dataset": { "description": "Dataset reference.", "$ref": "../artifacts.json#/definitions/DatasetReference" + }, + "linkedService": { + "description": "Linked service reference.", + "$ref": "../artifacts.json#/definitions/LinkedServiceReference" + }, + "schemaLinkedService": { + "description": "Schema linked service reference.", + "$ref": "../artifacts.json#/definitions/LinkedServiceReference" } } } diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/entityTypes/Dataset.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/entityTypes/Dataset.json index 1aa9e4d000f2..20d608963f69 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/entityTypes/Dataset.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/entityTypes/Dataset.json @@ -472,9 +472,39 @@ } } }, + "DatasetTarCompression": { + "x-ms-discriminator-value": "Tar", + "description": "The Tar archive method used on a dataset.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/DatasetCompression" + } + ], + "properties": {} + }, + "DatasetTarGZipCompression": { + "x-ms-discriminator-value": "TarGZip", + "description": "The TarGZip compression method used on a dataset.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/DatasetCompression" + } + ], + "properties": { + "level": { + "description": "The TarGZip compression level.", + "$ref": "#/definitions/CompressionLevel" + } + } + }, "CompressionLevel": { "title": "Microsoft.Azure.Management.DataFactories.Models.CompressionLevel", "description": "All available compression levels.", + "type": "object" + }, + "DatasetCompressionLevelEnum": { "type": "string", "enum": [ "Optimal", @@ -485,6 +515,67 @@ "modelAsString": true } }, + "AmazonS3Dataset": { + "x-ms-discriminator-value": "AmazonS3Object", + "description": "A single Amazon Simple Storage Service (S3) object or a set of S3 objects.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/Dataset" + } + ], + "properties": { + "typeProperties": { + "description": "Amazon S3 dataset properties.", + "x-ms-client-flatten": true, + "$ref": "#/definitions/AmazonS3DatasetTypeProperties" + } + }, + "required": [ + "typeProperties" + ] + }, + "AmazonS3DatasetTypeProperties": { + "description": "Amazon S3 dataset properties.", + "type": "object", + "properties": { + "bucketName": { + "type": "object", + "description": "The name of the Amazon S3 bucket. Type: string (or Expression with resultType string)." + }, + "key": { + "type": "object", + "description": "The key of the Amazon S3 object. Type: string (or Expression with resultType string)." + }, + "prefix": { + "type": "object", + "description": "The prefix filter for the S3 object name. Type: string (or Expression with resultType string)." + }, + "version": { + "type": "object", + "description": "The version for the S3 object. Type: string (or Expression with resultType string)." + }, + "modifiedDatetimeStart": { + "type": "object", + "description": "The start of S3 object's modified datetime. Type: string (or Expression with resultType string)." + }, + "modifiedDatetimeEnd": { + "type": "object", + "description": "The end of S3 object's modified datetime. Type: string (or Expression with resultType string)." + }, + "format": { + "description": "The format of files.", + "$ref": "#/definitions/DatasetStorageFormat" + }, + "compression": { + "description": "The data compression method used for the Amazon S3 object.", + "$ref": "#/definitions/DatasetCompression" + } + }, + "required": [ + "bucketName" + ] + }, "AvroDataset": { "x-ms-discriminator-value": "Avro", "description": "Avro dataset.", @@ -504,24 +595,15 @@ }, "AvroDatasetTypeProperties": { "description": "Avro dataset properties.", + "type": "object", "properties": { "location": { "$ref": "#/definitions/DatasetLocation", "description": "The location of the avro storage." }, "avroCompressionCodec": { - "type": "string", - "enum": [ - "none", - "deflate", - "snappy", - "xz", - "bzip2" - ], - "x-ms-enum": { - "name": "AvroCompressionCodec", - "modelAsString": true - } + "type": "object", + "description": "A string from AvroCompressionCodecEnum or an expression" }, "avroCompressionLevel": { "type": "integer", @@ -533,6 +615,71 @@ "location" ] }, + "AvroCompressionCodecEnum": { + "type": "string", + "enum": [ + "none", + "deflate", + "snappy", + "xz", + "bzip2" + ], + "x-ms-enum": { + "name": "AvroCompressionCodec", + "modelAsString": true + } + }, + "ExcelDataset": { + "x-ms-discriminator-value": "Excel", + "description": "Excel dataset.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/Dataset" + } + ], + "properties": { + "typeProperties": { + "description": "Excel dataset properties.", + "x-ms-client-flatten": true, + "$ref": "#/definitions/ExcelDatasetTypeProperties" + } + } + }, + "ExcelDatasetTypeProperties": { + "description": "Excel dataset properties.", + "type": "object", + "properties": { + "location": { + "$ref": "#/definitions/DatasetLocation", + "description": "The location of the excel storage." + }, + "sheetName": { + "type": "object", + "description": "The sheet of excel file. Type: string (or Expression with resultType string)." + }, + "range": { + "type": "object", + "description": "The partial data of one sheet. Type: string (or Expression with resultType string)." + }, + "firstRowAsHeader": { + "type": "object", + "description": "When used as input, treat the first row of data as headers. When used as output,write the headers into the output as the first row of data. The default value is false. Type: boolean (or Expression with resultType boolean)." + }, + "compression": { + "description": "The data compression method used for the json dataset.", + "$ref": "#/definitions/DatasetCompression" + }, + "nullValue": { + "type": "object", + "description": "The null value string. Type: string (or Expression with resultType string)." + } + }, + "required": [ + "location", + "sheetName" + ] + }, "ParquetDataset": { "x-ms-discriminator-value": "Parquet", "description": "Parquet dataset.", @@ -552,29 +699,34 @@ }, "ParquetDatasetTypeProperties": { "description": "Parquet dataset properties.", + "type": "object", "properties": { "location": { "$ref": "#/definitions/DatasetLocation", "description": "The location of the parquet storage." }, "compressionCodec": { - "type": "string", - "enum": [ - "none", - "gzip", - "snappy", - "lzo" - ], - "x-ms-enum": { - "name": "ParquetCompressionCodec", - "modelAsString": true - } + "type": "object", + "description": "A string from ParquetCompressionCodecEnum or an expression" } }, "required": [ "location" ] }, + "ParquetCompressionCodecEnum": { + "type": "string", + "enum": [ + "none", + "gzip", + "snappy", + "lzo" + ], + "x-ms-enum": { + "name": "ParquetCompressionCodecEnum", + "modelAsString": true + } + }, "DelimitedTextDataset": { "x-ms-discriminator-value": "DelimitedText", "description": "Delimited text dataset.", @@ -594,6 +746,7 @@ }, "DelimitedTextDatasetTypeProperties": { "description": "DelimitedText dataset properties.", + "type": "object", "properties": { "location": { "$ref": "#/definitions/DatasetLocation", @@ -619,10 +772,12 @@ "deflate", "zipDeflate", "snappy", - "lz4" + "lz4", + "tar", + "tarGZip" ], "x-ms-enum": { - "name": "DelimitedTextCompressionCodec", + "name": "compressionCodec", "modelAsString": true } }, @@ -670,6 +825,7 @@ }, "JsonDatasetTypeProperties": { "description": "Json dataset properties.", + "type": "object", "properties": { "location": { "$ref": "#/definitions/DatasetLocation", @@ -688,6 +844,48 @@ "location" ] }, + "XmlDataset": { + "x-ms-discriminator-value": "Xml", + "description": "Xml dataset.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/Dataset" + } + ], + "properties": { + "typeProperties": { + "description": "Xml dataset properties.", + "x-ms-client-flatten": true, + "$ref": "#/definitions/XmlDatasetTypeProperties" + } + } + }, + "XmlDatasetTypeProperties": { + "description": "Xml dataset properties.", + "type": "object", + "properties": { + "location": { + "$ref": "#/definitions/DatasetLocation", + "description": "The location of the json data storage." + }, + "encodingName": { + "type": "object", + "description": "The code page name of the preferred encoding. If not specified, the default value is UTF-8, unless BOM denotes another Unicode encoding. Refer to the name column of the table in the following link to set supported values: https://msdn.microsoft.com/library/system.text.encoding.aspx. Type: string (or Expression with resultType string)." + }, + "nullValue": { + "type": "object", + "description": "The null value string. Type: string (or Expression with resultType string)." + }, + "compression": { + "description": "The data compression method used for the json dataset.", + "$ref": "#/definitions/DatasetCompression" + } + }, + "required": [ + "location" + ] + }, "OrcDataset": { "x-ms-discriminator-value": "Orc", "description": "ORC dataset.", @@ -707,6 +905,7 @@ }, "OrcDatasetTypeProperties": { "description": "ORC dataset properties.", + "type": "object", "properties": { "location": { "$ref": "#/definitions/DatasetLocation", @@ -717,10 +916,11 @@ "enum": [ "none", "zlib", - "snappy" + "snappy", + "lzo" ], "x-ms-enum": { - "name": "OrcCompressionCodec", + "name": "orcCompressionCodec", "modelAsString": true } } @@ -763,6 +963,57 @@ "location" ] }, + "AzureBlobDataset": { + "x-ms-discriminator-value": "AzureBlob", + "description": "The Azure Blob storage.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/Dataset" + } + ], + "properties": { + "typeProperties": { + "description": "Azure Blob dataset properties.", + "x-ms-client-flatten": true, + "$ref": "#/definitions/AzureBlobDatasetTypeProperties" + } + } + }, + "AzureBlobDatasetTypeProperties": { + "description": "Azure Blob dataset properties.", + "type": "object", + "properties": { + "folderPath": { + "type": "object", + "description": "The path of the Azure Blob storage. Type: string (or Expression with resultType string)." + }, + "tableRootLocation": { + "type": "object", + "description": "The root of blob path. Type: string (or Expression with resultType string)." + }, + "fileName": { + "type": "object", + "description": "The name of the Azure Blob. Type: string (or Expression with resultType string)." + }, + "modifiedDatetimeStart": { + "type": "object", + "description": "The start of Azure Blob's modified datetime. Type: string (or Expression with resultType string)." + }, + "modifiedDatetimeEnd": { + "type": "object", + "description": "The end of Azure Blob's modified datetime. Type: string (or Expression with resultType string)." + }, + "format": { + "description": "The format of the Azure Blob storage.", + "$ref": "#/definitions/DatasetStorageFormat" + }, + "compression": { + "description": "The data compression method used for the blob storage.", + "$ref": "#/definitions/DatasetCompression" + } + } + }, "AzureTableDataset": { "x-ms-discriminator-value": "AzureTable", "description": "The Azure Table storage dataset.", @@ -785,6 +1036,7 @@ }, "AzureTableDatasetTypeProperties": { "description": "Azure Table dataset properties.", + "type": "object", "properties": { "tableName": { "type": "object", @@ -814,6 +1066,7 @@ }, "AzureSqlTableDatasetTypeProperties": { "description": "Azure SQL dataset properties.", + "type": "object", "properties": { "tableName": { "type": "object", @@ -848,6 +1101,7 @@ }, "AzureSqlMITableDatasetTypeProperties": { "description": "Azure SQL Managed Instance dataset properties.", + "type": "object", "properties": { "tableName": { "type": "object", @@ -882,6 +1136,7 @@ }, "AzureSqlDWTableDatasetTypeProperties": { "description": "Azure SQL Data Warehouse dataset properties.", + "type": "object", "properties": { "tableName": { "type": "object", @@ -916,6 +1171,7 @@ }, "CassandraTableDatasetTypeProperties": { "description": "Cassandra dataset properties.", + "type": "object", "properties": { "tableName": { "type": "object", @@ -965,6 +1221,7 @@ }, "CosmosDbSqlApiCollectionDatasetTypeProperties": { "description": "CosmosDB (SQL API) Collection dataset properties.", + "type": "object", "properties": { "collectionName": { "type": "object", @@ -997,6 +1254,7 @@ }, "DocumentDbCollectionDatasetTypeProperties": { "description": "DocumentDB Collection dataset properties.", + "type": "object", "properties": { "collectionName": { "type": "object", @@ -1026,6 +1284,7 @@ }, "DynamicsEntityDatasetTypeProperties": { "description": "Dynamics entity dataset properties.", + "type": "object", "properties": { "entityName": { "type": "object", @@ -1052,6 +1311,7 @@ }, "DynamicsCrmEntityDatasetTypeProperties": { "description": "Dynamics CRM entity dataset properties.", + "type": "object", "properties": { "entityName": { "type": "object", @@ -1078,6 +1338,7 @@ }, "CommonDataServiceForAppsEntityDatasetTypeProperties": { "description": "Common Data Service for Apps entity dataset properties.", + "type": "object", "properties": { "entityName": { "type": "object", @@ -1085,6 +1346,84 @@ } } }, + "AzureDataLakeStoreDataset": { + "x-ms-discriminator-value": "AzureDataLakeStoreFile", + "description": "Azure Data Lake Store dataset.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/Dataset" + } + ], + "properties": { + "typeProperties": { + "description": "Azure Data Lake Store dataset properties.", + "x-ms-client-flatten": true, + "$ref": "#/definitions/AzureDataLakeStoreDatasetTypeProperties" + } + } + }, + "AzureDataLakeStoreDatasetTypeProperties": { + "description": "Azure Data Lake Store dataset properties.", + "type": "object", + "properties": { + "folderPath": { + "type": "object", + "description": "Path to the folder in the Azure Data Lake Store. Type: string (or Expression with resultType string)." + }, + "fileName": { + "type": "object", + "description": "The name of the file in the Azure Data Lake Store. Type: string (or Expression with resultType string)." + }, + "format": { + "description": "The format of the Data Lake Store.", + "$ref": "#/definitions/DatasetStorageFormat" + }, + "compression": { + "description": "The data compression method used for the item(s) in the Azure Data Lake Store.", + "$ref": "#/definitions/DatasetCompression" + } + } + }, + "AzureBlobFSDataset": { + "x-ms-discriminator-value": "AzureBlobFSFile", + "description": "The Azure Data Lake Storage Gen2 storage.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/Dataset" + } + ], + "properties": { + "typeProperties": { + "description": "Azure Data Lake Storage Gen2 dataset properties.", + "x-ms-client-flatten": true, + "$ref": "#/definitions/AzureBlobFSDatasetTypeProperties" + } + } + }, + "AzureBlobFSDatasetTypeProperties": { + "description": "Azure Data Lake Storage Gen2 dataset properties.", + "type": "object", + "properties": { + "folderPath": { + "type": "object", + "description": "The path of the Azure Data Lake Storage Gen2 storage. Type: string (or Expression with resultType string)." + }, + "fileName": { + "type": "object", + "description": "The name of the Azure Data Lake Storage Gen2. Type: string (or Expression with resultType string)." + }, + "format": { + "description": "The format of the Azure Data Lake Storage Gen2 storage.", + "$ref": "#/definitions/DatasetStorageFormat" + }, + "compression": { + "description": "The data compression method used for the blob storage.", + "$ref": "#/definitions/DatasetCompression" + } + } + }, "Office365Dataset": { "x-ms-discriminator-value": "Office365Table", "description": "The Office365 account.", @@ -1107,6 +1446,7 @@ }, "Office365DatasetTypeProperties": { "description": "Office365 dataset properties.", + "type": "object", "properties": { "tableName": { "type": "object", @@ -1121,6 +1461,57 @@ "tableName" ] }, + "FileShareDataset": { + "x-ms-discriminator-value": "FileShare", + "description": "An on-premises file system dataset.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/Dataset" + } + ], + "properties": { + "typeProperties": { + "description": "On-premises file system dataset properties.", + "x-ms-client-flatten": true, + "$ref": "#/definitions/FileShareDatasetTypeProperties" + } + } + }, + "FileShareDatasetTypeProperties": { + "description": "On-premises file system dataset properties.", + "type": "object", + "properties": { + "folderPath": { + "type": "object", + "description": "The path of the on-premises file system. Type: string (or Expression with resultType string)." + }, + "fileName": { + "type": "object", + "description": "The name of the on-premises file system. Type: string (or Expression with resultType string)." + }, + "modifiedDatetimeStart": { + "type": "object", + "description": "The start of file's modified datetime. Type: string (or Expression with resultType string)." + }, + "modifiedDatetimeEnd": { + "type": "object", + "description": "The end of file's modified datetime. Type: string (or Expression with resultType string)." + }, + "format": { + "description": "The format of the files.", + "$ref": "#/definitions/DatasetStorageFormat" + }, + "fileFilter": { + "type": "object", + "description": "Specify a filter to be used to select a subset of files in the folderPath rather than all files. Type: string (or Expression with resultType string)." + }, + "compression": { + "description": "The data compression method used for the file system.", + "$ref": "#/definitions/DatasetCompression" + } + } + }, "MongoDbCollectionDataset": { "x-ms-discriminator-value": "MongoDbCollection", "description": "The MongoDB database dataset.", @@ -1143,6 +1534,7 @@ }, "MongoDbCollectionDatasetTypeProperties": { "description": "MongoDB database dataset properties.", + "type": "object", "properties": { "collectionName": { "type": "object", @@ -1153,6 +1545,39 @@ "collectionName" ] }, + "MongoDbAtlasCollectionDataset": { + "x-ms-discriminator-value": "MongoDbAtlasCollection", + "description": "The MongoDB Atlas database dataset.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/Dataset" + } + ], + "properties": { + "typeProperties": { + "description": "MongoDB Atlas database dataset properties.", + "x-ms-client-flatten": true, + "$ref": "#/definitions/MongoDbAtlasCollectionDatasetTypeProperties" + } + }, + "required": [ + "typeProperties" + ] + }, + "MongoDbAtlasCollectionDatasetTypeProperties": { + "description": "MongoDB Atlas database dataset properties.", + "type": "object", + "properties": { + "collection": { + "type": "object", + "description": "The collection name of the MongoDB Atlas database. Type: string (or Expression with resultType string)." + } + }, + "required": [ + "collection" + ] + }, "MongoDbV2CollectionDataset": { "x-ms-discriminator-value": "MongoDbV2Collection", "description": "The MongoDB database dataset.", @@ -1175,6 +1600,7 @@ }, "MongoDbV2CollectionDatasetTypeProperties": { "description": "MongoDB database dataset properties.", + "type": "object", "properties": { "collection": { "type": "object", @@ -1207,6 +1633,7 @@ }, "CosmosDbMongoDbApiCollectionDatasetTypeProperties": { "description": "CosmosDB (MongoDB API) database dataset properties.", + "type": "object", "properties": { "collection": { "type": "object", @@ -1236,6 +1663,7 @@ }, "ODataResourceDatasetTypeProperties": { "description": "OData dataset properties.", + "type": "object", "properties": { "path": { "type": "object", @@ -1262,6 +1690,7 @@ }, "OracleTableDatasetTypeProperties": { "description": "On-premises Oracle dataset properties.", + "type": "object", "properties": { "tableName": { "type": "object", @@ -1296,6 +1725,7 @@ }, "TeradataTableDatasetTypeProperties": { "description": "Teradata dataset properties.", + "type": "object", "properties": { "database": { "type": "object", @@ -1329,6 +1759,7 @@ }, "AzureMySqlTableDatasetTypeProperties": { "description": "Azure MySQL database dataset properties.", + "type": "object", "properties": { "tableName": { "type": "object", @@ -1359,6 +1790,7 @@ }, "AmazonRedshiftTableDatasetTypeProperties": { "description": "Amazon Redshift table dataset properties.", + "type": "object", "properties": { "tableName": { "type": "object", @@ -1393,6 +1825,7 @@ }, "Db2TableDatasetTypeProperties": { "description": "Db2 table dataset properties.", + "type": "object", "properties": { "tableName": { "type": "object", @@ -1427,6 +1860,7 @@ }, "RelationalTableDatasetTypeProperties": { "description": "Relational table dataset properties.", + "type": "object", "properties": { "tableName": { "type": "object", @@ -1453,6 +1887,7 @@ }, "InformixTableDatasetTypeProperties": { "description": "Informix table dataset properties.", + "type": "object", "properties": { "tableName": { "type": "object", @@ -1479,6 +1914,7 @@ }, "OdbcTableDatasetTypeProperties": { "description": "ODBC table dataset properties.", + "type": "object", "properties": { "tableName": { "type": "object", @@ -1505,6 +1941,7 @@ }, "MySqlTableDatasetTypeProperties": { "description": "MySql table dataset properties.", + "type": "object", "properties": { "tableName": { "type": "object", @@ -1531,6 +1968,7 @@ }, "PostgreSqlTableDatasetTypeProperties": { "description": "PostgreSQL table dataset properties.", + "type": "object", "properties": { "tableName": { "type": "object", @@ -1565,6 +2003,7 @@ }, "MicrosoftAccessTableDatasetTypeProperties": { "description": "Microsoft Access table dataset properties.", + "type": "object", "properties": { "tableName": { "type": "object", @@ -1591,6 +2030,7 @@ }, "SalesforceObjectDatasetTypeProperties": { "description": "Salesforce object dataset properties.", + "type": "object", "properties": { "objectApiName": { "type": "object", @@ -1617,6 +2057,7 @@ }, "SalesforceServiceCloudObjectDatasetTypeProperties": { "description": "Salesforce Service Cloud object dataset properties.", + "type": "object", "properties": { "objectApiName": { "type": "object", @@ -1643,6 +2084,7 @@ }, "SybaseTableDatasetTypeProperties": { "description": "Sybase table dataset properties.", + "type": "object", "properties": { "tableName": { "type": "object", @@ -1683,6 +2125,7 @@ }, "SapCloudForCustomerResourceDatasetTypeProperties": { "description": "Sap Cloud For Customer OData resource dataset properties.", + "type": "object", "properties": { "path": { "type": "object", @@ -1715,6 +2158,7 @@ }, "SapEccResourceDatasetTypeProperties": { "description": "Sap ECC OData resource dataset properties.", + "type": "object", "properties": { "path": { "type": "object", @@ -1744,6 +2188,7 @@ }, "SapHanaTableDatasetTypeProperties": { "description": "SAP HANA Table properties.", + "type": "object", "properties": { "schema": { "type": "object", @@ -1777,6 +2222,7 @@ }, "SapOpenHubTableDatasetTypeProperties": { "description": "Sap Business Warehouse Open Hub Destination Table properties.", + "type": "object", "properties": { "openHubDestinationName": { "type": "object", @@ -1814,6 +2260,7 @@ }, "SqlServerTableDatasetTypeProperties": { "description": "On-premises SQL Server dataset properties.", + "type": "object", "properties": { "tableName": { "type": "object", @@ -1848,6 +2295,7 @@ }, "RestResourceDatasetTypeProperties": { "description": "Properties specific to this dataset type.", + "type": "object", "properties": { "relativeUrl": { "type": "object", @@ -1893,6 +2341,7 @@ }, "SapTableResourceDatasetTypeProperties": { "description": "SAP Table Resource properties.", + "type": "object", "properties": { "tableName": { "type": "object", @@ -1925,6 +2374,7 @@ }, "WebTableDatasetTypeProperties": { "description": "Web table dataset properties.", + "type": "object", "properties": { "index": { "type": "object", @@ -1961,6 +2411,7 @@ }, "AzureSearchIndexDatasetTypeProperties": { "description": "Properties specific to this dataset type.", + "type": "object", "properties": { "indexName": { "type": "object", @@ -1971,8 +2422,56 @@ "indexName" ] }, + "HttpDataset": { + "x-ms-discriminator-value": "HttpFile", + "description": "A file in an HTTP web server.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/Dataset" + } + ], + "properties": { + "typeProperties": { + "description": "Properties specific to this dataset type.", + "x-ms-client-flatten": true, + "$ref": "#/definitions/HttpDatasetTypeProperties" + } + } + }, + "HttpDatasetTypeProperties": { + "description": "Properties specific to this dataset type.", + "type": "object", + "properties": { + "relativeUrl": { + "type": "object", + "description": "The relative URL based on the URL in the HttpLinkedService refers to an HTTP file Type: string (or Expression with resultType string)." + }, + "requestMethod": { + "type": "object", + "description": "The HTTP method for the HTTP request. Type: string (or Expression with resultType string)." + }, + "requestBody": { + "type": "object", + "description": "The body for the HTTP request. Type: string (or Expression with resultType string)." + }, + "additionalHeaders": { + "type": "object", + "description": "The headers for the HTTP Request. e.g. request-header-name-1:request-header-value-1\r\n...\r\nrequest-header-name-n:request-header-value-n Type: string (or Expression with resultType string)." + }, + "format": { + "description": "The format of files.", + "$ref": "#/definitions/DatasetStorageFormat" + }, + "compression": { + "description": "The data compression method used on files.", + "$ref": "#/definitions/DatasetCompression" + } + } + }, "GenericDatasetTypeProperties": { "description": "Properties specific to this dataset type.", + "type": "object", "properties": { "tableName": { "type": "object", @@ -2016,6 +2515,7 @@ }, "AzurePostgreSqlTableDatasetTypeProperties": { "description": "Azure PostgreSQL dataset properties.", + "type": "object", "properties": { "tableName": { "type": "object", @@ -2084,6 +2584,7 @@ }, "DrillDatasetTypeProperties": { "description": "Drill Dataset Properties", + "type": "object", "properties": { "tableName": { "type": "object", @@ -2135,6 +2636,7 @@ }, "GoogleBigQueryDatasetTypeProperties": { "description": "Google BigQuery Dataset Properties", + "type": "object", "properties": { "tableName": { "type": "object", @@ -2169,6 +2671,7 @@ }, "GreenplumDatasetTypeProperties": { "description": "Greenplum Dataset Properties", + "type": "object", "properties": { "tableName": { "type": "object", @@ -2220,6 +2723,7 @@ }, "HiveDatasetTypeProperties": { "description": "Hive Properties", + "type": "object", "properties": { "tableName": { "type": "object", @@ -2271,6 +2775,7 @@ }, "ImpalaDatasetTypeProperties": { "description": "Impala Dataset Properties", + "type": "object", "properties": { "tableName": { "type": "object", @@ -2407,6 +2912,7 @@ }, "PhoenixDatasetTypeProperties": { "description": "Phoenix Dataset Properties", + "type": "object", "properties": { "tableName": { "type": "object", @@ -2441,6 +2947,7 @@ }, "PrestoDatasetTypeProperties": { "description": "Presto Dataset Properties", + "type": "object", "properties": { "tableName": { "type": "object", @@ -2526,6 +3033,7 @@ }, "SparkDatasetTypeProperties": { "description": "Spark Properties", + "type": "object", "properties": { "tableName": { "type": "object", @@ -2611,6 +3119,7 @@ }, "NetezzaTableDatasetTypeProperties": { "description": "Netezza dataset properties.", + "type": "object", "properties": { "tableName": { "type": "object", @@ -2645,6 +3154,7 @@ }, "VerticaDatasetTypeProperties": { "description": "Vertica Properties", + "type": "object", "properties": { "tableName": { "type": "object", @@ -2716,6 +3226,7 @@ }, "DynamicsAXResourceDatasetTypeProperties": { "description": "Dynamics AX OData resource dataset properties.", + "type": "object", "properties": { "path": { "type": "object", @@ -2765,6 +3276,7 @@ }, "AzureDataExplorerDatasetTypeProperties": { "description": "Azure Data Explorer (Kusto) dataset properties.", + "type": "object", "properties": { "table": { "type": "object", @@ -2788,6 +3300,98 @@ "$ref": "#/definitions/GenericDatasetTypeProperties" } } + }, + "SnowflakeDataset": { + "x-ms-discriminator-value": "SnowflakeTable", + "description": "The snowflake dataset.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/Dataset" + } + ], + "properties": { + "typeProperties": { + "description": "Snowflake dataset properties.", + "x-ms-client-flatten": true, + "$ref": "#/definitions/SnowflakeDatasetTypeProperties" + } + }, + "required": [ + "typeProperties" + ] + }, + "SnowflakeDatasetTypeProperties": { + "description": "Snowflake dataset properties.", + "type": "object", + "properties": { + "schema": { + "type": "object", + "description": "The schema name of the Snowflake database. Type: string (or Expression with resultType string)." + }, + "table": { + "type": "object", + "description": "The table name of the Snowflake database. Type: string (or Expression with resultType string)." + } + } + }, + "SharePointOnlineListResourceDataset": { + "x-ms-discriminator-value": "SharePointOnlineListResource", + "description": "The sharepoint online list resource dataset.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/Dataset" + } + ], + "properties": { + "typeProperties": { + "description": "Sharepoint online list dataset properties.", + "x-ms-client-flatten": true, + "$ref": "#/definitions/SharePointOnlineListDatasetTypeProperties" + } + } + }, + "SharePointOnlineListDatasetTypeProperties": { + "description": "Sharepoint online list dataset properties.", + "type": "object", + "properties": { + "listName": { + "type": "object", + "description": "The name of the SharePoint Online list. Type: string (or Expression with resultType string)." + } + } + }, + "AzureDatabricksDeltaLakeDataset": { + "x-ms-discriminator-value": "AzureDatabricksDeltaLakeDataset", + "description": "Azure Databricks Delta Lake dataset.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/Dataset" + } + ], + "properties": { + "typeProperties": { + "description": "Properties specific to this dataset type.", + "x-ms-client-flatten": true, + "$ref": "#/definitions/AzureDatabricksDeltaLakeDatasetTypeProperties" + } + } + }, + "AzureDatabricksDeltaLakeDatasetTypeProperties": { + "description": "Azure Databricks Delta Lake Dataset Properties", + "type": "object", + "properties": { + "table": { + "type": "object", + "description": "The name of delta table. Type: string (or Expression with resultType string)." + }, + "database": { + "type": "object", + "description": "The database name of delta table. Type: string (or Expression with resultType string)." + } + } } } } diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/entityTypes/LinkedService.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/entityTypes/LinkedService.json index 8f54c7fb088c..6aa22cfb0fee 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/entityTypes/LinkedService.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/entityTypes/LinkedService.json @@ -104,6 +104,7 @@ }, "AzureStorageLinkedServiceTypeProperties": { "description": "Azure Storage linked service properties.", + "type": "object", "properties": { "connectionString": { "description": "The connection string. It is mutually exclusive with sasUri property. Type: string, SecureString or AzureKeyVaultSecretReference.", @@ -129,6 +130,7 @@ }, "AzureBlobStorageLinkedServiceTypeProperties": { "description": "Azure Blob Storage linked service properties.", + "type": "object", "properties": { "connectionString": { "type": "object", @@ -162,6 +164,10 @@ "type": "object", "description": "The name or ID of the tenant to which the service principal belongs. Type: string (or Expression with resultType string)." }, + "azureCloudType": { + "type": "object", + "description": "Indicates the azure cloud type of the service principle auth. Allowed values are AzurePublic, AzureChina, AzureUsGovernment, AzureGermany. Default value is the data factory regions’ cloud type. Type: string (or Expression with resultType string)." + }, "encryptedCredential": { "type": "string", "description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string)." @@ -190,6 +196,7 @@ }, "AzureSqlDWLinkedServiceTypeProperties": { "description": "Azure SQL Data Warehouse linked service properties.", + "type": "object", "properties": { "connectionString": { "description": "The connection string. Type: string, SecureString or AzureKeyVaultSecretReference. Type: string, SecureString or AzureKeyVaultSecretReference.", @@ -211,6 +218,10 @@ "type": "object", "description": "The name or ID of the tenant to which the service principal belongs. Type: string (or Expression with resultType string)." }, + "azureCloudType": { + "type": "object", + "description": "Indicates the azure cloud type of the service principle auth. Allowed values are AzurePublic, AzureChina, AzureUsGovernment, AzureGermany. Default value is the data factory regions’ cloud type. Type: string (or Expression with resultType string)." + }, "encryptedCredential": { "type": "object", "description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string)." @@ -242,6 +253,7 @@ }, "SqlServerLinkedServiceTypeProperties": { "description": "SQL Server linked service properties.", + "type": "object", "properties": { "connectionString": { "description": "The connection string. Type: string, SecureString or AzureKeyVaultSecretReference.", @@ -286,6 +298,7 @@ }, "AzureSqlDatabaseLinkedServiceTypeProperties": { "description": "Azure SQL Database linked service properties.", + "type": "object", "properties": { "connectionString": { "description": "The connection string. Type: string, SecureString or AzureKeyVaultSecretReference.", @@ -307,6 +320,10 @@ "type": "object", "description": "The name or ID of the tenant to which the service principal belongs. Type: string (or Expression with resultType string)." }, + "azureCloudType": { + "type": "object", + "description": "Indicates the azure cloud type of the service principle auth. Allowed values are AzurePublic, AzureChina, AzureUsGovernment, AzureGermany. Default value is the data factory regions’ cloud type. Type: string (or Expression with resultType string)." + }, "encryptedCredential": { "type": "object", "description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string)." @@ -338,6 +355,7 @@ }, "AzureSqlMILinkedServiceTypeProperties": { "description": "Azure SQL Managed Instance linked service properties.", + "type": "object", "properties": { "connectionString": { "description": "The connection string. Type: string, SecureString or AzureKeyVaultSecretReference.", @@ -359,6 +377,10 @@ "type": "object", "description": "The name or ID of the tenant to which the service principal belongs. Type: string (or Expression with resultType string)." }, + "azureCloudType": { + "type": "object", + "description": "Indicates the azure cloud type of the service principle auth. Allowed values are AzurePublic, AzureChina, AzureUsGovernment, AzureGermany. Default value is the data factory regions’ cloud type. Type: string (or Expression with resultType string)." + }, "encryptedCredential": { "type": "object", "description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string)." @@ -390,6 +412,7 @@ }, "AzureBatchLinkedServiceTypeProperties": { "description": "Azure Batch linked service properties.", + "type": "object", "properties": { "accountName": { "type": "object", @@ -445,6 +468,7 @@ }, "AzureKeyVaultLinkedServiceTypeProperties": { "description": "Azure Key Vault linked service properties.", + "type": "object", "properties": { "baseUrl": { "type": "object", @@ -477,6 +501,7 @@ }, "CosmosDbLinkedServiceTypeProperties": { "description": "CosmosDB linked service properties.", + "type": "object", "properties": { "connectionString": { "description": "The connection string. Type: string, SecureString or AzureKeyVaultSecretReference.", @@ -522,6 +547,7 @@ }, "DynamicsLinkedServiceTypeProperties": { "description": "Dynamics linked service properties.", + "type": "object", "properties": { "deploymentType": { "x-ms-enum": { @@ -536,19 +562,19 @@ "description": "The deployment type of the Dynamics instance. 'Online' for Dynamics Online and 'OnPremisesWithIfd' for Dynamics on-premises with Ifd. Type: string (or Expression with resultType string)." }, "hostName": { - "type": "string", + "type": "object", "description": "The host name of the on-premises Dynamics server. The property is required for on-prem and not allowed for online. Type: string (or Expression with resultType string)." }, "port": { - "type": "string", + "type": "object", "description": "The port of on-premises Dynamics server. The property is required for on-prem and not allowed for online. Default is 443. Type: integer (or Expression with resultType integer), minimum: 0." }, "serviceUri": { - "type": "string", + "type": "object", "description": "The URL to the Microsoft Dynamics server. The property is required for on-line and not allowed for on-prem. Type: string (or Expression with resultType string)." }, "organizationName": { - "type": "string", + "type": "object", "description": "The organization name of the Dynamics instance. The property is required for on-prem and required for online when there are more than one Dynamics instances associated with the user. Type: string (or Expression with resultType string)." }, "authenticationType": { @@ -585,7 +611,7 @@ "ServicePrincipalKey", "ServicePrincipalCert" ], - "type": "string", + "type": "object", "description": "The service principal credential type to use in Server-To-Server authentication. 'ServicePrincipalKey' for key/secret, 'ServicePrincipalCert' for certificate. Type: string (or Expression with resultType string)." }, "servicePrincipalCredential": { @@ -624,6 +650,7 @@ }, "DynamicsCrmLinkedServiceTypeProperties": { "description": "Dynamics CRM linked service properties.", + "type": "object", "properties": { "deploymentType": { "x-ms-enum": { @@ -679,16 +706,8 @@ "description": "The client ID of the application in Azure Active Directory used for Server-To-Server authentication. Type: string (or Expression with resultType string)." }, "servicePrincipalCredentialType": { - "x-ms-enum": { - "name": "DynamicsServicePrincipalCredentialType", - "modelAsString": true - }, - "enum": [ - "ServicePrincipalKey", - "ServicePrincipalCert" - ], - "type": "string", - "description": "The service principal credential type to use in Server-To-Server authentication. 'ServicePrincipalKey' for key/secret, 'ServicePrincipalCert' for certificate. Type: string (or Expression with resultType string)." + "type": "object", + "description": "A string from ServicePrincipalCredentialEnum or an expression" }, "servicePrincipalCredential": { "$ref": "../artifacts.json#/definitions/SecretBase", @@ -704,6 +723,18 @@ "authenticationType" ] }, + "ServicePrincipalCredentialEnum": { + "x-ms-enum": { + "name": "DynamicsServicePrincipalCredentialType", + "modelAsString": true + }, + "enum": [ + "ServicePrincipalKey", + "ServicePrincipalCert" + ], + "type": "object", + "description": "The service principal credential type to use in Server-To-Server authentication. 'ServicePrincipalKey' for key/secret, 'ServicePrincipalCert' for certificate. Type: string (or Expression with resultType string)." + }, "CommonDataServiceForAppsLinkedService": { "x-ms-discriminator-value": "CommonDataServiceForApps", "description": "Common Data Service for Apps linked service.", @@ -726,6 +757,7 @@ }, "CommonDataServiceForAppsLinkedServiceTypeProperties": { "description": "Common Data Service for Apps linked service properties.", + "type": "object", "properties": { "deploymentType": { "x-ms-enum": { @@ -781,16 +813,8 @@ "description": "The client ID of the application in Azure Active Directory used for Server-To-Server authentication. Type: string (or Expression with resultType string)." }, "servicePrincipalCredentialType": { - "x-ms-enum": { - "name": "DynamicsServicePrincipalCredentialType", - "modelAsString": true - }, - "enum": [ - "ServicePrincipalKey", - "ServicePrincipalCert" - ], - "type": "string", - "description": "The service principal credential type to use in Server-To-Server authentication. 'ServicePrincipalKey' for key/secret, 'ServicePrincipalCert' for certificate. Type: string (or Expression with resultType string)." + "type": "object", + "description": "A string from ServicePrincipalCredentialEnum or an expression" }, "servicePrincipalCredential": { "$ref": "../artifacts.json#/definitions/SecretBase", @@ -828,6 +852,7 @@ }, "HDInsightLinkedServiceTypeProperties": { "description": "HDInsight linked service properties.", + "type": "object", "properties": { "clusterUri": { "type": "object", @@ -888,6 +913,7 @@ }, "FileServerLinkedServiceTypeProperties": { "description": "File system linked service properties.", + "type": "object", "properties": { "host": { "type": "object", @@ -932,6 +958,7 @@ }, "AzureFileStorageLinkedServiceTypeProperties": { "description": "Azure File Storage linked service properties.", + "type": "object", "properties": { "host": { "type": "object", @@ -945,6 +972,30 @@ "description": "Password to logon the server.", "$ref": "../artifacts.json#/definitions/SecretBase" }, + "connectionString": { + "type": "object", + "description": "The connection string. It is mutually exclusive with sasUri property. Type: string, SecureString or AzureKeyVaultSecretReference." + }, + "accountKey": { + "$ref": "../artifacts.json#/definitions/AzureKeyVaultSecretReference", + "description": "The Azure key vault secret reference of accountKey in connection string." + }, + "sasUri": { + "description": "SAS URI of the Azure File resource. It is mutually exclusive with connectionString property. Type: string, SecureString or AzureKeyVaultSecretReference.", + "type": "object" + }, + "sasToken": { + "$ref": "../artifacts.json#/definitions/AzureKeyVaultSecretReference", + "description": "The Azure key vault secret reference of sasToken in sas uri." + }, + "fileShare": { + "description": "The azure file share name. It is required when auth with accountKey/sasToken. Type: string (or Expression with resultType string).", + "type": "object" + }, + "snapshot": { + "description": "The azure file share snapshot version. Type: string (or Expression with resultType string).", + "type": "object" + }, "encryptedCredential": { "type": "object", "description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string)." @@ -976,6 +1027,7 @@ }, "GoogleCloudStorageLinkedServiceTypeProperties": { "description": "Google Cloud Storage linked service properties.", + "type": "object", "properties": { "accessKeyId": { "type": "object", @@ -1017,6 +1069,7 @@ }, "OracleLinkedServiceTypeProperties": { "description": "Oracle database linked service properties.", + "type": "object", "properties": { "connectionString": { "description": "The connection string. Type: string, SecureString or AzureKeyVaultSecretReference.", @@ -1057,6 +1110,7 @@ }, "AzureMySqlLinkedServiceTypeProperties": { "description": "Azure MySQL database linked service properties.", + "type": "object", "properties": { "connectionString": { "description": "The connection string. Type: string, SecureString or AzureKeyVaultSecretReference.", @@ -1097,6 +1151,7 @@ }, "MySqlLinkedServiceTypeProperties": { "description": "MySQL linked service properties.", + "type": "object", "properties": { "connectionString": { "description": "The connection string.", @@ -1137,6 +1192,7 @@ }, "PostgreSqlLinkedServiceTypeProperties": { "description": "PostgreSQL linked service properties.", + "type": "object", "properties": { "connectionString": { "description": "The connection string.", @@ -1177,6 +1233,7 @@ }, "SybaseLinkedServiceTypeProperties": { "description": "Sybase linked service properties.", + "type": "object", "properties": { "server": { "type": "object", @@ -1242,17 +1299,22 @@ }, "Db2LinkedServiceTypeProperties": { "description": "DB2 linked service properties.", + "type": "object", "properties": { + "connectionString": { + "type": "object", + "description": "The connection string. It is mutually exclusive with server, database, authenticationType, userName, packageCollection and certificateCommonName property. Type: string, SecureString or AzureKeyVaultSecretReference." + }, "server": { "type": "object", - "description": "Server name for connection. Type: string (or Expression with resultType string)." + "description": "Server name for connection. It is mutually exclusive with connectionString property. Type: string (or Expression with resultType string)." }, "database": { "type": "object", - "description": "Database name for connection. Type: string (or Expression with resultType string)." + "description": "Database name for connection. It is mutually exclusive with connectionString property. Type: string (or Expression with resultType string)." }, "authenticationType": { - "description": "AuthenticationType to be used for connection.", + "description": "AuthenticationType to be used for connection. It is mutually exclusive with connectionString property.", "type": "string", "enum": [ "Basic" @@ -1264,7 +1326,7 @@ }, "username": { "type": "object", - "description": "Username for authentication. Type: string (or Expression with resultType string)." + "description": "Username for authentication. It is mutually exclusive with connectionString property. Type: string (or Expression with resultType string)." }, "password": { "description": "Password for authentication.", @@ -1272,15 +1334,15 @@ }, "packageCollection": { "type": "object", - "description": "Under where packages are created when querying database. Type: string (or Expression with resultType string)." + "description": "Under where packages are created when querying database. It is mutually exclusive with connectionString property. Type: string (or Expression with resultType string)." }, "certificateCommonName": { "type": "object", - "description": "Certificate Common Name when TLS is enabled. Type: string (or Expression with resultType string)." + "description": "Certificate Common Name when TLS is enabled. It is mutually exclusive with connectionString property. Type: string (or Expression with resultType string)." }, "encryptedCredential": { "type": "object", - "description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string)." + "description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. It is mutually exclusive with connectionString property. Type: string (or Expression with resultType string)." } }, "required": [ @@ -1310,6 +1372,7 @@ }, "TeradataLinkedServiceTypeProperties": { "description": "Teradata linked service properties.", + "type": "object", "properties": { "connectionString": { "description": "Teradata ODBC connection string. Type: string, SecureString or AzureKeyVaultSecretReference.", @@ -1367,6 +1430,7 @@ }, "AzureMLLinkedServiceTypeProperties": { "description": "Azure ML Studio Web Service linked service properties.", + "type": "object", "properties": { "mlEndpoint": { "type": "object", @@ -1424,6 +1488,7 @@ }, "AzureMLServiceLinkedServiceTypeProperties": { "description": "Azure ML Service linked service properties.", + "type": "object", "properties": { "subscriptionId": { "type": "object", @@ -1482,6 +1547,7 @@ }, "OdbcLinkedServiceTypeProperties": { "description": "ODBC linked service properties.", + "type": "object", "properties": { "connectionString": { "description": "The non-access credential portion of the connection string as well as an optional encrypted credential. Type: string, SecureString or AzureKeyVaultSecretReference.", @@ -1534,6 +1600,7 @@ }, "InformixLinkedServiceTypeProperties": { "description": "Informix linked service properties.", + "type": "object", "properties": { "connectionString": { "description": "The non-access credential portion of the connection string as well as an optional encrypted credential. Type: string, SecureString or AzureKeyVaultSecretReference.", @@ -1586,6 +1653,7 @@ }, "MicrosoftAccessLinkedServiceTypeProperties": { "description": "Microsoft Access linked service properties.", + "type": "object", "properties": { "connectionString": { "description": "The non-access credential portion of the connection string as well as an optional encrypted credential. Type: string, SecureString or AzureKeyVaultSecretReference.", @@ -1638,6 +1706,7 @@ }, "HdfsLinkedServiceTypeProperties": { "description": "HDFS linked service properties.", + "type": "object", "properties": { "url": { "type": "object", @@ -1686,6 +1755,7 @@ }, "ODataLinkedServiceTypeProperties": { "description": "OData linked service properties.", + "type": "object", "properties": { "url": { "type": "object", @@ -1722,6 +1792,10 @@ "type": "object", "description": "Specify the application id of your application registered in Azure Active Directory. Type: string (or Expression with resultType string)." }, + "azureCloudType": { + "type": "object", + "description": "Indicates the azure cloud type of the service principle auth. Allowed values are AzurePublic, AzureChina, AzureUsGovernment, AzureGermany. Default value is the data factory regions’ cloud type. Type: string (or Expression with resultType string)." + }, "aadResourceId": { "type": "object", "description": "Specify the resource you are requesting authorization to use Directory. Type: string (or Expression with resultType string)." @@ -1808,6 +1882,7 @@ }, "WebAnonymousAuthentication": { "description": "A WebLinkedService that uses anonymous authentication to communicate with an HTTP endpoint.", + "type": "object", "x-ms-discriminator-value": "Anonymous", "allOf": [ { @@ -1817,6 +1892,7 @@ }, "WebBasicAuthentication": { "description": "A WebLinkedService that uses basic authentication to communicate with an HTTP endpoint.", + "type": "object", "x-ms-discriminator-value": "Basic", "allOf": [ { @@ -1840,6 +1916,7 @@ }, "WebClientCertificateAuthentication": { "description": "A WebLinkedService that uses client certificate based authentication to communicate with an HTTP endpoint. This scheme follows mutual authentication; the server must also provide valid credentials to the client.", + "type": "object", "x-ms-discriminator-value": "ClientCertificate", "allOf": [ { @@ -1883,6 +1960,7 @@ }, "CassandraLinkedServiceTypeProperties": { "description": "Cassandra linked service properties.", + "type": "object", "properties": { "host": { "type": "object", @@ -1935,6 +2013,7 @@ }, "MongoDbLinkedServiceTypeProperties": { "description": "MongoDB linked service properties.", + "type": "object", "properties": { "server": { "type": "object", @@ -1990,6 +2069,44 @@ "databaseName" ] }, + "MongoDbAtlasLinkedService": { + "x-ms-discriminator-value": "MongoDbAtlas", + "description": "Linked service for MongoDB Atlas data source.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/LinkedService" + } + ], + "properties": { + "typeProperties": { + "description": "MongoDB Atlas linked service properties.", + "x-ms-client-flatten": true, + "$ref": "#/definitions/MongoDbAtlasLinkedServiceTypeProperties" + } + }, + "required": [ + "typeProperties" + ] + }, + "MongoDbAtlasLinkedServiceTypeProperties": { + "description": "MongoDB Atlas linked service properties.", + "type": "object", + "properties": { + "connectionString": { + "description": "The MongoDB Atlas connection string. Type: string, SecureString or AzureKeyVaultSecretReference. Type: string, SecureString or AzureKeyVaultSecretReference.", + "type": "object" + }, + "database": { + "type": "object", + "description": "The name of the MongoDB Atlas database that you want to access. Type: string (or Expression with resultType string)." + } + }, + "required": [ + "connectionString", + "database" + ] + }, "MongoDbV2LinkedService": { "x-ms-discriminator-value": "MongoDbV2", "description": "Linked service for MongoDB data source.", @@ -2012,6 +2129,7 @@ }, "MongoDbV2LinkedServiceTypeProperties": { "description": "MongoDB linked service properties.", + "type": "object", "properties": { "connectionString": { "description": "The MongoDB connection string. Type: string, SecureString or AzureKeyVaultSecretReference. Type: string, SecureString or AzureKeyVaultSecretReference.", @@ -2049,6 +2167,7 @@ }, "CosmosDbMongoDbApiLinkedServiceTypeProperties": { "description": "CosmosDB (MongoDB API) linked service properties.", + "type": "object", "properties": { "connectionString": { "description": "The CosmosDB (MongoDB API) connection string. Type: string, SecureString or AzureKeyVaultSecretReference. Type: string, SecureString or AzureKeyVaultSecretReference.", @@ -2086,6 +2205,7 @@ }, "AzureDataLakeStoreLinkedServiceTypeProperties": { "description": "Azure Data Lake Store linked service properties.", + "type": "object", "properties": { "dataLakeStoreUri": { "type": "object", @@ -2103,6 +2223,10 @@ "type": "object", "description": "The name or ID of the tenant to which the service principal belongs. Type: string (or Expression with resultType string)." }, + "azureCloudType": { + "type": "object", + "description": "Indicates the azure cloud type of the service principle auth. Allowed values are AzurePublic, AzureChina, AzureUsGovernment, AzureGermany. Default value is the data factory regions’ cloud type. Type: string (or Expression with resultType string)." + }, "accountName": { "type": "object", "description": "Data Lake Store account name. Type: string (or Expression with resultType string)." @@ -2146,6 +2270,7 @@ }, "AzureBlobFSLinkedServiceTypeProperties": { "description": "Azure Data Lake Storage Gen2 linked service properties.", + "type": "object", "properties": { "url": { "type": "object", @@ -2167,6 +2292,10 @@ "type": "object", "description": "The name or ID of the tenant to which the service principal belongs. Type: string (or Expression with resultType string)." }, + "azureCloudType": { + "type": "object", + "description": "Indicates the azure cloud type of the service principle auth. Allowed values are AzurePublic, AzureChina, AzureUsGovernment, AzureGermany. Default value is the data factory regions’ cloud type. Type: string (or Expression with resultType string)." + }, "encryptedCredential": { "type": "object", "description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string)." @@ -2198,6 +2327,7 @@ }, "Office365LinkedServiceTypeProperties": { "description": "Office365 linked service properties.", + "type": "object", "properties": { "office365TenantId": { "type": "object", @@ -2249,6 +2379,7 @@ }, "SalesforceLinkedServiceTypeProperties": { "description": "Salesforce linked service properties.", + "type": "object", "properties": { "environmentUrl": { "type": "object", @@ -2263,9 +2394,13 @@ "$ref": "../artifacts.json#/definitions/SecretBase" }, "securityToken": { - "description": "The security token is required to remotely access Salesforce instance.", + "description": "The security token is optional to remotely access Salesforce instance.", "$ref": "../artifacts.json#/definitions/SecretBase" }, + "apiVersion": { + "type": "object", + "description": "The Salesforce API version used in ADF. Type: string (or Expression with resultType string)." + }, "encryptedCredential": { "type": "object", "description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string)." @@ -2294,6 +2429,7 @@ }, "SalesforceServiceCloudLinkedServiceTypeProperties": { "description": "Salesforce Service Cloud linked service properties.", + "type": "object", "properties": { "environmentUrl": { "type": "object", @@ -2308,9 +2444,13 @@ "$ref": "../artifacts.json#/definitions/SecretBase" }, "securityToken": { - "description": "The security token is required to remotely access Salesforce instance.", + "description": "The security token is optional to remotely access Salesforce instance.", "$ref": "../artifacts.json#/definitions/SecretBase" }, + "apiVersion": { + "type": "object", + "description": "The Salesforce API version used in ADF. Type: string (or Expression with resultType string)." + }, "extendedProperties": { "type": "object", "description": "Extended properties appended to the connection string. Type: string (or Expression with resultType string)." @@ -2343,6 +2483,7 @@ }, "SapCloudForCustomerLinkedServiceTypeProperties": { "description": "SAP Cloud for Customer linked service properties.", + "type": "object", "properties": { "url": { "type": "object", @@ -2387,6 +2528,7 @@ }, "SapEccLinkedServiceTypeProperties": { "description": "SAP ECC linked service properties.", + "type": "object", "properties": { "url": { "type": "string", @@ -2431,6 +2573,7 @@ }, "SapOpenHubLinkedServiceTypeProperties": { "description": "Properties specific to SAP Business Warehouse Open Hub Destination linked service type.", + "type": "object", "properties": { "server": { "type": "object", @@ -2448,6 +2591,10 @@ "type": "object", "description": "Language of the BW system where the open hub destination is located. The default value is EN. Type: string (or Expression with resultType string)." }, + "systemId": { + "type": "object", + "description": "SystemID of the SAP system where the table is located. Type: string (or Expression with resultType string)." + }, "userName": { "type": "object", "description": "Username to access the SAP BW server where the open hub destination is located. Type: string (or Expression with resultType string)." @@ -2456,6 +2603,18 @@ "description": "Password to access the SAP BW server where the open hub destination is located.", "$ref": "../artifacts.json#/definitions/SecretBase" }, + "messageServer": { + "type": "object", + "description": "The hostname of the SAP Message Server. Type: string (or Expression with resultType string)." + }, + "messageServerService": { + "type": "object", + "description": "The service name or port number of the Message Server. Type: string (or Expression with resultType string)." + }, + "logonGroup": { + "type": "object", + "description": "The Logon Group for the SAP System. Type: string (or Expression with resultType string)." + }, "encryptedCredential": { "type": "object", "description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string)." @@ -2489,6 +2648,7 @@ }, "RestServiceLinkedServiceTypeProperties": { "description": "Rest Service linked service properties.", + "type": "object", "properties": { "url": { "description": "The base URL of the REST service.", @@ -2532,6 +2692,10 @@ "description": "The tenant information (domain name or tenant ID) used in AadServicePrincipal authentication type under which your application resides.", "type": "object" }, + "azureCloudType": { + "type": "object", + "description": "Indicates the azure cloud type of the service principle auth. Allowed values are AzurePublic, AzureChina, AzureUsGovernment, AzureGermany. Default value is the data factory regions’ cloud type. Type: string (or Expression with resultType string)." + }, "aadResourceId": { "description": "The resource you are requesting authorization to use.", "type": "object" @@ -2568,7 +2732,12 @@ }, "AmazonS3LinkedServiceTypeProperties": { "description": "Amazon S3 linked service properties.", + "type": "object", "properties": { + "authenticationType": { + "type": "object", + "description": "The authentication type of S3. Allowed value: AccessKey (default) or TemporarySecurityCredentials. Type: string (or Expression with resultType string)." + }, "accessKeyId": { "type": "object", "description": "The access key identifier of the Amazon S3 Identity and Access Management (IAM) user. Type: string (or Expression with resultType string)." @@ -2581,6 +2750,10 @@ "type": "object", "description": "This value specifies the endpoint to access with the S3 Connector. This is an optional property; change it only if you want to try a different service endpoint or want to switch between https and http. Type: string (or Expression with resultType string)." }, + "sessionToken": { + "$ref": "../artifacts.json#/definitions/SecretBase", + "description": "The session token for the S3 temporary security credential." + }, "encryptedCredential": { "type": "object", "description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string)." @@ -2609,6 +2782,7 @@ }, "AmazonRedshiftLinkedServiceTypeProperties": { "description": "Amazon Redshift linked service properties.", + "type": "object", "properties": { "server": { "type": "object", @@ -2682,6 +2856,7 @@ }, "AzureSearchLinkedServiceTypeProperties": { "description": "Windows Azure Search Service linked service properties.", + "type": "object", "properties": { "url": { "type": "object", @@ -2722,6 +2897,7 @@ }, "HttpLinkedServiceTypeProperties": { "description": "Properties specific to this linked service type.", + "type": "object", "properties": { "url": { "type": "object", @@ -2793,6 +2969,7 @@ }, "FtpServerLinkedServiceTypeProperties": { "description": "Properties specific to this linked service type.", + "type": "object", "properties": { "host": { "type": "object", @@ -2861,6 +3038,7 @@ }, "SftpServerLinkedServiceTypeProperties": { "description": "Properties specific to this linked service type.", + "type": "object", "properties": { "host": { "type": "object", @@ -2941,6 +3119,7 @@ }, "SapBWLinkedServiceTypeProperties": { "description": "Properties specific to this linked service type.", + "type": "object", "properties": { "server": { "type": "object", @@ -2995,6 +3174,7 @@ }, "SapHanaLinkedServiceProperties": { "description": "Properties specific to this linked service type.", + "type": "object", "properties": { "connectionString": { "type": "object", @@ -3055,6 +3235,7 @@ }, "AmazonMWSLinkedServiceTypeProperties": { "description": "Amazon Marketplace Web Service linked service properties.", + "type": "object", "properties": { "endpoint": { "description": "The endpoint of the Amazon MWS server, (i.e. mws.amazonservices.com)", @@ -3126,6 +3307,7 @@ }, "AzurePostgreSqlLinkedServiceTypeProperties": { "description": "Azure PostgreSQL linked service properties.", + "type": "object", "properties": { "connectionString": { "description": "An ODBC connection string. Type: string, SecureString or AzureKeyVaultSecretReference.", @@ -3163,7 +3345,12 @@ }, "ConcurLinkedServiceTypeProperties": { "description": "Concur Service linked service properties.", + "type": "object", "properties": { + "connectionProperties": { + "description": "Properties used to connect to Concur. It is mutually exclusive with any other properties in the linked service. Type: object.", + "type": "object" + }, "clientId": { "description": "Application client_id supplied by Concur App Management.", "type": "object" @@ -3220,6 +3407,7 @@ }, "CouchbaseLinkedServiceTypeProperties": { "description": "Couchbase server linked service properties.", + "type": "object", "properties": { "connectionString": { "description": "An ODBC connection string. Type: string, SecureString or AzureKeyVaultSecretReference.", @@ -3257,6 +3445,7 @@ }, "DrillLinkedServiceTypeProperties": { "description": "Drill server linked service properties.", + "type": "object", "properties": { "connectionString": { "description": "An ODBC connection string. Type: string, SecureString or AzureKeyVaultSecretReference.", @@ -3294,6 +3483,7 @@ }, "EloquaLinkedServiceTypeProperties": { "description": "Eloqua server linked service properties.", + "type": "object", "properties": { "endpoint": { "description": "The endpoint of the Eloqua server. (i.e. eloqua.example.com)", @@ -3351,6 +3541,7 @@ }, "GoogleBigQueryLinkedServiceTypeProperties": { "description": "Google BigQuery service linked service properties.", + "type": "object", "properties": { "project": { "description": "The default BigQuery project to query against.", @@ -3436,6 +3627,7 @@ }, "GreenplumLinkedServiceTypeProperties": { "description": "Greenplum Database linked service properties.", + "type": "object", "properties": { "connectionString": { "description": "An ODBC connection string. Type: string, SecureString or AzureKeyVaultSecretReference.", @@ -3473,6 +3665,7 @@ }, "HBaseLinkedServiceTypeProperties": { "description": "HBase server linked service properties.", + "type": "object", "properties": { "host": { "description": "The IP address or host name of the HBase server. (i.e. 192.168.222.160)", @@ -3554,6 +3747,7 @@ }, "HiveLinkedServiceTypeProperties": { "description": "Hive Server linked service properties.", + "type": "object", "properties": { "host": { "description": "IP address or host name of the Hive server, separated by ';' for multiple hosts (only when serviceDiscoveryMode is enable).", @@ -3679,6 +3873,7 @@ }, "HubspotLinkedServiceTypeProperties": { "description": "Hubspot Service linked service properties.", + "type": "object", "properties": { "clientId": { "description": "The client ID associated with your Hubspot application.", @@ -3739,6 +3934,7 @@ }, "ImpalaLinkedServiceTypeProperties": { "description": "Impala server linked service properties.", + "type": "object", "properties": { "host": { "description": "The IP address or host name of the Impala server. (i.e. 192.168.222.160)", @@ -3821,6 +4017,7 @@ }, "JiraLinkedServiceTypeProperties": { "description": "Jira Service linked service properties.", + "type": "object", "properties": { "host": { "description": "The IP address or host name of the Jira service. (e.g. jira.example.com)", @@ -3882,6 +4079,7 @@ }, "MagentoLinkedServiceTypeProperties": { "description": "Magento server linked service properties.", + "type": "object", "properties": { "host": { "description": "The URL of the Magento instance. (i.e. 192.168.222.110/magento3)", @@ -3934,6 +4132,7 @@ }, "MariaDBLinkedServiceTypeProperties": { "description": "MariaDB server linked service properties.", + "type": "object", "properties": { "connectionString": { "description": "An ODBC connection string. Type: string, SecureString or AzureKeyVaultSecretReference.", @@ -3971,6 +4170,7 @@ }, "AzureMariaDBLinkedServiceTypeProperties": { "description": "Azure Database for MariaDB linked service properties.", + "type": "object", "properties": { "connectionString": { "description": "An ODBC connection string. Type: string, SecureString or AzureKeyVaultSecretReference.", @@ -4008,6 +4208,7 @@ }, "MarketoLinkedServiceTypeProperties": { "description": "Marketo server linked service properties.", + "type": "object", "properties": { "endpoint": { "description": "The endpoint of the Marketo server. (i.e. 123-ABC-321.mktorest.com)", @@ -4065,6 +4266,7 @@ }, "PaypalLinkedServiceTypeProperties": { "description": "Paypal Service linked service properties.", + "type": "object", "properties": { "host": { "description": "The URL of the PayPal instance. (i.e. api.sandbox.paypal.com)", @@ -4122,6 +4324,7 @@ }, "PhoenixLinkedServiceTypeProperties": { "description": "Phoenix server linked service properties.", + "type": "object", "properties": { "host": { "description": "The IP address or host name of the Phoenix server. (i.e. 192.168.222.160)", @@ -4208,6 +4411,7 @@ }, "PrestoLinkedServiceTypeProperties": { "description": "Presto server linked service properties.", + "type": "object", "properties": { "host": { "description": "The IP address or host name of the Presto server. (i.e. 192.168.222.160)", @@ -4303,7 +4507,12 @@ }, "QuickBooksLinkedServiceTypeProperties": { "description": "QuickBooks server linked service properties.", + "type": "object", "properties": { + "connectionProperties": { + "description": "Properties used to connect to QuickBooks. It is mutually exclusive with any other properties in the linked service. Type: object.", + "type": "object" + }, "endpoint": { "description": "The endpoint of the QuickBooks server. (i.e. quickbooks.api.intuit.com)", "type": "object" @@ -4368,6 +4577,7 @@ }, "ServiceNowLinkedServiceTypeProperties": { "description": "ServiceNow server linked service properties.", + "type": "object", "properties": { "endpoint": { "description": "The endpoint of the ServiceNow server. (i.e. .service-now.com)", @@ -4445,6 +4655,7 @@ }, "ShopifyLinkedServiceTypeProperties": { "description": "Shopify Service linked service properties.", + "type": "object", "properties": { "host": { "description": "The endpoint of the Shopify server. (i.e. mystore.myshopify.com)", @@ -4497,6 +4708,7 @@ }, "SparkLinkedServiceTypeProperties": { "description": "Spark Server linked service properties.", + "type": "object", "properties": { "host": { "description": "IP address or host name of the Spark server", @@ -4611,7 +4823,12 @@ }, "SquareLinkedServiceTypeProperties": { "description": "Square Service linked service properties.", + "type": "object", "properties": { + "connectionProperties": { + "description": "Properties used to connect to Square. It is mutually exclusive with any other properties in the linked service. Type: object.", + "type": "object" + }, "host": { "description": "The URL of the Square instance. (i.e. mystore.mysquare.com)", "type": "object" @@ -4673,7 +4890,12 @@ }, "XeroLinkedServiceTypeProperties": { "description": "Xero Service linked service properties.", + "type": "object", "properties": { + "connectionProperties": { + "description": "Properties used to connect to Xero. It is mutually exclusive with any other properties in the linked service. Type: object.", + "type": "object" + }, "host": { "description": "The endpoint of the Xero server. (i.e. api.xero.com)", "type": "object" @@ -4729,7 +4951,12 @@ }, "ZohoLinkedServiceTypeProperties": { "description": "Zoho server linked service properties.", + "type": "object", "properties": { + "connectionProperties": { + "description": "Properties used to connect to Zoho. It is mutually exclusive with any other properties in the linked service. Type: object.", + "type": "object" + }, "endpoint": { "description": "The endpoint of the Zoho server. (i.e. crm.zoho.com/crm/private)", "type": "object" @@ -4781,6 +5008,7 @@ }, "VerticaLinkedServiceTypeProperties": { "description": "Vertica linked service properties.", + "type": "object", "properties": { "connectionString": { "description": "An ODBC connection string. Type: string, SecureString or AzureKeyVaultSecretReference.", @@ -4818,6 +5046,7 @@ }, "NetezzaLinkedServiceTypeProperties": { "description": "Netezza linked service properties.", + "type": "object", "properties": { "connectionString": { "description": "An ODBC connection string. Type: string, SecureString or AzureKeyVaultSecretReference.", @@ -4855,7 +5084,12 @@ }, "SalesforceMarketingCloudLinkedServiceTypeProperties": { "description": "Salesforce Marketing Cloud linked service properties.", + "type": "object", "properties": { + "connectionProperties": { + "description": "Properties used to connect to Salesforce Marketing Cloud. It is mutually exclusive with any other properties in the linked service. Type: object.", + "type": "object" + }, "clientId": { "description": "The client ID associated with the Salesforce Marketing Cloud application. Type: string (or Expression with resultType string).", "type": "object" @@ -4907,6 +5141,7 @@ }, "HDInsightOnDemandLinkedServiceTypeProperties": { "description": "HDInsight ondemand linked service properties.", + "type": "object", "properties": { "clusterSize": { "type": "object", @@ -5115,6 +5350,7 @@ }, "AzureDataLakeAnalyticsLinkedServiceTypeProperties": { "description": "Azure Data Lake Analytics linked service properties.", + "type": "object", "properties": { "accountName": { "type": "object", @@ -5176,6 +5412,7 @@ }, "AzureDatabricksLinkedServiceTypeProperties": { "description": "Azure Databricks linked service properties.", + "type": "object", "properties": { "domain": { "type": "object", @@ -5185,6 +5422,14 @@ "description": "Access token for databricks REST API. Refer to https://docs.azuredatabricks.net/api/latest/authentication.html. Type: string (or Expression with resultType string).", "$ref": "../artifacts.json#/definitions/SecretBase" }, + "authentication": { + "type": "object", + "description": "Required to specify MSI, if using Workspace resource id for databricks REST API. Type: string (or Expression with resultType string)." + }, + "workspaceResourceId": { + "type": "object", + "description": "Workspace resource id for databricks REST API. Type: string (or Expression with resultType string)." + }, "existingClusterId": { "type": "object", "description": "The id of an existing interactive cluster that will be used for all runs of this activity. Type: string (or Expression with resultType string)." @@ -5229,6 +5474,10 @@ "description": "Type: string (or Expression with resultType string)." } }, + "newClusterLogDestination": { + "type": "object", + "description": "Specify a location to deliver Spark driver, worker, and event logs. Type: string (or Expression with resultType string)." + }, "newClusterDriverNodeType": { "type": "object", "description": "The driver node type for the new job cluster. This property is ignored in instance pool configurations. Type: string (or Expression with resultType string)." @@ -5241,6 +5490,55 @@ "type": "object", "description": "Enable the elastic disk on the new cluster. This property is now ignored, and takes the default elastic disk behavior in Databricks (elastic disks are always enabled). Type: boolean (or Expression with resultType boolean)." }, + "encryptedCredential": { + "type": "object", + "description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string)." + }, + "policyId": { + "type": "object", + "description": "The policy id for limiting the ability to configure clusters based on a user defined set of rules. Type: string (or Expression with resultType string)." + } + }, + "required": [ + "domain" + ] + }, + "AzureDatabricksDeltaLakeLinkedService": { + "x-ms-discriminator-value": "AzureDatabricksDeltaLake", + "description": "Azure Databricks Delta Lake linked service.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/LinkedService" + } + ], + "properties": { + "typeProperties": { + "description": "Azure Databricks Delta Lake linked service properties.", + "x-ms-client-flatten": true, + "$ref": "#/definitions/AzureDatabricksDetltaLakeLinkedServiceTypeProperties" + } + }, + "required": [ + "typeProperties" + ] + }, + "AzureDatabricksDetltaLakeLinkedServiceTypeProperties": { + "description": "Azure Databricks Delta Lake linked service properties.", + "type": "object", + "properties": { + "domain": { + "type": "object", + "description": ".azuredatabricks.net, domain name of your Databricks deployment. Type: string (or Expression with resultType string)." + }, + "accessToken": { + "description": "Access token for databricks REST API. Refer to https://docs.azuredatabricks.net/api/latest/authentication.html. Type: string, SecureString or AzureKeyVaultSecretReference.", + "$ref": "../artifacts.json#/definitions/SecretBase" + }, + "clusterId": { + "type": "object", + "description": "The id of an existing interactive cluster that will be used for all runs of this job. Type: string (or Expression with resultType string)." + }, "encryptedCredential": { "type": "object", "description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string)." @@ -5273,6 +5571,7 @@ }, "ResponsysLinkedServiceTypeProperties": { "description": "Responsys linked service properties.", + "type": "object", "properties": { "endpoint": { "description": "The endpoint of the Responsys server.", @@ -5330,6 +5629,7 @@ }, "DynamicsAXLinkedServiceTypeProperties": { "description": "Dynamics AX linked service properties.", + "type": "object", "properties": { "url": { "description": "The Dynamics AX (or Dynamics 365 Finance and Operations) instance OData endpoint.", @@ -5386,6 +5686,7 @@ }, "OracleServiceCloudLinkedServiceTypeProperties": { "description": "Oracle Service Cloud linked service properties.", + "type": "object", "properties": { "host": { "description": "The URL of the Oracle Service Cloud instance.", @@ -5444,6 +5745,7 @@ }, "GoogleAdWordsLinkedServiceTypeProperties": { "description": "Google AdWords service linked service properties.", + "type": "object", "properties": { "clientCustomerID": { "description": "The Client customer ID of the AdWords account that you want to fetch report data for.", @@ -5526,6 +5828,7 @@ }, "SapTableLinkedServiceTypeProperties": { "description": "Properties specific to this linked service type.", + "type": "object", "properties": { "server": { "type": "object", @@ -5615,6 +5918,7 @@ }, "AzureDataExplorerLinkedServiceTypeProperties": { "description": "Azure Data Explorer (Kusto) linked service properties.", + "type": "object", "properties": { "endpoint": { "description": "The endpoint of Azure Data Explorer (the engine's endpoint). URL will be in the format https://..kusto.windows.net. Type: string (or Expression with resultType string)", @@ -5667,6 +5971,7 @@ }, "AzureFunctionLinkedServiceTypeProperties": { "description": "Azure Function linked service properties.", + "type": "object", "properties": { "functionAppUrl": { "description": "The endpoint of the Azure Function App. URL will be in the format https://.azurewebsites.net.", @@ -5684,6 +5989,99 @@ "required": [ "functionAppUrl" ] + }, + "SnowflakeLinkedService": { + "x-ms-discriminator-value": "Snowflake", + "description": "Snowflake linked service.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/LinkedService" + } + ], + "properties": { + "typeProperties": { + "description": "Snowflake linked service properties.", + "x-ms-client-flatten": true, + "$ref": "#/definitions/SnowflakeLinkedServiceTypeProperties" + } + }, + "required": [ + "typeProperties" + ] + }, + "SnowflakeLinkedServiceTypeProperties": { + "description": "Snowflake linked service properties.", + "type": "object", + "properties": { + "connectionString": { + "description": "The connection string of snowflake. Type: string, SecureString.", + "type": "object" + }, + "password": { + "$ref": "../artifacts.json#/definitions/AzureKeyVaultSecretReference", + "description": "The Azure key vault secret reference of password in connection string." + }, + "encryptedCredential": { + "type": "object", + "description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string)." + } + }, + "required": [ + "connectionString" + ] + }, + "SharePointOnlineListLinkedService": { + "x-ms-discriminator-value": "SharePointOnlineList", + "description": "SharePoint Online List linked service.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/LinkedService" + } + ], + "properties": { + "typeProperties": { + "description": "SharePoint Online List linked service properties.", + "x-ms-client-flatten": true, + "$ref": "#/definitions/SharePointOnlineListLinkedServiceTypeProperties" + } + }, + "required": [ + "typeProperties" + ] + }, + "SharePointOnlineListLinkedServiceTypeProperties": { + "description": "SharePoint Online List linked service properties.", + "type": "object", + "properties": { + "siteUrl": { + "type": "object", + "description": "The URL of the SharePoint Online site. For example, https://contoso.sharepoint.com/sites/siteName. Type: string (or Expression with resultType string)." + }, + "tenantId": { + "type": "object", + "description": "The tenant ID under which your application resides. You can find it from Azure portal Active Directory overview page. Type: string (or Expression with resultType string)." + }, + "servicePrincipalId": { + "type": "object", + "description": "The application (client) ID of your application registered in Azure Active Directory. Make sure to grant SharePoint site permission to this application. Type: string (or Expression with resultType string)." + }, + "servicePrincipalKey": { + "description": "The client secret of your application registered in Azure Active Directory. Type: string (or Expression with resultType string).", + "$ref": "../artifacts.json#/definitions/SecretBase" + }, + "encryptedCredential": { + "type": "object", + "description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string)." + } + }, + "required": [ + "siteUrl", + "tenantId", + "servicePrincipalId", + "servicePrincipalKey" + ] } } } diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/entityTypes/Notebook.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/entityTypes/Notebook.json index 4535e7d297a5..4facc7a9867d 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/entityTypes/Notebook.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/entityTypes/Notebook.json @@ -56,6 +56,7 @@ }, "BigDataPoolReference": { "description": "Big data pool reference.", + "type": "object", "properties": { "type": { "description": "Big data pool reference type.", @@ -180,6 +181,7 @@ }, "NotebookSessionProperties": { "description": "Session properties.", + "type": "object", "properties": { "driverMemory": { "description": "Amount of memory to use for the driver process.", @@ -212,6 +214,7 @@ }, "NotebookCellOutputItem": { "description": "An item of the notebook cell execution output.", + "type": "object", "properties": { "name": { "description": "For output_type=stream, determines the name of stream (stdout / stderr).", diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/entityTypes/Pipeline.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/entityTypes/Pipeline.json index ecd6378410b8..5fa826b4b7be 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/entityTypes/Pipeline.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/entityTypes/Pipeline.json @@ -155,6 +155,7 @@ }, "ControlActivity": { "x-ms-discriminator-value": "Container", + "type": "object", "description": "Base class for all control activities like IfCondition, ForEach , Until.", "allOf": [ { @@ -166,6 +167,7 @@ "ExecutionActivity": { "x-ms-discriminator-value": "Execution", "description": "Base class for all execution activities.", + "type": "object", "allOf": [ { "$ref": "#/definitions/Activity" @@ -259,10 +261,22 @@ "type": "object", "description": "The prefix filter for the Azure Blob name. Type: string (or Expression with resultType string)." }, + "fileListPath": { + "type": "object", + "description": "Point to a text file that lists each file (relative path to the path configured in the dataset) that you want to copy. Type: string (or Expression with resultType string)." + }, "enablePartitionDiscovery": { "type": "boolean", "description": "Indicates whether to enable partition discovery." }, + "partitionRootPath": { + "type": "object", + "description": "Specify the root path where partition discovery starts from. Type: string (or Expression with resultType string)." + }, + "deleteFilesAfterCompletion": { + "type": "object", + "description": "Indicates whether the source files need to be deleted after copy completion. Default is false. Type: boolean (or Expression with resultType boolean)." + }, "modifiedDatetimeStart": { "type": "object", "description": "The start of file's modified datetime. Type: string (or Expression with resultType string)." @@ -294,10 +308,22 @@ "type": "object", "description": "Azure blobFS wildcardFileName. Type: string (or Expression with resultType string)." }, + "fileListPath": { + "type": "object", + "description": "Point to a text file that lists each file (relative path to the path configured in the dataset) that you want to copy. Type: string (or Expression with resultType string)." + }, "enablePartitionDiscovery": { "type": "boolean", "description": "Indicates whether to enable partition discovery." }, + "partitionRootPath": { + "type": "object", + "description": "Specify the root path where partition discovery starts from. Type: string (or Expression with resultType string)." + }, + "deleteFilesAfterCompletion": { + "type": "object", + "description": "Indicates whether the source files need to be deleted after copy completion. Default is false. Type: boolean (or Expression with resultType boolean)." + }, "modifiedDatetimeStart": { "type": "object", "description": "The start of file's modified datetime. Type: string (or Expression with resultType string)." @@ -329,10 +355,30 @@ "type": "object", "description": "ADLS wildcardFileName. Type: string (or Expression with resultType string)." }, + "fileListPath": { + "type": "object", + "description": "Point to a text file that lists each file (relative path to the path configured in the dataset) that you want to copy. Type: string (or Expression with resultType string)." + }, + "listAfter": { + "type": "object", + "description": "Lists files after the value (exclusive) based on file/folder names’ lexicographical order. Applies under the folderPath in data set, and filter files/sub-folders under the folderPath. Type: string (or Expression with resultType string)." + }, + "listBefore": { + "type": "object", + "description": "Lists files before the value (inclusive) based on file/folder names’ lexicographical order. Applies under the folderPath in data set, and filter files/sub-folders under the folderPath. Type: string (or Expression with resultType string)." + }, "enablePartitionDiscovery": { "type": "boolean", "description": "Indicates whether to enable partition discovery." }, + "partitionRootPath": { + "type": "object", + "description": "Specify the root path where partition discovery starts from. Type: string (or Expression with resultType string)." + }, + "deleteFilesAfterCompletion": { + "type": "object", + "description": "Indicates whether the source files need to be deleted after copy completion. Default is false. Type: boolean (or Expression with resultType boolean)." + }, "modifiedDatetimeStart": { "type": "object", "description": "The start of file's modified datetime. Type: string (or Expression with resultType string)." @@ -368,10 +414,22 @@ "type": "object", "description": "The prefix filter for the S3 object name. Type: string (or Expression with resultType string)." }, + "fileListPath": { + "type": "object", + "description": "Point to a text file that lists each file (relative path to the path configured in the dataset) that you want to copy. Type: string (or Expression with resultType string)." + }, "enablePartitionDiscovery": { "type": "boolean", "description": "Indicates whether to enable partition discovery." }, + "partitionRootPath": { + "type": "object", + "description": "Specify the root path where partition discovery starts from. Type: string (or Expression with resultType string)." + }, + "deleteFilesAfterCompletion": { + "type": "object", + "description": "Indicates whether the source files need to be deleted after copy completion. Default is false. Type: boolean (or Expression with resultType boolean)." + }, "modifiedDatetimeStart": { "type": "object", "description": "The start of file's modified datetime. Type: string (or Expression with resultType string)." @@ -403,10 +461,22 @@ "type": "object", "description": "FileServer wildcardFileName. Type: string (or Expression with resultType string)." }, + "fileListPath": { + "type": "object", + "description": "Point to a text file that lists each file (relative path to the path configured in the dataset) that you want to copy. Type: string (or Expression with resultType string)." + }, "enablePartitionDiscovery": { "type": "boolean", "description": "Indicates whether to enable partition discovery." }, + "partitionRootPath": { + "type": "object", + "description": "Specify the root path where partition discovery starts from. Type: string (or Expression with resultType string)." + }, + "deleteFilesAfterCompletion": { + "type": "object", + "description": "Indicates whether the source files need to be deleted after copy completion. Default is false. Type: boolean (or Expression with resultType boolean)." + }, "modifiedDatetimeStart": { "type": "object", "description": "The start of file's modified datetime. Type: string (or Expression with resultType string)." @@ -414,6 +484,10 @@ "modifiedDatetimeEnd": { "type": "object", "description": "The end of file's modified datetime. Type: string (or Expression with resultType string)." + }, + "fileFilter": { + "type": "object", + "description": "Specify a filter to be used to select a subset of files in the folderPath rather than all files. Type: string (or Expression with resultType string)." } } }, @@ -438,10 +512,26 @@ "type": "object", "description": "Azure File Storage wildcardFileName. Type: string (or Expression with resultType string)." }, + "prefix": { + "type": "object", + "description": "The prefix filter for the Azure File name starting from root path. Type: string (or Expression with resultType string)." + }, + "fileListPath": { + "type": "object", + "description": "Point to a text file that lists each file (relative path to the path configured in the dataset) that you want to copy. Type: string (or Expression with resultType string)." + }, "enablePartitionDiscovery": { "type": "boolean", "description": "Indicates whether to enable partition discovery." }, + "partitionRootPath": { + "type": "object", + "description": "Specify the root path where partition discovery starts from. Type: string (or Expression with resultType string)." + }, + "deleteFilesAfterCompletion": { + "type": "object", + "description": "Indicates whether the source files need to be deleted after copy completion. Default is false. Type: boolean (or Expression with resultType boolean)." + }, "modifiedDatetimeStart": { "type": "object", "description": "The start of file's modified datetime. Type: string (or Expression with resultType string)." @@ -464,6 +554,10 @@ "operationTimeout": { "description": "Specifies the timeout for writing each chunk to SFTP server. Default value: 01:00:00 (one hour). Type: string (or Expression with resultType string).", "type": "object" + }, + "useTempFileRename": { + "description": "Upload to temporary file(s) and rename. Disable this option if your SFTP server doesn't support rename operation. Type: boolean (or Expression with resultType boolean).", + "type": "object" } } }, @@ -492,10 +586,22 @@ "type": "object", "description": "The prefix filter for the Google Cloud Storage object name. Type: string (or Expression with resultType string)." }, + "fileListPath": { + "type": "object", + "description": "Point to a text file that lists each file (relative path to the path configured in the dataset) that you want to copy. Type: string (or Expression with resultType string)." + }, "enablePartitionDiscovery": { "type": "boolean", "description": "Indicates whether to enable partition discovery." }, + "partitionRootPath": { + "type": "object", + "description": "Specify the root path where partition discovery starts from. Type: string (or Expression with resultType string)." + }, + "deleteFilesAfterCompletion": { + "type": "object", + "description": "Indicates whether the source files need to be deleted after copy completion. Default is false. Type: boolean (or Expression with resultType boolean)." + }, "modifiedDatetimeStart": { "type": "object", "description": "The start of file's modified datetime. Type: string (or Expression with resultType string)." @@ -527,6 +633,22 @@ "type": "object", "description": "Ftp wildcardFileName. Type: string (or Expression with resultType string)." }, + "enablePartitionDiscovery": { + "type": "boolean", + "description": "Indicates whether to enable partition discovery." + }, + "partitionRootPath": { + "type": "object", + "description": "Specify the root path where partition discovery starts from. Type: string (or Expression with resultType string)." + }, + "deleteFilesAfterCompletion": { + "type": "object", + "description": "Indicates whether the source files need to be deleted after copy completion. Default is false. Type: boolean (or Expression with resultType boolean)." + }, + "fileListPath": { + "type": "object", + "description": "Point to a text file that lists each file (relative path to the path configured in the dataset) that you want to copy. Type: string (or Expression with resultType string)." + }, "useBinaryTransfer": { "type": "boolean", "description": "Specify whether to use binary transfer mode for FTP stores." @@ -554,6 +676,22 @@ "type": "object", "description": "Sftp wildcardFileName. Type: string (or Expression with resultType string)." }, + "enablePartitionDiscovery": { + "type": "boolean", + "description": "Indicates whether to enable partition discovery." + }, + "partitionRootPath": { + "type": "object", + "description": "Specify the root path where partition discovery starts from. Type: string (or Expression with resultType string)." + }, + "fileListPath": { + "type": "object", + "description": "Point to a text file that lists each file (relative path to the path configured in the dataset) that you want to copy. Type: string (or Expression with resultType string)." + }, + "deleteFilesAfterCompletion": { + "type": "object", + "description": "Indicates whether the source files need to be deleted after copy completion. Default is false. Type: boolean (or Expression with resultType boolean)." + }, "modifiedDatetimeStart": { "type": "object", "description": "The start of file's modified datetime. Type: string (or Expression with resultType string)." @@ -588,6 +726,14 @@ "requestTimeout": { "type": "object", "description": "Specifies the timeout for a HTTP client to get HTTP response from HTTP server." + }, + "enablePartitionDiscovery": { + "type": "boolean", + "description": "Indicates whether to enable partition discovery." + }, + "partitionRootPath": { + "type": "object", + "description": "Specify the root path where partition discovery starts from. Type: string (or Expression with resultType string)." } } }, @@ -612,10 +758,18 @@ "type": "object", "description": "HDFS wildcardFileName. Type: string (or Expression with resultType string)." }, + "fileListPath": { + "type": "object", + "description": "Point to a text file that lists each file (relative path to the path configured in the dataset) that you want to copy. Type: string (or Expression with resultType string)." + }, "enablePartitionDiscovery": { "type": "boolean", "description": "Indicates whether to enable partition discovery." }, + "partitionRootPath": { + "type": "object", + "description": "Specify the root path where partition discovery starts from. Type: string (or Expression with resultType string)." + }, "modifiedDatetimeStart": { "type": "object", "description": "The start of file's modified datetime. Type: string (or Expression with resultType string)." @@ -627,6 +781,10 @@ "distcpSettings": { "description": "Specifies Distcp-related settings.", "$ref": "#/definitions/DistcpSettings" + }, + "deleteFilesAfterCompletion": { + "type": "object", + "description": "Indicates whether the source files need to be deleted after copy completion. Default is false. Type: boolean (or Expression with resultType boolean)." } } }, @@ -692,7 +850,13 @@ { "$ref": "#/definitions/StoreWriteSettings" } - ] + ], + "properties": { + "expiryDateTime": { + "description": "Specifies the expiry time of the written files. The time is applied to the UTC time zone in the format of \"2018-12-01T05:00:00Z\". Default value is NULL. Type: integer (or Expression with resultType integer).", + "type": "object" + } + } }, "FileServerWriteSettings": { "description": "File server write settings.", @@ -703,6 +867,15 @@ } ] }, + "AzureFileStorageWriteSettings": { + "description": "Azure File Storage write settings.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/StoreWriteSettings" + } + ] + }, "FormatReadSettings": { "description": "Format read settings.", "discriminator": "type", @@ -720,6 +893,68 @@ "type" ] }, + "CompressionReadSettings": { + "description": "Compression read settings.", + "discriminator": "type", + "type": "object", + "properties": { + "type": { + "type": "string", + "description": "The Compression setting type." + } + }, + "additionalProperties": { + "type": "object" + }, + "required": [ + "type" + ] + }, + "ZipDeflateReadSettings": { + "description": "The ZipDeflate compression read settings.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/CompressionReadSettings" + } + ], + "properties": { + "preserveZipFileNameAsFolder": { + "description": "Preserve the zip file name as folder path. Type: boolean (or Expression with resultType boolean).", + "type": "object" + } + } + }, + "TarReadSettings": { + "description": "The Tar compression read settings.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/CompressionReadSettings" + } + ], + "properties": { + "preserveCompressionFileNameAsFolder": { + "description": "Preserve the compression file name as folder path. Type: boolean (or Expression with resultType boolean).", + "type": "object" + } + } + }, + "TarGZipReadSettings": { + "description": "The TarGZip compression read settings.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/CompressionReadSettings" + } + ], + "properties": { + "preserveCompressionFileNameAsFolder": { + "description": "Preserve the compression file name as folder path. Type: boolean (or Expression with resultType boolean).", + "type": "object" + } + } + }, "DelimitedTextReadSettings": { "description": "Delimited text read settings.", "type": "object", @@ -732,6 +967,71 @@ "skipLineCount": { "type": "object", "description": "Indicates the number of non-empty rows to skip when reading data from input files. Type: integer (or Expression with resultType integer)." + }, + "compressionProperties": { + "$ref": "#/definitions/CompressionReadSettings", + "description": "Compression settings." + } + } + }, + "JsonReadSettings": { + "description": "Json read settings.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/FormatReadSettings" + } + ], + "properties": { + "compressionProperties": { + "$ref": "#/definitions/CompressionReadSettings", + "description": "Compression settings." + } + } + }, + "XmlReadSettings": { + "description": "Xml read settings.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/FormatReadSettings" + } + ], + "properties": { + "compressionProperties": { + "$ref": "#/definitions/CompressionReadSettings", + "description": "Compression settings." + }, + "validationMode": { + "type": "object", + "description": "Indicates what validation method is used when reading the xml files. Allowed values: 'none', 'xsd', or 'dtd'. Type: string (or Expression with resultType string)." + }, + "detectDataType": { + "type": "object", + "description": "Indicates whether type detection is enabled when reading the xml files. Type: boolean (or Expression with resultType boolean)." + }, + "namespaces": { + "type": "object", + "description": "Indicates whether namespace is enabled when reading the xml files. Type: boolean (or Expression with resultType boolean)." + }, + "namespacePrefixes": { + "type": "object", + "description": "Namespace uri to prefix mappings to override the prefixes in column names when namespace is enabled, if no prefix is defined for a namespace uri, the prefix of xml element/attribute name in the xml data file will be used. Example: \"{\"http://www.example.com/xml\":\"prefix\"}\" Type: object (or Expression with resultType object)." + } + } + }, + "BinaryReadSettings": { + "description": "Binary read settings.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/FormatReadSettings" + } + ], + "properties": { + "compressionProperties": { + "$ref": "#/definitions/CompressionReadSettings", + "description": "Compression settings." } } }, @@ -768,6 +1068,52 @@ "recordNamespace": { "type": "string", "description": "Record namespace in the write result." + }, + "maxRowsPerFile": { + "type": "object", + "description": "Limit the written file's row count to be smaller than or equal to the specified count. Type: integer (or Expression with resultType integer)." + }, + "fileNamePrefix": { + "type": "object", + "description": "Specifies the file name pattern _. when copy from non-file based store without partitionOptions. Type: string (or Expression with resultType string)." + } + } + }, + "OrcWriteSettings": { + "description": "Orc write settings.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/FormatWriteSettings" + } + ], + "properties": { + "maxRowsPerFile": { + "type": "object", + "description": "Limit the written file's row count to be smaller than or equal to the specified count. Type: integer (or Expression with resultType integer)." + }, + "fileNamePrefix": { + "type": "object", + "description": "Specifies the file name pattern _. when copy from non-file based store without partitionOptions. Type: string (or Expression with resultType string)." + } + } + }, + "ParquetWriteSettings": { + "description": "Parquet write settings.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/FormatWriteSettings" + } + ], + "properties": { + "maxRowsPerFile": { + "type": "object", + "description": "Limit the written file's row count to be smaller than or equal to the specified count. Type: integer (or Expression with resultType integer)." + }, + "fileNamePrefix": { + "type": "object", + "description": "Specifies the file name pattern _. when copy from non-file based store without partitionOptions. Type: string (or Expression with resultType string)." } } }, @@ -787,6 +1133,14 @@ "fileExtension": { "type": "object", "description": "The file extension used to create the files. Type: string (or Expression with resultType string)." + }, + "maxRowsPerFile": { + "type": "object", + "description": "Limit the written file's row count to be smaller than or equal to the specified count. Type: integer (or Expression with resultType integer)." + }, + "fileNamePrefix": { + "type": "object", + "description": "Specifies the file name pattern _. when copy from non-file based store without partitionOptions. Type: string (or Expression with resultType string)." } }, "required": [ @@ -828,6 +1182,35 @@ "storeSettings": { "$ref": "#/definitions/StoreReadSettings", "description": "Avro store settings." + }, + "additionalColumns": { + "type": "array", + "description": "Specifies the additional columns to be added to source data. Type: array of objects (or Expression with resultType array of objects).", + "items": { + "$ref": "#/definitions/AdditionalColumns" + } + } + } + }, + "ExcelSource": { + "description": "A copy activity excel source.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/CopySource" + } + ], + "properties": { + "storeSettings": { + "$ref": "#/definitions/StoreReadSettings", + "description": "Excel store settings." + }, + "additionalColumns": { + "type": "array", + "description": "Specifies the additional columns to be added to source data. Type: array of objects (or Expression with resultType array of objects).", + "items": { + "$ref": "#/definitions/AdditionalColumns" + } } } }, @@ -843,6 +1226,13 @@ "storeSettings": { "$ref": "#/definitions/StoreReadSettings", "description": "Parquet store settings." + }, + "additionalColumns": { + "type": "array", + "description": "Specifies the additional columns to be added to source data. Type: array of objects (or Expression with resultType array of objects).", + "items": { + "$ref": "#/definitions/AdditionalColumns" + } } } }, @@ -862,6 +1252,13 @@ "formatSettings": { "$ref": "#/definitions/DelimitedTextReadSettings", "description": "DelimitedText format settings." + }, + "additionalColumns": { + "type": "array", + "description": "Specifies the additional columns to be added to source data. Type: array of objects (or Expression with resultType array of objects).", + "items": { + "$ref": "#/definitions/AdditionalColumns" + } } } }, @@ -877,6 +1274,43 @@ "storeSettings": { "$ref": "#/definitions/StoreReadSettings", "description": "Json store settings." + }, + "formatSettings": { + "$ref": "#/definitions/JsonReadSettings", + "description": "Json format settings." + }, + "additionalColumns": { + "type": "array", + "description": "Specifies the additional columns to be added to source data. Type: array of objects (or Expression with resultType array of objects).", + "items": { + "$ref": "#/definitions/AdditionalColumns" + } + } + } + }, + "XmlSource": { + "description": "A copy activity Xml source.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/CopySource" + } + ], + "properties": { + "storeSettings": { + "$ref": "#/definitions/StoreReadSettings", + "description": "Xml store settings." + }, + "formatSettings": { + "$ref": "#/definitions/XmlReadSettings", + "description": "Xml format settings." + }, + "additionalColumns": { + "type": "array", + "description": "Specifies the additional columns to be added to source data. Type: array of objects (or Expression with resultType array of objects).", + "items": { + "$ref": "#/definitions/AdditionalColumns" + } } } }, @@ -892,6 +1326,13 @@ "storeSettings": { "$ref": "#/definitions/StoreReadSettings", "description": "ORC store settings." + }, + "additionalColumns": { + "type": "array", + "description": "Specifies the additional columns to be added to source data. Type: array of objects (or Expression with resultType array of objects).", + "items": { + "$ref": "#/definitions/AdditionalColumns" + } } } }, @@ -945,12 +1386,17 @@ "storeSettings": { "$ref": "#/definitions/StoreWriteSettings", "description": "ORC store settings." + }, + "formatSettings": { + "$ref": "#/definitions/OrcWriteSettings", + "description": "ORC format settings." } } }, "CopyActivity": { "x-ms-discriminator-value": "Copy", "description": "Copy activity.", + "type": "object", "allOf": [ { "$ref": "#/definitions/ExecutionActivity" @@ -983,6 +1429,7 @@ }, "CopyActivityTypeProperties": { "description": "Copy activity properties.", + "type": "object", "properties": { "source": { "description": "Copy activity source.", @@ -1020,6 +1467,14 @@ "description": "Redirect incompatible row settings when EnableSkipIncompatibleRow is true.", "$ref": "#/definitions/RedirectIncompatibleRowSettings" }, + "logStorageSettings": { + "description": "(Deprecated. Please use LogSettings) Log storage settings customer need to provide when enabling session log.", + "$ref": "#/definitions/LogStorageSettings" + }, + "logSettings": { + "description": "Log settings customer needs provide when enabling log.", + "$ref": "#/definitions/LogSettings" + }, "preserveRules": { "type": "array", "items": { @@ -1035,6 +1490,14 @@ "description": "Type: string (or Expression with resultType string)." }, "description": "Preserve rules." + }, + "validateDataConsistency": { + "type": "object", + "description": "Whether to enable Data Consistency validation. Type: boolean (or Expression with resultType boolean)." + }, + "skipErrorFile": { + "description": "Specify the fault tolerance for data consistency.", + "$ref": "#/definitions/SkipErrorFile" } }, "required": [ @@ -1083,6 +1546,10 @@ "storeSettings": { "$ref": "#/definitions/StoreReadSettings", "description": "Binary store settings." + }, + "formatSettings": { + "$ref": "#/definitions/BinaryReadSettings", + "description": "Binary format settings." } } }, @@ -1098,6 +1565,13 @@ "queryTimeout": { "type": "object", "description": "Query timeout. Type: string (or Expression with resultType string), pattern: ((\\d+)\\.)?(\\d\\d):(60|([0-5][0-9])):(60|([0-5][0-9]))." + }, + "additionalColumns": { + "type": "array", + "description": "Specifies the additional columns to be added to source data. Type: array of objects (or Expression with resultType array of objects).", + "items": { + "$ref": "#/definitions/AdditionalColumns" + } } } }, @@ -1163,6 +1637,13 @@ "queryTimeout": { "type": "object", "description": "Query timeout. Type: string (or Expression with resultType string), pattern: ((\\d+)\\.)?(\\d\\d):(60|([0-5][0-9])):(60|([0-5][0-9]))." + }, + "additionalColumns": { + "type": "array", + "description": "Specifies the additional columns to be added to source data. Type: array of objects (or Expression with resultType array of objects).", + "items": { + "$ref": "#/definitions/AdditionalColumns" + } } } }, @@ -1186,6 +1667,17 @@ "preferredRegions": { "type": "object", "description": "Preferred regions. Type: array of strings (or Expression with resultType array of strings)." + }, + "detectDatetime": { + "type": "object", + "description": "Whether detect primitive values as datetime values. Type: boolean (or Expression with resultType boolean)." + }, + "additionalColumns": { + "type": "array", + "description": "Specifies the additional columns to be added to source data. Type: array of objects (or Expression with resultType array of objects).", + "items": { + "$ref": "#/definitions/AdditionalColumns" + } } } }, @@ -1201,6 +1693,13 @@ "query": { "type": "object", "description": "FetchXML is a proprietary query language that is used in Microsoft Dynamics (online & on-premises). Type: string (or Expression with resultType string)." + }, + "additionalColumns": { + "type": "array", + "description": "Specifies the additional columns to be added to source data. Type: array of objects (or Expression with resultType array of objects).", + "items": { + "$ref": "#/definitions/AdditionalColumns" + } } } }, @@ -1216,6 +1715,13 @@ "query": { "type": "object", "description": "FetchXML is a proprietary query language that is used in Microsoft Dynamics CRM (online & on-premises). Type: string (or Expression with resultType string)." + }, + "additionalColumns": { + "type": "array", + "description": "Specifies the additional columns to be added to source data. Type: array of objects (or Expression with resultType array of objects).", + "items": { + "$ref": "#/definitions/AdditionalColumns" + } } } }, @@ -1231,6 +1737,13 @@ "query": { "type": "object", "description": "FetchXML is a proprietary query language that is used in Microsoft Common Data Service for Apps (online & on-premises). Type: string (or Expression with resultType string)." + }, + "additionalColumns": { + "type": "array", + "description": "Specifies the additional columns to be added to source data. Type: array of objects (or Expression with resultType array of objects).", + "items": { + "$ref": "#/definitions/AdditionalColumns" + } } } }, @@ -1246,6 +1759,13 @@ "query": { "type": "object", "description": "Database query. Type: string (or Expression with resultType string)." + }, + "additionalColumns": { + "type": "array", + "description": "Specifies the additional columns to be added to source data. Type: array of objects (or Expression with resultType array of objects).", + "items": { + "$ref": "#/definitions/AdditionalColumns" + } } } }, @@ -1276,6 +1796,13 @@ "query": { "type": "object", "description": "Database query. Type: string (or Expression with resultType string)." + }, + "additionalColumns": { + "type": "array", + "description": "Specifies the additional columns to be added to source data. Type: array of objects (or Expression with resultType array of objects).", + "items": { + "$ref": "#/definitions/AdditionalColumns" + } } } }, @@ -1381,6 +1908,17 @@ "query": { "type": "object", "description": "OData query. For example, \"$top=1\". Type: string (or Expression with resultType string)." + }, + "httpRequestTimeout": { + "type": "object", + "description": "The timeout (TimeSpan) to get an HTTP response. It is the timeout to get a response, not the timeout to read response data. Default value: 00:05:00. Type: string (or Expression with resultType string), pattern: ((\\d+)\\.)?(\\d\\d):(60|([0-5][0-9])):(60|([0-5][0-9]))." + }, + "additionalColumns": { + "type": "array", + "description": "Specifies the additional columns to be added to source data. Type: array of objects (or Expression with resultType array of objects).", + "items": { + "$ref": "#/definitions/AdditionalColumns" + } } } }, @@ -1435,6 +1973,13 @@ "name": "SalesforceSourceReadBehavior", "modelAsString": true } + }, + "additionalColumns": { + "type": "array", + "description": "Specifies the additional columns to be added to source data. Type: array of objects (or Expression with resultType array of objects).", + "items": { + "$ref": "#/definitions/AdditionalColumns" + } } } }, @@ -1450,6 +1995,10 @@ "query": { "type": "object", "description": "SAP Cloud for Customer OData query. For example, \"$top=1\". Type: string (or Expression with resultType string)." + }, + "httpRequestTimeout": { + "type": "object", + "description": "The timeout (TimeSpan) to get an HTTP response. It is the timeout to get a response, not the timeout to read response data. Default value: 00:05:00. Type: string (or Expression with resultType string), pattern: ((\\d+)\\.)?(\\d\\d):(60|([0-5][0-9])):(60|([0-5][0-9]))." } } }, @@ -1465,6 +2014,10 @@ "query": { "type": "object", "description": "SAP ECC OData query. For example, \"$top=1\". Type: string (or Expression with resultType string)." + }, + "httpRequestTimeout": { + "type": "object", + "description": "The timeout (TimeSpan) to get an HTTP response. It is the timeout to get a response, not the timeout to read response data. Default value: 00:05:00. Type: string (or Expression with resultType string), pattern: ((\\d+)\\.)?(\\d\\d):(60|([0-5][0-9])):(60|([0-5][0-9]))." } } }, @@ -1530,6 +2083,14 @@ "baseRequestId": { "type": "object", "description": "The ID of request for delta loading. Once it is set, only data with requestId larger than the value of this property will be retrieved. The default value is 0. Type: integer (or Expression with resultType integer )." + }, + "customRfcReadTableFunctionModule": { + "type": "object", + "description": "Specifies the custom RFC function module that will be used to read data from SAP Table. Type: string (or Expression with resultType string)." + }, + "sapDataColumnDelimiter": { + "type": "object", + "description": "The single character that will be used as delimiter passed to SAP RFC as well as splitting the output data retrieved. Type: string (or Expression with resultType string)." } } }, @@ -1566,6 +2127,10 @@ "type": "object", "description": "Specifies the custom RFC function module that will be used to read data from SAP Table. Type: string (or Expression with resultType string)." }, + "sapDataColumnDelimiter": { + "type": "object", + "description": "The single character that will be used as delimiter passed to SAP RFC as well as splitting the output data retrieved. Type: string (or Expression with resultType string)." + }, "partitionOption": { "description": "The partition mechanism that will be used for SAP table read in parallel.", "type": "string", @@ -1610,6 +2175,37 @@ } } }, + "RestSink": { + "description": "A copy activity Rest service Sink.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/CopySink" + } + ], + "properties": { + "requestMethod": { + "type": "object", + "description": "The HTTP method used to call the RESTful API. The default is POST. Type: string (or Expression with resultType string)." + }, + "additionalHeaders": { + "type": "object", + "description": "The additional HTTP headers in the request to the RESTful API. Type: string (or Expression with resultType string)." + }, + "httpRequestTimeout": { + "type": "object", + "description": "The timeout (TimeSpan) to get an HTTP response. It is the timeout to get a response, not the timeout to read response data. Default value: 00:01:40. Type: string (or Expression with resultType string), pattern: ((\\d+)\\.)?(\\d\\d):(60|([0-5][0-9])):(60|([0-5][0-9]))." + }, + "requestInterval": { + "type": "object", + "description": "The time to await before sending next request, in milliseconds " + }, + "httpCompressionType": { + "type": "object", + "description": "Http Compression Type to Send data in compressed format with Optimal Compression Level, Default is None. And The Only Supported option is Gzip. " + } + } + }, "RestSource": { "description": "A copy activity Rest service source.", "type": "object", @@ -1642,6 +2238,13 @@ "requestInterval": { "type": "object", "description": "The time to await before sending next page request. " + }, + "additionalColumns": { + "type": "array", + "description": "Specifies the additional columns to be added to source data. Type: array of objects (or Expression with resultType array of objects).", + "items": { + "$ref": "#/definitions/AdditionalColumns" + } } } }, @@ -1668,6 +2271,18 @@ "additionalProperties": { "$ref": "#/definitions/StoredProcedureParameter" } + }, + "isolationLevel": { + "description": "Specifies the transaction locking behavior for the SQL source. Allowed values: ReadCommitted/ReadUncommitted/RepeatableRead/Serializable/Snapshot. The default value is ReadCommitted. Type: string (or Expression with resultType string).", + "type": "object" + }, + "partitionOption": { + "description": "The partition mechanism that will be used for Sql read in parallel. Possible values include: \"None\", \"PhysicalPartitionsOfTable\", \"DynamicRange\".", + "type": "object" + }, + "partitionSettings": { + "description": "The settings that will be leveraged for Sql source partitioning.", + "$ref": "#/definitions/SqlPartitionSettings" } } }, @@ -1698,6 +2313,14 @@ "produceAdditionalTypes": { "description": "Which additional types to produce.", "type": "object" + }, + "partitionOption": { + "description": "The partition mechanism that will be used for Sql read in parallel. Possible values include: \"None\", \"PhysicalPartitionsOfTable\", \"DynamicRange\".", + "type": "object" + }, + "partitionSettings": { + "description": "The settings that will be leveraged for Sql source partitioning.", + "$ref": "#/definitions/SqlPartitionSettings" } } }, @@ -1728,6 +2351,14 @@ "produceAdditionalTypes": { "description": "Which additional types to produce.", "type": "object" + }, + "partitionOption": { + "description": "The partition mechanism that will be used for Sql read in parallel. Possible values include: \"None\", \"PhysicalPartitionsOfTable\", \"DynamicRange\".", + "type": "object" + }, + "partitionSettings": { + "description": "The settings that will be leveraged for Sql source partitioning.", + "$ref": "#/definitions/SqlPartitionSettings" } } }, @@ -1758,6 +2389,14 @@ "produceAdditionalTypes": { "description": "Which additional types to produce.", "type": "object" + }, + "partitionOption": { + "description": "The partition mechanism that will be used for Sql read in parallel. Possible values include: \"None\", \"PhysicalPartitionsOfTable\", \"DynamicRange\".", + "type": "object" + }, + "partitionSettings": { + "description": "The settings that will be leveraged for Sql source partitioning.", + "$ref": "#/definitions/SqlPartitionSettings" } } }, @@ -1781,6 +2420,32 @@ "storedProcedureParameters": { "type": "object", "description": "Value and type setting for stored procedure parameters. Example: \"{Parameter1: {value: \"1\", type: \"int\"}}\". Type: object (or Expression with resultType object), itemType: StoredProcedureParameter." + }, + "partitionOption": { + "description": "The partition mechanism that will be used for Sql read in parallel. Possible values include: \"None\", \"PhysicalPartitionsOfTable\", \"DynamicRange\".", + "type": "object" + }, + "partitionSettings": { + "description": "The settings that will be leveraged for Sql source partitioning.", + "$ref": "#/definitions/SqlPartitionSettings" + } + } + }, + "SqlPartitionSettings": { + "description": "The settings that will be leveraged for Sql source partitioning.", + "type": "object", + "properties": { + "partitionColumnName": { + "type": "object", + "description": "The name of the column in integer or datetime type that will be used for proceeding partitioning. If not specified, the primary key of the table is auto-detected and used as the partition column. Type: string (or Expression with resultType string)." + }, + "partitionUpperBound": { + "type": "object", + "description": "The maximum value of the partition column for partition range splitting. This value is used to decide the partition stride, not for filtering the rows in table. All rows in the table or query result will be partitioned and copied. Type: string (or Expression with resultType string)." + }, + "partitionLowerBound": { + "type": "object", + "description": "The minimum value of the partition column for partition range splitting. This value is used to decide the partition stride, not for filtering the rows in table. All rows in the table or query result will be partitioned and copied. Type: string (or Expression with resultType string)." } } }, @@ -1796,6 +2461,13 @@ "recursive": { "type": "object", "description": "If true, files under the folder path will be read recursively. Default is true. Type: boolean (or Expression with resultType boolean)." + }, + "additionalColumns": { + "type": "array", + "description": "Specifies the additional columns to be added to source data. Type: array of objects (or Expression with resultType array of objects).", + "items": { + "$ref": "#/definitions/AdditionalColumns" + } } } }, @@ -1875,6 +2547,13 @@ "queryTimeout": { "type": "object", "description": "Query timeout. Type: string (or Expression with resultType string), pattern: ((\\d+)\\.)?(\\d\\d):(60|([0-5][0-9])):(60|([0-5][0-9])).." + }, + "additionalColumns": { + "type": "array", + "description": "Specifies the additional columns to be added to source data. Type: array of objects (or Expression with resultType array of objects).", + "items": { + "$ref": "#/definitions/AdditionalColumns" + } } }, "required": [ @@ -1914,6 +2593,13 @@ "partitionSettings": { "description": "The settings that will be leveraged for Oracle source partitioning.", "$ref": "#/definitions/OraclePartitionSettings" + }, + "additionalColumns": { + "type": "array", + "description": "Specifies the additional columns to be added to source data. Type: array of objects (or Expression with resultType array of objects).", + "items": { + "$ref": "#/definitions/AdditionalColumns" + } } } }, @@ -2001,7 +2687,15 @@ "$ref": "#/definitions/CopySource" } ], - "properties": {} + "properties": { + "additionalColumns": { + "type": "array", + "description": "Specifies the additional columns to be added to source data. Type: array of objects (or Expression with resultType array of objects).", + "items": { + "$ref": "#/definitions/AdditionalColumns" + } + } + } }, "CassandraSource": { "description": "A copy activity source for a Cassandra database.", @@ -2050,6 +2744,47 @@ "query": { "type": "object", "description": "Database query. Should be a SQL-92 query expression. Type: string (or Expression with resultType string)." + }, + "additionalColumns": { + "type": "array", + "description": "Specifies the additional columns to be added to source data. Type: array of objects (or Expression with resultType array of objects).", + "items": { + "$ref": "#/definitions/AdditionalColumns" + } + } + } + }, + "MongoDbAtlasSource": { + "description": "A copy activity source for a MongoDB Atlas database.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/CopySource" + } + ], + "properties": { + "filter": { + "type": "object", + "description": "Specifies selection filter using query operators. To return all documents in a collection, omit this parameter or pass an empty document ({}). Type: string (or Expression with resultType string)." + }, + "cursorMethods": { + "description": "Cursor methods for Mongodb query", + "$ref": "#/definitions/MongoDbCursorMethodsProperties" + }, + "batchSize": { + "type": "object", + "description": "Specifies the number of documents to return in each batch of the response from MongoDB Atlas instance. In most cases, modifying the batch size will not affect the user or the application. This property's main purpose is to avoid hit the limitation of response size. Type: integer (or Expression with resultType integer)." + }, + "queryTimeout": { + "type": "object", + "description": "Query timeout. Type: string (or Expression with resultType string), pattern: ((\\d+)\\.)?(\\d\\d):(60|([0-5][0-9])):(60|([0-5][0-9]))." + }, + "additionalColumns": { + "type": "array", + "description": "Specifies the additional columns to be added to source data. Type: array of objects (or Expression with resultType array of objects).", + "items": { + "$ref": "#/definitions/AdditionalColumns" + } } } }, @@ -2077,6 +2812,13 @@ "queryTimeout": { "type": "object", "description": "Query timeout. Type: string (or Expression with resultType string), pattern: ((\\d+)\\.)?(\\d\\d):(60|([0-5][0-9])):(60|([0-5][0-9]))." + }, + "additionalColumns": { + "type": "array", + "description": "Specifies the additional columns to be added to source data. Type: array of objects (or Expression with resultType array of objects).", + "items": { + "$ref": "#/definitions/AdditionalColumns" + } } } }, @@ -2104,6 +2846,13 @@ "queryTimeout": { "type": "object", "description": "Query timeout. Type: string (or Expression with resultType string), pattern: ((\\d+)\\.)?(\\d\\d):(60|([0-5][0-9])):(60|([0-5][0-9]))." + }, + "additionalColumns": { + "type": "array", + "description": "Specifies the additional columns to be added to source data. Type: array of objects (or Expression with resultType array of objects).", + "items": { + "$ref": "#/definitions/AdditionalColumns" + } } } }, @@ -2762,6 +3511,10 @@ "query": { "type": "object", "description": "A query to retrieve data from source. Type: string (or Expression with resultType string)." + }, + "httpRequestTimeout": { + "type": "object", + "description": "The timeout (TimeSpan) to get an HTTP response. It is the timeout to get a response, not the timeout to read response data. Default value: 00:05:00. Type: string (or Expression with resultType string), pattern: ((\\d+)\\.)?(\\d\\d):(60|([0-5][0-9])):(60|([0-5][0-9]))." } } }, @@ -2832,6 +3585,143 @@ "bucketName" ] }, + "SnowflakeSource": { + "description": "A copy activity snowflake source.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/CopySource" + } + ], + "properties": { + "query": { + "type": "object", + "description": "Snowflake Sql query. Type: string (or Expression with resultType string)." + }, + "exportSettings": { + "$ref": "#/definitions/SnowflakeExportCopyCommand", + "description": "Snowflake export settings." + } + } + }, + "ExportSettings": { + "description": "Export command settings.", + "discriminator": "type", + "type": "object", + "properties": { + "type": { + "type": "string", + "description": "The export setting type." + } + }, + "additionalProperties": { + "type": "object" + }, + "required": [ + "type" + ] + }, + "SnowflakeExportCopyCommand": { + "description": "Snowflake export command settings.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/ExportSettings" + } + ], + "properties": { + "additionalCopyOptions": { + "type": "object", + "description": "Additional copy options directly passed to snowflake Copy Command. Type: key value pairs (value should be string type) (or Expression with resultType object). Example: \"additionalCopyOptions\": { \"DATE_FORMAT\": \"MM/DD/YYYY\", \"TIME_FORMAT\": \"'HH24:MI:SS.FF'\" }", + "additionalProperties": { + "type": "object" + } + }, + "additionalFormatOptions": { + "type": "object", + "description": "Additional format options directly passed to snowflake Copy Command. Type: key value pairs (value should be string type) (or Expression with resultType object). Example: \"additionalFormatOptions\": { \"OVERWRITE\": \"TRUE\", \"MAX_FILE_SIZE\": \"'FALSE'\" }", + "additionalProperties": { + "type": "object" + } + } + } + }, + "AzureDatabricksDeltaLakeSource": { + "description": "A copy activity Azure Databricks Delta Lake source.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/CopySource" + } + ], + "properties": { + "query": { + "type": "object", + "description": "Azure Databricks Delta Lake Sql query. Type: string (or Expression with resultType string)." + }, + "exportSettings": { + "$ref": "#/definitions/AzureDatabricksDeltaLakeExportCommand", + "description": "Azure Databricks Delta Lake export settings." + } + } + }, + "AzureDatabricksDeltaLakeExportCommand": { + "description": "Azure Databricks Delta Lake export command settings.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/ExportSettings" + } + ], + "properties": { + "dateFormat": { + "type": "object", + "description": "Specify the date format for the csv in Azure Databricks Delta Lake Copy. Type: string (or Expression with resultType string)." + }, + "timestampFormat": { + "type": "object", + "description": "Specify the timestamp format for the csv in Azure Databricks Delta Lake Copy. Type: string (or Expression with resultType string)." + } + } + }, + "AzureDatabricksDeltaLakeSink": { + "description": "A copy activity Azure Databricks Delta Lake sink.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/CopySink" + } + ], + "properties": { + "preCopyScript": { + "type": "object", + "description": "SQL pre-copy script. Type: string (or Expression with resultType string)." + }, + "importSettings": { + "$ref": "#/definitions/AzureDatabricksDeltaLakeImportCommand", + "description": "Azure Databricks Delta Lake import settings." + } + } + }, + "AzureDatabricksDeltaLakeImportCommand": { + "description": "Azure Databricks Delta Lake import command settings.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/ImportSettings" + } + ], + "properties": { + "dateFormat": { + "type": "object", + "description": "Specify the date format for csv in Azure Databricks Delta Lake Copy. Type: string (or Expression with resultType string)." + }, + "timestampFormat": { + "type": "object", + "description": "Specify the timestamp format for csv in Azure Databricks Delta Lake Copy. Type: string (or Expression with resultType string)." + } + } + }, "StoredProcedureParameter": { "description": "SQL stored procedure parameter.", "type": "object", @@ -2920,6 +3810,10 @@ "name": "SapCloudForCustomerSinkWriteBehavior", "modelAsString": true } + }, + "httpRequestTimeout": { + "type": "object", + "description": "The timeout (TimeSpan) to get an HTTP response. It is the timeout to get a response, not the timeout to read response data. Default value: 00:05:00. Type: string (or Expression with resultType string), pattern: ((\\d+)\\.)?(\\d\\d):(60|([0-5][0-9])):(60|([0-5][0-9]))." } } }, @@ -3004,6 +3898,10 @@ "storeSettings": { "$ref": "#/definitions/StoreWriteSettings", "description": "Parquet store settings." + }, + "formatSettings": { + "$ref": "#/definitions/ParquetWriteSettings", + "description": "Parquet format settings." } } }, @@ -3340,24 +4238,134 @@ "type": "string" } } - } + } + }, + "DWCopyCommandDefaultValue": { + "description": "Default value.", + "type": "object", + "properties": { + "columnName": { + "type": "object", + "description": "Column name. Type: object (or Expression with resultType string)." + }, + "defaultValue": { + "type": "object", + "description": "The default value of the column. Type: object (or Expression with resultType string)." + } + } + }, + "SnowflakeSink": { + "description": "A copy activity snowflake sink.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/CopySink" + } + ], + "properties": { + "preCopyScript": { + "type": "object", + "description": "SQL pre-copy script. Type: string (or Expression with resultType string)." + }, + "importSettings": { + "$ref": "#/definitions/SnowflakeImportCopyCommand", + "description": "Snowflake import settings." + } + } + }, + "ImportSettings": { + "description": "Import command settings.", + "discriminator": "type", + "type": "object", + "properties": { + "type": { + "type": "string", + "description": "The import setting type." + } + }, + "additionalProperties": { + "type": "object" + }, + "required": [ + "type" + ] + }, + "SnowflakeImportCopyCommand": { + "description": "Snowflake import command settings.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/ImportSettings" + } + ], + "properties": { + "additionalCopyOptions": { + "type": "object", + "description": "Additional copy options directly passed to snowflake Copy Command. Type: key value pairs (value should be string type) (or Expression with resultType object). Example: \"additionalCopyOptions\": { \"DATE_FORMAT\": \"MM/DD/YYYY\", \"TIME_FORMAT\": \"'HH24:MI:SS.FF'\" }", + "additionalProperties": { + "type": "object" + } + }, + "additionalFormatOptions": { + "type": "object", + "description": "Additional format options directly passed to snowflake Copy Command. Type: key value pairs (value should be string type) (or Expression with resultType object). Example: \"additionalFormatOptions\": { \"FORCE\": \"TRUE\", \"LOAD_UNCERTAIN_FILES\": \"'FALSE'\" }", + "additionalProperties": { + "type": "object" + } + } + } + }, + "LogStorageSettings": { + "description": "(Deprecated. Please use LogSettings) Log storage settings.", + "type": "object", + "properties": { + "linkedServiceName": { + "description": "Log storage linked service reference.", + "$ref": "../artifacts.json#/definitions/LinkedServiceReference" + }, + "path": { + "type": "object", + "description": "The path to storage for storing detailed logs of activity execution. Type: string (or Expression with resultType string)." + }, + "logLevel": { + "type": "object", + "description": "Gets or sets the log level, support: Info, Warning. Type: string (or Expression with resultType string)." + }, + "enableReliableLogging": { + "type": "object", + "description": "Specifies whether to enable reliable logging. Type: boolean (or Expression with resultType boolean)." + } + }, + "additionalProperties": { + "type": "object" + }, + "required": [ + "linkedServiceName" + ] }, - "DWCopyCommandDefaultValue": { - "description": "Default value.", + "LogSettings": { + "description": "Log settings.", "type": "object", "properties": { - "columnName": { + "enableCopyActivityLog": { "type": "object", - "description": "Column name. Type: object (or Expression with resultType string)." + "description": "Specifies whether to enable copy activity log. Type: boolean (or Expression with resultType boolean)." }, - "defaultValue": { - "type": "object", - "description": "The default value of the column. Type: object (or Expression with resultType string)." + "copyActivityLogSettings": { + "description": "Specifies settings for copy activity log.", + "$ref": "#/definitions/CopyActivityLogSettings" + }, + "logLocationSettings": { + "description": "Log location settings customer needs to provide when enabling log.", + "$ref": "#/definitions/LogLocationSettings" } - } + }, + "required": [ + "logLocationSettings" + ] }, - "LogStorageSettings": { - "description": "Log storage settings.", + "LogLocationSettings": { + "description": "Log location settings.", "type": "object", "properties": { "linkedServiceName": { @@ -3369,13 +4377,24 @@ "description": "The path to storage for storing detailed logs of activity execution. Type: string (or Expression with resultType string)." } }, - "additionalProperties": { - "type": "object" - }, "required": [ "linkedServiceName" ] }, + "CopyActivityLogSettings": { + "description": "Settings for copy activity log.", + "type": "object", + "properties": { + "logLevel": { + "type": "object", + "description": "Gets or sets the log level, support: Info, Warning. Type: string (or Expression with resultType string)." + }, + "enableReliableLogging": { + "type": "object", + "description": "Specifies whether to enable reliable logging. Type: boolean (or Expression with resultType boolean)." + } + } + }, "StagingSettings": { "description": "Staging settings.", "type": "object", @@ -3420,6 +4439,34 @@ "linkedServiceName" ] }, + "SkipErrorFile": { + "description": "Skip error file.", + "type": "object", + "properties": { + "fileMissing": { + "type": "object", + "description": "Skip if file is deleted by other client during copy. Default is true. Type: boolean (or Expression with resultType boolean)." + }, + "dataInconsistency": { + "type": "object", + "description": "Skip if source/sink file changed by other concurrent write. Default is false. Type: boolean (or Expression with resultType boolean)." + } + } + }, + "AdditionalColumns": { + "description": "Specify the column name and value of additional columns.", + "type": "object", + "properties": { + "name": { + "type": "object", + "description": "Additional column name. Type: string (or Expression with resultType string)." + }, + "value": { + "type": "object", + "description": "Additional column value. Type: string (or Expression with resultType string)." + } + } + }, "OracleSink": { "description": "A copy activity Oracle sink.", "type": "object", @@ -3537,6 +4584,17 @@ } } }, + "DynamicsSinkWriteBehavior": { + "description": "Defines values for DynamicsSinkWriteBehavior.", + "type": "string", + "enum": [ + "Upsert" + ], + "x-ms-enum": { + "name": "DynamicsSinkWriteBehavior", + "modelAsString": true + } + }, "DynamicsSink": { "description": "A copy activity Dynamics sink.", "type": "object", @@ -3548,14 +4606,7 @@ "properties": { "writeBehavior": { "description": "The write behavior for the operation.", - "type": "string", - "enum": [ - "Upsert" - ], - "x-ms-enum": { - "name": "DynamicsSinkWriteBehavior", - "modelAsString": true - } + "$ref": "#/definitions/DynamicsSinkWriteBehavior" }, "ignoreNullValues": { "type": "object", @@ -3581,14 +4632,7 @@ "properties": { "writeBehavior": { "description": "The write behavior for the operation.", - "type": "string", - "enum": [ - "Upsert" - ], - "x-ms-enum": { - "name": "DynamicsSinkWriteBehavior", - "modelAsString": true - } + "$ref": "#/definitions/DynamicsSinkWriteBehavior" }, "ignoreNullValues": { "type": "object", @@ -3614,14 +4658,7 @@ "properties": { "writeBehavior": { "description": "The write behavior for the operation.", - "type": "string", - "enum": [ - "Upsert" - ], - "x-ms-enum": { - "name": "DynamicsSinkWriteBehavior", - "modelAsString": true - } + "$ref": "#/definitions/DynamicsSinkWriteBehavior" }, "ignoreNullValues": { "type": "object", @@ -3781,11 +4818,50 @@ "mappings": { "type": "object", "description": "Column mappings with logical types. Tabular->tabular example: [{\"source\":{\"name\":\"CustomerName\",\"type\":\"String\"},\"sink\":{\"name\":\"ClientName\",\"type\":\"String\"}},{\"source\":{\"name\":\"CustomerAddress\",\"type\":\"String\"},\"sink\":{\"name\":\"ClientAddress\",\"type\":\"String\"}}]. Hierarchical->tabular example: [{\"source\":{\"path\":\"$.CustomerName\",\"type\":\"String\"},\"sink\":{\"name\":\"ClientName\",\"type\":\"String\"}},{\"source\":{\"path\":\"$.CustomerAddress\",\"type\":\"String\"},\"sink\":{\"name\":\"ClientAddress\",\"type\":\"String\"}}]. Type: object (or Expression with resultType object)." + }, + "typeConversion": { + "type": "object", + "description": "Whether to enable the advanced type conversion feature in the Copy activity. Type: boolean (or Expression with resultType boolean)." + }, + "typeConversionSettings": { + "description": "Type conversion settings", + "$ref": "#/definitions/TypeConversionSettings" + } + } + }, + "TypeConversionSettings": { + "description": "Type conversion settings", + "type": "object", + "properties": { + "allowDataTruncation": { + "type": "object", + "description": "Whether to allow data truncation when converting the data. Type: boolean (or Expression with resultType boolean)." + }, + "treatBooleanAsNumber": { + "type": "object", + "description": "Whether to treat boolean values as numbers. Type: boolean (or Expression with resultType boolean)." + }, + "dateTimeFormat": { + "type": "object", + "description": "The format for DateTime values. Type: string (or Expression with resultType string)." + }, + "dateTimeOffsetFormat": { + "type": "object", + "description": "The format for DateTimeOffset values. Type: string (or Expression with resultType string)." + }, + "timeSpanFormat": { + "type": "object", + "description": "The format for TimeSpan values. Type: string (or Expression with resultType string)." + }, + "culture": { + "type": "object", + "description": "The culture used to convert data from/to string. Type: string (or Expression with resultType string)." } } }, "HDInsightHiveActivity": { "description": "HDInsight Hive activity type.", + "type": "object", "x-ms-discriminator-value": "HDInsightHive", "allOf": [ { @@ -3805,6 +4881,7 @@ }, "HDInsightHiveActivityTypeProperties": { "description": "HDInsight Hive activity properties.", + "type": "object", "properties": { "storageLinkedServices": { "description": "Storage linked service references.", @@ -3870,6 +4947,7 @@ }, "HDInsightPigActivity": { "description": "HDInsight Pig activity type.", + "type": "object", "x-ms-discriminator-value": "HDInsightPig", "allOf": [ { @@ -3889,6 +4967,7 @@ }, "HDInsightPigActivityTypeProperties": { "description": "HDInsight Pig activity properties.", + "type": "object", "properties": { "storageLinkedServices": { "description": "Storage linked service references.", @@ -3925,6 +5004,7 @@ }, "HDInsightMapReduceActivity": { "description": "HDInsight MapReduce activity type.", + "type": "object", "x-ms-discriminator-value": "HDInsightMapReduce", "allOf": [ { @@ -3944,6 +5024,7 @@ }, "HDInsightMapReduceActivityTypeProperties": { "description": "HDInsight MapReduce activity properties.", + "type": "object", "properties": { "storageLinkedServices": { "description": "Storage linked service references.", @@ -4000,6 +5081,7 @@ }, "HDInsightStreamingActivity": { "description": "HDInsight streaming activity type.", + "type": "object", "x-ms-discriminator-value": "HDInsightStreaming", "allOf": [ { @@ -4019,6 +5101,7 @@ }, "HDInsightStreamingActivityTypeProperties": { "description": "HDInsight streaming activity properties.", + "type": "object", "properties": { "storageLinkedServices": { "description": "Storage linked service references.", @@ -4098,6 +5181,7 @@ }, "HDInsightSparkActivity": { "description": "HDInsight Spark activity.", + "type": "object", "x-ms-discriminator-value": "HDInsightSpark", "allOf": [ { @@ -4117,6 +5201,7 @@ }, "HDInsightSparkActivityTypeProperties": { "description": "HDInsight spark activity properties.", + "type": "object", "properties": { "rootPath": { "type": "object", @@ -4166,6 +5251,7 @@ }, "ExecuteSSISPackageActivity": { "description": "Execute SSIS package activity.", + "type": "object", "x-ms-discriminator-value": "ExecuteSSISPackage", "allOf": [ { @@ -4185,6 +5271,7 @@ }, "ExecuteSSISPackageActivityTypeProperties": { "description": "Execute SSIS package activity properties.", + "type": "object", "properties": { "packageLocation": { "description": "SSIS package location.", @@ -4269,7 +5356,8 @@ "enum": [ "SSISDB", "File", - "InlinePackage" + "InlinePackage", + "PackageStore" ], "x-ms-enum": { "name": "SsisPackageLocationType", @@ -4299,6 +5387,10 @@ "description": "The configuration file of the package execution. Type: string (or Expression with resultType string).", "type": "object" }, + "configurationAccessCredential": { + "description": "The configuration file access credential.", + "$ref": "#/definitions/SSISAccessCredential" + }, "packageName": { "description": "The package name.", "type": "string" @@ -4476,6 +5568,7 @@ }, "CustomActivity": { "description": "Custom activity type.", + "type": "object", "x-ms-discriminator-value": "Custom", "allOf": [ { @@ -4495,6 +5588,7 @@ }, "CustomActivityTypeProperties": { "description": "Custom activity properties.", + "type": "object", "properties": { "command": { "type": "object", @@ -4523,6 +5617,10 @@ "retentionTimeInDays": { "type": "object", "description": "The retention time for the files submitted for custom activity. Type: double (or Expression with resultType double)." + }, + "autoUserSpecification": { + "type": "object", + "description": "Elevation level and scope for the user, default is nonadmin task. Type: string (or Expression with resultType double)." } }, "required": [ @@ -4531,6 +5629,7 @@ }, "CustomActivityReferenceObject": { "description": "Reference objects for custom activity", + "type": "object", "properties": { "linkedServices": { "description": "Linked service references.", @@ -4550,6 +5649,7 @@ }, "SqlServerStoredProcedureActivity": { "description": "SQL stored procedure activity type.", + "type": "object", "x-ms-discriminator-value": "SqlServerStoredProcedure", "allOf": [ { @@ -4570,6 +5670,7 @@ }, "SqlServerStoredProcedureActivityTypeProperties": { "description": "SQL stored procedure activity properties.", + "type": "object", "properties": { "storedProcedureName": { "type": "object", @@ -4589,6 +5690,7 @@ }, "ExecutePipelineActivity": { "x-ms-discriminator-value": "ExecutePipeline", + "type": "object", "description": "Execute pipeline activity.", "allOf": [ { @@ -4608,6 +5710,7 @@ }, "ExecutePipelineActivityTypeProperties": { "description": "Execute pipeline activity properties.", + "type": "object", "properties": { "pipeline": { "description": "Pipeline reference.", @@ -4629,6 +5732,7 @@ "DeleteActivity": { "x-ms-discriminator-value": "Delete", "description": "Delete activity.", + "type": "object", "allOf": [ { "$ref": "#/definitions/ExecutionActivity" @@ -4647,6 +5751,7 @@ }, "DeleteActivityTypeProperties": { "description": "Delete activity properties.", + "type": "object", "properties": { "recursive": { "type": "object", @@ -4668,6 +5773,10 @@ "dataset": { "description": "Delete activity dataset reference.", "$ref": "../artifacts.json#/definitions/DatasetReference" + }, + "storeSettings": { + "$ref": "#/definitions/StoreReadSettings", + "description": "Delete activity store settings." } }, "required": [ @@ -4677,6 +5786,7 @@ "AzureDataExplorerCommandActivity": { "x-ms-discriminator-value": "AzureDataExplorerCommand", "description": "Azure Data Explorer command activity.", + "type": "object", "allOf": [ { "$ref": "#/definitions/ExecutionActivity" @@ -4695,6 +5805,7 @@ }, "AzureDataExplorerCommandActivityTypeProperties": { "description": "Azure Data Explorer command activity properties.", + "type": "object", "properties": { "command": { "type": "object", @@ -4712,6 +5823,7 @@ "LookupActivity": { "x-ms-discriminator-value": "Lookup", "description": "Lookup activity.", + "type": "object", "allOf": [ { "$ref": "#/definitions/ExecutionActivity" @@ -4730,6 +5842,7 @@ }, "LookupActivityTypeProperties": { "description": "Lookup activity properties.", + "type": "object", "properties": { "source": { "description": "Dataset-specific source properties, same as copy activity source.", @@ -4766,6 +5879,7 @@ "WebActivity": { "x-ms-discriminator-value": "WebActivity", "description": "Web activity.", + "type": "object", "allOf": [ { "$ref": "#/definitions/ExecutionActivity" @@ -4784,6 +5898,7 @@ }, "WebActivityAuthentication": { "description": "Web activity authentication properties.", + "type": "object", "properties": { "type": { "description": "Web activity authentication (Basic/ClientCertificate/MSI)", @@ -4812,6 +5927,7 @@ }, "WebActivityTypeProperties": { "description": "Web activity type properties.", + "type": "object", "properties": { "method": { "description": "Rest API method for target endpoint.", @@ -4860,6 +5976,7 @@ "GetMetadataActivity": { "x-ms-discriminator-value": "GetMetadata", "description": "Activity to get metadata of dataset", + "type": "object", "allOf": [ { "$ref": "#/definitions/ExecutionActivity" @@ -4878,6 +5995,7 @@ }, "GetMetadataActivityTypeProperties": { "description": "GetMetadata activity properties.", + "type": "object", "properties": { "dataset": { "description": "GetMetadata activity dataset reference.", @@ -4890,6 +6008,14 @@ "type": "object", "description": "Type: string (or Expression with resultType string)." } + }, + "storeSettings": { + "$ref": "#/definitions/StoreReadSettings", + "description": "GetMetadata activity store settings." + }, + "formatSettings": { + "$ref": "#/definitions/FormatReadSettings", + "description": "GetMetadata activity format settings." } }, "required": [ @@ -4899,6 +6025,7 @@ "IfConditionActivity": { "x-ms-discriminator-value": "IfCondition", "description": "This activity evaluates a boolean expression and executes either the activities under the ifTrueActivities property or the ifFalseActivities property depending on the result of the expression.", + "type": "object", "allOf": [ { "$ref": "#/definitions/ControlActivity" @@ -4917,6 +6044,7 @@ }, "IfConditionActivityTypeProperties": { "description": "IfCondition activity properties.", + "type": "object", "properties": { "expression": { "description": "An expression that would evaluate to Boolean. This is used to determine the block of activities (ifTrueActivities or ifFalseActivities) that will be executed.", @@ -4944,6 +6072,7 @@ "SwitchActivity": { "x-ms-discriminator-value": "Switch", "description": "This activity evaluates an expression and executes activities under the cases property that correspond to the expression evaluation expected in the equals property.", + "type": "object", "allOf": [ { "$ref": "#/definitions/ControlActivity" @@ -4962,6 +6091,7 @@ }, "SwitchActivityTypeProperties": { "description": "Switch activity properties.", + "type": "object", "properties": { "on": { "description": "An expression that would evaluate to a string or integer. This is used to determine the block of activities in cases that will be executed.", @@ -4989,6 +6119,7 @@ }, "SwitchCase": { "description": "Switch cases with have a value and corresponding activities.", + "type": "object", "properties": { "value": { "description": "Expected value that satisfies the expression result of the 'on' property.", @@ -5006,6 +6137,7 @@ "ForEachActivity": { "x-ms-discriminator-value": "ForEach", "description": "This activity is used for iterating over a collection and execute given activities.", + "type": "object", "allOf": [ { "$ref": "#/definitions/ControlActivity" @@ -5024,6 +6156,7 @@ }, "ForEachActivityTypeProperties": { "description": "ForEach activity properties.", + "type": "object", "properties": { "isSequential": { "description": "Should the loop be executed in sequence or in parallel (max 50)", @@ -5053,6 +6186,7 @@ }, "AzureMLBatchExecutionActivity": { "description": "Azure ML Batch Execution activity.", + "type": "object", "x-ms-discriminator-value": "AzureMLBatchExecution", "allOf": [ { @@ -5072,6 +6206,7 @@ }, "AzureMLBatchExecutionActivityTypeProperties": { "description": "Azure ML Batch Execution activity properties.", + "type": "object", "properties": { "globalParameters": { "description": "Key,Value pairs to be passed to the Azure ML Batch Execution Service endpoint. Keys must match the names of web service parameters defined in the published Azure ML web service. Values will be passed in the GlobalParameters property of the Azure ML batch execution request.", @@ -5117,6 +6252,7 @@ }, "AzureMLUpdateResourceActivity": { "description": "Azure ML Update Resource management activity.", + "type": "object", "x-ms-discriminator-value": "AzureMLUpdateResource", "allOf": [ { @@ -5136,6 +6272,7 @@ }, "AzureMLUpdateResourceActivityTypeProperties": { "description": "Azure ML Update Resource activity properties.", + "type": "object", "properties": { "trainedModelName": { "type": "object", @@ -5158,6 +6295,7 @@ }, "AzureMLExecutePipelineActivity": { "description": "Azure ML Execute Pipeline activity.", + "type": "object", "x-ms-discriminator-value": "AzureMLExecutePipeline", "allOf": [ { @@ -5177,6 +6315,7 @@ }, "AzureMLExecutePipelineActivityTypeProperties": { "description": "Azure ML Execute Pipeline activity properties.", + "type": "object", "properties": { "mlPipelineId": { "description": "ID of the published Azure ML pipeline. Type: string (or Expression with resultType string).", @@ -5213,6 +6352,7 @@ }, "DataLakeAnalyticsUSQLActivity": { "description": "Data Lake Analytics U-SQL activity.", + "type": "object", "x-ms-discriminator-value": "DataLakeAnalyticsU-SQL", "allOf": [ { @@ -5232,6 +6372,7 @@ }, "DataLakeAnalyticsUSQLActivityTypeProperties": { "description": "DataLakeAnalyticsU-SQL activity properties.", + "type": "object", "properties": { "scriptPath": { "type": "object", @@ -5274,6 +6415,7 @@ "WaitActivity": { "x-ms-discriminator-value": "Wait", "description": "This activity suspends pipeline execution for the specified interval.", + "type": "object", "allOf": [ { "$ref": "#/definitions/ControlActivity" @@ -5292,10 +6434,11 @@ }, "WaitActivityTypeProperties": { "description": "Wait activity properties.", + "type": "object", "properties": { "waitTimeInSeconds": { "description": "Duration in seconds.", - "type": "integer" + "type": "object" } }, "required": [ @@ -5305,6 +6448,7 @@ "UntilActivity": { "x-ms-discriminator-value": "Until", "description": "This activity executes inner activities until the specified boolean expression results to true or timeout is reached, whichever is earlier.", + "type": "object", "allOf": [ { "$ref": "#/definitions/ControlActivity" @@ -5323,6 +6467,7 @@ }, "UntilActivityTypeProperties": { "description": "Until activity properties.", + "type": "object", "properties": { "expression": { "description": "An expression that would evaluate to Boolean. The loop will continue until this expression evaluates to true", @@ -5348,6 +6493,7 @@ "ValidationActivity": { "x-ms-discriminator-value": "Validation", "description": "This activity verifies that an external resource exists.", + "type": "object", "allOf": [ { "$ref": "#/definitions/ControlActivity" @@ -5366,6 +6512,7 @@ }, "ValidationActivityTypeProperties": { "description": "Validation activity properties.", + "type": "object", "properties": { "timeout": { "type": "object", @@ -5395,6 +6542,7 @@ "FilterActivity": { "x-ms-discriminator-value": "Filter", "description": "Filter and return results from input array based on the conditions.", + "type": "object", "allOf": [ { "$ref": "#/definitions/ControlActivity" @@ -5413,6 +6561,7 @@ }, "FilterActivityTypeProperties": { "description": "Filter activity properties.", + "type": "object", "properties": { "items": { "description": "Input array on which filter should be applied.", @@ -5430,6 +6579,7 @@ }, "DatabricksNotebookActivity": { "description": "DatabricksNotebook activity.", + "type": "object", "x-ms-discriminator-value": "DatabricksNotebook", "allOf": [ { @@ -5448,7 +6598,8 @@ ] }, "DatabricksNotebookActivityTypeProperties": { - "description": "Databricks notebook activity properties.", + "description": "Databricks Notebook activity properties.", + "type": "object", "properties": { "notebookPath": { "type": "object", @@ -5480,6 +6631,7 @@ }, "DatabricksSparkJarActivity": { "description": "DatabricksSparkJar activity.", + "type": "object", "x-ms-discriminator-value": "DatabricksSparkJar", "allOf": [ { @@ -5499,6 +6651,7 @@ }, "DatabricksSparkJarActivityTypeProperties": { "description": "Databricks SparkJar activity properties.", + "type": "object", "properties": { "mainClassName": { "type": "object", @@ -5530,6 +6683,7 @@ }, "DatabricksSparkPythonActivity": { "description": "DatabricksSparkPython activity.", + "type": "object", "x-ms-discriminator-value": "DatabricksSparkPython", "allOf": [ { @@ -5549,6 +6703,7 @@ }, "DatabricksSparkPythonActivityTypeProperties": { "description": "Databricks SparkPython activity properties.", + "type": "object", "properties": { "pythonFile": { "type": "object", @@ -5581,6 +6736,7 @@ "SetVariableActivity": { "x-ms-discriminator-value": "SetVariable", "description": "Set value for a Variable.", + "type": "object", "allOf": [ { "$ref": "#/definitions/ControlActivity" @@ -5599,6 +6755,7 @@ }, "SetVariableActivityTypeProperties": { "description": "SetVariable activity properties.", + "type": "object", "properties": { "variableName": { "description": "Name of the variable whose value needs to be set.", @@ -5613,6 +6770,7 @@ "AppendVariableActivity": { "x-ms-discriminator-value": "AppendVariable", "description": "Append value for a Variable of type Array.", + "type": "object", "allOf": [ { "$ref": "#/definitions/ControlActivity" @@ -5631,6 +6789,7 @@ }, "AppendVariableActivityTypeProperties": { "description": "AppendVariable activity properties.", + "type": "object", "properties": { "variableName": { "description": "Name of the variable whose value needs to be appended to.", @@ -5662,6 +6821,7 @@ "AzureFunctionActivity": { "x-ms-discriminator-value": "AzureFunctionActivity", "description": "Azure Function activity.", + "type": "object", "allOf": [ { "$ref": "#/definitions/ExecutionActivity" @@ -5680,6 +6840,7 @@ }, "AzureFunctionActivityTypeProperties": { "description": "Azure Function activity type properties.", + "type": "object", "properties": { "method": { "description": "Rest API method for target endpoint.", @@ -5706,6 +6867,7 @@ "WebHookActivity": { "x-ms-discriminator-value": "WebHook", "description": "WebHook activity.", + "type": "object", "allOf": [ { "$ref": "#/definitions/ControlActivity" @@ -5735,6 +6897,7 @@ }, "WebHookActivityTypeProperties": { "description": "WebHook activity type properties.", + "type": "object", "properties": { "method": { "description": "Rest API method for target endpoint.", @@ -5762,7 +6925,7 @@ }, "reportStatusOnCallBack": { "type": "object", - "description": "When set to true, statusCode, output and error in callback request body will be consumed by activity. The activity can be marked as failed by setting statusCode >= 400 in callback request. Default is false. Type: boolean (or Expression with resultType boolean)." + "description": "When set to true, statusCode, output and error in callback request body will be consumed by activity. The activity can be marked as failed by setting statusCode >= 400 in callback request. Default is false. Type: boolean (or Expression with resultType boolean)." } }, "required": [ @@ -5772,6 +6935,7 @@ }, "ExecuteDataFlowActivity": { "description": "Execute data flow activity.", + "type": "object", "x-ms-discriminator-value": "ExecuteDataFlow", "allOf": [ { @@ -5791,8 +6955,9 @@ }, "ExecuteDataFlowActivityTypeProperties": { "description": "Execute data flow activity properties.", + "type": "object", "properties": { - "dataFlow": { + "dataflow": { "description": "Data flow reference.", "$ref": "../artifacts.json#/definitions/DataFlowReference" }, @@ -5826,14 +6991,127 @@ "type": "integer" } } + }, + "traceLevel": { + "description": "Trace level setting used for data flow monitoring output. Supported values are: 'coarse', 'fine', and 'none'. Type: string (or Expression with resultType string)", + "type": "object" + }, + "continueOnError": { + "description": "Continue on error setting used for data flow execution. Enables processing to continue if a sink fails. Type: boolean (or Expression with resultType boolean)", + "type": "object" + }, + "runConcurrently": { + "description": "Concurrent run setting used for data flow execution. Allows sinks with the same save order to be processed concurrently. Type: boolean (or Expression with resultType boolean)", + "type": "object" } }, "required": [ "dataFlow" ] }, + "SharePointOnlineListSource": { + "description": "A copy activity source for sharePoint online list source.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/CopySource" + } + ], + "properties": { + "query": { + "type": "object", + "description": "The OData query to filter the data in SharePoint Online list. For example, \"$top=1\". Type: string (or Expression with resultType string)." + }, + "httpRequestTimeout": { + "type": "object", + "description": "The wait time to get a response from SharePoint Online. Default value is 5 minutes (00:05:00). Type: string (or Expression with resultType string), pattern: ((\\d+)\\.)?(\\d\\d):(60|([0-5][0-9])):(60|([0-5][0-9]))." + } + } + }, + "SqlPartitionOption": { + "description": "The partition mechanism that will be used for Sql read in parallel.", + "type": "string", + "enum": [ + "None", + "PhysicalPartitionsOfTable", + "DynamicRange" + ], + "x-ms-enum": { + "name": "SqlPartitionOption", + "modelAsString": true + } + }, + "SapHanaPartitionOption": { + "description": "The partition mechanism that will be used for SAP HANA read in parallel.", + "type": "string", + "enum": [ + "None", + "PhysicalPartitionsOfTable", + "SapHanaDynamicRange" + ], + "x-ms-enum": { + "name": "SapHanaPartitionOption", + "modelAsString": true + } + }, + "SapTablePartitionOption": { + "description": "The partition mechanism that will be used for SAP table read in parallel.", + "type": "string", + "enum": [ + "None", + "PartitionOnInt", + "PartitionOnCalendarYear", + "PartitionOnCalendarMonth", + "PartitionOnCalendarDate", + "PartitionOnTime" + ], + "x-ms-enum": { + "name": "SapTablePartitionOption", + "modelAsString": true + } + }, + "OraclePartitionOption": { + "description": "The partition mechanism that will be used for Oracle read in parallel.", + "type": "string", + "enum": [ + "None", + "PhysicalPartitionsOfTable", + "DynamicRange" + ], + "x-ms-enum": { + "name": "OraclePartitionOption", + "modelAsString": true + } + }, + "TeradataPartitionOption": { + "description": "The partition mechanism that will be used for teradata read in parallel.", + "type": "string", + "enum": [ + "None", + "Hash", + "DynamicRange" + ], + "x-ms-enum": { + "name": "TeradataPartitionOption", + "modelAsString": true + } + }, + "NetezzaPartitionOption": { + "description": "The partition mechanism that will be used for Netezza read in parallel.", + "type": "string", + "enum": [ + "None", + "DataSlice", + "DynamicRange" + ], + "x-ms-enum": { + "name": "NetezzaPartitionOption", + "modelAsString": true + } + }, "SynapseNotebookActivity": { "description": "Execute Synapse notebook activity.", + "type": "object", "x-ms-discriminator-value": "SynapseNotebook", "allOf": [ { @@ -5853,6 +7131,7 @@ }, "SynapseNotebookActivityTypeProperties": { "description": "Execute Synapse notebook activity properties.", + "type": "object", "properties": { "notebook": { "description": "Synapse notebook reference.", @@ -5869,6 +7148,7 @@ }, "SynapseSparkJobDefinitionActivity": { "description": "Execute spark job activity.", + "type": "object", "x-ms-discriminator-value": "SparkJob", "allOf": [ { @@ -5888,6 +7168,7 @@ }, "SynapseSparkJobActivityTypeProperties": { "description": "Execute spark job activity properties.", + "type": "object", "properties": { "sparkJob": { "description": "Synapse spark job reference.", @@ -5900,6 +7181,7 @@ }, "SqlPoolStoredProcedureActivity": { "description": "Execute SQL pool stored procedure activity.", + "type": "object", "x-ms-discriminator-value": "SqlPoolStoredProcedure", "allOf": [ { @@ -5924,6 +7206,7 @@ }, "SqlPoolStoredProcedureActivityTypeProperties": { "description": "SQL stored procedure activity properties.", + "type": "object", "properties": { "storedProcedureName": { "type": "object", diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/entityTypes/SparkJobDefinition.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/entityTypes/SparkJobDefinition.json index 32c5484c99cd..e48302637e29 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/entityTypes/SparkJobDefinition.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/entityTypes/SparkJobDefinition.json @@ -41,6 +41,7 @@ }, "SparkJobProperties": { "description": "The properties of the Spark job.", + "type": "object", "properties": { "name": { "description": "The name of the job.", diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/entityTypes/Trigger.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/entityTypes/Trigger.json index 693fc59bcaff..19cce76a5542 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/entityTypes/Trigger.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/entityTypes/Trigger.json @@ -55,6 +55,7 @@ "MultiplePipelineTrigger": { "x-ms-discriminator-value": "MultiplePipelineTrigger", "description": "Base class for all triggers that support one to many model for trigger to pipeline.", + "type": "object", "allOf": [ { "$ref": "#/definitions/Trigger" @@ -72,7 +73,6 @@ }, "ScheduleTrigger": { "description": "Trigger that creates pipeline runs periodically, on schedule.", - "type": "object", "allOf": [ { "$ref": "#/definitions/MultiplePipelineTrigger" @@ -183,7 +183,7 @@ "Saturday" ], "x-ms-enum": { - "name": "DayOfWeek", + "name": "DaysOfWeek", "modelAsString": false } }, @@ -284,7 +284,6 @@ }, "BlobEventsTrigger": { "description": "Trigger that runs every time a Blob event occurs.", - "type": "object", "allOf": [ { "$ref": "#/definitions/MultiplePipelineTrigger" @@ -341,9 +340,50 @@ }, "description": "Blob event types." }, + "CustomEventsTrigger": { + "description": "Trigger that runs every time a custom event is received.", + "allOf": [ + { + "$ref": "#/definitions/MultiplePipelineTrigger" + } + ], + "properties": { + "typeProperties": { + "description": "Custom Events Trigger properties.", + "x-ms-client-flatten": true, + "properties": { + "subjectBeginsWith": { + "description": "The event subject must begin with the pattern provided for trigger to fire. At least one of these must be provided: subjectBeginsWith, subjectEndsWith.", + "type": "string" + }, + "subjectEndsWith": { + "description": "The event subject must end with the pattern provided for trigger to fire. At least one of these must be provided: subjectBeginsWith, subjectEndsWith.", + "type": "string" + }, + "events": { + "description": "The list of event types that cause this trigger to fire.", + "type": "array", + "items": { + "type": "object" + } + }, + "scope": { + "description": "The ARM resource ID of the Azure Event Grid Topic.", + "type": "string" + } + }, + "required": [ + "events", + "scope" + ] + } + }, + "required": [ + "typeProperties" + ] + }, "TumblingWindowTrigger": { "description": "Trigger that schedules pipeline runs for all fixed time interval windows from a start time without gaps and also supports backfill scenarios (when start time is in the past).", - "type": "object", "allOf": [ { "$ref": "#/definitions/Trigger" @@ -417,7 +457,8 @@ "type": "string", "enum": [ "Minute", - "Hour" + "Hour", + "Month" ], "x-ms-enum": { "name": "TumblingWindowFrequency", @@ -426,6 +467,7 @@ }, "RetryPolicy": { "description": "Execution policy for an activity.", + "type": "object", "properties": { "count": { "type": "object", @@ -508,7 +550,7 @@ "offset": { "description": "Timespan applied to the start time of a tumbling window when evaluating dependency.", "type": "string", - "pattern": "((\\d+)\\.)?(\\d\\d):(60|([0-5][0-9])):(60|([0-5][0-9]))", + "pattern": "-?((\\d+)\\.)?(\\d\\d):(60|([0-5][0-9])):(60|([0-5][0-9]))", "minLength": 8, "maxLength": 15 }, @@ -533,7 +575,7 @@ "offset": { "description": "Timespan applied to the start time of a tumbling window when evaluating dependency.", "type": "string", - "pattern": "((\\d+)\\.)?(\\d\\d):(60|([0-5][0-9])):(60|([0-5][0-9]))", + "pattern": "-((\\d+)\\.)?(\\d\\d):(60|([0-5][0-9])):(60|([0-5][0-9]))", "minLength": 8, "maxLength": 15 }, @@ -576,7 +618,7 @@ "format": "date-time", "description": "The end time for the time period for which restatement is initiated. Only UTC time is currently supported." }, - "maxConcurrency": { + "rerunConcurrency": { "description": "The max number of parallel time windows (ready for execution) for which a rerun is triggered.", "type": "integer", "minimum": 1, @@ -584,9 +626,10 @@ } }, "required": [ + "parentTrigger", "requestedStartTime", "requestedEndTime", - "maxConcurrency" + "rerunConcurrency" ] } }, diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/examples/SparkJobDefinitions_Create.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/examples/SparkJobDefinitions_Create.json index d969cd11b3e3..bf3ff124f606 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/examples/SparkJobDefinitions_Create.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/examples/SparkJobDefinitions_Create.json @@ -34,6 +34,15 @@ "api-version": "2019-06-01-preview" }, "responses": { + "202": { + "headers": { + "Date": "Sat, 16 Jun 2019 00:37:38 GMT", + "X-Content-Type-Options": "nosniff", + "x-ms-ratelimit-remaining-subscription-writes": "1194", + "x-ms-request-id": "ce95d6dd-c04d-4b02-b7ad-fe79c9b26df0", + "x-ms-correlation-request-id": "ce95d6dd-c04d-4b02-b7ad-fe79c9b26df0" + } + }, "200": { "headers": { "Date": "Sat, 16 Jun 2018 00:37:41 GMT", diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/examples/SparkJobDefinitions_Delete.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/examples/SparkJobDefinitions_Delete.json index 37e6bcc064e8..445a5678eacb 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/examples/SparkJobDefinitions_Delete.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/examples/SparkJobDefinitions_Delete.json @@ -6,6 +6,7 @@ }, "responses": { "200": {}, + "202": {}, "204": {} } } diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/examples/SparkJobDefinitions_Update.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/examples/SparkJobDefinitions_Update.json index 61f620544311..79e234008672 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/examples/SparkJobDefinitions_Update.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/examples/SparkJobDefinitions_Update.json @@ -34,6 +34,15 @@ "api-version": "2019-06-01-preview" }, "responses": { + "202": { + "headers": { + "Date": "Sat, 16 Jun 2019 00:37:38 GMT", + "X-Content-Type-Options": "nosniff", + "x-ms-ratelimit-remaining-subscription-writes": "1194", + "x-ms-request-id": "ce95d6dd-c04d-4b02-b7ad-fe79c9b26df0", + "x-ms-correlation-request-id": "ce95d6dd-c04d-4b02-b7ad-fe79c9b26df0" + } + }, "200": { "headers": { "Date": "Sat, 16 Jun 2018 00:37:41 GMT", diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/examples/SqlScripts_Create.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/examples/SqlScripts_Create.json index fda2cffe022a..0744cc75e3c3 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/examples/SqlScripts_Create.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/examples/SqlScripts_Create.json @@ -23,6 +23,15 @@ "api-version": "2019-06-01-preview" }, "responses": { + "202": { + "headers": { + "Date": "Sat, 16 Jun 2019 00:37:38 GMT", + "X-Content-Type-Options": "nosniff", + "x-ms-ratelimit-remaining-subscription-writes": "1194", + "x-ms-request-id": "ce95d6dd-c04d-4b02-b7ad-fe79c9b26df0", + "x-ms-correlation-request-id": "ce95d6dd-c04d-4b02-b7ad-fe79c9b26df0" + } + }, "200": { "headers": { "Date": "Sat, 16 Jun 2018 00:37:41 GMT", diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/examples/SqlScripts_Delete.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/examples/SqlScripts_Delete.json index b01abf40c85b..ae55d612149c 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/examples/SqlScripts_Delete.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/examples/SqlScripts_Delete.json @@ -6,6 +6,7 @@ }, "responses": { "200": {}, + "202": {}, "204": {} } } diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/examples/SqlScripts_Update.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/examples/SqlScripts_Update.json index 2ca6a02f3253..90162b1ffe96 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/examples/SqlScripts_Update.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/examples/SqlScripts_Update.json @@ -23,6 +23,15 @@ "api-version": "2019-06-01-preview" }, "responses": { + "202": { + "headers": { + "Date": "Sat, 16 Jun 2019 00:37:38 GMT", + "X-Content-Type-Options": "nosniff", + "x-ms-ratelimit-remaining-subscription-writes": "1194", + "x-ms-request-id": "ce95d6dd-c04d-4b02-b7ad-fe79c9b26df0", + "x-ms-correlation-request-id": "ce95d6dd-c04d-4b02-b7ad-fe79c9b26df0" + } + }, "200": { "headers": { "Date": "Sat, 16 Jun 2018 00:37:41 GMT", diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/library.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/library.json index c988088deef6..d2943c7752a4 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/library.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/library.json @@ -333,14 +333,6 @@ } } }, - "SubResource": { - "description": "Azure Synapse nested resource, which belongs to a workspace.", - "allOf": [ - { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/AzureEntityResource" - } - ] - }, "LibraryListResponse": { "description": "A list of Library resources.", "type": "object", @@ -414,9 +406,10 @@ }, "LibraryResource": { "description": "Library response details", + "type": "object", "allOf": [ { - "$ref": "#/definitions/SubResource" + "$ref": "./artifacts.json#/definitions/SubResource" } ], "properties": { diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/integrationRuntime.json b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/integrationRuntime.json index acba0e142fe1..922f84cb0914 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/integrationRuntime.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/integrationRuntime.json @@ -1334,6 +1334,10 @@ "description": "Managed integration runtime properties.", "x-ms-client-flatten": true, "$ref": "#/definitions/ManagedIntegrationRuntimeTypeProperties" + }, + "managedVirtualNetwork": { + "description": "Managed Virtual Network reference.", + "$ref": "#/definitions/ManagedVirtualNetworkReference" } }, "required": [ @@ -2939,6 +2943,26 @@ "description": "The operation error message." } } + }, + "ManagedVirtualNetworkReference": { + "description": "Managed Virtual Network reference type.", + "properties": { + "type": { + "type": "string", + "description": "Managed Virtual Network reference type.", + "enum": [ + "ManagedVirtualNetworkReference" + ] + }, + "referenceName": { + "type": "string", + "description": "Reference ManagedVirtualNetwork name." + } + }, + "required": [ + "type", + "referenceName" + ] } }, "parameters": {