diff options
author | Ondrej Fabry <ofabry@cisco.com> | 2020-04-17 14:29:26 +0200 |
---|---|---|
committer | Ondrej Fabry <ofabry@cisco.com> | 2020-04-17 14:32:55 +0200 |
commit | d372b4efe26650dbc83908ca0bbee38d90aed3e9 (patch) | |
tree | 6988708e1f1b54bbfc4504506921508cd8832f21 /cmd/binapi-generator/main.go | |
parent | 2c419b100f5f90c1215617d0fac81fa6749c4d6b (diff) |
Format generated Go source code in-processv0.3.4
This commit:
- removes dependency on gofmt tool
- cleans up package imports
- re-generates binapi for VPP 20.01
Change-Id: Ie4347720f92a87eb278be66c9f9ed9719c7bbbc3
Signed-off-by: Ondrej Fabry <ofabry@cisco.com>
Diffstat (limited to 'cmd/binapi-generator/main.go')
-rw-r--r-- | cmd/binapi-generator/main.go | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/cmd/binapi-generator/main.go b/cmd/binapi-generator/main.go index 8bf765b..fcd85ae 100644 --- a/cmd/binapi-generator/main.go +++ b/cmd/binapi-generator/main.go @@ -19,9 +19,9 @@ import ( "encoding/json" "flag" "fmt" + "go/format" "io/ioutil" "os" - "os/exec" "path/filepath" "strings" @@ -204,10 +204,15 @@ func generateFromFile(inputFile, outputDir string, typesPkgs []*context) error { } } - // generate Go package code + // generate Go package var buf bytes.Buffer if err := generatePackage(ctx, &buf); err != nil { - return fmt.Errorf("generating code for package %s failed: %v", ctx.packageName, err) + return fmt.Errorf("generating Go package for %s failed: %v", ctx.packageName, err) + } + // format generated source code + gosrc, err := format.Source(buf.Bytes()) + if err != nil { + return fmt.Errorf("formatting source code for package %s failed: %v", ctx.packageName, err) } // create output directory @@ -216,16 +221,10 @@ func generateFromFile(inputFile, outputDir string, typesPkgs []*context) error { return fmt.Errorf("creating output dir %s failed: %v", packageDir, err) } // write generated code to output file - if err := ioutil.WriteFile(ctx.outputFile, buf.Bytes(), 0666); err != nil { + if err := ioutil.WriteFile(ctx.outputFile, gosrc, 0666); err != nil { return fmt.Errorf("writing to output file %s failed: %v", ctx.outputFile, err) } - // go format the output file (fail probably means the output is not compilable) - cmd := exec.Command("gofmt", "-w", ctx.outputFile) - if output, err := cmd.CombinedOutput(); err != nil { - return fmt.Errorf("gofmt failed: %v\n%s", err, string(output)) - } - return nil } |