diff --git a/internal/hook/hook.go b/internal/hook/hook.go index 6699eeb6..d4301dc9 100644 --- a/internal/hook/hook.go +++ b/internal/hook/hook.go @@ -824,7 +824,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/webhook.go b/webhook.go index 9ed793c6..3e3dcc20 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