Skip to content

Commit 067a328

Browse files
thockinthockin
committed
Move import-boss: k/code-generator/cmd -> k/k/cmd
1 parent 7776496 commit 067a328

File tree

67 files changed

+147
-150
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+147
-150
lines changed

‎build/tools.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ import (
2727
_ "k8s.io/code-generator/cmd/defaulter-gen"
2828
_ "k8s.io/code-generator/cmd/go-to-protobuf"
2929
_ "k8s.io/code-generator/cmd/go-to-protobuf/protoc-gen-gogo"
30-
_ "k8s.io/code-generator/cmd/import-boss"
3130
_ "k8s.io/kube-openapi/cmd/openapi-gen"
3231

3332
// submodule test dependencies

‎staging/src/k8s.io/code-generator/cmd/import-boss/README.md renamed to ‎cmd/import-boss/README.md

‎staging/src/k8s.io/code-generator/cmd/import-boss/main.go renamed to ‎cmd/import-boss/main.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ func loadPkgs(patterns ...string) ([]*packages.Package, error) {
103103
}
104104
}
105105
if len(errs) > 0 {
106-
allErrs = append(allErrs, fmt.Errorf("error(s) in %q: %v", pkg.PkgPath, errors.Join(errs...)))
106+
allErrs = append(allErrs, fmt.Errorf("error(s) in %q: %w", pkg.PkgPath, errors.Join(errs...)))
107107
}
108108
}
109109
if len(allErrs) > 0 {
@@ -194,7 +194,7 @@ func (boss *ImportBoss) Verify(pkg *packages.Package) []error {
194194

195195
restrictionFiles, err := recursiveRead(filepath.Join(pkgDir, rulesFileName))
196196
if err != nil {
197-
return []error{fmt.Errorf("error finding rules file: %v", err)}
197+
return []error{fmt.Errorf("error finding rules file: %w", err)}
198198
}
199199
if len(restrictionFiles) == 0 {
200200
return nil
@@ -299,13 +299,13 @@ func recursiveRead(path string) ([]*FileFormat, error) {
299299
func readFile(path string) (*FileFormat, error) {
300300
currentBytes, err := os.ReadFile(path)
301301
if err != nil {
302-
return nil, fmt.Errorf("couldn't read %v: %v", path, err)
302+
return nil, fmt.Errorf("couldn't read %v: %w", path, err)
303303
}
304304

305305
var current FileFormat
306306
err = yaml.Unmarshal(currentBytes, &current)
307307
if err != nil {
308-
return nil, fmt.Errorf("couldn't unmarshal %v: %v", path, err)
308+
return nil, fmt.Errorf("couldn't unmarshal %v: %w", path, err)
309309
}
310310
current.path = path
311311
return &current, nil

‎staging/src/k8s.io/code-generator/cmd/import-boss/main_test.go renamed to ‎cmd/import-boss/main_test.go

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -226,18 +226,18 @@ func TestSimpleForward(t *testing.T) {
226226
if len(pkgs) != 1 {
227227
t.Fatalf("expected 1 pkg result, got %d", len(pkgs))
228228
}
229-
if pkgs[0].PkgPath != "k8s.io/code-generator/cmd/import-boss/testdata/simple-fwd/aaa" {
229+
if pkgs[0].PkgPath != "k8s.io/kubernetes/cmd/import-boss/testdata/simple-fwd/aaa" {
230230
t.Fatalf("wrong PkgPath: %q", pkgs[0].PkgPath)
231231
}
232232

233233
boss := newBoss(pkgs)
234234
errs := boss.Verify(pkgs[0])
235235

236236
expect := []string{
237-
`"k8s.io/code-generator/cmd/import-boss/testdata/simple-fwd/aaa" -> "k8s.io/code-generator/cmd/import-boss/testdata/simple-fwd/forbidden" is forbidden`,
238-
`"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`,
239-
`"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`,
240-
`"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`,
237+
`"k8s.io/kubernetes/cmd/import-boss/testdata/simple-fwd/aaa" -> "k8s.io/kubernetes/cmd/import-boss/testdata/simple-fwd/forbidden" is forbidden`,
238+
`"k8s.io/kubernetes/cmd/import-boss/testdata/simple-fwd/aaa" -> "k8s.io/kubernetes/cmd/import-boss/testdata/simple-fwd/forbidden/f1" is forbidden`,
239+
`"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`,
240+
`"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`,
241241
}
242242

243243
checkAllErrorStrings(t, errs, expect)
@@ -251,18 +251,18 @@ func TestNestedForward(t *testing.T) {
251251
if len(pkgs) != 1 {
252252
t.Fatalf("expected 1 pkg result, got %d", len(pkgs))
253253
}
254-
if pkgs[0].PkgPath != "k8s.io/code-generator/cmd/import-boss/testdata/nested-fwd/aaa" {
254+
if pkgs[0].PkgPath != "k8s.io/kubernetes/cmd/import-boss/testdata/nested-fwd/aaa" {
255255
t.Fatalf("wrong PkgPath: %q", pkgs[0].PkgPath)
256256
}
257257

258258
boss := newBoss(pkgs)
259259
errs := boss.Verify(pkgs[0])
260260

261261
expect := []string{
262-
`"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`,
263-
`"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`,
264-
`"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`,
265-
`"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`,
262+
`"k8s.io/kubernetes/cmd/import-boss/testdata/nested-fwd/aaa" -> "k8s.io/kubernetes/cmd/import-boss/testdata/nested-fwd/forbidden-by-both" is forbidden`,
263+
`"k8s.io/kubernetes/cmd/import-boss/testdata/nested-fwd/aaa" -> "k8s.io/kubernetes/cmd/import-boss/testdata/nested-fwd/forbidden-by-root" is forbidden`,
264+
`"k8s.io/kubernetes/cmd/import-boss/testdata/nested-fwd/aaa" -> "k8s.io/kubernetes/cmd/import-boss/testdata/nested-fwd/forbidden-by-sub" is forbidden`,
265+
`"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`,
266266
}
267267

268268
checkAllErrorStrings(t, errs, expect)
@@ -285,10 +285,10 @@ func TestInverse(t *testing.T) {
285285
}
286286

287287
expect := []string{
288-
`"k8s.io/code-generator/cmd/import-boss/testdata/inverse/forbidden" <- "k8s.io/code-generator/cmd/import-boss/testdata/inverse/aaa" is forbidden`,
289-
`"k8s.io/code-generator/cmd/import-boss/testdata/inverse/forbidden/f1" <- "k8s.io/code-generator/cmd/import-boss/testdata/inverse/aaa" is forbidden`,
290-
`"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`,
291-
`"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`,
288+
`"k8s.io/kubernetes/cmd/import-boss/testdata/inverse/forbidden" <- "k8s.io/kubernetes/cmd/import-boss/testdata/inverse/aaa" is forbidden`,
289+
`"k8s.io/kubernetes/cmd/import-boss/testdata/inverse/forbidden/f1" <- "k8s.io/kubernetes/cmd/import-boss/testdata/inverse/aaa" is forbidden`,
290+
`"k8s.io/kubernetes/cmd/import-boss/testdata/inverse/allowed/a2" <- "k8s.io/kubernetes/cmd/import-boss/testdata/inverse/allowed" did not match any rule`,
291+
`"k8s.io/kubernetes/cmd/import-boss/testdata/inverse/forbidden/f2" <- "k8s.io/kubernetes/cmd/import-boss/testdata/inverse/allowed" did not match any rule`,
292292
}
293293

294294
checkAllErrorStrings(t, errs, expect)
@@ -311,11 +311,11 @@ func TestTransitive(t *testing.T) {
311311
}
312312

313313
expect := []string{
314-
`"k8s.io/code-generator/cmd/import-boss/testdata/transitive/forbidden" <- "k8s.io/code-generator/cmd/import-boss/testdata/transitive/aaa" is forbidden`,
315-
`"k8s.io/code-generator/cmd/import-boss/testdata/transitive/forbidden/f1" <- "k8s.io/code-generator/cmd/import-boss/testdata/transitive/aaa" is forbidden`,
316-
`"k8s.io/code-generator/cmd/import-boss/testdata/transitive/forbidden/f2" <-- "k8s.io/code-generator/cmd/import-boss/testdata/transitive/aaa" is forbidden`,
317-
`"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`,
318-
`"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`,
314+
`"k8s.io/kubernetes/cmd/import-boss/testdata/transitive/forbidden" <- "k8s.io/kubernetes/cmd/import-boss/testdata/transitive/aaa" is forbidden`,
315+
`"k8s.io/kubernetes/cmd/import-boss/testdata/transitive/forbidden/f1" <- "k8s.io/kubernetes/cmd/import-boss/testdata/transitive/aaa" is forbidden`,
316+
`"k8s.io/kubernetes/cmd/import-boss/testdata/transitive/forbidden/f2" <-- "k8s.io/kubernetes/cmd/import-boss/testdata/transitive/aaa" is forbidden`,
317+
`"k8s.io/kubernetes/cmd/import-boss/testdata/transitive/allowed/a2" <- "k8s.io/kubernetes/cmd/import-boss/testdata/transitive/allowed" did not match any rule`,
318+
`"k8s.io/kubernetes/cmd/import-boss/testdata/transitive/forbidden/f2" <- "k8s.io/kubernetes/cmd/import-boss/testdata/transitive/allowed" did not match any rule`,
319319
}
320320

321321
checkAllErrorStrings(t, errs, expect)

‎cmd/import-boss/testdata/inverse/aaa/file.go

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
package aaa
2+
3+
import (
4+
_ "k8s.io/kubernetes/cmd/import-boss/testdata/inverse/allowed"
5+
_ "k8s.io/kubernetes/cmd/import-boss/testdata/inverse/allowed/a1"
6+
_ "k8s.io/kubernetes/cmd/import-boss/testdata/inverse/forbidden"
7+
_ "k8s.io/kubernetes/cmd/import-boss/testdata/inverse/forbidden/f1"
8+
_ "k8s.io/kubernetes/cmd/import-boss/testdata/inverse/neither"
9+
_ "k8s.io/kubernetes/cmd/import-boss/testdata/inverse/neither/n1"
10+
)
11+
12+
var X = "aaa"

‎cmd/import-boss/testdata/inverse/allowed/.import-restrictions

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
inverseRules:
2+
- selectorRegexp: k8s[.]io
3+
allowedPrefixes:
4+
- k8s.io/kubernetes/cmd/import-boss/testdata/inverse/aaa

‎staging/src/k8s.io/code-generator/cmd/import-boss/testdata/inverse/allowed/a1/file.go renamed to ‎cmd/import-boss/testdata/inverse/allowed/a1/file.go

File renamed without changes.

‎staging/src/k8s.io/code-generator/cmd/import-boss/testdata/inverse/allowed/a2/file.go renamed to ‎cmd/import-boss/testdata/inverse/allowed/a2/file.go

File renamed without changes.

‎cmd/import-boss/testdata/inverse/allowed/file.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
package allowed
2+
3+
import (
4+
_ "k8s.io/kubernetes/cmd/import-boss/testdata/inverse/allowed/a2"
5+
_ "k8s.io/kubernetes/cmd/import-boss/testdata/inverse/forbidden/f2"
6+
_ "k8s.io/kubernetes/cmd/import-boss/testdata/inverse/neither/n2"
7+
)
8+
9+
var X = "allowed"

‎cmd/import-boss/testdata/inverse/forbidden/.import-restrictions

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
inverseRules:
2+
- selectorRegexp: k8s[.]io
3+
forbiddenPrefixes:
4+
- k8s.io/kubernetes/cmd/import-boss/testdata/inverse/aaa

‎staging/src/k8s.io/code-generator/cmd/import-boss/testdata/inverse/forbidden/f1/file.go renamed to ‎cmd/import-boss/testdata/inverse/forbidden/f1/file.go

File renamed without changes.

‎staging/src/k8s.io/code-generator/cmd/import-boss/testdata/inverse/forbidden/f2/file.go renamed to ‎cmd/import-boss/testdata/inverse/forbidden/f2/file.go

File renamed without changes.

‎staging/src/k8s.io/code-generator/cmd/import-boss/testdata/inverse/forbidden/file.go renamed to ‎cmd/import-boss/testdata/inverse/forbidden/file.go

File renamed without changes.

‎staging/src/k8s.io/code-generator/cmd/import-boss/testdata/inverse/neither/file.go renamed to ‎cmd/import-boss/testdata/inverse/neither/file.go

File renamed without changes.

‎staging/src/k8s.io/code-generator/cmd/import-boss/testdata/inverse/neither/n1/file.go renamed to ‎cmd/import-boss/testdata/inverse/neither/n1/file.go

File renamed without changes.

‎staging/src/k8s.io/code-generator/cmd/import-boss/testdata/inverse/neither/n2/file.go renamed to ‎cmd/import-boss/testdata/inverse/neither/n2/file.go

File renamed without changes.

‎cmd/import-boss/testdata/nested-fwd/.import-restrictions

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
rules:
2+
- selectorRegexp: k8s[.]io
3+
allowedPrefixes:
4+
- k8s.io/kubernetes/cmd/import-boss/testdata/nested-fwd/allowed-by-root
5+
- k8s.io/kubernetes/cmd/import-boss/testdata/nested-fwd/allowed-by-both
6+
forbiddenPrefixes:
7+
- k8s.io/kubernetes/cmd/import-boss/testdata/nested-fwd/forbidden-by-root
8+
- k8s.io/kubernetes/cmd/import-boss/testdata/nested-fwd/forbidden-by-both

‎cmd/import-boss/testdata/nested-fwd/aaa/.import-restrictions

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
rules:
2+
- selectorRegexp: k8s[.]io
3+
allowedPrefixes:
4+
- k8s.io/kubernetes/cmd/import-boss/testdata/nested-fwd/bbb
5+
- k8s.io/kubernetes/cmd/import-boss/testdata/nested-fwd/allowed-by-sub
6+
- k8s.io/kubernetes/cmd/import-boss/testdata/nested-fwd/allowed-by-both
7+
forbiddenPrefixes:
8+
- k8s.io/kubernetes/cmd/import-boss/testdata/nested-fwd/forbidden-by-sub
9+
- k8s.io/kubernetes/cmd/import-boss/testdata/nested-fwd/forbidden-by-both

‎cmd/import-boss/testdata/nested-fwd/aaa/file.go

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
package aaa
2+
3+
import (
4+
_ "k8s.io/kubernetes/cmd/import-boss/testdata/nested-fwd/allowed-by-both"
5+
_ "k8s.io/kubernetes/cmd/import-boss/testdata/nested-fwd/allowed-by-root"
6+
_ "k8s.io/kubernetes/cmd/import-boss/testdata/nested-fwd/allowed-by-sub"
7+
_ "k8s.io/kubernetes/cmd/import-boss/testdata/nested-fwd/bbb"
8+
_ "k8s.io/kubernetes/cmd/import-boss/testdata/nested-fwd/forbidden-by-both"
9+
_ "k8s.io/kubernetes/cmd/import-boss/testdata/nested-fwd/forbidden-by-root"
10+
_ "k8s.io/kubernetes/cmd/import-boss/testdata/nested-fwd/forbidden-by-sub"
11+
_ "k8s.io/kubernetes/cmd/import-boss/testdata/nested-fwd/neither/n1"
12+
)
13+
14+
var X = "aaa"

‎staging/src/k8s.io/code-generator/cmd/import-boss/testdata/nested-fwd/allowed-by-both/file.go renamed to ‎cmd/import-boss/testdata/nested-fwd/allowed-by-both/file.go

File renamed without changes.

‎staging/src/k8s.io/code-generator/cmd/import-boss/testdata/nested-fwd/allowed-by-root/file.go renamed to ‎cmd/import-boss/testdata/nested-fwd/allowed-by-root/file.go

File renamed without changes.

‎staging/src/k8s.io/code-generator/cmd/import-boss/testdata/nested-fwd/allowed-by-sub/file.go renamed to ‎cmd/import-boss/testdata/nested-fwd/allowed-by-sub/file.go

File renamed without changes.

‎cmd/import-boss/testdata/nested-fwd/bbb/file.go

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
package bbb
2+
3+
import (
4+
_ "k8s.io/kubernetes/cmd/import-boss/testdata/nested-fwd/allowed-by-both"
5+
_ "k8s.io/kubernetes/cmd/import-boss/testdata/nested-fwd/allowed-by-root"
6+
_ "k8s.io/kubernetes/cmd/import-boss/testdata/nested-fwd/allowed-by-sub"
7+
_ "k8s.io/kubernetes/cmd/import-boss/testdata/nested-fwd/forbidden-by-both"
8+
_ "k8s.io/kubernetes/cmd/import-boss/testdata/nested-fwd/forbidden-by-root"
9+
_ "k8s.io/kubernetes/cmd/import-boss/testdata/nested-fwd/forbidden-by-sub"
10+
_ "k8s.io/kubernetes/cmd/import-boss/testdata/nested-fwd/neither/n2"
11+
)
12+
13+
var X = "bbb"

‎staging/src/k8s.io/code-generator/cmd/import-boss/testdata/nested-fwd/forbidden-by-both/file.go renamed to ‎cmd/import-boss/testdata/nested-fwd/forbidden-by-both/file.go

File renamed without changes.

‎staging/src/k8s.io/code-generator/cmd/import-boss/testdata/nested-fwd/forbidden-by-root/file.go renamed to ‎cmd/import-boss/testdata/nested-fwd/forbidden-by-root/file.go

File renamed without changes.

‎staging/src/k8s.io/code-generator/cmd/import-boss/testdata/nested-fwd/forbidden-by-sub/file.go renamed to ‎cmd/import-boss/testdata/nested-fwd/forbidden-by-sub/file.go

File renamed without changes.

‎staging/src/k8s.io/code-generator/cmd/import-boss/testdata/nested-fwd/neither/n1/file.go renamed to ‎cmd/import-boss/testdata/nested-fwd/neither/n1/file.go

File renamed without changes.

‎staging/src/k8s.io/code-generator/cmd/import-boss/testdata/nested-fwd/neither/n2/file.go renamed to ‎cmd/import-boss/testdata/nested-fwd/neither/n2/file.go

File renamed without changes.

‎cmd/import-boss/testdata/simple-fwd/aaa/.import-restrictions

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
rules:
2+
- selectorRegexp: k8s[.]io
3+
allowedPrefixes:
4+
- k8s.io/kubernetes/cmd/import-boss/testdata/simple-fwd/allowed
5+
forbiddenPrefixes:
6+
- k8s.io/kubernetes/cmd/import-boss/testdata/simple-fwd/forbidden

‎cmd/import-boss/testdata/simple-fwd/aaa/file.go

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
package aaa
2+
3+
import (
4+
_ "k8s.io/kubernetes/cmd/import-boss/testdata/simple-fwd/allowed"
5+
_ "k8s.io/kubernetes/cmd/import-boss/testdata/simple-fwd/allowed/a1"
6+
_ "k8s.io/kubernetes/cmd/import-boss/testdata/simple-fwd/forbidden"
7+
_ "k8s.io/kubernetes/cmd/import-boss/testdata/simple-fwd/forbidden/f1"
8+
_ "k8s.io/kubernetes/cmd/import-boss/testdata/simple-fwd/neither"
9+
_ "k8s.io/kubernetes/cmd/import-boss/testdata/simple-fwd/neither/n1"
10+
)
11+
12+
var X = "aaa"

‎staging/src/k8s.io/code-generator/cmd/import-boss/testdata/simple-fwd/allowed/a1/file.go renamed to ‎cmd/import-boss/testdata/simple-fwd/allowed/a1/file.go

File renamed without changes.

‎staging/src/k8s.io/code-generator/cmd/import-boss/testdata/simple-fwd/allowed/a2/file.go renamed to ‎cmd/import-boss/testdata/simple-fwd/allowed/a2/file.go

File renamed without changes.

‎cmd/import-boss/testdata/simple-fwd/allowed/file.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
package allowed
2+
3+
import (
4+
_ "k8s.io/kubernetes/cmd/import-boss/testdata/simple-fwd/allowed/a2"
5+
_ "k8s.io/kubernetes/cmd/import-boss/testdata/simple-fwd/forbidden/f2"
6+
_ "k8s.io/kubernetes/cmd/import-boss/testdata/simple-fwd/neither/n2"
7+
)
8+
9+
var X = "allowed"

‎staging/src/k8s.io/code-generator/cmd/import-boss/testdata/simple-fwd/forbidden/f1/file.go renamed to ‎cmd/import-boss/testdata/simple-fwd/forbidden/f1/file.go

File renamed without changes.

‎staging/src/k8s.io/code-generator/cmd/import-boss/testdata/simple-fwd/forbidden/f2/file.go renamed to ‎cmd/import-boss/testdata/simple-fwd/forbidden/f2/file.go

File renamed without changes.

‎staging/src/k8s.io/code-generator/cmd/import-boss/testdata/simple-fwd/forbidden/file.go renamed to ‎cmd/import-boss/testdata/simple-fwd/forbidden/file.go

File renamed without changes.

‎staging/src/k8s.io/code-generator/cmd/import-boss/testdata/simple-fwd/neither/file.go renamed to ‎cmd/import-boss/testdata/simple-fwd/neither/file.go

File renamed without changes.

‎staging/src/k8s.io/code-generator/cmd/import-boss/testdata/simple-fwd/neither/n1/file.go renamed to ‎cmd/import-boss/testdata/simple-fwd/neither/n1/file.go

File renamed without changes.

‎staging/src/k8s.io/code-generator/cmd/import-boss/testdata/simple-fwd/neither/n2/file.go renamed to ‎cmd/import-boss/testdata/simple-fwd/neither/n2/file.go

File renamed without changes.

‎cmd/import-boss/testdata/transitive/aaa/file.go

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
package aaa
2+
3+
import (
4+
_ "k8s.io/kubernetes/cmd/import-boss/testdata/transitive/allowed"
5+
_ "k8s.io/kubernetes/cmd/import-boss/testdata/transitive/allowed/a1"
6+
_ "k8s.io/kubernetes/cmd/import-boss/testdata/transitive/forbidden"
7+
_ "k8s.io/kubernetes/cmd/import-boss/testdata/transitive/forbidden/f1"
8+
_ "k8s.io/kubernetes/cmd/import-boss/testdata/transitive/neither"
9+
_ "k8s.io/kubernetes/cmd/import-boss/testdata/transitive/neither/n1"
10+
)
11+
12+
var X = "aaa"

‎staging/src/k8s.io/code-generator/cmd/import-boss/testdata/transitive/allowed/.import-restrictions renamed to ‎cmd/import-boss/testdata/transitive/allowed/.import-restrictions

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
inverseRules:
22
- selectorRegexp: k8s[.]io
33
allowedPrefixes:
4-
- k8s.io/code-generator/cmd/import-boss/testdata/transitive/aaa
4+
- k8s.io/kubernetes/cmd/import-boss/testdata/transitive/aaa
55
transitive: true

‎staging/src/k8s.io/code-generator/cmd/import-boss/testdata/transitive/allowed/a1/file.go renamed to ‎cmd/import-boss/testdata/transitive/allowed/a1/file.go

File renamed without changes.

‎staging/src/k8s.io/code-generator/cmd/import-boss/testdata/transitive/allowed/a2/file.go renamed to ‎cmd/import-boss/testdata/transitive/allowed/a2/file.go

File renamed without changes.

‎cmd/import-boss/testdata/transitive/allowed/file.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
package allowed
2+
3+
import (
4+
_ "k8s.io/kubernetes/cmd/import-boss/testdata/transitive/allowed/a2"
5+
_ "k8s.io/kubernetes/cmd/import-boss/testdata/transitive/forbidden/f2"
6+
_ "k8s.io/kubernetes/cmd/import-boss/testdata/transitive/neither/n2"
7+
)
8+
9+
var X = "allowed"

‎staging/src/k8s.io/code-generator/cmd/import-boss/testdata/transitive/forbidden/.import-restrictions renamed to ‎cmd/import-boss/testdata/transitive/forbidden/.import-restrictions

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
inverseRules:
22
- selectorRegexp: k8s[.]io
33
forbiddenPrefixes:
4-
- k8s.io/code-generator/cmd/import-boss/testdata/transitive/aaa
4+
- k8s.io/kubernetes/cmd/import-boss/testdata/transitive/aaa
55
transitive: true

‎staging/src/k8s.io/code-generator/cmd/import-boss/testdata/transitive/forbidden/f1/file.go renamed to ‎cmd/import-boss/testdata/transitive/forbidden/f1/file.go

File renamed without changes.

‎staging/src/k8s.io/code-generator/cmd/import-boss/testdata/transitive/forbidden/f2/file.go renamed to ‎cmd/import-boss/testdata/transitive/forbidden/f2/file.go

File renamed without changes.

‎staging/src/k8s.io/code-generator/cmd/import-boss/testdata/transitive/forbidden/file.go renamed to ‎cmd/import-boss/testdata/transitive/forbidden/file.go

File renamed without changes.

‎staging/src/k8s.io/code-generator/cmd/import-boss/testdata/transitive/neither/file.go renamed to ‎cmd/import-boss/testdata/transitive/neither/file.go

File renamed without changes.

‎staging/src/k8s.io/code-generator/cmd/import-boss/testdata/transitive/neither/n1/file.go renamed to ‎cmd/import-boss/testdata/transitive/neither/n1/file.go

File renamed without changes.

‎staging/src/k8s.io/code-generator/cmd/import-boss/testdata/transitive/neither/n2/file.go renamed to ‎cmd/import-boss/testdata/transitive/neither/n2/file.go

File renamed without changes.

‎hack/verify-import-boss.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,4 @@ kube::util::read-array packages < <(
3737
)
3838

3939
GOPROXY=off \
40-
go run k8s.io/code-generator/cmd/import-boss -v "${KUBE_VERBOSE:-0}" "${packages[@]}"
40+
go run ./cmd/import-boss -v "${KUBE_VERBOSE:-0}" "${packages[@]}"

‎staging/src/k8s.io/code-generator/cmd/import-boss/.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎staging/src/k8s.io/code-generator/cmd/import-boss/testdata/inverse/aaa/file.go

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎staging/src/k8s.io/code-generator/cmd/import-boss/testdata/inverse/allowed/.import-restrictions

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎staging/src/k8s.io/code-generator/cmd/import-boss/testdata/inverse/allowed/file.go

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎staging/src/k8s.io/code-generator/cmd/import-boss/testdata/inverse/forbidden/.import-restrictions

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎staging/src/k8s.io/code-generator/cmd/import-boss/testdata/nested-fwd/.import-restrictions

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎staging/src/k8s.io/code-generator/cmd/import-boss/testdata/nested-fwd/aaa/.import-restrictions

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎staging/src/k8s.io/code-generator/cmd/import-boss/testdata/nested-fwd/aaa/file.go

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎staging/src/k8s.io/code-generator/cmd/import-boss/testdata/nested-fwd/bbb/file.go

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎staging/src/k8s.io/code-generator/cmd/import-boss/testdata/simple-fwd/aaa/.import-restrictions

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎staging/src/k8s.io/code-generator/cmd/import-boss/testdata/simple-fwd/aaa/file.go

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎staging/src/k8s.io/code-generator/cmd/import-boss/testdata/simple-fwd/allowed/file.go

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)