Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Pipeline Variables / Set Variable Activity / Append Variable Activity #4028

Merged
merged 8 commits into from
Oct 1, 2018
Merged

Add Pipeline Variables / Set Variable Activity / Append Variable Activity #4028

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a09d7e7
SecureInput swagger update for pipeline
Sep 6, 2018
41a5cc1
SecureInput swagger update for pipeline
Sep 6, 2018
0d7afc1
Merge branch 'master' of https://github.com/leonliang33/azure-rest-ap…
Sep 26, 2018
67d57a8
Revert "SecureInput swagger update for pipeline"
Sep 26, 2018
ac8b846
Add Append Variables and Set Variables
Sep 27, 2018
f243e19
Example for variables
Sep 28, 2018
a250539
Variables into pipeline json and datafactory json
Sep 28, 2018
68c58c2
Fix grammar and typo
Sep 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 33 additions & 0 deletions ...ion/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/datafactory.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3101,6 +3101,39 @@
"message"
]
},
"VariableDefinitionSpecification": {
"description": "Definition of variable for a Pipeline.",
"type": "object",
"additionalProperties": {
"$ref": "#/definitions/VariableSpecification"
}
},
"VariableSpecification": {
"description": "Definition of a single variable for a 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",
Expand Down
68 changes: 68 additions & 0 deletions ...actory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -3023,6 +3027,70 @@
"required": [
"pythonFile"
]
},
"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": {
"variableName": {
"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"
}
}
},
"AppendVariableActivity": {
"x-ms-discriminator-value": "AppendVariable",
"description": "Append value for a Variable of type Array.",
"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": {
"variableName": {
"description": "Name of the variable whose value needs to be appended to.",
"type": "string"
},
"value": {
"description": "Value to be appended. Could be a static value or Expression",
"type": "object"
}
}
}
}
}
10 changes: 10 additions & 0 deletions ...y/resource-manager/Microsoft.DataFactory/stable/2018-06-01/examples/Pipelines_Create.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,11 @@
"OutputBlobNameList": {
"type": "Array"
}
},
"variables": {
"TestVariableArray": {
"type": "Array"
}
}
}
},
Expand Down Expand Up @@ -136,6 +141,11 @@
"OutputBlobNameList": {
"type": "Array"
}
},
"variables": {
"TestVariableArray": {
"type": "Array"
}
}
},
"etag": "0a0069d4-0000-0000-0000-5b245bd50000"
Expand Down