diff --git a/vendor.conf b/vendor.conf index 4d107c63..c6bd1a68 100644 --- a/vendor.conf +++ b/vendor.conf @@ -3,4 +3,4 @@ github.com/rancher/types k8s.io/kubernetes v1.8.3 transitive=true,staging=true bitbucket.org/ww/goautoneg a547fc61f48d567d5b4ec6f8aee5573d8efce11d https://github.com/rancher/goautoneg.git -github.com/rancher/norman f0aa87928ff6639fb80d4923ca8967332bff4bc6 +github.com/rancher/norman e9dea7f5f63bc881b3d6fda485ec1ba606803262 diff --git a/vendor/github.com/rancher/norman/generator/generator.go b/vendor/github.com/rancher/norman/generator/generator.go index c51fc093..93af4ee1 100644 --- a/vendor/github.com/rancher/norman/generator/generator.go +++ b/vendor/github.com/rancher/norman/generator/generator.go @@ -1,24 +1,20 @@ package generator import ( - "k8s.io/gengo/args" - "k8s.io/gengo/examples/deepcopy-gen/generators" - + "io/ioutil" + "net/http" "os" + "os/exec" "path" "regexp" "strings" "text/template" - "net/http" - - "os/exec" - - "fmt" - "io/ioutil" - + "github.com/pkg/errors" "github.com/rancher/norman/types" "github.com/rancher/norman/types/convert" + "k8s.io/gengo/args" + "k8s.io/gengo/examples/deepcopy-gen/generators" ) var ( @@ -224,10 +220,9 @@ func prepareDirs(dirs ...string) error { for _, file := range files { if strings.HasPrefix(file.Name(), "zz_generated") { - fmt.Println("DELETING", path.Join(dir, file.Name())) - //if err != os.Remove(path.Join(dir, file.Name()); err != nil { - // return errors.Wrapf(err, "failed to delete %s", path.Join(dir, file.Name())) - //} + if err := os.Remove(path.Join(dir, file.Name())); err != nil { + return errors.Wrapf(err, "failed to delete %s", path.Join(dir, file.Name())) + } } } } @@ -236,7 +231,7 @@ func prepareDirs(dirs ...string) error { } func gofmt(workDir, pkg string) error { - cmd := exec.Command("go", "fmt", "./"+pkg+"/...") + cmd := exec.Command("goimports", "-w", "-l", "./"+pkg) cmd.Dir = workDir cmd.Stdout = os.Stdout cmd.Stderr = os.Stderr