diff --git a/internal/hook/hook.go b/internal/hook/hook.go index 394dd79..d43fb0f 100644 --- a/internal/hook/hook.go +++ b/internal/hook/hook.go @@ -828,7 +828,7 @@ func (r Rules) Evaluate(req *Request) (bool, error) { return r.Match.Evaluate(req) } - return false, nil + return true, nil } // AndRule will evaluate to true if and only if all of the ChildRules evaluate to true diff --git a/internal/hook/hook_test.go b/internal/hook/hook_test.go index cbc49f7..71d5a47 100644 --- a/internal/hook/hook_test.go +++ b/internal/hook/hook_test.go @@ -351,20 +351,21 @@ func TestHookExtractCommandArguments(t *testing.T) { // we test both cases where the name of the data is used as the name of the // env key & the case where the hook definition sets the env var name to a // fixed value using the envname construct like so:: -// [ -// { -// "id": "push", -// "execute-command": "bb2mm", -// "command-working-directory": "/tmp", -// "pass-environment-to-command": -// [ -// { -// "source": "entire-payload", -// "envname": "PAYLOAD" -// }, -// ] -// } -// ] +// +// [ +// { +// "id": "push", +// "execute-command": "bb2mm", +// "command-working-directory": "/tmp", +// "pass-environment-to-command": +// [ +// { +// "source": "entire-payload", +// "envname": "PAYLOAD" +// }, +// ] +// } +// ] var hookExtractCommandArgumentsForEnvTests = []struct { exec string args []Argument @@ -596,7 +597,7 @@ var andRuleTests = []struct { []byte{}, true, false, }, - {"empty rule", AndRule{{}}, nil, nil, nil, nil, false, false}, + {"empty rule", AndRule{{}}, nil, nil, nil, nil, true, false}, // failures { "invalid rule", diff --git a/webhook.go b/webhook.go index 9ed793c..3e3dcc2 100644 --- a/webhook.go +++ b/webhook.go @@ -5,7 +5,7 @@ import ( "encoding/json" "flag" "fmt" - "io/ioutil" + "io" "log" "net" "net/http" @@ -172,7 +172,7 @@ func main() { } if !*verbose { - log.SetOutput(ioutil.Discard) + log.SetOutput(io.Discard) } // Create pidfile @@ -379,7 +379,7 @@ func hookHandler(w http.ResponseWriter, r *http.Request) { isMultipart := strings.HasPrefix(req.ContentType, "multipart/form-data;") if !isMultipart { - req.Body, err = ioutil.ReadAll(r.Body) + req.Body, err = io.ReadAll(r.Body) if err != nil { log.Printf("[%s] error reading the request body: %+v\n", req.ID, err) } @@ -608,7 +608,7 @@ func handleHook(h *hook.Hook, r *hook.Request) (string, error) { } for i := range files { - tmpfile, err := ioutil.TempFile(h.CommandWorkingDirectory, files[i].EnvName) + tmpfile, err := os.CreateTemp(h.CommandWorkingDirectory, files[i].EnvName) if err != nil { log.Printf("[%s] error creating temp file [%s]", r.ID, err) continue