Make main use MustSub

3 files changed, 14 insertions, 19 deletions

diff --git a/go.mod b/go.mod
index daaa54a..a416ec6 100644
--- a/go.mod
+++ b/go.mod
@@ -3,6 +3,7 @@ module code.crute.us/mcrute/ssh-proxy
 go 1.20
 
 require (
+        code.crute.us/mcrute/golib v0.6.1
         code.crute.us/mcrute/golib/cli v0.2.2
         code.crute.us/mcrute/golib/clients/autocert/v2 v2.2.0
         code.crute.us/mcrute/golib/clients/netbox/v3 v3.2.0
@@ -21,7 +22,6 @@ require (
 )
 
 require (
-        code.crute.us/mcrute/golib v0.6.0 // indirect
         code.crute.us/mcrute/golib/clients/dns v0.1.0 // indirect
         code.crute.us/mcrute/golib/clients/netbox v0.1.0 // indirect
         code.crute.us/mcrute/golib/vault v0.2.4 // indirect
diff --git a/go.sum b/go.sum
index a9ff448..c05469d 100644
--- a/go.sum
+++ b/go.sum
@@ -30,8 +30,8 @@ cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0Zeo
 cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=
 cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
 cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
-code.crute.us/mcrute/golib v0.6.0 h1:36+rTs5Z7lKjXpsgKhyKsOl9S2pHRcxK+D9ytbbTqGw=
-code.crute.us/mcrute/golib v0.6.0/go.mod h1:nB/ZeOhlFWUwGj5jTPJxYVyqDLdO3U9ZvBiH+Kll87s=
+code.crute.us/mcrute/golib v0.6.1 h1:Ldrc5Fgs6vufiFpIfwb+YpC5gID9RacHxWRPUvyeTzQ=
+code.crute.us/mcrute/golib v0.6.1/go.mod h1:nB/ZeOhlFWUwGj5jTPJxYVyqDLdO3U9ZvBiH+Kll87s=
 code.crute.us/mcrute/golib/cli v0.2.2 h1:1MgyEYCyZ2oJBs/FrztMmxJoh0v+7j21VsWXBTIWsqw=
 code.crute.us/mcrute/golib/cli v0.2.2/go.mod h1:vc2TpQ5J/3zRfcWq6sclmU0EmJI8xygpOij77VJ8EK8=
 code.crute.us/mcrute/golib/clients/autocert/v2 v2.2.0 h1:Vy/DhmVWNF8be9jeyO/oMRtPxBVGwWXFyicBudFMv4E=
diff --git a/main.go b/main.go
index c64f374..fd2de2c 100644
--- a/main.go
+++ b/main.go
@@ -5,7 +5,6 @@ package main
 import (
         "embed"
         "fmt"
-        "io/fs"
         "log"
 
         "code.crute.us/mcrute/ssh-proxy/app"
@@ -14,6 +13,7 @@ import (
         "code.crute.us/mcrute/ssh-proxy/cmd/web"
 
         "code.crute.us/mcrute/golib/cli"
+        "code.crute.us/mcrute/golib/fs"
 
         "github.com/spf13/cobra"
 
@@ -23,30 +23,25 @@ import (
 )
 
 //go:embed templates
-var embeddedTemplates embed.FS
+var templates embed.FS
 
 //go:embed clients
-var embeddedClients embed.FS
+var clients embed.FS
 
-var appVersion string
+var version string
 
 func main() {
-        rootCmd := &cobra.Command{
+        r := &cobra.Command{
                 Use:   "web-server",
-                Short: fmt.Sprintf("SSH proxy web server (version %s)", appVersion),
+                Short: fmt.Sprintf("SSH proxy web server (version %s)", version),
         }
-        cli.AddFlags(rootCmd, &app.Config{}, app.DefaultConfig, "")
+        cli.AddFlags(r, &app.Config{}, app.DefaultConfig, "")
 
-        templates, err := fs.Sub(embeddedTemplates, "templates")
-        if err != nil {
-                log.Fatalf("Error building sub-fs of embeded fs")
-        }
-
-        web.Register(rootCmd, templates, embeddedClients, appVersion)
-        client.Register(rootCmd, appVersion)
-        register.Register(rootCmd)
+        web.Register(r, fs.MustSub(templates, "templates"), clients, version)
+        client.Register(r, version)
+        register.Register(r)
 
-        if err := rootCmd.Execute(); err != nil {
+        if err := r.Execute(); err != nil {
                 log.Fatalf("Error running root command: %s", err)
         }
 }