hooks: Use built-in function for testing slice elements

cmd/tusd/cli/flags.go

@@ -6,6 +6,7 @@ import (
 	"strings"
 
 	"github.com/tus/tusd/v2/pkg/hooks"
+	"golang.org/x/exp/slices"
 )
 
 var Flags struct {
@@ -131,7 +132,7 @@ func SetEnabledHooks() {
 		for i, h := range slc {
 			slc[i] = strings.TrimSpace(h)
 
-			if !hookTypeInSlice(hooks.HookType(h), hooks.AvailableHooks) {
+			if !slices.Contains(hooks.AvailableHooks, hooks.HookType(h)) {
 				stderr.Fatalf("Unknown hook event type in -hooks-enabled-events flag: %s", h)
 			}
 

cmd/tusd/cli/hooks.go

@@ -9,21 +9,13 @@ import (
 	"github.com/tus/tusd/v2/pkg/hooks/grpc"
 	"github.com/tus/tusd/v2/pkg/hooks/http"
 	"github.com/tus/tusd/v2/pkg/hooks/plugin"
+	"golang.org/x/exp/slices"
 )
 
 // TODO: Move some parts into hooks package
 
 var hookHandler hooks.HookHandler = nil
 
-func hookTypeInSlice(a hooks.HookType, list []hooks.HookType) bool {
-	for _, b := range list {
-		if b == a {
-			return true
-		}
-	}
-	return false
-}
-
 func preCreateCallback(event handler.HookEvent) (handler.HTTPResponse, handler.FileInfoChanges, error) {
 	ok, hookRes, err := invokeHookSync(hooks.HookPreCreate, event)
 	if !ok || err != nil {
@@ -170,7 +162,7 @@ func invokeHookAsync(typ hooks.HookType, event handler.HookEvent) {
 // hook completed successfully.
 func invokeHookSync(typ hooks.HookType, event handler.HookEvent) (ok bool, res hooks.HookResponse, err error) {
 	// Stop, if no hook handler is installed or this hook event is not enabled
-	if hookHandler == nil || !hookTypeInSlice(typ, Flags.EnabledHooks) {
+	if hookHandler == nil || !slices.Contains(Flags.EnabledHooks, typ) {
 		return false, hooks.HookResponse{}, nil
 	}
 

examples/hooks/plugin/hook_handler.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/hashicorp/go-hclog"
 	"github.com/hashicorp/go-plugin"
-	"github.com/tus/tusd/v2/cmd/tusd/cli/hooks"
+	"github.com/tus/tusd/v2/pkg/hooks"
 )
 
 // Here is the implementation of our hook handler

go.mod

@@ -20,6 +20,7 @@ require (
 	github.com/sethgrid/pester v1.2.0
 	github.com/stretchr/testify v1.8.4
 	github.com/vimeo/go-util v1.4.1
+	golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df
 	google.golang.org/api v0.129.0
 	google.golang.org/grpc v1.56.1
 	google.golang.org/protobuf v1.31.0

pkg/handler/hooks.go

@@ -2,8 +2,6 @@ package handler
 
 import "net/http"
 
-// TODO: Move some parts to hooks package
-
 // HookEvent represents an event from tusd which can be handled by the application.
 type HookEvent struct {
 	// Upload contains information about the upload that caused this hook