Skip to content

Commit

Permalink
Merge pull request #77 from yue9944882/feat/support-single-group-pkg
Browse files Browse the repository at this point in the history
Support single api group project
  • Loading branch information
k8s-ci-robot authored Apr 27, 2022
2 parents 965f497 + 0ebcafb commit 7479e06
Showing 1 changed file with 39 additions and 2 deletions.
41 changes: 39 additions & 2 deletions tools/apiserver-runtime-gen/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -116,9 +116,17 @@ func doGen() error {
}

if gen["client-gen"] {
inputBase := ""
versionsInputs := inputs
// e.g. base = "example.io/foo/api", strippedVersions = "v1,v1beta1"
// e.g. base = "example.io/foo/pkg/apis", strippedVersions = "test/v1,test/v1beta1"
if base, strippedVersions, ok := findInputBase(module, versions); ok {
inputBase = base
versionsInputs = strings.Join(strippedVersions, ",")
}
err := run(getCmd("client-gen",
"--clientset-name", "versioned", "--input-base", "",
"--input", inputs, "--output-package", path.Join(module, "pkg/generated/clientset")))
"--clientset-name", "versioned", "--input-base", inputBase,
"--input", versionsInputs, "--output-package", path.Join(module, "pkg/generated/clientset")))
if err != nil {
return err
}
Expand Down Expand Up @@ -238,3 +246,32 @@ func findModuleRoot(dir string) string {
}
return ""
}

func findInputBase(module string, versions []string) (string, []string, bool) {
if allHasPrefix(filepath.Join(module, "api"), versions) {
base := filepath.Join(module, "api")
return base, allTrimPrefix(base+"/", versions), true
}
if allHasPrefix(filepath.Join(module, "pkg", "apis"), versions) {
base := filepath.Join(module, "pkg", "apis")
return base, allTrimPrefix(base+"/", versions), true
}
return "", nil, false
}

func allHasPrefix(prefix string, paths []string) bool {
for _, p := range paths {
if !strings.HasPrefix(p, prefix) {
return false
}
}
return true
}

func allTrimPrefix(prefix string, versions []string) []string {
vs := make([]string, 0)
for _, v := range versions {
vs = append(vs, strings.TrimPrefix(v, prefix))
}
return vs
}

0 comments on commit 7479e06

Please sign in to comment.