rancher/types
1
0
Fork 0
mirror of https://github.com/rancher/types.git synced 2025-09-01 05:09:10 +00:00
Code Issues Releases Wiki Activity

Bump vendor

Browse Source
This commit is contained in:
Darren Shepherd
2017-11-10 22:09:08 -07:00
parent 2d8cd96180
commit 1bb36dd453
2 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
vendor/github.com/rancher/norman/generator/generator.go generated vendored
View File

@@ -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