From f435f65536db520fdc7d6ed7e12bcc5e7d601564 Mon Sep 17 00:00:00 2001 From: cubixle Date: Fri, 18 Jun 2021 13:58:58 +0100 Subject: [PATCH] work on generating main.go and use config not hardcoded vals --- app.go | 31 +++++++++++++++++++ cmd.go | 4 +-- cmd/tuugen/main.go | 9 ++++-- cmd/tuugen/templates/main.go.tmpl | 30 ++++++++++++++++++- config.go | 7 +++++ example_project/cmd/app/main.go | 33 ++++++++++++++++++++ example_project/tuugen.yml | 3 +- go.mod | 5 +--- go.sum | 28 +---------------- service.go | 50 +++++++------------------------ 10 files changed, 124 insertions(+), 76 deletions(-) create mode 100644 app.go create mode 100644 example_project/cmd/app/main.go diff --git a/app.go b/app.go new file mode 100644 index 0000000..d27c951 --- /dev/null +++ b/app.go @@ -0,0 +1,31 @@ +package tuugen + +import ( + "embed" + "html/template" + "os" + "path/filepath" +) + +func GenerateMain(FS embed.FS, cfg Config) error { + t, err := template.ParseFS(FS, "templates/main.go.tmpl") + if err != nil { + return err + } + + outputFile := "cmd/app/main.go" + fp := filepath.Dir(outputFile) + if err := os.MkdirAll(fp, 0777); err != nil { + return err + } + + f, err := os.Create(outputFile) + if err != nil { + return nil + } + + if err := t.Execute(f, cfg); err != nil { + return err + } + return nil +} diff --git a/cmd.go b/cmd.go index ebea317..c2b73fa 100644 --- a/cmd.go +++ b/cmd.go @@ -15,9 +15,9 @@ func runCommand(cmd string, args []string) error { return nil } -func GenerateProtos() error { +func GenerateProtos(protoFile string) error { cmd := "protoc" - args := []string{"-I", ".:${GOPATH}/src", "--go_out=.", "--go-grpc_out=.", "service.proto"} + args := []string{"-I", ".:${GOPATH}/src", "--go_out=.", "--go-grpc_out=.", protoFile} return runCommand(cmd, args) } diff --git a/cmd/tuugen/main.go b/cmd/tuugen/main.go index 816240f..495fd15 100644 --- a/cmd/tuugen/main.go +++ b/cmd/tuugen/main.go @@ -22,8 +22,8 @@ func main() { log.Fatalf("failed to load config, %v", err) } - log.Println("Generating protos") - err = tuugen.GenerateProtos() + log.Printf("Generating protos from %s\n", cfg.ProtoFile) + err = tuugen.GenerateProtos(cfg.ProtoFile) if err != nil { log.Fatal(err) } @@ -44,6 +44,11 @@ func main() { log.Fatalf("failed to generate data models: %v", err) } + log.Println("Generate main.go") + if err := tuugen.GenerateMain(FS, cfg); err != nil { + log.Fatalf("failed to generate main file: %v", err) + } + log.Printf("Running 'go mod init %s' \n", cfg.ImportPath) if err := tuugen.GoModInit(cfg.ImportPath); err != nil { log.Fatalf("failed to run 'go mod init': %v", err) diff --git a/cmd/tuugen/templates/main.go.tmpl b/cmd/tuugen/templates/main.go.tmpl index 1723c37..43d7dcb 100644 --- a/cmd/tuugen/templates/main.go.tmpl +++ b/cmd/tuugen/templates/main.go.tmpl @@ -1,5 +1,33 @@ package main +import ( + "os" + "fmt" + "net" + "log" + + "google.golang.org/grpc" + pb "{{.ImportPath}}/{{.GRPCPath}}" + "{{.ImportPath}}/internal/service" +) + func main() { - + lis, err := net.Listen("tcp", fmt.Sprintf(":%s", getEnv("GRPC_PORT", "8090"))) + if err != nil { + log.Fatalf("failed to listen: %v", err) + } + + s := grpc.NewServer() + pb.Register{{.ServiceName}}Server(s, service.New(store)) + if err := s.Serve(lis); err != nil { + log.Fatalf("failed to serve: %v", err) + } +} + +func getEnv(name, defaultValue string) string { + v := os.Getenv(name) + if v == "" { + return defaultValue + } + return v } \ No newline at end of file diff --git a/config.go b/config.go index 2292ee1..c348bfe 100644 --- a/config.go +++ b/config.go @@ -1,6 +1,8 @@ package tuugen import ( + "path/filepath" + "gopkg.in/yaml.v2" ) @@ -9,9 +11,14 @@ type Config struct { ServiceName string `yaml:"service_name"` ImportPath string `yaml:"import_path"` ProtoFile string `yaml:"proto_file"` + GRPCFile string `yaml:"grpc_file"` DataModels []DataModel `yaml:"data_models"` } +func (c Config) GRPCPath() string { + return filepath.Dir(c.GRPCFile) +} + func YamlToConfig(b []byte) (Config, error) { cfg := Config{} err := yaml.Unmarshal(b, &cfg) diff --git a/example_project/cmd/app/main.go b/example_project/cmd/app/main.go new file mode 100644 index 0000000..071ba08 --- /dev/null +++ b/example_project/cmd/app/main.go @@ -0,0 +1,33 @@ +package main + +import ( + "os" + "fmt" + "net" + "log" + + "google.golang.org/grpc" + pb "github.com/cubixle/tuugen/example_project/internal/pb/service" + "github.com/cubixle/tuugen/example_project/internal/service" +) + +func main() { + lis, err := net.Listen("tcp", fmt.Sprintf(":%s", getEnv("GRPC_PORT", "8090"))) + if err != nil { + log.Fatalf("failed to listen: %v", err) + } + + s := grpc.NewServer() + pb.RegisterServiceServer(s, service.New(store)) + if err := s.Serve(lis); err != nil { + log.Fatalf("failed to serve: %v", err) + } +} + +func getEnv(name, defaultValue string) string { + v := os.Getenv(name) + if v == "" { + return defaultValue + } + return v +} \ No newline at end of file diff --git a/example_project/tuugen.yml b/example_project/tuugen.yml index 36c3aa0..29d5c48 100644 --- a/example_project/tuugen.yml +++ b/example_project/tuugen.yml @@ -1,6 +1,7 @@ project: tuugen_test_project import_path: github.com/cubixle/tuugen/example_project -proto: service.proto +proto_file: service.proto +grpc_file: internal/pb/service/service_grpc.pb.go service_name: Service data_models: - name: User diff --git a/go.mod b/go.mod index 1cb2a44..3f22fb1 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,4 @@ module github.com/cubixle/tuugen go 1.16 -require ( - golang.org/x/tools v0.1.3 // indirect - gopkg.in/yaml.v2 v2.4.0 // indirect -) +require gopkg.in/yaml.v2 v2.4.0 diff --git a/go.sum b/go.sum index 764f06e..dd0bc19 100644 --- a/go.sum +++ b/go.sum @@ -1,30 +1,4 @@ -github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/mod v0.4.2 h1:Gz96sIWK3OalVv/I/qNygP42zyoKp3xptRVCWRFEBvo= -golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210510120138-977fb7262007 h1:gG67DSER+11cZvqIMb8S8bt0vZtiN6xWYARwirrOSfE= -golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.1.3 h1:L69ShwSZEyCsLKoAxDKeMvLDZkumEe8gXUZAjab0tX8= -golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= diff --git a/service.go b/service.go index 567d296..cf5a970 100644 --- a/service.go +++ b/service.go @@ -12,34 +12,12 @@ import ( "strings" ) -const grpcServiceFile = "./internal/pb/service/service_grpc.pb.go" - func GenerateService(FS embed.FS, cfg Config) error { - // read interface from project built protos. - if err := createFileFromProto(FS, - cfg.ServiceName, - "templates/service.go.tmpl", - cfg.ImportPath, - grpcServiceFile, - "./internal/service/service.go", - ); err != nil { - return err - } - return nil + return createFileFromProto(FS, cfg, "templates/service.go.tmpl", "./internal/service/service.go") } func GenerateInteractor(FS embed.FS, cfg Config) error { - // read interface from project built protos. - if err := createFileFromProto(FS, - cfg.ServiceName, - "templates/interactors.go.tmpl", - cfg.ImportPath, - grpcServiceFile, - "./internal/interactors/interactors.go", - ); err != nil { - return err - } - return nil + return createFileFromProto(FS, cfg, "templates/interactors.go.tmpl", "./internal/interactors/interactors.go") } type serviceDef struct { @@ -71,7 +49,7 @@ func (s serviceFuncDef) ArgsToStr() string { } // generate the service/interactor template and store it to a file. -func createFileFromProto(FS embed.FS, serviceName, templateFile, importPath, protoFilePath, outputFile string) error { +func createFileFromProto(FS embed.FS, cfg Config, templateFile, outputFile string) error { // load service template t, err := template.ParseFS(FS, templateFile) if err != nil { @@ -89,7 +67,7 @@ func createFileFromProto(FS embed.FS, serviceName, templateFile, importPath, pro if err != nil { return nil } - funcs, err := methodsFromProto(protoFilePath, importPath, serviceName) + funcs, err := methodsFromProto(cfg) if err != nil { return err } @@ -101,25 +79,23 @@ func createFileFromProto(FS embed.FS, serviceName, templateFile, importPath, pro return f.Close() } -func methodsFromProto(filepath, importPath, serviceName string) (serviceDef, error) { +func methodsFromProto(cfg Config) (serviceDef, error) { funcs := []serviceFuncDef{} fset := token.NewFileSet() - f, err := parser.ParseFile(fset, filepath, nil, 0) + f, err := parser.ParseFile(fset, cfg.GRPCFile, nil, 0) if err != nil { - return serviceDef{}, fmt.Errorf("failed to parse proto go file: %w", err) + return serviceDef{}, fmt.Errorf("failed to parse compiled proto go file: %w", err) } - imports := f.Imports importStrs := []string{} - // ast.Print(fset, imports) - // return serviceDef{}, nil - for _, i := range imports { + servicePath := filepath.Dir(cfg.GRPCFile) + for _, i := range f.Imports { importStrs = append(importStrs, i.Name.Name) } - importStrs = append(importStrs, importPath+"/internal/pb/service", importPath+"/internal/interactors") + importStrs = append(importStrs, strings.Join([]string{cfg.ImportPath, strings.TrimLeft(servicePath, "/")}, "/"), cfg.ImportPath+"/internal/interactors") for _, m := range f.Scope.Objects { - if m.Name != serviceName+"Server" { + if m.Name != cfg.ServiceName+"Server" { continue } decl := m.Decl.(*ast.TypeSpec) @@ -140,10 +116,6 @@ func methodsFromProto(filepath, importPath, serviceName string) (serviceDef, err f.Returns = parseFieldList(ft.Results) } funcs = append(funcs, f) - // err = ast.Print(fset, ft.Params) - // if err != nil { - // return serviceDef{}, err - // } } } return serviceDef{Funcs: funcs, Imports: importStrs}, nil