From 9ac1030aabd8b5c34fb3c1d0c5473dabd2df95b1 Mon Sep 17 00:00:00 2001 From: haricr Date: Thu, 6 Sep 2018 12:38:47 -0700 Subject: [PATCH 1/5] Add Variables, Secure Input and Update Cancel API --- .../stable/2018-06-01/datafactory.json | 41 ++++++++++ .../2018-06-01/entityTypes/Pipeline.json | 82 ++++++++++++++++++- 2 files changed, 122 insertions(+), 1 deletion(-) 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..4d8b799fc23b 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,14 @@ { "$ref": "#/parameters/runId" }, + { + "name": "isRecursive", + "description": "If true, cancel all the Child pipelines that are triggered by the current pipeline.", + "in": "path", + "required": true, + "type": "boolean", + "x-ms-parameter-location": "method" + }, { "$ref": "#/parameters/api-version" } @@ -3043,6 +3051,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": "Parameter type.", + "enum": [ + "String", + "Bool", + "Array" + ], + "x-ms-enum": { + "name": "ParameterType", + "modelAsString": true + } + }, + "defaultValue": { + "type": "object", + "description": "Default value of parameter." + } + }, + "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..62f917e1e11e 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" ] }, + "SetVaraibleActivity": { + "x-ms-discriminator-value": "SetVaraible", + "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" + ] + }, + "AppendVaraibleActivity": { + "x-ms-discriminator-value": "AppendVaraible", + "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", From bd816e47198a4d4994fdf81ca8db2dd6dc38e5cc Mon Sep 17 00:00:00 2001 From: haricr Date: Thu, 6 Sep 2018 12:57:24 -0700 Subject: [PATCH 2/5] Update required property for isrecursive in cancel --- .../Microsoft.DataFactory/stable/2018-06-01/datafactory.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 4d8b799fc23b..5280e07cee8f 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 @@ -2220,7 +2220,7 @@ "name": "isRecursive", "description": "If true, cancel all the Child pipelines that are triggered by the current pipeline.", "in": "path", - "required": true, + "required": false, "type": "boolean", "x-ms-parameter-location": "method" }, From 2fc778b62b9f673a43fd84e96d5b9e4becd6359e Mon Sep 17 00:00:00 2001 From: haricr Date: Thu, 6 Sep 2018 16:41:16 -0700 Subject: [PATCH 3/5] Fix errors from Validation --- .../Microsoft.DataFactory/stable/2018-06-01/datafactory.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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 5280e07cee8f..fa2151c7a97e 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 @@ -2219,10 +2219,9 @@ { "name": "isRecursive", "description": "If true, cancel all the Child pipelines that are triggered by the current pipeline.", - "in": "path", + "in": "query", "required": false, - "type": "boolean", - "x-ms-parameter-location": "method" + "type": "boolean" }, { "$ref": "#/parameters/api-version" From 682ee8d598bfc060da9c1bb3f4ec7f45fd0f99ec Mon Sep 17 00:00:00 2001 From: haricr Date: Thu, 6 Sep 2018 18:41:33 -0700 Subject: [PATCH 4/5] Fix Names for Varaible Type --- .../stable/2018-06-01/datafactory.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 fa2151c7a97e..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 @@ -3063,20 +3063,20 @@ "properties": { "type": { "type": "string", - "description": "Parameter type.", + "description": "Variable type.", "enum": [ "String", "Bool", "Array" ], "x-ms-enum": { - "name": "ParameterType", + "name": "VariableType", "modelAsString": true } }, "defaultValue": { "type": "object", - "description": "Default value of parameter." + "description": "Default value of variable." } }, "required": [ From 7a5bc14de93c8e37ceccdc643536a35c019dd285 Mon Sep 17 00:00:00 2001 From: haricr Date: Fri, 7 Sep 2018 15:08:49 -0700 Subject: [PATCH 5/5] Fix Typos --- .../stable/2018-06-01/entityTypes/Pipeline.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 62f917e1e11e..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 @@ -2878,8 +2878,8 @@ "items" ] }, - "SetVaraibleActivity": { - "x-ms-discriminator-value": "SetVaraible", + "SetVariableActivity": { + "x-ms-discriminator-value": "SetVariable", "description": "Set value for a Variable.", "allOf": [ { @@ -2914,8 +2914,8 @@ "value" ] }, - "AppendVaraibleActivity": { - "x-ms-discriminator-value": "AppendVaraible", + "AppendVariableActivity": { + "x-ms-discriminator-value": "AppendVariable", "description": "Append value to a array Variable.", "allOf": [ {