From 22073d88473d50679a3da508df2f42475ecd494b Mon Sep 17 00:00:00 2001 From: Andreas Lundblad Date: Sat, 15 Sep 2018 16:00:42 +0200 Subject: [PATCH] Renamed http-response-code to success-http-response-code --- docs/Hook-Definition.md | 2 +- hook/hook.go | 2 +- webhook.go | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/Hook-Definition.md b/docs/Hook-Definition.md index 42397a2..a3941af 100644 --- a/docs/Hook-Definition.md +++ b/docs/Hook-Definition.md @@ -8,7 +8,7 @@ Hooks are defined as JSON objects. Please note that in order to be considered va * `command-working-directory` - specifies the working directory that will be used for the script when it's executed * `response-message` - specifies the string that will be returned to the hook initiator * `response-headers` - specifies the list of headers in format `{"name": "X-Example-Header", "value": "it works"}` that will be returned in HTTP response for the hook - * `http-response-code` - specifies the HTTP status code to be returned + * `success-http-response-code` - specifies the HTTP status code to be returned upon success * `include-command-output-in-response` - boolean whether webhook should wait for the command to finish and return the raw output as a response to the hook initiator. If the command fails to execute or encounters any errors while executing the response will result in 500 Internal Server Error HTTP status code, otherwise the 200 OK status code will be returned. * `include-command-output-in-response-on-error` - boolean whether webhook should include command stdout & stderror as a response in failed executions. It only works if `include-command-output-in-response` is set to `true`. * `parse-parameters-as-json` - specifies the list of arguments that contain JSON strings. These parameters will be decoded by webhook and you can access them like regular objects in rules and `pass-arguments-to-command`. diff --git a/hook/hook.go b/hook/hook.go index 75d7119..bba4e9c 100644 --- a/hook/hook.go +++ b/hook/hook.go @@ -427,7 +427,7 @@ type Hook struct { TriggerRule *Rules `json:"trigger-rule,omitempty"` TriggerRuleMismatchHttpResponseCode int `json:"trigger-rule-mismatch-http-response-code,omitempty"` IncomingPayloadContentType string `json:"incoming-payload-content-type,omitempty"` - HttpResponseCode int `json:"http-response-code,omitempty"` + SuccessHttpResponseCode int `json:"success-http-response-code,omitempty"` } // ParseJSONParameters decodes specified arguments to JSON objects and replaces the diff --git a/webhook.go b/webhook.go index 590ae84..25e2296 100644 --- a/webhook.go +++ b/webhook.go @@ -299,8 +299,8 @@ func hookHandler(w http.ResponseWriter, r *http.Request) { go handleHook(matchedHook, rid, &headers, &query, &payload, &body) // Check if a return code is configured for the hook - if matchedHook.HttpResponseCode != 0 { - writeHttpResponseCode(w, rid, matchedHook.ID, matchedHook.HttpResponseCode) + if matchedHook.SuccessHttpResponseCode != 0 { + writeHttpResponseCode(w, rid, matchedHook.ID, matchedHook.SuccessHttpResponseCode) } fmt.Fprintf(w, matchedHook.ResponseMessage)