From e8376936d577f8863b9de9f6351ab8f2e3c3dfed Mon Sep 17 00:00:00 2001 From: Kevin Wan Date: Mon, 13 Sep 2021 14:04:06 +0800 Subject: [PATCH] remove goctl config command (#1035) --- tools/goctl/config/config.go | 6 +- tools/goctl/configgen/genconfig.go | 95 ------------------------------ tools/goctl/goctl.go | 12 ---- 3 files changed, 2 insertions(+), 111 deletions(-) delete mode 100644 tools/goctl/configgen/genconfig.go diff --git a/tools/goctl/config/config.go b/tools/goctl/config/config.go index fdc61f50..49e80075 100644 --- a/tools/goctl/config/config.go +++ b/tools/goctl/config/config.go @@ -5,10 +5,8 @@ import ( "strings" ) -const ( - // DefaultFormat defines a default naming style - DefaultFormat = "gozero" -) +// DefaultFormat defines a default naming style +const DefaultFormat = "gozero" // Config defines the file naming style type Config struct { diff --git a/tools/goctl/configgen/genconfig.go b/tools/goctl/configgen/genconfig.go deleted file mode 100644 index 7d477ca8..00000000 --- a/tools/goctl/configgen/genconfig.go +++ /dev/null @@ -1,95 +0,0 @@ -package configgen - -import ( - "errors" - "fmt" - "os" - "os/exec" - "path/filepath" - "strings" - "text/template" - - "github.com/logrusorgru/aurora" - "github.com/tal-tech/go-zero/tools/goctl/util" - "github.com/urfave/cli" -) - -const configTemplate = `package main - -import ( - "io/ioutil" - "os" - "{{.import}}" - - "github.com/ghodss/yaml" -) - -func main() { - var c config.Config - template, err := yaml.Marshal(c) - if err != nil { - panic(err) - } - err = ioutil.WriteFile("config.yaml", template, os.ModePerm) - if err != nil { - panic(err) - } -} -` - -// GenConfigCommand provides the entry of goctl config -func GenConfigCommand(c *cli.Context) error { - path, err := filepath.Abs(c.String("path")) - if err != nil { - return errors.New("abs failed: " + c.String("path")) - } - - goModPath, found := util.FindGoModPath(path) - if !found { - return errors.New("go mod not initial") - } - - path = strings.TrimSuffix(path, "/config.go") - location := filepath.Join(path, "tmp") - err = os.MkdirAll(location, os.ModePerm) - if err != nil { - return err - } - - goPath := filepath.Join(location, "config.go") - fp, err := os.Create(goPath) - if err != nil { - return err - } - defer fp.Close() - defer os.RemoveAll(location) - - t := template.Must(template.New("template").Parse(configTemplate)) - if err := t.Execute(fp, map[string]string{ - "import": filepath.Dir(goModPath), - }); err != nil { - return err - } - - gen := exec.Command("go", "run", "config.go") - gen.Dir = filepath.Dir(goPath) - gen.Stderr = os.Stderr - gen.Stdout = os.Stdout - err = gen.Run() - if err != nil { - panic(err) - } - - path, err = os.Getwd() - if err != nil { - panic(err) - } - - err = os.Rename(filepath.Dir(goPath)+"/config.yaml", path+"/config.yaml") - if err != nil { - panic(err) - } - - fmt.Println(aurora.Green("Done.")) - return nil -} diff --git a/tools/goctl/goctl.go b/tools/goctl/goctl.go index 2df43999..2568dc70 100644 --- a/tools/goctl/goctl.go +++ b/tools/goctl/goctl.go @@ -19,7 +19,6 @@ import ( "github.com/tal-tech/go-zero/tools/goctl/api/new" "github.com/tal-tech/go-zero/tools/goctl/api/tsgen" "github.com/tal-tech/go-zero/tools/goctl/api/validate" - "github.com/tal-tech/go-zero/tools/goctl/configgen" "github.com/tal-tech/go-zero/tools/goctl/docker" "github.com/tal-tech/go-zero/tools/goctl/internal/errorx" "github.com/tal-tech/go-zero/tools/goctl/internal/version" @@ -569,17 +568,6 @@ var commands = []cli.Command{ }, }, }, - { - Name: "config", - Usage: "generate config json", - Flags: []cli.Flag{ - cli.StringFlag{ - Name: "path, p", - Usage: "the target config go file", - }, - }, - Action: configgen.GenConfigCommand, - }, { Name: "template", Usage: "template operation",