15422: highlight output/log/mount/container_image

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

diff --git a/lib/controller/handler.go b/lib/controller/handler.go
index 2c3ce1d4f28d189e956cd3e120b8433214861619..d524195e4429a2358ea560a784acf469350f7751 100644 (file)
--- a/lib/controller/handler.go
+++ b/lib/controller/handler.go
@@ -5,16 +5,21 @@
 package controller
 
 import (
+       "bytes"
        "context"
        "database/sql"
        "errors"
        "fmt"
+       "io"
        "net/http"
        "net/url"
        "strings"
        "sync"
        "time"
 
+       "git.curoverse.com/arvados.git/lib/config"
+       "git.curoverse.com/arvados.git/lib/controller/railsproxy"
+       "git.curoverse.com/arvados.git/lib/controller/router"
        "git.curoverse.com/arvados.git/sdk/go/arvados"
        "git.curoverse.com/arvados.git/sdk/go/health"
        "git.curoverse.com/arvados.git/sdk/go/httpserver"
@@ -60,7 +65,7 @@ func (h *Handler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 
 func (h *Handler) CheckHealth() error {
        h.setupOnce.Do(h.setup)
-       _, _, err := findRailsAPI(h.Cluster)
+       _, _, err := railsproxy.FindRailsAPI(h.Cluster)
        return err
 }
 
@@ -73,6 +78,24 @@ func (h *Handler) setup() {
                Prefix: "/_health/",
                Routes: health.Routes{"ping": func() error { _, err := h.db(&http.Request{}); return err }},
        })
+
+       mux.Handle("/arvados/v1/config", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+               var buf bytes.Buffer
+               err := config.ExportJSON(&buf, h.Cluster)
+               if err != nil {
+                       httpserver.Error(w, err.Error(), http.StatusInternalServerError)
+                       return
+               }
+               w.Header().Set("Content-Type", "application/json")
+               io.Copy(w, &buf)
+       }))
+
+       if h.Cluster.EnableBetaController14287 {
+               rtr := router.New(h.Cluster)
+               mux.Handle("/arvados/v1/collections", rtr)
+               mux.Handle("/arvados/v1/collections/", rtr)
+       }
+
        hs := http.NotFoundHandler()
        hs = prepend(hs, h.proxyRailsAPI)
        hs = h.setupProxyRemoteCluster(hs)
@@ -126,7 +149,7 @@ func prepend(next http.Handler, middleware middlewareFunc) http.Handler {
 }
 
 func (h *Handler) localClusterRequest(req *http.Request) (*http.Response, error) {
-       urlOut, insecure, err := findRailsAPI(h.Cluster)
+       urlOut, insecure, err := railsproxy.FindRailsAPI(h.Cluster)
        if err != nil {
                return nil, err
        }