mirrors/webhook
1
0
Fork 0
mirror of https://github.com/adnanh/webhook.git synced 2025-05-23 05:42:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rename trigger rule http response code config option

Browse source 
Signed-off-by: Mathias Merscher <Mathias.Merscher@dg-i.net>
This commit is contained in:
Mathias Merscher 2017-02-10 18:42:02 +01:00
parent ddb1f2441a
commit 058f820cbd
3 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

22
hook/hook.go
View file

@ -290,17 +290,17 @@ func (h *ResponseHeaders) Set(value string) error {
// Hook type is a structure containing details for a single hook // Hook type is a structure containing details for a single hook
type Hook struct { type Hook struct {
ID string `json:"id,omitempty"` ID string `json:"id,omitempty"`
ExecuteCommand string `json:"execute-command,omitempty"` ExecuteCommand string `json:"execute-command,omitempty"`
CommandWorkingDirectory string `json:"command-working-directory,omitempty"` CommandWorkingDirectory string `json:"command-working-directory,omitempty"`
ResponseMessage string `json:"response-message,omitempty"` ResponseMessage string `json:"response-message,omitempty"`
ResponseHeaders ResponseHeaders `json:"response-headers,omitempty"` ResponseHeaders ResponseHeaders `json:"response-headers,omitempty"`
CaptureCommandOutput bool `json:"include-command-output-in-response,omitempty"` CaptureCommandOutput bool `json:"include-command-output-in-response,omitempty"`
PassEnvironmentToCommand []Argument `json:"pass-environment-to-command,omitempty"` PassEnvironmentToCommand []Argument `json:"pass-environment-to-command,omitempty"`
PassArgumentsToCommand []Argument `json:"pass-arguments-to-command,omitempty"` PassArgumentsToCommand []Argument `json:"pass-arguments-to-command,omitempty"`
JSONStringParameters []Argument `json:"parse-parameters-as-json,omitempty"` JSONStringParameters []Argument `json:"parse-parameters-as-json,omitempty"`
TriggerRule *Rules `json:"trigger-rule,omitempty"` TriggerRule *Rules `json:"trigger-rule,omitempty"`
TriggerRuleMismatchCode int `json:"trigger-rule-mismatch-code,omitempty"` TriggerRuleMismatchHttpResponseCode int `json:"trigger-rule-mismatch-http-response-code,omitempty"`
} }
// ParseJSONParameters decodes specified arguments to JSON objects and replaces the // ParseJSONParameters decodes specified arguments to JSON objects and replaces the

4
test/hooks.json.tmpl
View file

@ -4,7 +4,7 @@
"execute-command": "{{ .Hookecho }}", "execute-command": "{{ .Hookecho }}",
"command-working-directory": "/", "command-working-directory": "/",
"include-command-output-in-response": true, "include-command-output-in-response": true,
"trigger-rule-mismatch-code": 400, "trigger-rule-mismatch-http-response-code": 400,
"pass-environment-to-command": "pass-environment-to-command":
[ [
{ {
@ -60,7 +60,7 @@
"command-working-directory": "/", "command-working-directory": "/",
"include-command-output-in-response": false, "include-command-output-in-response": false,
"response-message": "success", "response-message": "success",
"trigger-rule-mismatch-code": 999, "trigger-rule-mismatch-http-response-code": 999,
"parse-parameters-as-json": [ "parse-parameters-as-json": [
{ {
"source": "payload", "source": "payload",

8
webhook.go
View file

@ -243,13 +243,13 @@ func hookHandler(w http.ResponseWriter, r *http.Request) {
} }
// Check if a return code is configured for the hook // Check if a return code is configured for the hook
if matchedHook.TriggerRuleMismatchCode != 0 { if matchedHook.TriggerRuleMismatchHttpResponseCode != 0 {
// Check if the configured return code is supported by the http package // Check if the configured return code is supported by the http package
// by testing if there is a StatusText for this code. // by testing if there is a StatusText for this code.
if len(http.StatusText(matchedHook.TriggerRuleMismatchCode)) > 0 { if len(http.StatusText(matchedHook.TriggerRuleMismatchHttpResponseCode)) > 0 {
w.WriteHeader(matchedHook.TriggerRuleMismatchCode) w.WriteHeader(matchedHook.TriggerRuleMismatchHttpResponseCode)
} else { } else {
log.Printf("%s got matched, but the configured return code %d is unknown - defaulting to 200\n", matchedHook.ID, matchedHook.TriggerRuleMismatchCode) log.Printf("%s got matched, but the configured return code %d is unknown - defaulting to 200\n", matchedHook.ID, matchedHook.TriggerRuleMismatchHttpResponseCode)
} }
} }