Update code-generator to v0.26.0
This commit is contained in:
39
client/vendor/k8s.io/code-generator/pkg/util/build.go
generated
vendored
39
client/vendor/k8s.io/code-generator/pkg/util/build.go
generated
vendored
@@ -18,16 +18,10 @@ package util
|
||||
|
||||
import (
|
||||
gobuild "go/build"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"reflect"
|
||||
"strings"
|
||||
|
||||
"golang.org/x/tools/go/packages"
|
||||
)
|
||||
|
||||
type empty struct{}
|
||||
|
||||
// CurrentPackage returns the go package of the current directory, or "" if it cannot
|
||||
// be derived from the GOPATH.
|
||||
func CurrentPackage() string {
|
||||
@@ -57,39 +51,6 @@ func hasSubdir(root, dir string) (rel string, ok bool) {
|
||||
return filepath.ToSlash(dir[len(root):]), true
|
||||
}
|
||||
|
||||
// BoilerplatePath returns the path to the boilerplate file in code-generator,
|
||||
// or "" if the default boilerplate.go.txt file cannot be located.
|
||||
func BoilerplatePath() string {
|
||||
// set up paths to check
|
||||
paths := []string{
|
||||
// works when run from root of $GOPATH containing k8s.io/code-generator
|
||||
filepath.Join(reflect.TypeOf(empty{}).PkgPath(), "/../../hack/boilerplate.go.txt"),
|
||||
// works when run from root of module vendoring k8s.io/code-generator
|
||||
"vendor/k8s.io/code-generator/hack/boilerplate.go.txt",
|
||||
// works when run from root of $GOPATH containing k8s.io/kubernetes
|
||||
"k8s.io/kubernetes/vendor/k8s.io/code-generator/hack/boilerplate.go.txt",
|
||||
}
|
||||
|
||||
// see if we can locate the module directory and add that to the list
|
||||
config := packages.Config{Mode: packages.NeedModule}
|
||||
if loadedPackages, err := packages.Load(&config, "k8s.io/code-generator/pkg/util"); err == nil {
|
||||
for _, loadedPackage := range loadedPackages {
|
||||
if loadedPackage.Module != nil && loadedPackage.Module.Dir != "" {
|
||||
paths = append(paths, filepath.Join(loadedPackage.Module.Dir, "hack/boilerplate.go.txt"))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// try all paths and return the first that exists
|
||||
for _, path := range paths {
|
||||
if _, err := os.Stat(path); err == nil {
|
||||
return path
|
||||
}
|
||||
}
|
||||
// cannot be located, invoker will have to explicitly specify boilerplate file
|
||||
return ""
|
||||
}
|
||||
|
||||
// Vendorless trims vendor prefix from a package path to make it canonical
|
||||
func Vendorless(p string) string {
|
||||
if pos := strings.LastIndex(p, "/vendor/"); pos != -1 {
|
||||
|
Reference in New Issue
Block a user