Merge branch 'master' into 14874-protected-collection-properties

[arvados.git] / lib / controller / cmd.go

diff --git a/lib/controller/cmd.go b/lib/controller/cmd.go
index 2bb68aed9ed90b31999dd794aee8ff8da0aff5b1..4345370469d07f3d5be685b9dd2e4a0efbe1ab7b 100644 (file)
--- a/lib/controller/cmd.go
+++ b/lib/controller/cmd.go
@@ -5,13 +5,15 @@
 package controller
 
 import (
-       "net/http"
+       "context"
 
        "git.curoverse.com/arvados.git/lib/cmd"
        "git.curoverse.com/arvados.git/lib/service"
        "git.curoverse.com/arvados.git/sdk/go/arvados"
 )
 
-var Command cmd.Handler = service.Command(arvados.ServiceNameController, func(cluster *arvados.Cluster, _ *arvados.SystemNode) http.Handler {
+var Command cmd.Handler = service.Command(arvados.ServiceNameController, newHandler)
+
+func newHandler(_ context.Context, cluster *arvados.Cluster, _ string) service.Handler {
        return &Handler{Cluster: cluster}
-})
+}