Add a root route to serve the ui from the clusters-service

.github/workflows/build.yaml

@@ -39,6 +39,8 @@ jobs:
       with:
         fetch-depth: 0
     - name: build
+      env:
+        GITHUB_TOKEN: ${{ secrets.WGE_NPM_GITHUB_TOKEN }}
       run: |
         make GITHUB_BUILD_TOKEN=${GITHUB_BUILD_TOKEN} cmd/clusters-service/.uptodate
     - name: Login to Docker Hub

Makefile

@@ -53,7 +53,7 @@ cmd/event-writer/$(UPTODATE): cmd/event-writer/Dockerfile cmd/event-writer/*
 
 # Takes precedence over the more general rule above
 # The only difference is the build context
-cmd/clusters-service/$(UPTODATE): cmd/clusters-service/Dockerfile cmd/clusters-service/*
+cmd/clusters-service/$(UPTODATE): cmd/clusters-service/Dockerfile cmd/clusters-service/* ui-cra/build
 	$(SUDO) docker build \
 		--build-arg=version=$(WEAVE_GITOPS_VERSION) \
 		--build-arg=image_tag=$(IMAGE_TAG) \
@@ -169,6 +169,10 @@ ui-audit:
 lint:
 	bin/go-lint
 
+cmd/clusters-service/clusters-service: ui-cra/build
+	CGO_ENABLED=1 GOARCH=amd64 go build -ldflags "$(cgo_ldflags)" -o $@ ./cmd/gitops-repo-broker
+	cp -r ui-cra/build/* cmd/clusters-service/app/dist/
+
 # We select which directory we want to descend into to not execute integration
 # tests here.
 unit-tests-with-coverage: $(GENERATED)

cmd/clusters-service/Dockerfile

@@ -35,6 +35,7 @@ COPY cmd/clusters-service/main.go main.go
 COPY cmd/clusters-service/api/ api/
 COPY cmd/clusters-service/app/ app/
 COPY cmd/clusters-service/pkg/ pkg/
+COPY ui-cra/build app/dist
 
 ARG version
 # build

cmd/clusters-service/app/server.go

@@ -2,12 +2,15 @@ package app
 
 import (
 	"context"
+	"embed"
 	"encoding/json"
 	"errors"
 	"fmt"
+	"io/fs"
 	"net/http"
 	"os"
 	"os/signal"
+	"path/filepath"
 	"strings"
 	"syscall"
 
@@ -16,6 +19,7 @@ import (
 	"github.com/go-playground/validator/v10"
 	"github.com/gorilla/mux"
 	grpc_runtime "github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
+	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 	"github.com/spf13/viper"
@@ -323,7 +327,23 @@ func RunInProcessGateway(ctx context.Context, addr string, setters ...Option) er
 	httpHandler = entitlement.EntitlementHandler(ctx, args.Log, args.KubernetesClient, args.EntitlementSecretKey, entitlement.CheckEntitlementHandler(args.Log, httpHandler))
 
 	gitopsBrokerHandler := getGitopsBrokerMux(args.AgentTemplateNatsURL, args.AgentTemplateAlertmanagerURL, args.Database)
-	mux.Handle("/gitops/", gitopsBrokerHandler)
+	mux.Handle("/gitops/api/", gitopsBrokerHandler)
+
+	// UI
+	var log = logrus.New()
+	assetFS := getAssets()
+	assetHandler := http.FileServer(http.FS(assetFS))
+	redirector := createRedirector(assetFS, log)
+
+	mux.Handle("/", http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
+		extension := filepath.Ext(req.URL.Path)
+
+		if extension == "" {
+			redirector(w, req)
+			return
+		}
+		assetHandler.ServeHTTP(w, req)
+	}))
 
 	s := &http.Server{
 		Addr:    addr,
@@ -428,13 +448,68 @@ func checkVersionWithFlags(log logr.Logger, flags map[string]string) {
 func getGitopsBrokerMux(agentTemplateNatsURL, agentTemplateAlertmanagerURL string, db *gorm.DB) *mux.Router {
 	r := mux.NewRouter()
 
-	r.HandleFunc("/agent.yaml", agent.NewGetHandler(db, agentTemplateNatsURL, agentTemplateAlertmanagerURL)).Methods("GET")
-	r.HandleFunc("/clusters", api.ListClusters(db, json.MarshalIndent)).Methods("GET")
-	r.HandleFunc("/clusters/{id:[0-9]+}", api.FindCluster(db, json.MarshalIndent)).Methods("GET")
-	r.HandleFunc("/clusters", api.RegisterCluster(db, validator.New(), json.Unmarshal, json.MarshalIndent, utils.Generate)).Methods("POST")
-	r.HandleFunc("/clusters/{id:[0-9]+}", api.UpdateCluster(db, validator.New(), json.Unmarshal, json.MarshalIndent)).Methods("PUT")
-	r.HandleFunc("/clusters/{id:[0-9]+}", api.UnregisterCluster(db)).Methods("DELETE")
-	r.HandleFunc("/alerts", api.ListAlerts(db, json.MarshalIndent)).Methods("GET")
+	r.HandleFunc("/gitops/api/agent.yaml", agent.NewGetHandler(db, agentTemplateNatsURL, agentTemplateAlertmanagerURL)).Methods("GET")
+	r.HandleFunc("/gitops/api/clusters", api.ListClusters(db, json.MarshalIndent)).Methods("GET")
+	r.HandleFunc("/gitops/api/clusters/{id:[0-9]+}", api.FindCluster(db, json.MarshalIndent)).Methods("GET")
+	r.HandleFunc("/gitops/api/clusters", api.RegisterCluster(db, validator.New(), json.Unmarshal, json.MarshalIndent, utils.Generate)).Methods("POST")
+	r.HandleFunc("/gitops/api/clusters/{id:[0-9]+}", api.UpdateCluster(db, validator.New(), json.Unmarshal, json.MarshalIndent)).Methods("PUT")
+	r.HandleFunc("/gitops/api/clusters/{id:[0-9]+}", api.UnregisterCluster(db)).Methods("DELETE")
+	r.HandleFunc("/gitops/api/alerts", api.ListAlerts(db, json.MarshalIndent)).Methods("GET")
 
 	return r
 }
+
+//go:embed dist/*
+var static embed.FS
+
+func getAssets() fs.FS {
+	f, err := fs.Sub(static, "dist")
+
+	if err != nil {
+		panic(err)
+	}
+
+	return f
+}
+
+// A redirector ensures that index.html always gets served.
+// The JS router will take care of actual navigation once the index.html page lands.
+func createRedirector(fsys fs.FS, log logrus.FieldLogger) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		indexPage, err := fsys.Open("index.html")
+
+		if err != nil {
+			log.Error(err, "could not open index.html page")
+			w.WriteHeader(http.StatusInternalServerError)
+
+			return
+		}
+
+		stat, err := indexPage.Stat()
+		if err != nil {
+			log.Error(err, "could not get index.html stat")
+			w.WriteHeader(http.StatusInternalServerError)
+
+			return
+		}
+
+		bt := make([]byte, stat.Size())
+		_, err = indexPage.Read(bt)
+
+		if err != nil {
+			log.Error(err, "could not read index.html")
+			w.WriteHeader(http.StatusInternalServerError)
+
+			return
+		}
+
+		_, err = w.Write(bt)
+
+		if err != nil {
+			log.Error(err, "error writing index.html")
+			w.WriteHeader(http.StatusInternalServerError)
+
+			return
+		}
+	}
+}