19146: Remove unneeded special case checks, explain the needed one.

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

diff --git a/lib/controller/handler.go b/lib/controller/handler.go
index a35d0030194e8bf9e79d1f2f256ff9fab5621fe7..f5840b34ce72cd18da4d75c4d27dbb23920e53dd 100644 (file)
--- a/lib/controller/handler.go
+++ b/lib/controller/handler.go
@@ -9,6 +9,7 @@ import (
        "errors"
        "fmt"
        "net/http"
+       "net/http/httptest"
        "net/url"
        "strings"
        "sync"
@@ -31,9 +32,11 @@ import (
 )
 
 type Handler struct {
-       Cluster *arvados.Cluster
+       Cluster           *arvados.Cluster
+       BackgroundContext context.Context
 
        setupOnce      sync.Once
+       federation     *federation.Conn
        handlerStack   http.Handler
        proxy          *proxy
        secureClient   *http.Client
@@ -74,7 +77,21 @@ func (h *Handler) CheckHealth() error {
                return err
        }
        _, _, err = railsproxy.FindRailsAPI(h.Cluster)
-       return err
+       if err != nil {
+               return err
+       }
+       if h.Cluster.API.VocabularyPath != "" {
+               req, err := http.NewRequest("GET", "/arvados/v1/vocabulary", nil)
+               if err != nil {
+                       return err
+               }
+               var resp httptest.ResponseRecorder
+               h.handlerStack.ServeHTTP(&resp, req)
+               if resp.Result().StatusCode != http.StatusOK {
+                       return fmt.Errorf("%d %s", resp.Result().StatusCode, resp.Result().Status)
+               }
+       }
+       return nil
 }
 
 func (h *Handler) Done() <-chan struct{} {
@@ -85,18 +102,26 @@ func neverRedirect(*http.Request, []*http.Request) error { return http.ErrUseLas
 
 func (h *Handler) setup() {
        mux := http.NewServeMux()
-       mux.Handle("/_health/", &health.Handler{
-               Token:  h.Cluster.ManagementToken,
-               Prefix: "/_health/",
-               Routes: health.Routes{"ping": func() error { _, err := h.db(context.TODO()); return err }},
-       })
+       healthFuncs := make(map[string]health.Func)
 
        oidcAuthorizer := localdb.OIDCAccessTokenAuthorizer(h.Cluster, h.db)
-       rtr := router.New(federation.New(h.Cluster), router.Config{
+       h.federation = federation.New(h.Cluster, &healthFuncs)
+       rtr := router.New(h.federation, router.Config{
                MaxRequestSize: h.Cluster.API.MaxRequestSize,
                WrapCalls:      api.ComposeWrappers(ctrlctx.WrapCallsInTransactions(h.db), oidcAuthorizer.WrapCalls),
        })
+
+       healthRoutes := health.Routes{"ping": func() error { _, err := h.db(context.TODO()); return err }}
+       for name, f := range healthFuncs {
+               healthRoutes[name] = f
+       }
+       mux.Handle("/_health/", &health.Handler{
+               Token:  h.Cluster.ManagementToken,
+               Prefix: "/_health/",
+               Routes: healthRoutes,
+       })
        mux.Handle("/arvados/v1/config", rtr)
+       mux.Handle("/arvados/v1/vocabulary", rtr)
        mux.Handle("/"+arvados.EndpointUserAuthenticate.Path, rtr) // must come before .../users/
        mux.Handle("/arvados/v1/collections", rtr)
        mux.Handle("/arvados/v1/collections/", rtr)
@@ -107,8 +132,12 @@ func (h *Handler) setup() {
        mux.Handle("/arvados/v1/container_requests/", rtr)
        mux.Handle("/arvados/v1/groups", rtr)
        mux.Handle("/arvados/v1/groups/", rtr)
+       mux.Handle("/arvados/v1/links", rtr)
+       mux.Handle("/arvados/v1/links/", rtr)
        mux.Handle("/login", rtr)
        mux.Handle("/logout", rtr)
+       mux.Handle("/arvados/v1/api_client_authorizations", rtr)
+       mux.Handle("/arvados/v1/api_client_authorizations/", rtr)
 
        hs := http.NotFoundHandler()
        hs = prepend(hs, h.proxyRailsAPI)
@@ -128,6 +157,8 @@ func (h *Handler) setup() {
        h.proxy = &proxy{
                Name: "arvados-controller",
        }
+
+       go h.trashSweepWorker()
 }
 
 var errDBConnection = errors.New("database connection error")