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

[Datafactory] Webhook activity #5468

Merged
merged 10 commits into from
Mar 28, 2019
Merged

[Datafactory] Webhook activity #5468

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c1f80e3
webhook changes
arsunda Jan 8, 2019
30ce8a5
remove timeout as required
arsunda Jan 8, 2019
0d3bebe
combine and update web auth definitions
arsunda Jan 10, 2019
dafb001
revert auth type enum change
arsunda Jan 10, 2019
0753422
Merge remote-tracking branch 'upstream/master'
arsunda Jan 17, 2019
ae366aa
Merge branch 'master' of https://github.com/Azure/azure-rest-api-specs
arsunda Feb 6, 2019
e73a054
Merge remote-tracking branch 'upstream/master'
arsunda Mar 25, 2019
1e5988d
Added webhook activity
arsunda Mar 25, 2019
eaee060
update type to string
arsunda Mar 28, 2019
e66e21c
Update description
arsunda Mar 28, 2019
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
65 changes: 64 additions & 1 deletion ...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 @@ -277,7 +277,7 @@
"description": "Redirect incompatible row settings when EnableSkipIncompatibleRow is true.",
"$ref": "#/definitions/RedirectIncompatibleRowSettings"
},
"preserveRules":{
"preserveRules": {
"type": "array",
"items": {
"type": "object",
Expand Down Expand Up @@ -3529,6 +3529,69 @@
"method",
"functionName"
]
},
"WebHookActivity": {
"x-ms-discriminator-value": "WebHook",
"description": "WebHook activity.",
"allOf": [
{
"$ref": "#/definitions/ControlActivity"
}
],
"properties": {
"typeProperties": {
"description": "WebHook activity properties.",
"x-ms-client-flatten": true,
"$ref": "#/definitions/WebHookActivityTypeProperties"
}
},
"required": [
"typeProperties"
]
},
"WebHookActivityMethod": {
"description": "The list of HTTP methods supported by a WebHook activity.",
"type": "string",
"enum": [
"POST"
],
"x-ms-enum": {
"name": "WebHookActivityMethod",
"modelAsString": true
}
},
"WebHookActivityTypeProperties": {
"description": "WebHook activity type properties.",
"properties": {
"method": {
"description": "Rest API method for target endpoint.",
"$ref": "#/definitions/WebHookActivityMethod"
},
"url": {
"type": "object",
"description": "WebHook activity target endpoint and path. Type: string (or Expression with resultType string)."
},
"timeout": {
"type": "string",
"description": "The timeout within which the webhook should be called back. If there is no value specified, it defaults to 10 minutes. Type: string. Pattern: ((\\d+)\\.)?(\\d\\d):(60|([0-5][0-9])):(60|([0-5][0-9]))."
},
"headers": {
"type": "object",
"description": "Represents the headers that will be sent to the request. For example, to set the language and type on a request: \"headers\" : { \"Accept-Language\": \"en-us\", \"Content-Type\": \"application/json\" }. Type: string (or Expression with resultType string)."
},
"body": {
"type": "object",
"description": "Represents the payload that will be sent to the endpoint. Required for POST/PUT method, not allowed for GET method Type: string (or Expression with resultType string)."
},
"authentication": {
"description": "Authentication method used for calling the endpoint.",
"$ref": "#/definitions/WebActivityAuthentication"
}
},
"required": [
"method",
"url"
]
}
}
}