From 52359771e93b85d2b60f6ea8ae179b8eb0b9c3ae Mon Sep 17 00:00:00 2001 From: Tit Petric Date: Sun, 25 Nov 2018 11:16:25 +0100 Subject: [PATCH] add(codegen): source formatting for permissions --- codegen/v2/permissions.go | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/codegen/v2/permissions.go b/codegen/v2/permissions.go index eac2e7926..a5d20f3c7 100644 --- a/codegen/v2/permissions.go +++ b/codegen/v2/permissions.go @@ -2,14 +2,16 @@ package main import ( "bytes" - "encoding/json" "flag" "fmt" - "io/ioutil" "log" "os" "strings" + "encoding/json" + "go/format" + "io/ioutil" + "github.com/crusttech/crust/internal/rbac" ) @@ -22,7 +24,7 @@ func main() { ) flag.Parse() - export := func(s string) string { + export := func(s string) []byte { s = strings.Replace(s, "true,", "true,\n", -1) s = strings.Replace(s, "false,", "false,\n", -1) s = strings.Replace(s, "{", "{\n", -1) @@ -41,7 +43,13 @@ func main() { fmt.Fprintln(&w, "\treturn", s) fmt.Fprintln(&w, "}") - return w.String() + fmtsrc, err := format.Source(buf.Bytes()) + if err != nil { + stderr("fmt warn: %v", err) + fmtsrc = buf.Bytes() + } + + return fmtsrc } var result []rbac.OperationGroup @@ -53,7 +61,7 @@ func main() { log.Fatal(err) } source := export(fmt.Sprintf("%#v", result)) - if err := ioutil.WriteFile(*output, []byte(source), 0644); err != nil { + if err := ioutil.WriteFile(*output, source, 0644); err != nil { log.Fatal(err) } fmt.Println(*output)