1 files changed, 7 insertions, 14 deletions

diff --git a/main.go b/main.go
index 7122192..8eb87b5 100644
--- a/main.go
+++ b/main.go
@@ -2,13 +2,13 @@ package main
 
 import (
         "embed"
-        "io/fs"
         "log"
 
         "code.crute.us/mcrute/cloud-identity-broker/app"
         "code.crute.us/mcrute/cloud-identity-broker/cmd/web"
 
         "code.crute.us/mcrute/golib/cli"
+        "code.crute.us/mcrute/golib/fs"
 
         "github.com/spf13/cobra"
 
@@ -18,27 +18,20 @@ import (
 )
 
 //go:embed templates
-var embeddedTemplates embed.FS
+var templates embed.FS
 
-var appVersion string
+var version string
 
 func main() {
-        rootCmd := &cobra.Command{
+        r := &cobra.Command{
                 Use:   "cloud-identity-broker",
                 Short: "Identity broker for cloud account access",
         }
-        cli.AddFlags(rootCmd, &app.Config{}, app.DefaultConfig, "")
+        cli.AddFlags(r, &app.Config{}, app.DefaultConfig, "")
 
-        // This is here because the trimmed prefix must match the embed prefix
-        // above and there's no need to bury it and de-couple that relationship.
-        templates, err := fs.Sub(embeddedTemplates, "templates")
-        if err != nil {
-                log.Fatalf("Error building sub-fs of embeded fs")
-        }
-
-        web.Register(rootCmd, templates, appVersion)
+        web.Register(r, fs.MustSub(templates, "templates"), version)
 
-        if err := rootCmd.Execute(); err != nil {
+        if err := r.Execute(); err != nil {
                 log.Fatalf("Error running root command: %s", err)
         }
 }