Merge pull request #12 from owenthereal/flag_refactor

Move config parsing to cmd

Author: owenthereal

cmd/candy/cmd/root.go

@@ -20,12 +20,12 @@ var rootCmd = &cobra.Command{
 }
 
 var (
-	homeDir         string
-	flagRootCfgFile string
+	homeDir        string
+	flagConfigFile string
 )
 
 func init() {
-	rootCmd.PersistentFlags().StringVar(&flagRootCfgFile, "config", filepath.Join(userHomeDir(), ".candyconfig"), "Config file")
+	rootCmd.PersistentFlags().StringVar(&flagConfigFile, "config", filepath.Join(userHomeDir(), ".candyconfig"), "Config file")
 }
 
 func userHomeDir() string {

cmd/candy/cmd/run.go

@@ -5,10 +5,13 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"strings"
 
 	"github.com/owenthereal/candy"
 	"github.com/owenthereal/candy/server"
 	"github.com/spf13/cobra"
+	"github.com/spf13/pflag"
+	"github.com/spf13/viper"
 	"go.uber.org/zap"
 )
 
@@ -46,20 +49,8 @@ func runRunE(c *cobra.Command, args []string) error {
 }
 
 func startServer(c *cobra.Command, ctx context.Context) error {
-	var cfg server.Config
-	if err := candy.LoadConfig(
-		flagRootCfgFile,
-		c,
-		[]string{
-			"host-root",
-			"domain",
-			"http-addr",
-			"https-addr",
-			"admin-addr",
-			"dns-addr",
-		},
-		&cfg,
-	); err != nil {
+	cfg, err := loadServerConfig(c)
+	if err != nil {
 		return err
 	}
 
@@ -69,7 +60,51 @@ func startServer(c *cobra.Command, ctx context.Context) error {
 		return fmt.Errorf("failed to create host directory %s: %w", cfg.HostRoot, err)
 	}
 
-	svr := server.New(cfg)
+	svr := server.New(*cfg)
 
 	return svr.Run(ctx)
 }
+
+func loadServerConfig(cmd *cobra.Command) (*server.Config, error) {
+	var cfg server.Config
+
+	if err := unmarshalFlags(flagConfigFile, cmd, &cfg); err != nil {
+		return nil, err
+	}
+
+	if err := cfg.Validate(); err != nil {
+		return nil, err
+	}
+
+	return &cfg, nil
+}
+
+func unmarshalFlags(cfgFile string, cmd *cobra.Command, opts interface{}) error {
+	v := viper.New()
+
+	cmd.Flags().VisitAll(func(flag *pflag.Flag) {
+		flagName := flag.Name
+		if flagName != "config" && flagName != "help" {
+			if err := v.BindPFlag(flagName, flag); err != nil {
+				panic(fmt.Errorf("error binding flag '%s': %w", flagName, err).Error())
+			}
+		}
+	})
+
+	v.AutomaticEnv()
+	v.SetEnvKeyReplacer(strings.NewReplacer("-", "_"))
+	v.SetEnvPrefix("CANDY")
+
+	if _, err := os.Stat(cfgFile); err == nil {
+		v.SetConfigFile(cfgFile)
+		v.SetConfigType("json")
+	}
+
+	if err := v.ReadInConfig(); err != nil {
+		if _, ok := err.(viper.ConfigFileNotFoundError); !ok {
+			return fmt.Errorf("error loading config file %s: %w", cfgFile, err)
+		}
+	}
+
+	return v.Unmarshal(opts)
+}

cmd/candy/cmd/setup_darwin.go

@@ -12,7 +12,6 @@ import (
 	"strings"
 
 	"github.com/owenthereal/candy"
-	"github.com/owenthereal/candy/server"
 	"github.com/spf13/cobra"
 	"go.uber.org/zap"
 )
@@ -50,16 +49,8 @@ func setupRunE(c *cobra.Command, args []string) error {
 }
 
 func runSetupRunE(c *cobra.Command, args []string) error {
-	var cfg server.Config
-	if err := candy.LoadConfig(
-		flagRootCfgFile,
-		c,
-		[]string{
-			"domain",
-			"dns-addr",
-		},
-		&cfg,
-	); err != nil {
+	cfg, err := loadServerConfig(c)
+	if err != nil {
 		return err
 	}
 
@@ -72,7 +63,7 @@ func runSetupRunE(c *cobra.Command, args []string) error {
 		return err
 	}
 
-	var logger = candy.Log()
+	logger := candy.Log()
 
 	for _, domain := range cfg.Domain {
 		file := filepath.Join(resolverDir, "candy-"+domain)

cmd/candy/cmd/setup_linux.go

@@ -12,7 +12,6 @@ import (
 	"strings"
 
 	"github.com/owenthereal/candy"
-	"github.com/owenthereal/candy/server"
 	"github.com/spf13/cobra"
 	"go.uber.org/zap"
 )
@@ -49,16 +48,8 @@ func setupRunE(c *cobra.Command, args []string) error {
 }
 
 func runSetupRunE(c *cobra.Command, args []string) error {
-	var cfg server.Config
-	if err := candy.LoadConfig(
-		flagRootCfgFile,
-		c,
-		[]string{
-			"domain",
-			"dns-addr",
-		},
-		&cfg,
-	); err != nil {
+	cfg, err := loadServerConfig(c)
+	if err != nil {
 		return err
 	}
 

config.go

@@ -2,6 +2,7 @@ package server
 
 import (
 	"context"
+	"fmt"
 
 	"github.com/owenthereal/candy"
 	"github.com/owenthereal/candy/caddy"
@@ -21,6 +22,34 @@ type Config struct {
 	DnsLocalIp bool     `mapstructure:"dns-local-ip"`
 }
 
+func (c Config) Validate() error {
+	if c.HostRoot == "" {
+		return fmt.Errorf("--host-root is required")
+	}
+
+	if len(c.Domain) == 0 {
+		return fmt.Errorf("--domain is required")
+	}
+
+	if c.HttpAddr == "" {
+		return fmt.Errorf("--http-addr is required")
+	}
+
+	if c.HttpsAddr == "" {
+		return fmt.Errorf("--https-addr is required")
+	}
+
+	if c.AdminAddr == "" {
+		return fmt.Errorf("--admin-addr is required")
+	}
+
+	if c.DnsAddr == "" {
+		return fmt.Errorf("--dns-addr is required")
+	}
+
+	return nil
+}
+
 func New(cfg Config) *Server {
 	return &Server{cfg: cfg}
 }