diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/datafactory.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/datafactory.json index 917caf7f0037..e688f37b7e65 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/datafactory.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/datafactory.json @@ -2216,6 +2216,13 @@ { "$ref": "#/parameters/runId" }, + { + "name": "isRecursive", + "description": "If true, cancel all the Child pipelines that are triggered by the current pipeline.", + "in": "query", + "required": false, + "type": "boolean" + }, { "$ref": "#/parameters/api-version" } @@ -3043,6 +3050,39 @@ "message" ] }, + "VariableDefinitionSpecification": { + "description": "Definition of all variables for an Pipeline.", + "type": "object", + "additionalProperties": { + "$ref": "#/definitions/VariableSpecification" + } + }, + "VariableSpecification": { + "description": "Definition of a single variable for an pipeline.", + "type": "object", + "properties": { + "type": { + "type": "string", + "description": "Variable type.", + "enum": [ + "String", + "Bool", + "Array" + ], + "x-ms-enum": { + "name": "VariableType", + "modelAsString": true + } + }, + "defaultValue": { + "type": "object", + "description": "Default value of variable." + } + }, + "required": [ + "type" + ] + }, "ParameterDefinitionSpecification": { "description": "Definition of all parameters for an entity.", "type": "object", diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json index 8510a9e874f0..3f7733a434b5 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json @@ -25,6 +25,10 @@ "$ref": "../datafactory.json#/definitions/ParameterDefinitionSpecification", "description": "List of parameters for pipeline." }, + "variables": { + "$ref": "../datafactory.json#/definitions/VariableDefinitionSpecification", + "description": "List of variables for pipeline." + }, "concurrency": { "type": "integer", "minimum": 1, @@ -188,6 +192,10 @@ "minimum": 30, "maximum": 86400 }, + "secureInput": { + "type": "boolean", + "description": "When set to true, input from activity is considered as secure and will not be logged to monitoring." + }, "secureOutput": { "type": "boolean", "description": "When set to true, Output from activity is considered as secure and will not be logged to monitoring." @@ -2854,7 +2862,7 @@ ] }, "FilterActivityTypeProperties": { - "description": "Fitler activity properties.", + "description": "Filter activity properties.", "properties": { "items": { "description": "Input array on which filter should be applied.", @@ -2870,6 +2878,78 @@ "items" ] }, + "SetVariableActivity": { + "x-ms-discriminator-value": "SetVariable", + "description": "Set value for a Variable.", + "allOf": [ + { + "$ref": "#/definitions/ControlActivity" + } + ], + "properties": { + "typeProperties": { + "description": "Set Variable activity properties.", + "x-ms-client-flatten": true, + "$ref": "#/definitions/SetVariableActivityTypeProperties" + } + }, + "required": [ + "typeProperties" + ] + }, + "SetVariableActivityTypeProperties": { + "description": "SetVariable activity properties.", + "properties": { + "name": { + "description": "Name of the variable whose value needs to be set.", + "type": "string" + }, + "value": { + "description": "Value to be set. Could be a static value or Expression", + "type": "object" + } + }, + "required": [ + "name", + "value" + ] + }, + "AppendVariableActivity": { + "x-ms-discriminator-value": "AppendVariable", + "description": "Append value to a array Variable.", + "allOf": [ + { + "$ref": "#/definitions/ControlActivity" + } + ], + "properties": { + "typeProperties": { + "description": "Append Variable activity properties.", + "x-ms-client-flatten": true, + "$ref": "#/definitions/AppendVariableActivityTypeProperties" + } + }, + "required": [ + "typeProperties" + ] + }, + "AppendVariableActivityTypeProperties": { + "description": "AppendVariable activity properties.", + "properties": { + "name": { + "description": "Name of the variable to which value needs to be appended.", + "type": "string" + }, + "value": { + "description": "Value to be appended. Could be a static value or Expression", + "type": "object" + } + }, + "required": [ + "name", + "value" + ] + }, "DatabricksNotebookActivity": { "description": "DatabricksNotebook activity.", "x-ms-discriminator-value": "DatabricksNotebook",