feat: add viper struct fields

Author: pot-code

cmd/add.go

@@ -11,5 +11,6 @@ var addCmd = &cli.Command{
 		addReactCmd,
 		addGoAirCmd,
 		addPriceUpdateConfigCmd,
+		addViperTagCmd,
 	},
 }

cmd/add_viper_tag.go

@@ -0,0 +1,69 @@
+package cmd
+
+import (
+	"bytes"
+
+	"github.com/pot-code/web-cli/pkg/core"
+	"github.com/pot-code/web-cli/pkg/util"
+	"github.com/urfave/cli/v2"
+)
+
+type addViperTagConfig struct {
+	ConfigPath string `arg:"0" name:"CONFIG_PATH" validate:"required"`
+	OutName    string `name:"out"`
+}
+
+var addViperTagCmd = &cli.Command{
+	Name:      "viper",
+	Aliases:   []string{"v"},
+	Usage:     "generate flags registration go file",
+	ArgsUsage: "CONFIG_PATH",
+	Flags:     []cli.Flag{
+		// &cli.StringFlag{
+		// 	Name:    "out",
+		// 	Aliases: []string{"o"},
+		// 	Usage:   "output file name",
+		// 	Value:   "config_gen.go",
+		// },
+	},
+	Action: func(c *cli.Context) error {
+		config := new(addViperTagConfig)
+		err := util.ParseConfig(c, config)
+		if err != nil {
+			if _, ok := err.(*util.CommandError); ok {
+				cli.ShowCommandHelp(c, c.Command.Name)
+			}
+			return err
+		}
+
+		cmd, err := addViperFlag(config)
+		if err != nil {
+			return err
+		}
+		return cmd.Run()
+	},
+}
+
+func addViperFlag(config *addViperTagConfig) (core.Runner, error) {
+	var outData bytes.Buffer
+
+	return util.NewTaskComposer("", &core.FileDesc{
+		Path:      config.ConfigPath,
+		Overwrite: true,
+		Data: func() []byte {
+			return outData.Bytes()
+		},
+	}).AddCommand(&core.Command{
+		Bin:    "gomodifytags",
+		Before: true,
+		Args: []string{
+			"-file",
+			config.ConfigPath,
+			"-struct",
+			"AppConfig",
+			"-add-tags",
+			"mapstructure,yaml",
+		},
+		Out: &outData,
+	}), nil
+}

cmd/gen_flags parse.go cmd/gen_flags_parse.gocmd/gen_flags parse.go renamed to cmd/gen_flags_parse.go

@@ -13,7 +13,7 @@ var (
 	ErrUnhandledEt             = errors.New("no handler for array element type")
 	ErrUnhandledField          = errors.New("no handler for field type")
 	ErrUnhandledSelectorPrefix = errors.New("no handler for selector prefix")
-	ErrUnhandledPflagMapping   = errors.New("no handler for pflag mapping")
+	ErrPflagMappingNotFound    = errors.New("no pflag mapping found")
 )
 
 type pflagType struct {
@@ -52,7 +52,7 @@ func newConfigStructVisitor(fset *token.FileSet, pkg string) *configStructVisito
 
 func (cv *configStructVisitor) visitField(node ast.Node, prefix []string) {
 	n := node.(*ast.Field)
-	comment := n.Comment.Text()
+	comment := strings.TrimSpace(n.Comment.Text())
 	fieldName := n.Names[0].String()
 
 	tag := n.Tag.Value
@@ -65,8 +65,6 @@ func (cv *configStructVisitor) visitField(node ast.Node, prefix []string) {
 		panic(err)
 	}
 
-	comment = strings.TrimSpace(comment)
-
 	log.WithFields(log.Fields{
 		"tag_raw":              tag,
 		"tag_meta.Default":     ptm.Default,
@@ -115,8 +113,8 @@ func (cv *configStructVisitor) visitIdent(node ast.Node, prefix []string, ft, co
 		log.WithFields(log.Fields{
 			"go_type":  ft,
 			"position": cv.fset.Position(n.Pos()),
-		}).Error(ErrUnhandledPflagMapping)
-		panic(ErrUnhandledPflagMapping)
+		}).Error(ErrPflagMappingNotFound)
+		panic(ErrPflagMappingNotFound)
 	}
 }
 

cmd/gen_flags_visitor.go

@@ -2,6 +2,7 @@ package core
 
 import (
 	"fmt"
+	"io"
 	"os"
 	"os/exec"
 	"strings"
@@ -15,6 +16,7 @@ type Command struct {
 	Dir    string
 	Before bool // run before file generation
 	Args   []string
+	Out    io.Writer
 }
 
 func (c Command) String() string {
@@ -35,14 +37,18 @@ func NewCmdExecutor(cmd *Command) *CmdExecutor {
 }
 
 func (ce CmdExecutor) Run() error {
-	log.WithField("cmd", ce.cmd).Info("execute command")
 	cmd := ce.cmd
+	log.WithFields(log.Fields{"cmd": cmd, "context": "CmdExecutor.Run"}).Info("execute command")
 	proc := exec.Command(cmd.Bin, cmd.Args...)
 
-	if ce.cmd.Dir != "" {
-		proc.Dir = ce.cmd.Dir
+	if cmd.Dir != "" {
+		proc.Dir = cmd.Dir
 	}
+
 	proc.Stdout = os.Stdout
+	if cmd.Out != nil {
+		proc.Stdout = cmd.Out
+	}
 	proc.Stderr = os.Stdout
 	return errors.Wrapf(proc.Run(), "failed to execute command '%s'", cmd)
 }

pkg/core/command.go

@@ -25,22 +25,12 @@ func NewTaskComposer(root string, files ...*core.FileDesc) *TaskComposer {
 
 // AddFile add file task
 func (tc *TaskComposer) AddFile(fd *core.FileDesc) *TaskComposer {
-	log.WithFields(log.Fields{
-		"caller":    "AddFile",
-		"file":      fd.Path,
-		"overwrite": fd.Overwrite,
-	}).Debug("call function")
 	tc.files = append(tc.files, fd)
 	return tc
 }
 
 // AddCommand add command
 func (tc *TaskComposer) AddCommand(cmd *core.Command) *TaskComposer {
-	log.WithFields(log.Fields{
-		"caller": "AddCommand",
-		"bin":    cmd.Bin,
-		"cwd":    cmd.Dir,
-	}).Debug("call function")
 	tc.commands = append(tc.commands, cmd)
 	return tc
 }