Remove webui

.goreleaser.yml

@@ -28,36 +28,18 @@ builds:
     hooks:
       post:
         - tar -zcf dist/migrations.tar.gz migrations
-  - main: ./cmd/webui/main.go
-    id: webui
-    binary: webui
-    env:
-      - CGO_ENABLED=0
-    ldflags:
-      - -s -w -X github.com/gadget-inc/dateilager/pkg/version.Version=v{{.Version}}
-    goos:
-      - linux
-      - darwin
-    goarch:
-      - amd64
-      - arm64
-    hooks:
-      post:
-        - tar -zcf dist/assets.tar.gz assets
 
 changelog:
   skip: true
 
 checksum:
   name_template: "checksums.txt"
   extra_files:
-    - glob: ./dist/assets.tar.gz
     - glob: ./dist/migrations.tar.gz
 
 archives:
   - name_template: "{{ .ProjectName }}-v{{ .Version }}-{{ .Os }}-{{ .Arch }}"
 
 release:
   extra_files:
-    - glob: ./dist/assets.tar.gz
     - glob: ./dist/migrations.tar.gz

Makefile

@@ -25,7 +25,7 @@ SERVICE := $(PROJECT).server
 .PHONY: reset-db setup-local server server-profile install-js
 .PHONY: client-update client-large-update client-get client-rebuild client-pack
 .PHONY: client-gc-contents client-gc-project client-gc-random-projects
-.PHONY: webui health upload-container-image gen-docs
+.PHONY: health upload-container-image gen-docs
 .PHONY: load-test-new load-test-get load-test-update
 
 install:
@@ -72,7 +72,7 @@ development/server.key:
 
 development/server.crt: development/server.key
 
-build: internal/pb/fs.pb.go internal/pb/fs_grpc.pb.go bin/server bin/client bin/webui  development/server.crt
+build: internal/pb/fs.pb.go internal/pb/fs_grpc.pb.go bin/server bin/client development/server.crt
 
 lint:
 	golangci-lint run
@@ -89,14 +89,10 @@ release/%_macos_arm64: cmd/%/main.go $(PKG_GO_FILES) $(INTERNAL_GO_FILES) go.sum
 release/migrations.tar.gz: migrations/*
 	tar -zcf $@ migrations
 
-release/assets.tar.gz: assets/*
-	tar -zcf $@ assets
-
 release: build
 release: release/server_linux_amd64 release/server_macos_amd64 release/server_macos_arm64
 release: release/client_linux_amd64 release/client_macos_amd64 release/client_macos_arm64
-release: release/webui_linux_amd64 release/webui_macos_amd64 release/webui_macos_arm64
-release: release/assets.tar.gz release/migrations.tar.gz
+release: release/migrations.tar.gz
 
 test: export DB_URI = postgres://$(DB_USER):$(DB_PASS)@$(DB_HOST):5432/dl_tests
 test: migrate
@@ -182,12 +178,6 @@ client-gc-random-projects: export DL_SKIP_SSL_VERIFICATION=1
 client-gc-random-projects:
 	go run cmd/client/main.go gc --server $(GRPC_SERVER) --mode random-projects --sample 25 --keep 1
 
-webui: export DL_ENV=dev
-webui: export DL_TOKEN=$(DEV_TOKEN_ADMIN)
-webui: export DL_SKIP_SSL_VERIFICATION=1
-webui:
-	go run cmd/webui/main.go --server $(GRPC_SERVER)
-
 health:
 	grpc-health-probe -addr $(GRPC_SERVER)
 	grpc-health-probe -addr $(GRPC_SERVER) -service $(SERVICE)

default.nix

@@ -17,9 +17,9 @@ buildGoModule rec {
   version = "0.5.3";
   src = ./.;
   proxyVendor = true; # Fixes: cannot query module due to -mod=vendor running make install
-  vendorSha256 = "sha256-CZmCLHfNKXA2BLFbd4V78IrAsMnWN79MGLOvquu+AG0=";
+  vendorSha256 = "sha256-nw7OC0EjAy5wbsa/KIGtxsvBgbRfutD2VSXG+78lCdY=";
 
-  outputs = [ "out" "client" "server" "webui" "assets" "migrations" ];
+  outputs = [ "out" "client" "server" "migrations" ];
 
   nativeBuildInputs = [
     git
@@ -63,13 +63,11 @@ buildGoModule rec {
   '';
 
   postInstall = ''
-    mkdir -p "$client/bin" "$server/bin" "$webui/bin"
+    mkdir -p "$client/bin" "$server/bin"
     mv "$out/bin/client" "$client/bin/dateilager-client"
     mv "$out/bin/server" "$server/bin/dateilager-server"
-    mv "$out/bin/webui" "$webui/bin/dateilager-webui"
-    cp -r ${./assets} "$assets"
     cp -r ${./migrations} "$migrations"
-    ln -s "$client/bin/dateilager-client" "$server/bin/dateilager-server" "$webui/bin/dateilager-webui" "$out/bin"
+    ln -s "$client/bin/dateilager-client" "$server/bin/dateilager-server" "$out/bin"
   '';
 
   meta = with lib; {

go.mod

@@ -5,7 +5,6 @@ go 1.19
 require (
 	github.com/dgraph-io/ristretto v0.1.1
 	github.com/gadget-inc/fsdiff v0.4.4
-	github.com/go-chi/chi/v5 v5.0.7
 	github.com/gobwas/glob v0.2.3
 	github.com/grpc-ecosystem/go-grpc-middleware v1.3.0
 	github.com/jackc/pgx/v5 v5.0.2

go.sum

@@ -85,8 +85,6 @@ github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7
 github.com/gadget-inc/fsdiff v0.4.4 h1:hLl/rCcWmW3P27LqMEyT2LVNWDLsREqsncODECH1vNw=
 github.com/gadget-inc/fsdiff v0.4.4/go.mod h1:GJurAL/F4qq4hp7uLc7nhqu9PbszI4/7fkTAUNa/VIY=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
-github.com/go-chi/chi/v5 v5.0.7 h1:rDTPXLDHGATaeHvVlLcR4Qe0zftYethFucbjVQ1PxU8=
-github.com/go-chi/chi/v5 v5.0.7/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
 github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=