Format generated golang with go/format (#48)

This commit is contained in:
Joshua Spence
2021-09-24 13:17:25 +10:00
committed by GitHub
parent 8d4ca5f389
commit 124f349da4
2 changed files with 19 additions and 5 deletions

View File

@@ -7,6 +7,7 @@ import (
"errors" "errors"
"flag" "flag"
"fmt" "fmt"
"go/format"
"io" "io"
"io/ioutil" "io/ioutil"
"os" "os"
@@ -391,14 +392,20 @@ func main() {
} }
// Write version file. // Write version file.
versionGo := fmt.Sprintf(` versionGo := []byte(fmt.Sprintf(`
// Generated code. DO NOT EDIT. // Generated code. DO NOT EDIT.
package unifi package unifi
const UnifiVersion = %q const UnifiVersion = %q
`, unifiVersion) `, unifiVersion))
if err := ioutil.WriteFile(filepath.Join(outDir, "version.generated.go"), []byte(versionGo), 0644); err != nil {
versionGo, err = format.Source(versionGo)
if err != nil {
panic(err)
}
if err := ioutil.WriteFile(filepath.Join(outDir, "version.generated.go"), versionGo, 0644); err != nil {
panic(err) panic(err)
} }
@@ -538,8 +545,16 @@ func (r *Resource) generateCode() (string, error) {
}).Parse(apiGoTemplate)) }).Parse(apiGoTemplate))
err = tpl.Execute(writer, r) err = tpl.Execute(writer, r)
if err != nil {
return "", err
}
return buf.String(), err src, err := format.Source(buf.Bytes())
if err != nil {
return "", err
}
return string(src), err
} }
func normalizeValidation(re string) string { func normalizeValidation(re string) string {

View File

@@ -3,4 +3,3 @@ package unifi
// This will generate the *.generated.go files in this package for the specified // This will generate the *.generated.go files in this package for the specified
// Unifi controller version. // Unifi controller version.
//go:generate go run ../fields/ -version-base-dir=../fields/ -latest //go:generate go run ../fields/ -version-base-dir=../fields/ -latest
//go:generate gofmt -w -s ./