Refator using le utils

1 files changed, 14 insertions, 38 deletions

diff --git a/main.go b/main.go
index 367814d..e657062 100644
--- a/main.go
+++ b/main.go
@@ -1,44 +1,19 @@
 package main
 
 import (
-        "fmt"
         "log"
         "os"
-        "strconv"
 
         "github.com/gin-gonic/gin"
         "github.com/spf13/cobra"
+        "github.com/spf13/viper"
 
+        "code.crute.me/mcrute/go_ddns_manager/util"
         "code.crute.me/mcrute/go_ddns_manager/web"
         "code.crute.me/mcrute/go_ddns_manager/web/controllers"
         "code.crute.me/mcrute/go_ddns_manager/web/middleware"
 )
 
-// TODO: use from a common package
-func MustGetString(c *cobra.Command, k string) string {
-        f := c.Flags().Lookup(k)
-        if f == nil {
-                panic(fmt.Errorf("No flag named %s", k))
-        }
-
-        return f.Value.String()
-}
-
-// TODO: use from a common package
-func MustGetBool(c *cobra.Command, k string) bool {
-        f := c.Flags().Lookup(k)
-        if f == nil {
-                panic(fmt.Errorf("No flag named %s", k))
-        }
-
-        t, err := strconv.ParseBool(f.Value.String())
-        if err != nil {
-                panic(err)
-        }
-
-        return t
-}
-
 func makeServer(cfg *web.ServerConfig) *gin.Engine {
         router := gin.Default()
         router.Use(middleware.ConfigContextMiddleware(cfg))
@@ -68,9 +43,9 @@ func main() {
                 Args:  cobra.MinimumNArgs(1),
                 Run: func(cmd *cobra.Command, args []string) {
                         cfg, err := web.LoadServerConfig(
-                                MustGetString(cmd, "zones-config"),
-                                MustGetString(cmd, "auth-config"),
-                                MustGetString(cmd, "view-name"),
+                                viper.GetString("zones-config"),
+                                viper.GetString("auth-config"),
+                                viper.GetString("view-name"),
                                 args[0],
                         )
                         if err != nil {
@@ -78,18 +53,19 @@ func main() {
                                 os.Exit(1)
                         }
 
-                        web.GinRun(
+                        util.GinRun(
                                 makeServer(cfg),
-                                MustGetBool(cmd, "debug"),
-                                MustGetString(cmd, "listen"))
+                                viper.GetBool("debug"),
+                                viper.GetString("listen"))
                 },
         }
 
-        cmd.Flags().StringP("zones-config", "z", "cfg/zones.conf", "Bind key and zones config file")
-        cmd.Flags().StringP("auth-config", "a", "cfg/server_auth.json", "Server auth configuration file")
-        cmd.Flags().StringP("view-name", "n", "external", "Name of view to update for ACME and DDNS")
-        cmd.Flags().StringP("listen", "l", ":9090", "Listen address and port")
-        cmd.Flags().BoolP("debug", "d", false, "Run server in debug mode with debug logs")
+        util.WrapViper(cmd, "DNS_MANAGE").
+                BindString("zones-config", "z", "cfg/zones.conf", "Bind key and zones config file").
+                BindString("auth-config", "a", "cfg/server_auth.json", "Server auth configuration file").
+                BindString("view-name", "n", "external", "Name of view to update for ACME and DDNS").
+                BindString("listen", "l", ":9090", "Listen address and port").
+                BindBool("debug", "d", false, "Run server in debug mode with debug logs")
 
         if err := cmd.Execute(); err != nil {
                 log.Println(err)