diff --git a/schemas/2018-06-01/Microsoft.DataFactory.json b/schemas/2018-06-01/Microsoft.DataFactory.json index be2045ccf1..b8a8614fc1 100644 --- a/schemas/2018-06-01/Microsoft.DataFactory.json +++ b/schemas/2018-06-01/Microsoft.DataFactory.json @@ -8665,6 +8665,9 @@ { "$ref": "#/definitions/MappingDataFlow" }, + { + "$ref": "#/definitions/Flowlet" + }, { "$ref": "#/definitions/WranglingDataFlow" } @@ -8780,6 +8783,17 @@ "type": "string", "description": "Transformation description." }, + "flowlet": { + "oneOf": [ + { + "$ref": "#/definitions/DataFlowReference" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Data flow reference type." + }, "linkedService": { "oneOf": [ { @@ -8830,6 +8844,17 @@ "type": "string", "description": "Transformation description." }, + "flowlet": { + "oneOf": [ + { + "$ref": "#/definitions/DataFlowReference" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Data flow reference type." + }, "linkedService": { "oneOf": [ { @@ -9351,43 +9376,8 @@ ], "description": "The Azure Data Factory nested object which identifies data within different data stores, such as tables, files, folders, and documents." }, - "DatasetBZip2Compression": { - "type": "object", - "properties": { - "type": { - "type": "string", - "enum": [ - "BZip2" - ] - } - }, - "required": [ - "type" - ], - "description": "The BZip2 compression method used on a dataset." - }, "DatasetCompression": { "type": "object", - "oneOf": [ - { - "$ref": "#/definitions/DatasetBZip2Compression" - }, - { - "$ref": "#/definitions/DatasetGZipCompression" - }, - { - "$ref": "#/definitions/DatasetDeflateCompression" - }, - { - "$ref": "#/definitions/DatasetZipDeflateCompression" - }, - { - "$ref": "#/definitions/DatasetTarCompression" - }, - { - "$ref": "#/definitions/DatasetTarGZipCompression" - } - ], "properties": { "additionalProperties": { "oneOf": [ @@ -9404,29 +9394,22 @@ } ], "description": "Unmatched properties from the message are deserialized this collection" - } - }, - "description": "The compression method used on a dataset." - }, - "DatasetDeflateCompression": { - "type": "object", - "properties": { + }, "level": { "type": "object", "properties": {}, - "description": "The Deflate compression level." + "description": "The dataset compression level. Type: string (or Expression with resultType string)." }, "type": { - "type": "string", - "enum": [ - "Deflate" - ] + "type": "object", + "properties": {}, + "description": "Type of dataset compression. Type: string (or Expression with resultType string)." } }, "required": [ "type" ], - "description": "The Deflate compression method used on a dataset." + "description": "The compression method used on a dataset." }, "DatasetFolder": { "type": "object", @@ -9438,26 +9421,6 @@ }, "description": "The folder that this Dataset is in. If not specified, Dataset will appear at the root level." }, - "DatasetGZipCompression": { - "type": "object", - "properties": { - "level": { - "type": "object", - "properties": {}, - "description": "The GZip compression level." - }, - "type": { - "type": "string", - "enum": [ - "GZip" - ] - } - }, - "required": [ - "type" - ], - "description": "The GZip compression method used on a dataset." - }, "DatasetLocation": { "type": "object", "oneOf": [ @@ -9624,61 +9587,6 @@ }, "description": "The format definition of a storage." }, - "DatasetTarCompression": { - "type": "object", - "properties": { - "type": { - "type": "string", - "enum": [ - "Tar" - ] - } - }, - "required": [ - "type" - ], - "description": "The Tar archive method used on a dataset." - }, - "DatasetTarGZipCompression": { - "type": "object", - "properties": { - "level": { - "type": "object", - "properties": {}, - "description": "The TarGZip compression level." - }, - "type": { - "type": "string", - "enum": [ - "TarGZip" - ] - } - }, - "required": [ - "type" - ], - "description": "The TarGZip compression method used on a dataset." - }, - "DatasetZipDeflateCompression": { - "type": "object", - "properties": { - "level": { - "type": "object", - "properties": {}, - "description": "The ZipDeflate compression level." - }, - "type": { - "type": "string", - "enum": [ - "ZipDeflate" - ] - } - }, - "required": [ - "type" - ], - "description": "The ZipDeflate compression method used on a dataset." - }, "Db2LinkedService": { "type": "object", "properties": { @@ -13016,6 +12924,118 @@ ], "description": "Filter activity properties." }, + "Flowlet": { + "type": "object", + "properties": { + "additionalProperties": { + "oneOf": [ + { + "type": "object", + "additionalProperties": { + "type": "object", + "properties": {} + }, + "properties": {} + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Unmatched properties from the message are deserialized this collection" + }, + "type": { + "type": "string", + "enum": [ + "Flowlet" + ] + }, + "typeProperties": { + "oneOf": [ + { + "$ref": "#/definitions/FlowletTypeProperties" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Flowlet type properties." + } + }, + "required": [ + "type" + ], + "description": "Data flow flowlet" + }, + "FlowletTypeProperties": { + "type": "object", + "properties": { + "additionalProperties": { + "type": "object", + "properties": {} + }, + "script": { + "type": "string", + "description": "Flowlet script." + }, + "scriptLines": { + "oneOf": [ + { + "type": "array", + "items": { + "type": "string" + } + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Flowlet script lines." + }, + "sinks": { + "oneOf": [ + { + "type": "array", + "items": { + "$ref": "#/definitions/DataFlowSink" + } + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "List of sinks in Flowlet." + }, + "sources": { + "oneOf": [ + { + "type": "array", + "items": { + "$ref": "#/definitions/DataFlowSource" + } + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "List of sources in Flowlet." + }, + "transformations": { + "oneOf": [ + { + "type": "array", + "items": { + "$ref": "#/definitions/Transformation" + } + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "List of transformations in Flowlet." + } + }, + "description": "Flowlet type properties." + }, "ForEachActivity": { "type": "object", "properties": { @@ -18394,6 +18414,20 @@ "type": "string", "description": "DataFlow script." }, + "scriptLines": { + "oneOf": [ + { + "type": "array", + "items": { + "type": "string" + } + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Data flow script lines." + }, "sinks": { "oneOf": [ { @@ -21764,6 +21798,17 @@ "type": "string", "description": "Transformation description." }, + "flowlet": { + "oneOf": [ + { + "$ref": "#/definitions/DataFlowReference" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Data flow reference type." + }, "linkedService": { "oneOf": [ { @@ -21842,6 +21887,17 @@ "type": "string", "description": "Transformation description." }, + "flowlet": { + "oneOf": [ + { + "$ref": "#/definitions/DataFlowReference" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Data flow reference type." + }, "linkedService": { "oneOf": [ { @@ -28191,6 +28247,17 @@ "type": "string", "description": "Transformation description." }, + "flowlet": { + "oneOf": [ + { + "$ref": "#/definitions/DataFlowReference" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Data flow reference type." + }, "name": { "type": "string", "description": "Transformation name."