From 067a328284eaced250e714fb6daa7f0bfdc77c60 Mon Sep 17 00:00:00 2001 From: Tim Hockin Date: Tue, 16 Jan 2024 22:38:42 -0800 Subject: [PATCH] Move import-boss: k/code-generator/cmd -> k/k/cmd --- build/tools.go | 1 - .../cmd => cmd}/import-boss/README.md | 0 .../cmd => cmd}/import-boss/main.go | 8 ++-- .../cmd => cmd}/import-boss/main_test.go | 38 +++++++++---------- cmd/import-boss/testdata/inverse/aaa/file.go | 12 ++++++ .../inverse/allowed/.import-restrictions | 4 ++ .../testdata/inverse/allowed/a1/file.go | 0 .../testdata/inverse/allowed/a2/file.go | 0 .../testdata/inverse/allowed/file.go | 9 +++++ .../inverse/forbidden/.import-restrictions | 4 ++ .../testdata/inverse/forbidden/f1/file.go | 0 .../testdata/inverse/forbidden/f2/file.go | 0 .../testdata/inverse/forbidden/file.go | 0 .../testdata/inverse/neither/file.go | 0 .../testdata/inverse/neither/n1/file.go | 0 .../testdata/inverse/neither/n2/file.go | 0 .../testdata/nested-fwd/.import-restrictions | 8 ++++ .../nested-fwd/aaa/.import-restrictions | 9 +++++ .../testdata/nested-fwd/aaa/file.go | 14 +++++++ .../nested-fwd/allowed-by-both/file.go | 0 .../nested-fwd/allowed-by-root/file.go | 0 .../nested-fwd/allowed-by-sub/file.go | 0 .../testdata/nested-fwd/bbb/file.go | 13 +++++++ .../nested-fwd/forbidden-by-both/file.go | 0 .../nested-fwd/forbidden-by-root/file.go | 0 .../nested-fwd/forbidden-by-sub/file.go | 0 .../testdata/nested-fwd/neither/n1/file.go | 0 .../testdata/nested-fwd/neither/n2/file.go | 0 .../simple-fwd/aaa/.import-restrictions | 6 +++ .../testdata/simple-fwd/aaa/file.go | 12 ++++++ .../testdata/simple-fwd/allowed/a1/file.go | 0 .../testdata/simple-fwd/allowed/a2/file.go | 0 .../testdata/simple-fwd/allowed/file.go | 9 +++++ .../testdata/simple-fwd/forbidden/f1/file.go | 0 .../testdata/simple-fwd/forbidden/f2/file.go | 0 .../testdata/simple-fwd/forbidden/file.go | 0 .../testdata/simple-fwd/neither/file.go | 0 .../testdata/simple-fwd/neither/n1/file.go | 0 .../testdata/simple-fwd/neither/n2/file.go | 0 .../testdata/transitive/aaa/file.go | 12 ++++++ .../transitive/allowed/.import-restrictions | 2 +- .../testdata/transitive/allowed/a1/file.go | 0 .../testdata/transitive/allowed/a2/file.go | 0 .../testdata/transitive/allowed/file.go | 9 +++++ .../transitive/forbidden/.import-restrictions | 2 +- .../testdata/transitive/forbidden/f1/file.go | 0 .../testdata/transitive/forbidden/f2/file.go | 0 .../testdata/transitive/forbidden/file.go | 0 .../testdata/transitive/neither/file.go | 0 .../testdata/transitive/neither/n1/file.go | 0 .../testdata/transitive/neither/n2/file.go | 0 hack/verify-import-boss.sh | 2 +- .../code-generator/cmd/import-boss/.gitignore | 1 - .../import-boss/testdata/inverse/aaa/file.go | 12 ------ .../inverse/allowed/.import-restrictions | 4 -- .../testdata/inverse/allowed/file.go | 9 ----- .../inverse/forbidden/.import-restrictions | 4 -- .../testdata/nested-fwd/.import-restrictions | 8 ---- .../nested-fwd/aaa/.import-restrictions | 9 ----- .../testdata/nested-fwd/aaa/file.go | 14 ------- .../testdata/nested-fwd/bbb/file.go | 13 ------- .../simple-fwd/aaa/.import-restrictions | 6 --- .../testdata/simple-fwd/aaa/file.go | 12 ------ .../testdata/simple-fwd/allowed/file.go | 9 ----- .../testdata/transitive/aaa/file.go | 12 ------ .../testdata/transitive/allowed/file.go | 9 ----- staging/src/k8s.io/code-generator/tools.go | 1 - 67 files changed, 147 insertions(+), 150 deletions(-) rename {staging/src/k8s.io/code-generator/cmd => cmd}/import-boss/README.md (100%) rename {staging/src/k8s.io/code-generator/cmd => cmd}/import-boss/main.go (98%) rename {staging/src/k8s.io/code-generator/cmd => cmd}/import-boss/main_test.go (68%) create mode 100644 cmd/import-boss/testdata/inverse/aaa/file.go create mode 100644 cmd/import-boss/testdata/inverse/allowed/.import-restrictions rename {staging/src/k8s.io/code-generator/cmd => cmd}/import-boss/testdata/inverse/allowed/a1/file.go (100%) rename {staging/src/k8s.io/code-generator/cmd => cmd}/import-boss/testdata/inverse/allowed/a2/file.go (100%) create mode 100644 cmd/import-boss/testdata/inverse/allowed/file.go create mode 100644 cmd/import-boss/testdata/inverse/forbidden/.import-restrictions rename {staging/src/k8s.io/code-generator/cmd => cmd}/import-boss/testdata/inverse/forbidden/f1/file.go (100%) rename {staging/src/k8s.io/code-generator/cmd => cmd}/import-boss/testdata/inverse/forbidden/f2/file.go (100%) rename {staging/src/k8s.io/code-generator/cmd => cmd}/import-boss/testdata/inverse/forbidden/file.go (100%) rename {staging/src/k8s.io/code-generator/cmd => cmd}/import-boss/testdata/inverse/neither/file.go (100%) rename {staging/src/k8s.io/code-generator/cmd => cmd}/import-boss/testdata/inverse/neither/n1/file.go (100%) rename {staging/src/k8s.io/code-generator/cmd => cmd}/import-boss/testdata/inverse/neither/n2/file.go (100%) create mode 100644 cmd/import-boss/testdata/nested-fwd/.import-restrictions create mode 100644 cmd/import-boss/testdata/nested-fwd/aaa/.import-restrictions create mode 100644 cmd/import-boss/testdata/nested-fwd/aaa/file.go rename {staging/src/k8s.io/code-generator/cmd => cmd}/import-boss/testdata/nested-fwd/allowed-by-both/file.go (100%) rename {staging/src/k8s.io/code-generator/cmd => cmd}/import-boss/testdata/nested-fwd/allowed-by-root/file.go (100%) rename {staging/src/k8s.io/code-generator/cmd => cmd}/import-boss/testdata/nested-fwd/allowed-by-sub/file.go (100%) create mode 100644 cmd/import-boss/testdata/nested-fwd/bbb/file.go rename {staging/src/k8s.io/code-generator/cmd => cmd}/import-boss/testdata/nested-fwd/forbidden-by-both/file.go (100%) rename {staging/src/k8s.io/code-generator/cmd => cmd}/import-boss/testdata/nested-fwd/forbidden-by-root/file.go (100%) rename {staging/src/k8s.io/code-generator/cmd => cmd}/import-boss/testdata/nested-fwd/forbidden-by-sub/file.go (100%) rename {staging/src/k8s.io/code-generator/cmd => cmd}/import-boss/testdata/nested-fwd/neither/n1/file.go (100%) rename {staging/src/k8s.io/code-generator/cmd => cmd}/import-boss/testdata/nested-fwd/neither/n2/file.go (100%) create mode 100644 cmd/import-boss/testdata/simple-fwd/aaa/.import-restrictions create mode 100644 cmd/import-boss/testdata/simple-fwd/aaa/file.go rename {staging/src/k8s.io/code-generator/cmd => cmd}/import-boss/testdata/simple-fwd/allowed/a1/file.go (100%) rename {staging/src/k8s.io/code-generator/cmd => cmd}/import-boss/testdata/simple-fwd/allowed/a2/file.go (100%) create mode 100644 cmd/import-boss/testdata/simple-fwd/allowed/file.go rename {staging/src/k8s.io/code-generator/cmd => cmd}/import-boss/testdata/simple-fwd/forbidden/f1/file.go (100%) rename {staging/src/k8s.io/code-generator/cmd => cmd}/import-boss/testdata/simple-fwd/forbidden/f2/file.go (100%) rename {staging/src/k8s.io/code-generator/cmd => cmd}/import-boss/testdata/simple-fwd/forbidden/file.go (100%) rename {staging/src/k8s.io/code-generator/cmd => cmd}/import-boss/testdata/simple-fwd/neither/file.go (100%) rename {staging/src/k8s.io/code-generator/cmd => cmd}/import-boss/testdata/simple-fwd/neither/n1/file.go (100%) rename {staging/src/k8s.io/code-generator/cmd => cmd}/import-boss/testdata/simple-fwd/neither/n2/file.go (100%) create mode 100644 cmd/import-boss/testdata/transitive/aaa/file.go rename {staging/src/k8s.io/code-generator/cmd => cmd}/import-boss/testdata/transitive/allowed/.import-restrictions (54%) rename {staging/src/k8s.io/code-generator/cmd => cmd}/import-boss/testdata/transitive/allowed/a1/file.go (100%) rename {staging/src/k8s.io/code-generator/cmd => cmd}/import-boss/testdata/transitive/allowed/a2/file.go (100%) create mode 100644 cmd/import-boss/testdata/transitive/allowed/file.go rename {staging/src/k8s.io/code-generator/cmd => cmd}/import-boss/testdata/transitive/forbidden/.import-restrictions (55%) rename {staging/src/k8s.io/code-generator/cmd => cmd}/import-boss/testdata/transitive/forbidden/f1/file.go (100%) rename {staging/src/k8s.io/code-generator/cmd => cmd}/import-boss/testdata/transitive/forbidden/f2/file.go (100%) rename {staging/src/k8s.io/code-generator/cmd => cmd}/import-boss/testdata/transitive/forbidden/file.go (100%) rename {staging/src/k8s.io/code-generator/cmd => cmd}/import-boss/testdata/transitive/neither/file.go (100%) rename {staging/src/k8s.io/code-generator/cmd => cmd}/import-boss/testdata/transitive/neither/n1/file.go (100%) rename {staging/src/k8s.io/code-generator/cmd => cmd}/import-boss/testdata/transitive/neither/n2/file.go (100%) delete mode 100644 staging/src/k8s.io/code-generator/cmd/import-boss/.gitignore delete mode 100644 staging/src/k8s.io/code-generator/cmd/import-boss/testdata/inverse/aaa/file.go delete mode 100644 staging/src/k8s.io/code-generator/cmd/import-boss/testdata/inverse/allowed/.import-restrictions delete mode 100644 staging/src/k8s.io/code-generator/cmd/import-boss/testdata/inverse/allowed/file.go delete mode 100644 staging/src/k8s.io/code-generator/cmd/import-boss/testdata/inverse/forbidden/.import-restrictions delete mode 100644 staging/src/k8s.io/code-generator/cmd/import-boss/testdata/nested-fwd/.import-restrictions delete mode 100644 staging/src/k8s.io/code-generator/cmd/import-boss/testdata/nested-fwd/aaa/.import-restrictions delete mode 100644 staging/src/k8s.io/code-generator/cmd/import-boss/testdata/nested-fwd/aaa/file.go delete mode 100644 staging/src/k8s.io/code-generator/cmd/import-boss/testdata/nested-fwd/bbb/file.go delete mode 100644 staging/src/k8s.io/code-generator/cmd/import-boss/testdata/simple-fwd/aaa/.import-restrictions delete mode 100644 staging/src/k8s.io/code-generator/cmd/import-boss/testdata/simple-fwd/aaa/file.go delete mode 100644 staging/src/k8s.io/code-generator/cmd/import-boss/testdata/simple-fwd/allowed/file.go delete mode 100644 staging/src/k8s.io/code-generator/cmd/import-boss/testdata/transitive/aaa/file.go delete mode 100644 staging/src/k8s.io/code-generator/cmd/import-boss/testdata/transitive/allowed/file.go diff --git a/build/tools.go b/build/tools.go index aae735e5bfe..60e1880c803 100644 --- a/build/tools.go +++ b/build/tools.go @@ -27,7 +27,6 @@ import ( _ "k8s.io/code-generator/cmd/defaulter-gen" _ "k8s.io/code-generator/cmd/go-to-protobuf" _ "k8s.io/code-generator/cmd/go-to-protobuf/protoc-gen-gogo" - _ "k8s.io/code-generator/cmd/import-boss" _ "k8s.io/kube-openapi/cmd/openapi-gen" // submodule test dependencies diff --git a/staging/src/k8s.io/code-generator/cmd/import-boss/README.md b/cmd/import-boss/README.md similarity index 100% rename from staging/src/k8s.io/code-generator/cmd/import-boss/README.md rename to cmd/import-boss/README.md diff --git a/staging/src/k8s.io/code-generator/cmd/import-boss/main.go b/cmd/import-boss/main.go similarity index 98% rename from staging/src/k8s.io/code-generator/cmd/import-boss/main.go rename to cmd/import-boss/main.go index ff4c802ec1d..61366069759 100644 --- a/staging/src/k8s.io/code-generator/cmd/import-boss/main.go +++ b/cmd/import-boss/main.go @@ -103,7 +103,7 @@ func loadPkgs(patterns ...string) ([]*packages.Package, error) { } } if len(errs) > 0 { - allErrs = append(allErrs, fmt.Errorf("error(s) in %q: %v", pkg.PkgPath, errors.Join(errs...))) + allErrs = append(allErrs, fmt.Errorf("error(s) in %q: %w", pkg.PkgPath, errors.Join(errs...))) } } if len(allErrs) > 0 { @@ -194,7 +194,7 @@ func (boss *ImportBoss) Verify(pkg *packages.Package) []error { restrictionFiles, err := recursiveRead(filepath.Join(pkgDir, rulesFileName)) if err != nil { - return []error{fmt.Errorf("error finding rules file: %v", err)} + return []error{fmt.Errorf("error finding rules file: %w", err)} } if len(restrictionFiles) == 0 { return nil @@ -299,13 +299,13 @@ func recursiveRead(path string) ([]*FileFormat, error) { func readFile(path string) (*FileFormat, error) { currentBytes, err := os.ReadFile(path) if err != nil { - return nil, fmt.Errorf("couldn't read %v: %v", path, err) + return nil, fmt.Errorf("couldn't read %v: %w", path, err) } var current FileFormat err = yaml.Unmarshal(currentBytes, ¤t) if err != nil { - return nil, fmt.Errorf("couldn't unmarshal %v: %v", path, err) + return nil, fmt.Errorf("couldn't unmarshal %v: %w", path, err) } current.path = path return ¤t, nil diff --git a/staging/src/k8s.io/code-generator/cmd/import-boss/main_test.go b/cmd/import-boss/main_test.go similarity index 68% rename from staging/src/k8s.io/code-generator/cmd/import-boss/main_test.go rename to cmd/import-boss/main_test.go index 6c0151104a5..93405d94170 100644 --- a/staging/src/k8s.io/code-generator/cmd/import-boss/main_test.go +++ b/cmd/import-boss/main_test.go @@ -226,7 +226,7 @@ func TestSimpleForward(t *testing.T) { if len(pkgs) != 1 { t.Fatalf("expected 1 pkg result, got %d", len(pkgs)) } - if pkgs[0].PkgPath != "k8s.io/code-generator/cmd/import-boss/testdata/simple-fwd/aaa" { + if pkgs[0].PkgPath != "k8s.io/kubernetes/cmd/import-boss/testdata/simple-fwd/aaa" { t.Fatalf("wrong PkgPath: %q", pkgs[0].PkgPath) } @@ -234,10 +234,10 @@ func TestSimpleForward(t *testing.T) { errs := boss.Verify(pkgs[0]) expect := []string{ - `"k8s.io/code-generator/cmd/import-boss/testdata/simple-fwd/aaa" -> "k8s.io/code-generator/cmd/import-boss/testdata/simple-fwd/forbidden" is forbidden`, - `"k8s.io/code-generator/cmd/import-boss/testdata/simple-fwd/aaa" -> "k8s.io/code-generator/cmd/import-boss/testdata/simple-fwd/forbidden/f1" is forbidden`, - `"k8s.io/code-generator/cmd/import-boss/testdata/simple-fwd/aaa" -> "k8s.io/code-generator/cmd/import-boss/testdata/simple-fwd/neither" did not match any rule`, - `"k8s.io/code-generator/cmd/import-boss/testdata/simple-fwd/aaa" -> "k8s.io/code-generator/cmd/import-boss/testdata/simple-fwd/neither/n1" did not match any rule`, + `"k8s.io/kubernetes/cmd/import-boss/testdata/simple-fwd/aaa" -> "k8s.io/kubernetes/cmd/import-boss/testdata/simple-fwd/forbidden" is forbidden`, + `"k8s.io/kubernetes/cmd/import-boss/testdata/simple-fwd/aaa" -> "k8s.io/kubernetes/cmd/import-boss/testdata/simple-fwd/forbidden/f1" is forbidden`, + `"k8s.io/kubernetes/cmd/import-boss/testdata/simple-fwd/aaa" -> "k8s.io/kubernetes/cmd/import-boss/testdata/simple-fwd/neither" did not match any rule`, + `"k8s.io/kubernetes/cmd/import-boss/testdata/simple-fwd/aaa" -> "k8s.io/kubernetes/cmd/import-boss/testdata/simple-fwd/neither/n1" did not match any rule`, } checkAllErrorStrings(t, errs, expect) @@ -251,7 +251,7 @@ func TestNestedForward(t *testing.T) { if len(pkgs) != 1 { t.Fatalf("expected 1 pkg result, got %d", len(pkgs)) } - if pkgs[0].PkgPath != "k8s.io/code-generator/cmd/import-boss/testdata/nested-fwd/aaa" { + if pkgs[0].PkgPath != "k8s.io/kubernetes/cmd/import-boss/testdata/nested-fwd/aaa" { t.Fatalf("wrong PkgPath: %q", pkgs[0].PkgPath) } @@ -259,10 +259,10 @@ func TestNestedForward(t *testing.T) { errs := boss.Verify(pkgs[0]) expect := []string{ - `"k8s.io/code-generator/cmd/import-boss/testdata/nested-fwd/aaa" -> "k8s.io/code-generator/cmd/import-boss/testdata/nested-fwd/forbidden-by-both" is forbidden`, - `"k8s.io/code-generator/cmd/import-boss/testdata/nested-fwd/aaa" -> "k8s.io/code-generator/cmd/import-boss/testdata/nested-fwd/forbidden-by-root" is forbidden`, - `"k8s.io/code-generator/cmd/import-boss/testdata/nested-fwd/aaa" -> "k8s.io/code-generator/cmd/import-boss/testdata/nested-fwd/forbidden-by-sub" is forbidden`, - `"k8s.io/code-generator/cmd/import-boss/testdata/nested-fwd/aaa" -> "k8s.io/code-generator/cmd/import-boss/testdata/nested-fwd/neither/n1" did not match any rule`, + `"k8s.io/kubernetes/cmd/import-boss/testdata/nested-fwd/aaa" -> "k8s.io/kubernetes/cmd/import-boss/testdata/nested-fwd/forbidden-by-both" is forbidden`, + `"k8s.io/kubernetes/cmd/import-boss/testdata/nested-fwd/aaa" -> "k8s.io/kubernetes/cmd/import-boss/testdata/nested-fwd/forbidden-by-root" is forbidden`, + `"k8s.io/kubernetes/cmd/import-boss/testdata/nested-fwd/aaa" -> "k8s.io/kubernetes/cmd/import-boss/testdata/nested-fwd/forbidden-by-sub" is forbidden`, + `"k8s.io/kubernetes/cmd/import-boss/testdata/nested-fwd/aaa" -> "k8s.io/kubernetes/cmd/import-boss/testdata/nested-fwd/neither/n1" did not match any rule`, } checkAllErrorStrings(t, errs, expect) @@ -285,10 +285,10 @@ func TestInverse(t *testing.T) { } expect := []string{ - `"k8s.io/code-generator/cmd/import-boss/testdata/inverse/forbidden" <- "k8s.io/code-generator/cmd/import-boss/testdata/inverse/aaa" is forbidden`, - `"k8s.io/code-generator/cmd/import-boss/testdata/inverse/forbidden/f1" <- "k8s.io/code-generator/cmd/import-boss/testdata/inverse/aaa" is forbidden`, - `"k8s.io/code-generator/cmd/import-boss/testdata/inverse/allowed/a2" <- "k8s.io/code-generator/cmd/import-boss/testdata/inverse/allowed" did not match any rule`, - `"k8s.io/code-generator/cmd/import-boss/testdata/inverse/forbidden/f2" <- "k8s.io/code-generator/cmd/import-boss/testdata/inverse/allowed" did not match any rule`, + `"k8s.io/kubernetes/cmd/import-boss/testdata/inverse/forbidden" <- "k8s.io/kubernetes/cmd/import-boss/testdata/inverse/aaa" is forbidden`, + `"k8s.io/kubernetes/cmd/import-boss/testdata/inverse/forbidden/f1" <- "k8s.io/kubernetes/cmd/import-boss/testdata/inverse/aaa" is forbidden`, + `"k8s.io/kubernetes/cmd/import-boss/testdata/inverse/allowed/a2" <- "k8s.io/kubernetes/cmd/import-boss/testdata/inverse/allowed" did not match any rule`, + `"k8s.io/kubernetes/cmd/import-boss/testdata/inverse/forbidden/f2" <- "k8s.io/kubernetes/cmd/import-boss/testdata/inverse/allowed" did not match any rule`, } checkAllErrorStrings(t, errs, expect) @@ -311,11 +311,11 @@ func TestTransitive(t *testing.T) { } expect := []string{ - `"k8s.io/code-generator/cmd/import-boss/testdata/transitive/forbidden" <- "k8s.io/code-generator/cmd/import-boss/testdata/transitive/aaa" is forbidden`, - `"k8s.io/code-generator/cmd/import-boss/testdata/transitive/forbidden/f1" <- "k8s.io/code-generator/cmd/import-boss/testdata/transitive/aaa" is forbidden`, - `"k8s.io/code-generator/cmd/import-boss/testdata/transitive/forbidden/f2" <-- "k8s.io/code-generator/cmd/import-boss/testdata/transitive/aaa" is forbidden`, - `"k8s.io/code-generator/cmd/import-boss/testdata/transitive/allowed/a2" <- "k8s.io/code-generator/cmd/import-boss/testdata/transitive/allowed" did not match any rule`, - `"k8s.io/code-generator/cmd/import-boss/testdata/transitive/forbidden/f2" <- "k8s.io/code-generator/cmd/import-boss/testdata/transitive/allowed" did not match any rule`, + `"k8s.io/kubernetes/cmd/import-boss/testdata/transitive/forbidden" <- "k8s.io/kubernetes/cmd/import-boss/testdata/transitive/aaa" is forbidden`, + `"k8s.io/kubernetes/cmd/import-boss/testdata/transitive/forbidden/f1" <- "k8s.io/kubernetes/cmd/import-boss/testdata/transitive/aaa" is forbidden`, + `"k8s.io/kubernetes/cmd/import-boss/testdata/transitive/forbidden/f2" <-- "k8s.io/kubernetes/cmd/import-boss/testdata/transitive/aaa" is forbidden`, + `"k8s.io/kubernetes/cmd/import-boss/testdata/transitive/allowed/a2" <- "k8s.io/kubernetes/cmd/import-boss/testdata/transitive/allowed" did not match any rule`, + `"k8s.io/kubernetes/cmd/import-boss/testdata/transitive/forbidden/f2" <- "k8s.io/kubernetes/cmd/import-boss/testdata/transitive/allowed" did not match any rule`, } checkAllErrorStrings(t, errs, expect) diff --git a/cmd/import-boss/testdata/inverse/aaa/file.go b/cmd/import-boss/testdata/inverse/aaa/file.go new file mode 100644 index 00000000000..df2cb5dabb9 --- /dev/null +++ b/cmd/import-boss/testdata/inverse/aaa/file.go @@ -0,0 +1,12 @@ +package aaa + +import ( + _ "k8s.io/kubernetes/cmd/import-boss/testdata/inverse/allowed" + _ "k8s.io/kubernetes/cmd/import-boss/testdata/inverse/allowed/a1" + _ "k8s.io/kubernetes/cmd/import-boss/testdata/inverse/forbidden" + _ "k8s.io/kubernetes/cmd/import-boss/testdata/inverse/forbidden/f1" + _ "k8s.io/kubernetes/cmd/import-boss/testdata/inverse/neither" + _ "k8s.io/kubernetes/cmd/import-boss/testdata/inverse/neither/n1" +) + +var X = "aaa" diff --git a/cmd/import-boss/testdata/inverse/allowed/.import-restrictions b/cmd/import-boss/testdata/inverse/allowed/.import-restrictions new file mode 100644 index 00000000000..cd26adf7ad7 --- /dev/null +++ b/cmd/import-boss/testdata/inverse/allowed/.import-restrictions @@ -0,0 +1,4 @@ +inverseRules: + - selectorRegexp: k8s[.]io + allowedPrefixes: + - k8s.io/kubernetes/cmd/import-boss/testdata/inverse/aaa diff --git a/staging/src/k8s.io/code-generator/cmd/import-boss/testdata/inverse/allowed/a1/file.go b/cmd/import-boss/testdata/inverse/allowed/a1/file.go similarity index 100% rename from staging/src/k8s.io/code-generator/cmd/import-boss/testdata/inverse/allowed/a1/file.go rename to cmd/import-boss/testdata/inverse/allowed/a1/file.go diff --git a/staging/src/k8s.io/code-generator/cmd/import-boss/testdata/inverse/allowed/a2/file.go b/cmd/import-boss/testdata/inverse/allowed/a2/file.go similarity index 100% rename from staging/src/k8s.io/code-generator/cmd/import-boss/testdata/inverse/allowed/a2/file.go rename to cmd/import-boss/testdata/inverse/allowed/a2/file.go diff --git a/cmd/import-boss/testdata/inverse/allowed/file.go b/cmd/import-boss/testdata/inverse/allowed/file.go new file mode 100644 index 00000000000..7bbba79151a --- /dev/null +++ b/cmd/import-boss/testdata/inverse/allowed/file.go @@ -0,0 +1,9 @@ +package allowed + +import ( + _ "k8s.io/kubernetes/cmd/import-boss/testdata/inverse/allowed/a2" + _ "k8s.io/kubernetes/cmd/import-boss/testdata/inverse/forbidden/f2" + _ "k8s.io/kubernetes/cmd/import-boss/testdata/inverse/neither/n2" +) + +var X = "allowed" diff --git a/cmd/import-boss/testdata/inverse/forbidden/.import-restrictions b/cmd/import-boss/testdata/inverse/forbidden/.import-restrictions new file mode 100644 index 00000000000..11e6be860ef --- /dev/null +++ b/cmd/import-boss/testdata/inverse/forbidden/.import-restrictions @@ -0,0 +1,4 @@ +inverseRules: + - selectorRegexp: k8s[.]io + forbiddenPrefixes: + - k8s.io/kubernetes/cmd/import-boss/testdata/inverse/aaa diff --git a/staging/src/k8s.io/code-generator/cmd/import-boss/testdata/inverse/forbidden/f1/file.go b/cmd/import-boss/testdata/inverse/forbidden/f1/file.go similarity index 100% rename from staging/src/k8s.io/code-generator/cmd/import-boss/testdata/inverse/forbidden/f1/file.go rename to cmd/import-boss/testdata/inverse/forbidden/f1/file.go diff --git a/staging/src/k8s.io/code-generator/cmd/import-boss/testdata/inverse/forbidden/f2/file.go b/cmd/import-boss/testdata/inverse/forbidden/f2/file.go similarity index 100% rename from staging/src/k8s.io/code-generator/cmd/import-boss/testdata/inverse/forbidden/f2/file.go rename to cmd/import-boss/testdata/inverse/forbidden/f2/file.go diff --git a/staging/src/k8s.io/code-generator/cmd/import-boss/testdata/inverse/forbidden/file.go b/cmd/import-boss/testdata/inverse/forbidden/file.go similarity index 100% rename from staging/src/k8s.io/code-generator/cmd/import-boss/testdata/inverse/forbidden/file.go rename to cmd/import-boss/testdata/inverse/forbidden/file.go diff --git a/staging/src/k8s.io/code-generator/cmd/import-boss/testdata/inverse/neither/file.go b/cmd/import-boss/testdata/inverse/neither/file.go similarity index 100% rename from staging/src/k8s.io/code-generator/cmd/import-boss/testdata/inverse/neither/file.go rename to cmd/import-boss/testdata/inverse/neither/file.go diff --git a/staging/src/k8s.io/code-generator/cmd/import-boss/testdata/inverse/neither/n1/file.go b/cmd/import-boss/testdata/inverse/neither/n1/file.go similarity index 100% rename from staging/src/k8s.io/code-generator/cmd/import-boss/testdata/inverse/neither/n1/file.go rename to cmd/import-boss/testdata/inverse/neither/n1/file.go diff --git a/staging/src/k8s.io/code-generator/cmd/import-boss/testdata/inverse/neither/n2/file.go b/cmd/import-boss/testdata/inverse/neither/n2/file.go similarity index 100% rename from staging/src/k8s.io/code-generator/cmd/import-boss/testdata/inverse/neither/n2/file.go rename to cmd/import-boss/testdata/inverse/neither/n2/file.go diff --git a/cmd/import-boss/testdata/nested-fwd/.import-restrictions b/cmd/import-boss/testdata/nested-fwd/.import-restrictions new file mode 100644 index 00000000000..092f0dc47ce --- /dev/null +++ b/cmd/import-boss/testdata/nested-fwd/.import-restrictions @@ -0,0 +1,8 @@ +rules: + - selectorRegexp: k8s[.]io + allowedPrefixes: + - k8s.io/kubernetes/cmd/import-boss/testdata/nested-fwd/allowed-by-root + - k8s.io/kubernetes/cmd/import-boss/testdata/nested-fwd/allowed-by-both + forbiddenPrefixes: + - k8s.io/kubernetes/cmd/import-boss/testdata/nested-fwd/forbidden-by-root + - k8s.io/kubernetes/cmd/import-boss/testdata/nested-fwd/forbidden-by-both diff --git a/cmd/import-boss/testdata/nested-fwd/aaa/.import-restrictions b/cmd/import-boss/testdata/nested-fwd/aaa/.import-restrictions new file mode 100644 index 00000000000..b54e311527b --- /dev/null +++ b/cmd/import-boss/testdata/nested-fwd/aaa/.import-restrictions @@ -0,0 +1,9 @@ +rules: + - selectorRegexp: k8s[.]io + allowedPrefixes: + - k8s.io/kubernetes/cmd/import-boss/testdata/nested-fwd/bbb + - k8s.io/kubernetes/cmd/import-boss/testdata/nested-fwd/allowed-by-sub + - k8s.io/kubernetes/cmd/import-boss/testdata/nested-fwd/allowed-by-both + forbiddenPrefixes: + - k8s.io/kubernetes/cmd/import-boss/testdata/nested-fwd/forbidden-by-sub + - k8s.io/kubernetes/cmd/import-boss/testdata/nested-fwd/forbidden-by-both diff --git a/cmd/import-boss/testdata/nested-fwd/aaa/file.go b/cmd/import-boss/testdata/nested-fwd/aaa/file.go new file mode 100644 index 00000000000..25bd13abce9 --- /dev/null +++ b/cmd/import-boss/testdata/nested-fwd/aaa/file.go @@ -0,0 +1,14 @@ +package aaa + +import ( + _ "k8s.io/kubernetes/cmd/import-boss/testdata/nested-fwd/allowed-by-both" + _ "k8s.io/kubernetes/cmd/import-boss/testdata/nested-fwd/allowed-by-root" + _ "k8s.io/kubernetes/cmd/import-boss/testdata/nested-fwd/allowed-by-sub" + _ "k8s.io/kubernetes/cmd/import-boss/testdata/nested-fwd/bbb" + _ "k8s.io/kubernetes/cmd/import-boss/testdata/nested-fwd/forbidden-by-both" + _ "k8s.io/kubernetes/cmd/import-boss/testdata/nested-fwd/forbidden-by-root" + _ "k8s.io/kubernetes/cmd/import-boss/testdata/nested-fwd/forbidden-by-sub" + _ "k8s.io/kubernetes/cmd/import-boss/testdata/nested-fwd/neither/n1" +) + +var X = "aaa" diff --git a/staging/src/k8s.io/code-generator/cmd/import-boss/testdata/nested-fwd/allowed-by-both/file.go b/cmd/import-boss/testdata/nested-fwd/allowed-by-both/file.go similarity index 100% rename from staging/src/k8s.io/code-generator/cmd/import-boss/testdata/nested-fwd/allowed-by-both/file.go rename to cmd/import-boss/testdata/nested-fwd/allowed-by-both/file.go diff --git a/staging/src/k8s.io/code-generator/cmd/import-boss/testdata/nested-fwd/allowed-by-root/file.go b/cmd/import-boss/testdata/nested-fwd/allowed-by-root/file.go similarity index 100% rename from staging/src/k8s.io/code-generator/cmd/import-boss/testdata/nested-fwd/allowed-by-root/file.go rename to cmd/import-boss/testdata/nested-fwd/allowed-by-root/file.go diff --git a/staging/src/k8s.io/code-generator/cmd/import-boss/testdata/nested-fwd/allowed-by-sub/file.go b/cmd/import-boss/testdata/nested-fwd/allowed-by-sub/file.go similarity index 100% rename from staging/src/k8s.io/code-generator/cmd/import-boss/testdata/nested-fwd/allowed-by-sub/file.go rename to cmd/import-boss/testdata/nested-fwd/allowed-by-sub/file.go diff --git a/cmd/import-boss/testdata/nested-fwd/bbb/file.go b/cmd/import-boss/testdata/nested-fwd/bbb/file.go new file mode 100644 index 00000000000..55fa094a740 --- /dev/null +++ b/cmd/import-boss/testdata/nested-fwd/bbb/file.go @@ -0,0 +1,13 @@ +package bbb + +import ( + _ "k8s.io/kubernetes/cmd/import-boss/testdata/nested-fwd/allowed-by-both" + _ "k8s.io/kubernetes/cmd/import-boss/testdata/nested-fwd/allowed-by-root" + _ "k8s.io/kubernetes/cmd/import-boss/testdata/nested-fwd/allowed-by-sub" + _ "k8s.io/kubernetes/cmd/import-boss/testdata/nested-fwd/forbidden-by-both" + _ "k8s.io/kubernetes/cmd/import-boss/testdata/nested-fwd/forbidden-by-root" + _ "k8s.io/kubernetes/cmd/import-boss/testdata/nested-fwd/forbidden-by-sub" + _ "k8s.io/kubernetes/cmd/import-boss/testdata/nested-fwd/neither/n2" +) + +var X = "bbb" diff --git a/staging/src/k8s.io/code-generator/cmd/import-boss/testdata/nested-fwd/forbidden-by-both/file.go b/cmd/import-boss/testdata/nested-fwd/forbidden-by-both/file.go similarity index 100% rename from staging/src/k8s.io/code-generator/cmd/import-boss/testdata/nested-fwd/forbidden-by-both/file.go rename to cmd/import-boss/testdata/nested-fwd/forbidden-by-both/file.go diff --git a/staging/src/k8s.io/code-generator/cmd/import-boss/testdata/nested-fwd/forbidden-by-root/file.go b/cmd/import-boss/testdata/nested-fwd/forbidden-by-root/file.go similarity index 100% rename from staging/src/k8s.io/code-generator/cmd/import-boss/testdata/nested-fwd/forbidden-by-root/file.go rename to cmd/import-boss/testdata/nested-fwd/forbidden-by-root/file.go diff --git a/staging/src/k8s.io/code-generator/cmd/import-boss/testdata/nested-fwd/forbidden-by-sub/file.go b/cmd/import-boss/testdata/nested-fwd/forbidden-by-sub/file.go similarity index 100% rename from staging/src/k8s.io/code-generator/cmd/import-boss/testdata/nested-fwd/forbidden-by-sub/file.go rename to cmd/import-boss/testdata/nested-fwd/forbidden-by-sub/file.go diff --git a/staging/src/k8s.io/code-generator/cmd/import-boss/testdata/nested-fwd/neither/n1/file.go b/cmd/import-boss/testdata/nested-fwd/neither/n1/file.go similarity index 100% rename from staging/src/k8s.io/code-generator/cmd/import-boss/testdata/nested-fwd/neither/n1/file.go rename to cmd/import-boss/testdata/nested-fwd/neither/n1/file.go diff --git a/staging/src/k8s.io/code-generator/cmd/import-boss/testdata/nested-fwd/neither/n2/file.go b/cmd/import-boss/testdata/nested-fwd/neither/n2/file.go similarity index 100% rename from staging/src/k8s.io/code-generator/cmd/import-boss/testdata/nested-fwd/neither/n2/file.go rename to cmd/import-boss/testdata/nested-fwd/neither/n2/file.go diff --git a/cmd/import-boss/testdata/simple-fwd/aaa/.import-restrictions b/cmd/import-boss/testdata/simple-fwd/aaa/.import-restrictions new file mode 100644 index 00000000000..bcd54ac88eb --- /dev/null +++ b/cmd/import-boss/testdata/simple-fwd/aaa/.import-restrictions @@ -0,0 +1,6 @@ +rules: + - selectorRegexp: k8s[.]io + allowedPrefixes: + - k8s.io/kubernetes/cmd/import-boss/testdata/simple-fwd/allowed + forbiddenPrefixes: + - k8s.io/kubernetes/cmd/import-boss/testdata/simple-fwd/forbidden diff --git a/cmd/import-boss/testdata/simple-fwd/aaa/file.go b/cmd/import-boss/testdata/simple-fwd/aaa/file.go new file mode 100644 index 00000000000..8d7f761739d --- /dev/null +++ b/cmd/import-boss/testdata/simple-fwd/aaa/file.go @@ -0,0 +1,12 @@ +package aaa + +import ( + _ "k8s.io/kubernetes/cmd/import-boss/testdata/simple-fwd/allowed" + _ "k8s.io/kubernetes/cmd/import-boss/testdata/simple-fwd/allowed/a1" + _ "k8s.io/kubernetes/cmd/import-boss/testdata/simple-fwd/forbidden" + _ "k8s.io/kubernetes/cmd/import-boss/testdata/simple-fwd/forbidden/f1" + _ "k8s.io/kubernetes/cmd/import-boss/testdata/simple-fwd/neither" + _ "k8s.io/kubernetes/cmd/import-boss/testdata/simple-fwd/neither/n1" +) + +var X = "aaa" diff --git a/staging/src/k8s.io/code-generator/cmd/import-boss/testdata/simple-fwd/allowed/a1/file.go b/cmd/import-boss/testdata/simple-fwd/allowed/a1/file.go similarity index 100% rename from staging/src/k8s.io/code-generator/cmd/import-boss/testdata/simple-fwd/allowed/a1/file.go rename to cmd/import-boss/testdata/simple-fwd/allowed/a1/file.go diff --git a/staging/src/k8s.io/code-generator/cmd/import-boss/testdata/simple-fwd/allowed/a2/file.go b/cmd/import-boss/testdata/simple-fwd/allowed/a2/file.go similarity index 100% rename from staging/src/k8s.io/code-generator/cmd/import-boss/testdata/simple-fwd/allowed/a2/file.go rename to cmd/import-boss/testdata/simple-fwd/allowed/a2/file.go diff --git a/cmd/import-boss/testdata/simple-fwd/allowed/file.go b/cmd/import-boss/testdata/simple-fwd/allowed/file.go new file mode 100644 index 00000000000..145e41560b4 --- /dev/null +++ b/cmd/import-boss/testdata/simple-fwd/allowed/file.go @@ -0,0 +1,9 @@ +package allowed + +import ( + _ "k8s.io/kubernetes/cmd/import-boss/testdata/simple-fwd/allowed/a2" + _ "k8s.io/kubernetes/cmd/import-boss/testdata/simple-fwd/forbidden/f2" + _ "k8s.io/kubernetes/cmd/import-boss/testdata/simple-fwd/neither/n2" +) + +var X = "allowed" diff --git a/staging/src/k8s.io/code-generator/cmd/import-boss/testdata/simple-fwd/forbidden/f1/file.go b/cmd/import-boss/testdata/simple-fwd/forbidden/f1/file.go similarity index 100% rename from staging/src/k8s.io/code-generator/cmd/import-boss/testdata/simple-fwd/forbidden/f1/file.go rename to cmd/import-boss/testdata/simple-fwd/forbidden/f1/file.go diff --git a/staging/src/k8s.io/code-generator/cmd/import-boss/testdata/simple-fwd/forbidden/f2/file.go b/cmd/import-boss/testdata/simple-fwd/forbidden/f2/file.go similarity index 100% rename from staging/src/k8s.io/code-generator/cmd/import-boss/testdata/simple-fwd/forbidden/f2/file.go rename to cmd/import-boss/testdata/simple-fwd/forbidden/f2/file.go diff --git a/staging/src/k8s.io/code-generator/cmd/import-boss/testdata/simple-fwd/forbidden/file.go b/cmd/import-boss/testdata/simple-fwd/forbidden/file.go similarity index 100% rename from staging/src/k8s.io/code-generator/cmd/import-boss/testdata/simple-fwd/forbidden/file.go rename to cmd/import-boss/testdata/simple-fwd/forbidden/file.go diff --git a/staging/src/k8s.io/code-generator/cmd/import-boss/testdata/simple-fwd/neither/file.go b/cmd/import-boss/testdata/simple-fwd/neither/file.go similarity index 100% rename from staging/src/k8s.io/code-generator/cmd/import-boss/testdata/simple-fwd/neither/file.go rename to cmd/import-boss/testdata/simple-fwd/neither/file.go diff --git a/staging/src/k8s.io/code-generator/cmd/import-boss/testdata/simple-fwd/neither/n1/file.go b/cmd/import-boss/testdata/simple-fwd/neither/n1/file.go similarity index 100% rename from staging/src/k8s.io/code-generator/cmd/import-boss/testdata/simple-fwd/neither/n1/file.go rename to cmd/import-boss/testdata/simple-fwd/neither/n1/file.go diff --git a/staging/src/k8s.io/code-generator/cmd/import-boss/testdata/simple-fwd/neither/n2/file.go b/cmd/import-boss/testdata/simple-fwd/neither/n2/file.go similarity index 100% rename from staging/src/k8s.io/code-generator/cmd/import-boss/testdata/simple-fwd/neither/n2/file.go rename to cmd/import-boss/testdata/simple-fwd/neither/n2/file.go diff --git a/cmd/import-boss/testdata/transitive/aaa/file.go b/cmd/import-boss/testdata/transitive/aaa/file.go new file mode 100644 index 00000000000..47876ae958a --- /dev/null +++ b/cmd/import-boss/testdata/transitive/aaa/file.go @@ -0,0 +1,12 @@ +package aaa + +import ( + _ "k8s.io/kubernetes/cmd/import-boss/testdata/transitive/allowed" + _ "k8s.io/kubernetes/cmd/import-boss/testdata/transitive/allowed/a1" + _ "k8s.io/kubernetes/cmd/import-boss/testdata/transitive/forbidden" + _ "k8s.io/kubernetes/cmd/import-boss/testdata/transitive/forbidden/f1" + _ "k8s.io/kubernetes/cmd/import-boss/testdata/transitive/neither" + _ "k8s.io/kubernetes/cmd/import-boss/testdata/transitive/neither/n1" +) + +var X = "aaa" diff --git a/staging/src/k8s.io/code-generator/cmd/import-boss/testdata/transitive/allowed/.import-restrictions b/cmd/import-boss/testdata/transitive/allowed/.import-restrictions similarity index 54% rename from staging/src/k8s.io/code-generator/cmd/import-boss/testdata/transitive/allowed/.import-restrictions rename to cmd/import-boss/testdata/transitive/allowed/.import-restrictions index 45485d5a8bf..ae19bbdd447 100644 --- a/staging/src/k8s.io/code-generator/cmd/import-boss/testdata/transitive/allowed/.import-restrictions +++ b/cmd/import-boss/testdata/transitive/allowed/.import-restrictions @@ -1,5 +1,5 @@ inverseRules: - selectorRegexp: k8s[.]io allowedPrefixes: - - k8s.io/code-generator/cmd/import-boss/testdata/transitive/aaa + - k8s.io/kubernetes/cmd/import-boss/testdata/transitive/aaa transitive: true diff --git a/staging/src/k8s.io/code-generator/cmd/import-boss/testdata/transitive/allowed/a1/file.go b/cmd/import-boss/testdata/transitive/allowed/a1/file.go similarity index 100% rename from staging/src/k8s.io/code-generator/cmd/import-boss/testdata/transitive/allowed/a1/file.go rename to cmd/import-boss/testdata/transitive/allowed/a1/file.go diff --git a/staging/src/k8s.io/code-generator/cmd/import-boss/testdata/transitive/allowed/a2/file.go b/cmd/import-boss/testdata/transitive/allowed/a2/file.go similarity index 100% rename from staging/src/k8s.io/code-generator/cmd/import-boss/testdata/transitive/allowed/a2/file.go rename to cmd/import-boss/testdata/transitive/allowed/a2/file.go diff --git a/cmd/import-boss/testdata/transitive/allowed/file.go b/cmd/import-boss/testdata/transitive/allowed/file.go new file mode 100644 index 00000000000..ba22f974f33 --- /dev/null +++ b/cmd/import-boss/testdata/transitive/allowed/file.go @@ -0,0 +1,9 @@ +package allowed + +import ( + _ "k8s.io/kubernetes/cmd/import-boss/testdata/transitive/allowed/a2" + _ "k8s.io/kubernetes/cmd/import-boss/testdata/transitive/forbidden/f2" + _ "k8s.io/kubernetes/cmd/import-boss/testdata/transitive/neither/n2" +) + +var X = "allowed" diff --git a/staging/src/k8s.io/code-generator/cmd/import-boss/testdata/transitive/forbidden/.import-restrictions b/cmd/import-boss/testdata/transitive/forbidden/.import-restrictions similarity index 55% rename from staging/src/k8s.io/code-generator/cmd/import-boss/testdata/transitive/forbidden/.import-restrictions rename to cmd/import-boss/testdata/transitive/forbidden/.import-restrictions index 71d11e58373..f4df48723b2 100644 --- a/staging/src/k8s.io/code-generator/cmd/import-boss/testdata/transitive/forbidden/.import-restrictions +++ b/cmd/import-boss/testdata/transitive/forbidden/.import-restrictions @@ -1,5 +1,5 @@ inverseRules: - selectorRegexp: k8s[.]io forbiddenPrefixes: - - k8s.io/code-generator/cmd/import-boss/testdata/transitive/aaa + - k8s.io/kubernetes/cmd/import-boss/testdata/transitive/aaa transitive: true diff --git a/staging/src/k8s.io/code-generator/cmd/import-boss/testdata/transitive/forbidden/f1/file.go b/cmd/import-boss/testdata/transitive/forbidden/f1/file.go similarity index 100% rename from staging/src/k8s.io/code-generator/cmd/import-boss/testdata/transitive/forbidden/f1/file.go rename to cmd/import-boss/testdata/transitive/forbidden/f1/file.go diff --git a/staging/src/k8s.io/code-generator/cmd/import-boss/testdata/transitive/forbidden/f2/file.go b/cmd/import-boss/testdata/transitive/forbidden/f2/file.go similarity index 100% rename from staging/src/k8s.io/code-generator/cmd/import-boss/testdata/transitive/forbidden/f2/file.go rename to cmd/import-boss/testdata/transitive/forbidden/f2/file.go diff --git a/staging/src/k8s.io/code-generator/cmd/import-boss/testdata/transitive/forbidden/file.go b/cmd/import-boss/testdata/transitive/forbidden/file.go similarity index 100% rename from staging/src/k8s.io/code-generator/cmd/import-boss/testdata/transitive/forbidden/file.go rename to cmd/import-boss/testdata/transitive/forbidden/file.go diff --git a/staging/src/k8s.io/code-generator/cmd/import-boss/testdata/transitive/neither/file.go b/cmd/import-boss/testdata/transitive/neither/file.go similarity index 100% rename from staging/src/k8s.io/code-generator/cmd/import-boss/testdata/transitive/neither/file.go rename to cmd/import-boss/testdata/transitive/neither/file.go diff --git a/staging/src/k8s.io/code-generator/cmd/import-boss/testdata/transitive/neither/n1/file.go b/cmd/import-boss/testdata/transitive/neither/n1/file.go similarity index 100% rename from staging/src/k8s.io/code-generator/cmd/import-boss/testdata/transitive/neither/n1/file.go rename to cmd/import-boss/testdata/transitive/neither/n1/file.go diff --git a/staging/src/k8s.io/code-generator/cmd/import-boss/testdata/transitive/neither/n2/file.go b/cmd/import-boss/testdata/transitive/neither/n2/file.go similarity index 100% rename from staging/src/k8s.io/code-generator/cmd/import-boss/testdata/transitive/neither/n2/file.go rename to cmd/import-boss/testdata/transitive/neither/n2/file.go diff --git a/hack/verify-import-boss.sh b/hack/verify-import-boss.sh index a28bac55f9e..46e14786d70 100755 --- a/hack/verify-import-boss.sh +++ b/hack/verify-import-boss.sh @@ -37,4 +37,4 @@ kube::util::read-array packages < <( ) GOPROXY=off \ - go run k8s.io/code-generator/cmd/import-boss -v "${KUBE_VERBOSE:-0}" "${packages[@]}" + go run ./cmd/import-boss -v "${KUBE_VERBOSE:-0}" "${packages[@]}" diff --git a/staging/src/k8s.io/code-generator/cmd/import-boss/.gitignore b/staging/src/k8s.io/code-generator/cmd/import-boss/.gitignore deleted file mode 100644 index a5c47b66f83..00000000000 --- a/staging/src/k8s.io/code-generator/cmd/import-boss/.gitignore +++ /dev/null @@ -1 +0,0 @@ -import-boss diff --git a/staging/src/k8s.io/code-generator/cmd/import-boss/testdata/inverse/aaa/file.go b/staging/src/k8s.io/code-generator/cmd/import-boss/testdata/inverse/aaa/file.go deleted file mode 100644 index e84a68eecf1..00000000000 --- a/staging/src/k8s.io/code-generator/cmd/import-boss/testdata/inverse/aaa/file.go +++ /dev/null @@ -1,12 +0,0 @@ -package aaa - -import ( - _ "k8s.io/code-generator/cmd/import-boss/testdata/inverse/allowed" - _ "k8s.io/code-generator/cmd/import-boss/testdata/inverse/allowed/a1" - _ "k8s.io/code-generator/cmd/import-boss/testdata/inverse/forbidden" - _ "k8s.io/code-generator/cmd/import-boss/testdata/inverse/forbidden/f1" - _ "k8s.io/code-generator/cmd/import-boss/testdata/inverse/neither" - _ "k8s.io/code-generator/cmd/import-boss/testdata/inverse/neither/n1" -) - -var X = "aaa" diff --git a/staging/src/k8s.io/code-generator/cmd/import-boss/testdata/inverse/allowed/.import-restrictions b/staging/src/k8s.io/code-generator/cmd/import-boss/testdata/inverse/allowed/.import-restrictions deleted file mode 100644 index 62a34b5d0fd..00000000000 --- a/staging/src/k8s.io/code-generator/cmd/import-boss/testdata/inverse/allowed/.import-restrictions +++ /dev/null @@ -1,4 +0,0 @@ -inverseRules: - - selectorRegexp: k8s[.]io - allowedPrefixes: - - k8s.io/code-generator/cmd/import-boss/testdata/inverse/aaa diff --git a/staging/src/k8s.io/code-generator/cmd/import-boss/testdata/inverse/allowed/file.go b/staging/src/k8s.io/code-generator/cmd/import-boss/testdata/inverse/allowed/file.go deleted file mode 100644 index 98e620416ab..00000000000 --- a/staging/src/k8s.io/code-generator/cmd/import-boss/testdata/inverse/allowed/file.go +++ /dev/null @@ -1,9 +0,0 @@ -package allowed - -import ( - _ "k8s.io/code-generator/cmd/import-boss/testdata/inverse/allowed/a2" - _ "k8s.io/code-generator/cmd/import-boss/testdata/inverse/forbidden/f2" - _ "k8s.io/code-generator/cmd/import-boss/testdata/inverse/neither/n2" -) - -var X = "allowed" diff --git a/staging/src/k8s.io/code-generator/cmd/import-boss/testdata/inverse/forbidden/.import-restrictions b/staging/src/k8s.io/code-generator/cmd/import-boss/testdata/inverse/forbidden/.import-restrictions deleted file mode 100644 index 516550ac657..00000000000 --- a/staging/src/k8s.io/code-generator/cmd/import-boss/testdata/inverse/forbidden/.import-restrictions +++ /dev/null @@ -1,4 +0,0 @@ -inverseRules: - - selectorRegexp: k8s[.]io - forbiddenPrefixes: - - k8s.io/code-generator/cmd/import-boss/testdata/inverse/aaa diff --git a/staging/src/k8s.io/code-generator/cmd/import-boss/testdata/nested-fwd/.import-restrictions b/staging/src/k8s.io/code-generator/cmd/import-boss/testdata/nested-fwd/.import-restrictions deleted file mode 100644 index 9afbbef9ee7..00000000000 --- a/staging/src/k8s.io/code-generator/cmd/import-boss/testdata/nested-fwd/.import-restrictions +++ /dev/null @@ -1,8 +0,0 @@ -rules: - - selectorRegexp: k8s[.]io - allowedPrefixes: - - k8s.io/code-generator/cmd/import-boss/testdata/nested-fwd/allowed-by-root - - k8s.io/code-generator/cmd/import-boss/testdata/nested-fwd/allowed-by-both - forbiddenPrefixes: - - k8s.io/code-generator/cmd/import-boss/testdata/nested-fwd/forbidden-by-root - - k8s.io/code-generator/cmd/import-boss/testdata/nested-fwd/forbidden-by-both diff --git a/staging/src/k8s.io/code-generator/cmd/import-boss/testdata/nested-fwd/aaa/.import-restrictions b/staging/src/k8s.io/code-generator/cmd/import-boss/testdata/nested-fwd/aaa/.import-restrictions deleted file mode 100644 index 269ebd2428d..00000000000 --- a/staging/src/k8s.io/code-generator/cmd/import-boss/testdata/nested-fwd/aaa/.import-restrictions +++ /dev/null @@ -1,9 +0,0 @@ -rules: - - selectorRegexp: k8s[.]io - allowedPrefixes: - - k8s.io/code-generator/cmd/import-boss/testdata/nested-fwd/bbb - - k8s.io/code-generator/cmd/import-boss/testdata/nested-fwd/allowed-by-sub - - k8s.io/code-generator/cmd/import-boss/testdata/nested-fwd/allowed-by-both - forbiddenPrefixes: - - k8s.io/code-generator/cmd/import-boss/testdata/nested-fwd/forbidden-by-sub - - k8s.io/code-generator/cmd/import-boss/testdata/nested-fwd/forbidden-by-both diff --git a/staging/src/k8s.io/code-generator/cmd/import-boss/testdata/nested-fwd/aaa/file.go b/staging/src/k8s.io/code-generator/cmd/import-boss/testdata/nested-fwd/aaa/file.go deleted file mode 100644 index 68bab587cf2..00000000000 --- a/staging/src/k8s.io/code-generator/cmd/import-boss/testdata/nested-fwd/aaa/file.go +++ /dev/null @@ -1,14 +0,0 @@ -package aaa - -import ( - _ "k8s.io/code-generator/cmd/import-boss/testdata/nested-fwd/allowed-by-both" - _ "k8s.io/code-generator/cmd/import-boss/testdata/nested-fwd/allowed-by-root" - _ "k8s.io/code-generator/cmd/import-boss/testdata/nested-fwd/allowed-by-sub" - _ "k8s.io/code-generator/cmd/import-boss/testdata/nested-fwd/bbb" - _ "k8s.io/code-generator/cmd/import-boss/testdata/nested-fwd/forbidden-by-both" - _ "k8s.io/code-generator/cmd/import-boss/testdata/nested-fwd/forbidden-by-root" - _ "k8s.io/code-generator/cmd/import-boss/testdata/nested-fwd/forbidden-by-sub" - _ "k8s.io/code-generator/cmd/import-boss/testdata/nested-fwd/neither/n1" -) - -var X = "aaa" diff --git a/staging/src/k8s.io/code-generator/cmd/import-boss/testdata/nested-fwd/bbb/file.go b/staging/src/k8s.io/code-generator/cmd/import-boss/testdata/nested-fwd/bbb/file.go deleted file mode 100644 index f9d71731008..00000000000 --- a/staging/src/k8s.io/code-generator/cmd/import-boss/testdata/nested-fwd/bbb/file.go +++ /dev/null @@ -1,13 +0,0 @@ -package bbb - -import ( - _ "k8s.io/code-generator/cmd/import-boss/testdata/nested-fwd/allowed-by-both" - _ "k8s.io/code-generator/cmd/import-boss/testdata/nested-fwd/allowed-by-root" - _ "k8s.io/code-generator/cmd/import-boss/testdata/nested-fwd/allowed-by-sub" - _ "k8s.io/code-generator/cmd/import-boss/testdata/nested-fwd/forbidden-by-both" - _ "k8s.io/code-generator/cmd/import-boss/testdata/nested-fwd/forbidden-by-root" - _ "k8s.io/code-generator/cmd/import-boss/testdata/nested-fwd/forbidden-by-sub" - _ "k8s.io/code-generator/cmd/import-boss/testdata/nested-fwd/neither/n2" -) - -var X = "bbb" diff --git a/staging/src/k8s.io/code-generator/cmd/import-boss/testdata/simple-fwd/aaa/.import-restrictions b/staging/src/k8s.io/code-generator/cmd/import-boss/testdata/simple-fwd/aaa/.import-restrictions deleted file mode 100644 index 56ebc9040b5..00000000000 --- a/staging/src/k8s.io/code-generator/cmd/import-boss/testdata/simple-fwd/aaa/.import-restrictions +++ /dev/null @@ -1,6 +0,0 @@ -rules: - - selectorRegexp: k8s[.]io - allowedPrefixes: - - k8s.io/code-generator/cmd/import-boss/testdata/simple-fwd/allowed - forbiddenPrefixes: - - k8s.io/code-generator/cmd/import-boss/testdata/simple-fwd/forbidden diff --git a/staging/src/k8s.io/code-generator/cmd/import-boss/testdata/simple-fwd/aaa/file.go b/staging/src/k8s.io/code-generator/cmd/import-boss/testdata/simple-fwd/aaa/file.go deleted file mode 100644 index 2b04c576131..00000000000 --- a/staging/src/k8s.io/code-generator/cmd/import-boss/testdata/simple-fwd/aaa/file.go +++ /dev/null @@ -1,12 +0,0 @@ -package aaa - -import ( - _ "k8s.io/code-generator/cmd/import-boss/testdata/simple-fwd/allowed" - _ "k8s.io/code-generator/cmd/import-boss/testdata/simple-fwd/allowed/a1" - _ "k8s.io/code-generator/cmd/import-boss/testdata/simple-fwd/forbidden" - _ "k8s.io/code-generator/cmd/import-boss/testdata/simple-fwd/forbidden/f1" - _ "k8s.io/code-generator/cmd/import-boss/testdata/simple-fwd/neither" - _ "k8s.io/code-generator/cmd/import-boss/testdata/simple-fwd/neither/n1" -) - -var X = "aaa" diff --git a/staging/src/k8s.io/code-generator/cmd/import-boss/testdata/simple-fwd/allowed/file.go b/staging/src/k8s.io/code-generator/cmd/import-boss/testdata/simple-fwd/allowed/file.go deleted file mode 100644 index 5605ade40df..00000000000 --- a/staging/src/k8s.io/code-generator/cmd/import-boss/testdata/simple-fwd/allowed/file.go +++ /dev/null @@ -1,9 +0,0 @@ -package allowed - -import ( - _ "k8s.io/code-generator/cmd/import-boss/testdata/simple-fwd/allowed/a2" - _ "k8s.io/code-generator/cmd/import-boss/testdata/simple-fwd/forbidden/f2" - _ "k8s.io/code-generator/cmd/import-boss/testdata/simple-fwd/neither/n2" -) - -var X = "allowed" diff --git a/staging/src/k8s.io/code-generator/cmd/import-boss/testdata/transitive/aaa/file.go b/staging/src/k8s.io/code-generator/cmd/import-boss/testdata/transitive/aaa/file.go deleted file mode 100644 index 338c025ef9b..00000000000 --- a/staging/src/k8s.io/code-generator/cmd/import-boss/testdata/transitive/aaa/file.go +++ /dev/null @@ -1,12 +0,0 @@ -package aaa - -import ( - _ "k8s.io/code-generator/cmd/import-boss/testdata/transitive/allowed" - _ "k8s.io/code-generator/cmd/import-boss/testdata/transitive/allowed/a1" - _ "k8s.io/code-generator/cmd/import-boss/testdata/transitive/forbidden" - _ "k8s.io/code-generator/cmd/import-boss/testdata/transitive/forbidden/f1" - _ "k8s.io/code-generator/cmd/import-boss/testdata/transitive/neither" - _ "k8s.io/code-generator/cmd/import-boss/testdata/transitive/neither/n1" -) - -var X = "aaa" diff --git a/staging/src/k8s.io/code-generator/cmd/import-boss/testdata/transitive/allowed/file.go b/staging/src/k8s.io/code-generator/cmd/import-boss/testdata/transitive/allowed/file.go deleted file mode 100644 index 169bad01f13..00000000000 --- a/staging/src/k8s.io/code-generator/cmd/import-boss/testdata/transitive/allowed/file.go +++ /dev/null @@ -1,9 +0,0 @@ -package allowed - -import ( - _ "k8s.io/code-generator/cmd/import-boss/testdata/transitive/allowed/a2" - _ "k8s.io/code-generator/cmd/import-boss/testdata/transitive/forbidden/f2" - _ "k8s.io/code-generator/cmd/import-boss/testdata/transitive/neither/n2" -) - -var X = "allowed" diff --git a/staging/src/k8s.io/code-generator/tools.go b/staging/src/k8s.io/code-generator/tools.go index 476bd3a9760..6893f6ff190 100644 --- a/staging/src/k8s.io/code-generator/tools.go +++ b/staging/src/k8s.io/code-generator/tools.go @@ -28,7 +28,6 @@ import ( _ "k8s.io/code-generator/cmd/deepcopy-gen" _ "k8s.io/code-generator/cmd/defaulter-gen" _ "k8s.io/code-generator/cmd/go-to-protobuf" - _ "k8s.io/code-generator/cmd/import-boss" _ "k8s.io/code-generator/cmd/informer-gen" _ "k8s.io/code-generator/cmd/lister-gen" _ "k8s.io/code-generator/cmd/openapi-gen"