diff --git a/schemas/2018-06-01/Microsoft.DataFactory.json b/schemas/2018-06-01/Microsoft.DataFactory.json index 7a1b2928c2..0c72cff6d8 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": [ { @@ -11633,6 +11658,20 @@ ], "description": "Integration runtime reference type." }, + "queries": { + "oneOf": [ + { + "type": "array", + "items": { + "$ref": "#/definitions/PowerQuerySinkMapping" + } + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "List of mapping for Power Query mashup query to sink dataset(s)." + }, "runConcurrently": { "type": "object", "properties": {}, @@ -11651,7 +11690,7 @@ "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" } ], - "description": "List of Power Query activity sinks mapped to a queryName." + "description": "(Deprecated. Please use Queries). List of Power Query activity sinks mapped to a queryName." }, "staging": { "oneOf": [ @@ -13002,6 +13041,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": { @@ -18380,6 +18531,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": [ { @@ -21750,6 +21915,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": [ { @@ -21786,6 +21962,30 @@ ], "description": "Power query sink." }, + "PowerQuerySinkMapping": { + "type": "object", + "properties": { + "dataflowSinks": { + "oneOf": [ + { + "type": "array", + "items": { + "$ref": "#/definitions/PowerQuerySink" + } + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "List of sinks mapped to Power Query mashup query." + }, + "queryName": { + "type": "string", + "description": "Name of the query in Power Query mashup document." + } + }, + "description": "Map Power Query mashup query to sink dataset(s)." + }, "PowerQuerySource": { "type": "object", "properties": { @@ -21804,6 +22004,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": [ { @@ -21843,6 +22054,10 @@ "PowerQueryTypeProperties": { "type": "object", "properties": { + "documentLocale": { + "type": "string", + "description": "Locale of the Power query mashup document." + }, "script": { "type": "string", "description": "Power query mashup script." @@ -28149,6 +28364,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."