From d372b4efe26650dbc83908ca0bbee38d90aed3e9 Mon Sep 17 00:00:00 2001 From: Ondrej Fabry Date: Fri, 17 Apr 2020 14:29:26 +0200 Subject: Format generated Go source code in-process 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 --- cmd/binapi-generator/main.go | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'cmd/binapi-generator/main.go') 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 } -- cgit 1.2.3-korg