Merge pull request #1656 from monopole/makeResourcePublic

Make resource, resmap and ifc public.

api/builtinconfig/loaddefaultconfig.go

@@ -4,7 +4,7 @@
 package builtinconfig
 
 import (
-	"sigs.k8s.io/kustomize/v3/pkg/ifc"
+	"sigs.k8s.io/kustomize/v3/api/ifc"
 	"sigs.k8s.io/yaml"
 )
 

api/builtinconfig/transformerconfig.go

@@ -8,8 +8,8 @@ import (
 	"sort"
 
 	"sigs.k8s.io/kustomize/v3/api/builtinconfig/consts"
+	"sigs.k8s.io/kustomize/v3/api/ifc"
 	"sigs.k8s.io/kustomize/v3/api/types"
-	"sigs.k8s.io/kustomize/v3/pkg/ifc"
 )
 
 // TransformerConfig holds the data needed to perform transformations.

api/kusttest/kusttestharness.go

@@ -10,17 +10,17 @@ import (
 	"testing"
 
 	"sigs.k8s.io/kustomize/v3/api/builtinconfig/consts"
+	"sigs.k8s.io/kustomize/v3/api/loader"
+	"sigs.k8s.io/kustomize/v3/api/resmap"
+	"sigs.k8s.io/kustomize/v3/api/resource"
+	"sigs.k8s.io/kustomize/v3/api/testutils/valtest"
 	"sigs.k8s.io/kustomize/v3/api/types"
 	"sigs.k8s.io/kustomize/v3/internal/loadertest"
 	"sigs.k8s.io/kustomize/v3/k8sdeps/kunstruct"
 	"sigs.k8s.io/kustomize/v3/k8sdeps/transformer"
-	"sigs.k8s.io/kustomize/v3/pkg/loader"
 	"sigs.k8s.io/kustomize/v3/pkg/pgmconfig"
 	"sigs.k8s.io/kustomize/v3/pkg/plugins"
-	"sigs.k8s.io/kustomize/v3/pkg/resmap"
-	"sigs.k8s.io/kustomize/v3/pkg/resource"
 	"sigs.k8s.io/kustomize/v3/pkg/target"
-	"sigs.k8s.io/kustomize/v3/pkg/validators"
 )
 
 // KustTestHarness is an environment for running a kustomize build,
@@ -63,7 +63,7 @@ func NewKustTestHarnessFull(
 
 func (th *KustTestHarness) MakeKustTarget() *target.KustTarget {
 	kt, err := target.NewKustTarget(
-		th.ldr, validators.MakeFakeValidator(), th.rf,
+		th.ldr, valtest_test.MakeFakeValidator(), th.rf,
 		transformer.NewFactoryImpl(), th.pl)
 	if err != nil {
 		th.t.Fatalf("Unexpected construction error %v", err)
@@ -119,7 +119,7 @@ func (th *KustTestHarness) LoadAndRunGenerator(
 		th.t.Fatalf("Err: %v", err)
 	}
 	g, err := th.pl.LoadGenerator(
-		th.ldr, validators.MakeFakeValidator(), res)
+		th.ldr, valtest_test.MakeFakeValidator(), res)
 	if err != nil {
 		th.t.Fatalf("Err: %v", err)
 	}
@@ -161,7 +161,7 @@ func (th *KustTestHarness) RunTransformerFromResMap(
 		th.t.Fatalf("Err: %v", err)
 	}
 	g, err := th.pl.LoadTransformer(
-		th.ldr, validators.MakeFakeValidator(), transConfig)
+		th.ldr, valtest_test.MakeFakeValidator(), transConfig)
 	if err != nil {
 		return nil, err
 	}

api/kv/kv.go

@@ -14,8 +14,8 @@ import (
 	"unicode/utf8"
 
 	"github.com/pkg/errors"
+	"sigs.k8s.io/kustomize/v3/api/ifc"
 	"sigs.k8s.io/kustomize/v3/api/types"
-	"sigs.k8s.io/kustomize/v3/pkg/ifc"
 )
 
 var utf8bom = []byte{0xEF, 0xBB, 0xBF}

api/kv/kv_test.go

@@ -8,15 +8,15 @@ import (
 	"testing"
 
 	"sigs.k8s.io/kustomize/v3/api/filesys"
+	ldr "sigs.k8s.io/kustomize/v3/api/loader"
+	"sigs.k8s.io/kustomize/v3/api/testutils/valtest"
 	"sigs.k8s.io/kustomize/v3/api/types"
-	ldr "sigs.k8s.io/kustomize/v3/pkg/loader"
-	"sigs.k8s.io/kustomize/v3/pkg/validators"
 )
 
 func makeKvLoader(fSys filesys.FileSystem) *loader {
 	return &loader{
 		ldr:       ldr.NewFileLoaderAtRoot(fSys),
-		validator: validators.MakeFakeValidator()}
+		validator: valtest_test.MakeFakeValidator()}
 }
 
 func TestKeyValuesFromLines(t *testing.T) {

api/loader/fileloader.go

@@ -10,8 +10,8 @@ import (
 	"strings"
 
 	"sigs.k8s.io/kustomize/v3/api/filesys"
+	"sigs.k8s.io/kustomize/v3/api/ifc"
 	"sigs.k8s.io/kustomize/v3/pkg/git"
-	"sigs.k8s.io/kustomize/v3/pkg/ifc"
 )
 
 // fileLoader is a kustomization's interface to files.

api/loader/fileloader_test.go

@@ -26,8 +26,8 @@ import (
 	"testing"
 
 	"sigs.k8s.io/kustomize/v3/api/filesys"
+	"sigs.k8s.io/kustomize/v3/api/ifc"
 	"sigs.k8s.io/kustomize/v3/pkg/git"
-	"sigs.k8s.io/kustomize/v3/pkg/ifc"
 	"sigs.k8s.io/kustomize/v3/pkg/pgmconfig"
 )
 

api/loader/loader.go

@@ -6,8 +6,8 @@ package loader
 
 import (
 	"sigs.k8s.io/kustomize/v3/api/filesys"
+	"sigs.k8s.io/kustomize/v3/api/ifc"
 	"sigs.k8s.io/kustomize/v3/pkg/git"
-	"sigs.k8s.io/kustomize/v3/pkg/ifc"
 )
 
 // NewLoader returns a Loader pointed at the given target.

api/resmap/factory.go

@@ -5,10 +5,10 @@ package resmap
 
 import (
 	"github.com/pkg/errors"
+	"sigs.k8s.io/kustomize/v3/api/ifc"
+	"sigs.k8s.io/kustomize/v3/api/resource"
 	"sigs.k8s.io/kustomize/v3/api/types"
 	"sigs.k8s.io/kustomize/v3/internal/kusterr"
-	"sigs.k8s.io/kustomize/v3/pkg/ifc"
-	"sigs.k8s.io/kustomize/v3/pkg/resource"
 )
 
 // Factory makes instances of ResMap.

api/resmap/factory_test.go

@@ -10,14 +10,14 @@ import (
 	"testing"
 
 	"sigs.k8s.io/kustomize/v3/api/filesys"
+	"sigs.k8s.io/kustomize/v3/api/ifc"
 	"sigs.k8s.io/kustomize/v3/api/kv"
+	"sigs.k8s.io/kustomize/v3/api/loader"
+	. "sigs.k8s.io/kustomize/v3/api/resmap"
+	"sigs.k8s.io/kustomize/v3/api/testutils/resmaptest"
+	"sigs.k8s.io/kustomize/v3/api/testutils/valtest"
 	"sigs.k8s.io/kustomize/v3/api/types"
 	"sigs.k8s.io/kustomize/v3/internal/loadertest"
-	"sigs.k8s.io/kustomize/v3/pkg/ifc"
-	"sigs.k8s.io/kustomize/v3/pkg/loader"
-	. "sigs.k8s.io/kustomize/v3/pkg/resmap"
-	"sigs.k8s.io/kustomize/v3/pkg/resmaptest"
-	"sigs.k8s.io/kustomize/v3/pkg/validators"
 )
 
 func TestFromFile(t *testing.T) {
@@ -120,7 +120,7 @@ func TestNewFromConfigMaps(t *testing.T) {
 	}
 
 	l := loadertest.NewFakeLoader("/whatever/project")
-	kvLdr := kv.NewLoader(l, validators.MakeFakeValidator())
+	kvLdr := kv.NewLoader(l, valtest_test.MakeFakeValidator())
 	testCases := []testCase{
 		{
 			description: "construct config map from env",
@@ -242,7 +242,7 @@ func TestNewResMapFromSecretArgs(t *testing.T) {
 	actual, err := rmF.NewResMapFromSecretArgs(
 		kv.NewLoader(
 			loader.NewFileLoaderAtRoot(fSys),
-			validators.MakeFakeValidator()), nil, secrets)
+			valtest_test.MakeFakeValidator()), nil, secrets)
 	if err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	}

api/resmap/patchfactory.go

@@ -5,7 +5,7 @@
 package resmap
 
 import (
-	"sigs.k8s.io/kustomize/v3/pkg/resource"
+	"sigs.k8s.io/kustomize/v3/api/resource"
 )
 
 // PatchFactory makes transformers that require k8sdeps.

api/resmap/resmap.go

@@ -11,10 +11,10 @@ import (
 	"regexp"
 
 	"github.com/pkg/errors"
+	"sigs.k8s.io/kustomize/v3/api/ifc"
 	"sigs.k8s.io/kustomize/v3/api/resid"
+	"sigs.k8s.io/kustomize/v3/api/resource"
 	"sigs.k8s.io/kustomize/v3/api/types"
-	"sigs.k8s.io/kustomize/v3/pkg/ifc"
-	"sigs.k8s.io/kustomize/v3/pkg/resource"
 	"sigs.k8s.io/yaml"
 )
 

api/resmap/resmap_test.go

@@ -10,11 +10,11 @@ import (
 	"testing"
 
 	"sigs.k8s.io/kustomize/v3/api/resid"
+	. "sigs.k8s.io/kustomize/v3/api/resmap"
+	"sigs.k8s.io/kustomize/v3/api/resource"
+	"sigs.k8s.io/kustomize/v3/api/testutils/resmaptest"
 	"sigs.k8s.io/kustomize/v3/api/types"
 	"sigs.k8s.io/kustomize/v3/k8sdeps/kunstruct"
-	. "sigs.k8s.io/kustomize/v3/pkg/resmap"
-	"sigs.k8s.io/kustomize/v3/pkg/resmaptest"
-	"sigs.k8s.io/kustomize/v3/pkg/resource"
 )
 
 var rf = resource.NewFactory(

api/resmap/selector_test.go

@@ -4,14 +4,14 @@
 package resmap_test
 
 import (
-	"sigs.k8s.io/kustomize/v3/api/resid"
 	"testing"
 
+	"sigs.k8s.io/kustomize/v3/api/resid"
+	. "sigs.k8s.io/kustomize/v3/api/resmap"
 	"sigs.k8s.io/kustomize/v3/api/types"
-	"sigs.k8s.io/kustomize/v3/pkg/resmap"
 )
 
-func setupRMForPatchTargets(t *testing.T) resmap.ResMap {
+func setupRMForPatchTargets(t *testing.T) ResMap {
 	result, err := rmF.NewResMapFromBytes([]byte(`
 apiVersion: group1/v1
 kind: Kind1

api/resource/factory.go

@@ -9,9 +9,9 @@ import (
 	"log"
 	"strings"
 
+	"sigs.k8s.io/kustomize/v3/api/ifc"
 	"sigs.k8s.io/kustomize/v3/api/types"
 	"sigs.k8s.io/kustomize/v3/internal/kusterr"
-	"sigs.k8s.io/kustomize/v3/pkg/ifc"
 )
 
 // Factory makes instances of Resource.

api/resource/factory_test.go

@@ -20,9 +20,9 @@ import (
 	"reflect"
 	"testing"
 
+	. "sigs.k8s.io/kustomize/v3/api/resource"
 	"sigs.k8s.io/kustomize/v3/api/types"
 	"sigs.k8s.io/kustomize/v3/internal/loadertest"
-	. "sigs.k8s.io/kustomize/v3/pkg/resource"
 )
 
 func TestSliceFromPatches(t *testing.T) {

api/resource/resource.go

@@ -8,9 +8,9 @@ import (
 	"reflect"
 	"strings"
 
+	"sigs.k8s.io/kustomize/v3/api/ifc"
 	"sigs.k8s.io/kustomize/v3/api/resid"
 	"sigs.k8s.io/kustomize/v3/api/types"
-	"sigs.k8s.io/kustomize/v3/pkg/ifc"
 	"sigs.k8s.io/yaml"
 )
 

api/resource/resource_test.go

@@ -21,9 +21,9 @@ import (
 	"testing"
 
 	"sigs.k8s.io/kustomize/v3/api/resid"
+	. "sigs.k8s.io/kustomize/v3/api/resource"
 	"sigs.k8s.io/kustomize/v3/api/types"
 	"sigs.k8s.io/kustomize/v3/k8sdeps/kunstruct"
-	. "sigs.k8s.io/kustomize/v3/pkg/resource"
 )
 
 var factory = NewFactory(

api/testutils/resmaptest/rmbuilder.go

@@ -7,8 +7,8 @@ import (
 	"testing"
 
 	"sigs.k8s.io/kustomize/v3/api/resid"
-	"sigs.k8s.io/kustomize/v3/pkg/resmap"
-	"sigs.k8s.io/kustomize/v3/pkg/resource"
+	"sigs.k8s.io/kustomize/v3/api/resmap"
+	"sigs.k8s.io/kustomize/v3/api/resource"
 )
 
 // Builds ResMaps for tests, with test-aware error handling.

api/testutils/valtest/fakevalidator.go

@@ -1,8 +1,8 @@
 // Copyright 2019 The Kubernetes Authors.
 // SPDX-License-Identifier: Apache-2.0
 
-// Package validators defines a FakeValidator that can be used in tests
-package validators
+// Package valtest_test defines a fakeValidator that can be used in tests
+package valtest_test
 
 import (
 	"errors"
@@ -10,8 +10,8 @@ import (
 	"testing"
 )
 
-// FakeValidator can be used in tests.
-type FakeValidator struct {
+// fakeValidator can be used in tests.
+type fakeValidator struct {
 	happy  bool
 	called bool
 	t      *testing.T
@@ -20,53 +20,53 @@ type FakeValidator struct {
 // SAD is an error string.
 const SAD = "i'm not happy Bob, NOT HAPPY"
 
-// MakeHappyMapValidator makes a FakeValidator that always passes.
-func MakeHappyMapValidator(t *testing.T) *FakeValidator {
-	return &FakeValidator{happy: true, t: t}
+// MakeHappyMapValidator makes a fakeValidator that always passes.
+func MakeHappyMapValidator(t *testing.T) *fakeValidator {
+	return &fakeValidator{happy: true, t: t}
 }
 
-// MakeSadMapValidator makes a FakeValidator that always fails.
-func MakeSadMapValidator(t *testing.T) *FakeValidator {
-	return &FakeValidator{happy: false, t: t}
+// MakeSadMapValidator makes a fakeValidator that always fails.
+func MakeSadMapValidator(t *testing.T) *fakeValidator {
+	return &fakeValidator{happy: false, t: t}
 }
 
 // MakeFakeValidator makes an empty Fake Validator.
-func MakeFakeValidator() *FakeValidator {
-	return &FakeValidator{}
+func MakeFakeValidator() *fakeValidator {
+	return &fakeValidator{}
 }
 
 // ErrIfInvalidKey returns nil
-func (v *FakeValidator) ErrIfInvalidKey(k string) error {
+func (v *fakeValidator) ErrIfInvalidKey(k string) error {
 	return nil
 }
 
 // IsEnvVarName returns nil
-func (v *FakeValidator) IsEnvVarName(k string) error {
+func (v *fakeValidator) IsEnvVarName(k string) error {
 	return nil
 }
 
 // MakeAnnotationValidator returns a nil function
-func (v *FakeValidator) MakeAnnotationValidator() func(map[string]string) error {
+func (v *fakeValidator) MakeAnnotationValidator() func(map[string]string) error {
 	return nil
 }
 
 // MakeAnnotationNameValidator returns a nil function
-func (v *FakeValidator) MakeAnnotationNameValidator() func([]string) error {
+func (v *fakeValidator) MakeAnnotationNameValidator() func([]string) error {
 	return nil
 }
 
 // MakeLabelValidator returns a nil function
-func (v *FakeValidator) MakeLabelValidator() func(map[string]string) error {
+func (v *fakeValidator) MakeLabelValidator() func(map[string]string) error {
 	return nil
 }
 
 // MakeLabelNameValidator returns a nil function
-func (v *FakeValidator) MakeLabelNameValidator() func([]string) error {
+func (v *fakeValidator) MakeLabelNameValidator() func([]string) error {
 	return nil
 }
 
 // ValidateNamespace validates namespace by regexp
-func (v *FakeValidator) ValidateNamespace(s string) []string {
+func (v *fakeValidator) ValidateNamespace(s string) []string {
 	pattern := regexp.MustCompile(`^[a-zA-Z].*`)
 	if pattern.MatchString(s) {
 		return nil
@@ -77,7 +77,7 @@ func (v *FakeValidator) ValidateNamespace(s string) []string {
 // Validator replaces apimachinery validation in tests.
 // Can be set to fail or succeed to test error handling.
 // Can confirm if run or not run by surrounding code.
-func (v *FakeValidator) Validator(_ map[string]string) error {
+func (v *fakeValidator) Validator(_ map[string]string) error {
 	v.called = true
 	if v.happy {
 		return nil
@@ -85,7 +85,7 @@ func (v *FakeValidator) Validator(_ map[string]string) error {
 	return errors.New(SAD)
 }
 
-func (v *FakeValidator) ValidatorArray(_ []string) error {
+func (v *fakeValidator) ValidatorArray(_ []string) error {
 	v.called = true
 	if v.happy {
 		return nil
@@ -94,14 +94,14 @@ func (v *FakeValidator) ValidatorArray(_ []string) error {
 }
 
 // VerifyCall returns true if Validator was used.
-func (v *FakeValidator) VerifyCall() {
+func (v *fakeValidator) VerifyCall() {
 	if !v.called {
 		v.t.Errorf("should have called Validator")
 	}
 }
 
 // VerifyNoCall returns true if Validator was not used.
-func (v *FakeValidator) VerifyNoCall() {
+func (v *fakeValidator) VerifyNoCall() {
 	if v.called {
 		v.t.Errorf("should not have called Validator")
 	}

api/transform/maptransformer.go

@@ -6,8 +6,8 @@ package transform
 import (
 	"errors"
 	"fmt"
+	"sigs.k8s.io/kustomize/v3/api/resmap"
 	"sigs.k8s.io/kustomize/v3/api/types"
-	"sigs.k8s.io/kustomize/v3/pkg/resmap"
 )
 
 // mapTransformer applies a string->string map to fieldSpecs.

api/transform/maptransformer_test.go

@@ -7,10 +7,10 @@ import (
 	"testing"
 
 	"sigs.k8s.io/kustomize/v3/api/builtinconfig"
+	"sigs.k8s.io/kustomize/v3/api/resource"
+	"sigs.k8s.io/kustomize/v3/api/testutils/resmaptest"
 	. "sigs.k8s.io/kustomize/v3/api/transform"
 	"sigs.k8s.io/kustomize/v3/k8sdeps/kunstruct"
-	"sigs.k8s.io/kustomize/v3/pkg/resmaptest"
-	"sigs.k8s.io/kustomize/v3/pkg/resource"
 )
 
 var resourceFactory = resource.NewFactory(kunstruct.NewKunstructuredFactoryImpl())

api/transform/multitransformer.go

@@ -6,7 +6,7 @@ package transform
 import (
 	"fmt"
 
-	"sigs.k8s.io/kustomize/v3/pkg/resmap"
+	"sigs.k8s.io/kustomize/v3/api/resmap"
 )
 
 // multiTransformer contains a list of transformers.

api/transform/mutatefield_test.go

@@ -5,9 +5,9 @@ package transform_test
 
 import (
 	"fmt"
+	"sigs.k8s.io/kustomize/v3/api/ifc"
 	. "sigs.k8s.io/kustomize/v3/api/transform"
 	"sigs.k8s.io/kustomize/v3/k8sdeps/kunstruct"
-	"sigs.k8s.io/kustomize/v3/pkg/ifc"
 	"testing"
 )
 

api/transform/nooptransformer.go

@@ -3,7 +3,7 @@
 
 package transform
 
-import "sigs.k8s.io/kustomize/v3/pkg/resmap"
+import "sigs.k8s.io/kustomize/v3/api/resmap"
 
 // noOpTransformer contains a no-op transformer.
 type noOpTransformer struct{}

internal/loadertest/fakeloader.go

@@ -8,8 +8,8 @@ import (
 	"log"
 
 	"sigs.k8s.io/kustomize/v3/api/filesys"
-	"sigs.k8s.io/kustomize/v3/pkg/ifc"
-	"sigs.k8s.io/kustomize/v3/pkg/loader"
+	"sigs.k8s.io/kustomize/v3/api/ifc"
+	"sigs.k8s.io/kustomize/v3/api/loader"
 )
 
 // FakeLoader encapsulates the delegate Loader and the fake file system.

k8sdeps/configmapandsecret/configmapfactory_test.go

@@ -12,9 +12,9 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"sigs.k8s.io/kustomize/v3/api/filesys"
 	"sigs.k8s.io/kustomize/v3/api/kv"
+	"sigs.k8s.io/kustomize/v3/api/loader"
+	"sigs.k8s.io/kustomize/v3/api/testutils/valtest"
 	"sigs.k8s.io/kustomize/v3/api/types"
-	"sigs.k8s.io/kustomize/v3/pkg/loader"
-	"sigs.k8s.io/kustomize/v3/pkg/validators"
 )
 
 func makeEnvConfigMap(name string) *corev1.ConfigMap {
@@ -144,7 +144,7 @@ func TestConstructConfigMap(t *testing.T) {
 		[]byte{0xff, 0xfd})
 	kvLdr := kv.NewLoader(
 		loader.NewFileLoaderAtRoot(fSys),
-		validators.MakeFakeValidator())
+		valtest_test.MakeFakeValidator())
 	for _, tc := range testCases {
 		f := NewFactory(kvLdr, tc.options)
 		cm, err := f.MakeConfigMap(&tc.input)

k8sdeps/configmapandsecret/factory.go

@@ -4,8 +4,8 @@
 package configmapandsecret
 
 import (
+	"sigs.k8s.io/kustomize/v3/api/ifc"
 	"sigs.k8s.io/kustomize/v3/api/types"
-	"sigs.k8s.io/kustomize/v3/pkg/ifc"
 )
 
 // Factory makes ConfigMaps and Secrets.

k8sdeps/configmapandsecret/secretfactory_test.go

@@ -11,9 +11,9 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"sigs.k8s.io/kustomize/v3/api/filesys"
 	"sigs.k8s.io/kustomize/v3/api/kv"
+	"sigs.k8s.io/kustomize/v3/api/loader"
+	"sigs.k8s.io/kustomize/v3/api/testutils/valtest"
 	"sigs.k8s.io/kustomize/v3/api/types"
-	"sigs.k8s.io/kustomize/v3/pkg/loader"
-	"sigs.k8s.io/kustomize/v3/pkg/validators"
 )
 
 func makeEnvSecret(name string) *corev1.Secret {
@@ -129,7 +129,7 @@ func TestConstructSecret(t *testing.T) {
 	fSys.WriteFile("/secret/app-init.ini", []byte("FOO=bar\nBAR=baz\n"))
 	kvLdr := kv.NewLoader(
 		loader.NewFileLoaderAtRoot(fSys),
-		validators.MakeFakeValidator())
+		valtest_test.MakeFakeValidator())
 	for _, tc := range testCases {
 		f := NewFactory(kvLdr, tc.options)
 		cm, err := f.MakeSecret(&tc.input)

k8sdeps/kunstruct/factory.go

@@ -12,9 +12,9 @@ import (
 
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/util/yaml"
+	"sigs.k8s.io/kustomize/v3/api/ifc"
 	"sigs.k8s.io/kustomize/v3/api/types"
 	"sigs.k8s.io/kustomize/v3/k8sdeps/configmapandsecret"
-	"sigs.k8s.io/kustomize/v3/pkg/ifc"
 )
 
 // KunstructuredFactoryImpl hides construction using apimachinery types.

k8sdeps/kunstruct/factory_test.go

@@ -20,7 +20,7 @@ import (
 	"reflect"
 	"testing"
 
-	"sigs.k8s.io/kustomize/v3/pkg/ifc"
+	"sigs.k8s.io/kustomize/v3/api/ifc"
 )
 
 func TestSliceFromBytes(t *testing.T) {

k8sdeps/kunstruct/hasher.go

@@ -10,7 +10,7 @@ import (
 	"k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"sigs.k8s.io/kustomize/v3/api/hasher"
-	"sigs.k8s.io/kustomize/v3/pkg/ifc"
+	"sigs.k8s.io/kustomize/v3/api/ifc"
 )
 
 // kustHash computes a hash of an unstructured object.

k8sdeps/kunstruct/unstructadapter.go

@@ -16,8 +16,8 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/util/strategicpatch"
 	"k8s.io/client-go/kubernetes/scheme"
+	"sigs.k8s.io/kustomize/v3/api/ifc"
 	"sigs.k8s.io/kustomize/v3/api/resid"
-	"sigs.k8s.io/kustomize/v3/pkg/ifc"
 )
 
 var _ ifc.Kunstructured = &UnstructAdapter{}

k8sdeps/transformer/factory.go

@@ -5,9 +5,9 @@
 package transformer
 
 import (
+	"sigs.k8s.io/kustomize/v3/api/resmap"
+	"sigs.k8s.io/kustomize/v3/api/resource"
 	"sigs.k8s.io/kustomize/v3/k8sdeps/transformer/patch"
-	"sigs.k8s.io/kustomize/v3/pkg/resmap"
-	"sigs.k8s.io/kustomize/v3/pkg/resource"
 )
 
 // FactoryImpl makes patch transformer and name hash transformer

k8sdeps/transformer/patch/conflictdetector.go

@@ -14,8 +14,8 @@ import (
 	"k8s.io/apimachinery/pkg/util/strategicpatch"
 	"k8s.io/client-go/kubernetes/scheme"
 	"sigs.k8s.io/kustomize/v3/api/resid"
-	"sigs.k8s.io/kustomize/v3/pkg/resmap"
-	"sigs.k8s.io/kustomize/v3/pkg/resource"
+	"sigs.k8s.io/kustomize/v3/api/resmap"
+	"sigs.k8s.io/kustomize/v3/api/resource"
 )
 
 type conflictDetector interface {

kustomize/internal/commands/build/build.go

@@ -11,12 +11,12 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"sigs.k8s.io/kustomize/v3/api/filesys"
-	"sigs.k8s.io/kustomize/v3/pkg/ifc"
-	"sigs.k8s.io/kustomize/v3/pkg/loader"
+	"sigs.k8s.io/kustomize/v3/api/ifc"
+	"sigs.k8s.io/kustomize/v3/api/loader"
+	"sigs.k8s.io/kustomize/v3/api/resmap"
+	"sigs.k8s.io/kustomize/v3/api/resource"
 	"sigs.k8s.io/kustomize/v3/pkg/pgmconfig"
 	"sigs.k8s.io/kustomize/v3/pkg/plugins"
-	"sigs.k8s.io/kustomize/v3/pkg/resmap"
-	"sigs.k8s.io/kustomize/v3/pkg/resource"
 	"sigs.k8s.io/kustomize/v3/pkg/target"
 	"sigs.k8s.io/kustomize/v3/plugin/builtin"
 	"sigs.k8s.io/yaml"

kustomize/internal/commands/commands.go

@@ -15,12 +15,12 @@ import (
 	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/edit"
 	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/version"
 	"sigs.k8s.io/kustomize/v3/api/filesys"
+	"sigs.k8s.io/kustomize/v3/api/resmap"
+	"sigs.k8s.io/kustomize/v3/api/resource"
 	"sigs.k8s.io/kustomize/v3/k8sdeps/kunstruct"
 	"sigs.k8s.io/kustomize/v3/k8sdeps/transformer"
 	"sigs.k8s.io/kustomize/v3/k8sdeps/validator"
 	"sigs.k8s.io/kustomize/v3/pkg/pgmconfig"
-	"sigs.k8s.io/kustomize/v3/pkg/resmap"
-	"sigs.k8s.io/kustomize/v3/pkg/resource"
 )
 
 // NewDefaultCommand returns the default (aka root) command for kustomize command.

kustomize/internal/commands/create/create.go

@@ -13,7 +13,7 @@ import (
 	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile"
 	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/util"
 	"sigs.k8s.io/kustomize/v3/api/filesys"
-	"sigs.k8s.io/kustomize/v3/pkg/ifc"
+	"sigs.k8s.io/kustomize/v3/api/ifc"
 	"sigs.k8s.io/kustomize/v3/pkg/pgmconfig"
 )
 

kustomize/internal/commands/edit/add/addbase_test.go

@@ -22,7 +22,7 @@ func TestAddBaseHappyPath(t *testing.T) {
 	for _, base := range bases {
 		fSys.Mkdir(base)
 	}
-	testutils.WriteTestKustomization(fSys)
+	testutils_test.WriteTestKustomization(fSys)
 
 	cmd := newCmdAddBase(fSys)
 	args := []string{baseDirectoryPaths}
@@ -30,7 +30,7 @@ func TestAddBaseHappyPath(t *testing.T) {
 	if err != nil {
 		t.Errorf("unexpected cmd error: %v", err)
 	}
-	content, err := testutils.ReadTestKustomization(fSys)
+	content, err := testutils_test.ReadTestKustomization(fSys)
 	if err != nil {
 		t.Errorf("unexpected read error: %v", err)
 	}
@@ -49,7 +49,7 @@ func TestAddBaseAlreadyThere(t *testing.T) {
 	for _, base := range bases {
 		fSys.Mkdir(base)
 	}
-	testutils.WriteTestKustomization(fSys)
+	testutils_test.WriteTestKustomization(fSys)
 
 	cmd := newCmdAddBase(fSys)
 	args := []string{baseDirectoryPaths}

kustomize/internal/commands/edit/add/addmetadata_test.go

@@ -9,13 +9,13 @@ import (
 	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile"
 	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils"
 	"sigs.k8s.io/kustomize/v3/api/filesys"
+	"sigs.k8s.io/kustomize/v3/api/testutils/valtest"
 	"sigs.k8s.io/kustomize/v3/api/types"
-	"sigs.k8s.io/kustomize/v3/pkg/validators"
 )
 
 func makeKustomization(t *testing.T) *types.Kustomization {
 	fSys := filesys.MakeFsInMemory()
-	testutils.WriteTestKustomization(fSys)
+	testutils_test.WriteTestKustomization(fSys)
 	kf, err := kustfile.NewKustomizationFile(fSys)
 	if err != nil {
 		t.Errorf("unexpected new error %v", err)
@@ -51,7 +51,7 @@ func TestRunAddAnnotation(t *testing.T) {
 
 func TestAddAnnotationNoArgs(t *testing.T) {
 	fSys := filesys.MakeFsInMemory()
-	v := validators.MakeHappyMapValidator(t)
+	v := valtest_test.MakeHappyMapValidator(t)
 	cmd := newCmdAddAnnotation(fSys, v.Validator)
 	err := cmd.Execute()
 	v.VerifyNoCall()
@@ -65,7 +65,7 @@ func TestAddAnnotationNoArgs(t *testing.T) {
 
 func TestAddAnnotationInvalidFormat(t *testing.T) {
 	fSys := filesys.MakeFsInMemory()
-	v := validators.MakeSadMapValidator(t)
+	v := valtest_test.MakeSadMapValidator(t)
 	cmd := newCmdAddAnnotation(fSys, v.Validator)
 	args := []string{"whatever:whatever"}
 	err := cmd.RunE(cmd, args)
@@ -80,8 +80,8 @@ func TestAddAnnotationInvalidFormat(t *testing.T) {
 
 func TestAddAnnotationManyArgs(t *testing.T) {
 	fSys := filesys.MakeFsInMemory()
-	testutils.WriteTestKustomization(fSys)
-	v := validators.MakeHappyMapValidator(t)
+	testutils_test.WriteTestKustomization(fSys)
+	v := valtest_test.MakeHappyMapValidator(t)
 	cmd := newCmdAddAnnotation(fSys, v.Validator)
 	args := []string{"k1:v1,k2:v2,k3:v3,k4:v5"}
 	err := cmd.RunE(cmd, args)
@@ -93,8 +93,8 @@ func TestAddAnnotationManyArgs(t *testing.T) {
 
 func TestAddAnnotationValueQuoted(t *testing.T) {
 	fSys := filesys.MakeFsInMemory()
-	testutils.WriteTestKustomization(fSys)
-	v := validators.MakeHappyMapValidator(t)
+	testutils_test.WriteTestKustomization(fSys)
+	v := valtest_test.MakeHappyMapValidator(t)
 	cmd := newCmdAddAnnotation(fSys, v.Validator)
 	args := []string{"k1:\"v1\""}
 	err := cmd.RunE(cmd, args)
@@ -106,8 +106,8 @@ func TestAddAnnotationValueQuoted(t *testing.T) {
 
 func TestAddAnnotationValueWithColon(t *testing.T) {
 	fSys := filesys.MakeFsInMemory()
-	testutils.WriteTestKustomization(fSys)
-	v := validators.MakeHappyMapValidator(t)
+	testutils_test.WriteTestKustomization(fSys)
+	v := valtest_test.MakeHappyMapValidator(t)
 	cmd := newCmdAddAnnotation(fSys, v.Validator)
 	args := []string{"k1:\"v1:v2\""}
 	err := cmd.RunE(cmd, args)
@@ -119,7 +119,7 @@ func TestAddAnnotationValueWithColon(t *testing.T) {
 
 func TestAddAnnotationNoKey(t *testing.T) {
 	fSys := filesys.MakeFsInMemory()
-	v := validators.MakeHappyMapValidator(t)
+	v := valtest_test.MakeHappyMapValidator(t)
 	cmd := newCmdAddAnnotation(fSys, v.Validator)
 	args := []string{":nokey"}
 	err := cmd.RunE(cmd, args)
@@ -134,8 +134,8 @@ func TestAddAnnotationNoKey(t *testing.T) {
 
 func TestAddAnnotationTooManyColons(t *testing.T) {
 	fSys := filesys.MakeFsInMemory()
-	testutils.WriteTestKustomization(fSys)
-	v := validators.MakeHappyMapValidator(t)
+	testutils_test.WriteTestKustomization(fSys)
+	v := valtest_test.MakeHappyMapValidator(t)
 	cmd := newCmdAddAnnotation(fSys, v.Validator)
 	args := []string{"key:v1:v2"}
 	err := cmd.RunE(cmd, args)
@@ -147,8 +147,8 @@ func TestAddAnnotationTooManyColons(t *testing.T) {
 
 func TestAddAnnotationNoValue(t *testing.T) {
 	fSys := filesys.MakeFsInMemory()
-	testutils.WriteTestKustomization(fSys)
-	v := validators.MakeHappyMapValidator(t)
+	testutils_test.WriteTestKustomization(fSys)
+	v := valtest_test.MakeHappyMapValidator(t)
 	cmd := newCmdAddAnnotation(fSys, v.Validator)
 	args := []string{"no:,value"}
 	err := cmd.RunE(cmd, args)
@@ -160,8 +160,8 @@ func TestAddAnnotationNoValue(t *testing.T) {
 
 func TestAddAnnotationMultipleArgs(t *testing.T) {
 	fSys := filesys.MakeFsInMemory()
-	testutils.WriteTestKustomization(fSys)
-	v := validators.MakeHappyMapValidator(t)
+	testutils_test.WriteTestKustomization(fSys)
+	v := valtest_test.MakeHappyMapValidator(t)
 	cmd := newCmdAddAnnotation(fSys, v.Validator)
 	args := []string{"this:annotation", "has:spaces"}
 	err := cmd.RunE(cmd, args)
@@ -176,8 +176,8 @@ func TestAddAnnotationMultipleArgs(t *testing.T) {
 
 func TestAddAnnotationForce(t *testing.T) {
 	fSys := filesys.MakeFsInMemory()
-	testutils.WriteTestKustomization(fSys)
-	v := validators.MakeHappyMapValidator(t)
+	testutils_test.WriteTestKustomization(fSys)
+	v := valtest_test.MakeHappyMapValidator(t)
 	cmd := newCmdAddAnnotation(fSys, v.Validator)
 	args := []string{"key:foo"}
 	err := cmd.RunE(cmd, args)
@@ -187,7 +187,7 @@ func TestAddAnnotationForce(t *testing.T) {
 	}
 	// trying to add the same annotation again should not work
 	args = []string{"key:bar"}
-	v = validators.MakeHappyMapValidator(t)
+	v = valtest_test.MakeHappyMapValidator(t)
 	cmd = newCmdAddAnnotation(fSys, v.Validator)
 	err = cmd.RunE(cmd, args)
 	v.VerifyCall()
@@ -198,7 +198,7 @@ func TestAddAnnotationForce(t *testing.T) {
 		t.Errorf("expected an error")
 	}
 	// but trying to add it with --force should
-	v = validators.MakeHappyMapValidator(t)
+	v = valtest_test.MakeHappyMapValidator(t)
 	cmd = newCmdAddAnnotation(fSys, v.Validator)
 	cmd.Flag("force").Value.Set("true")
 	err = cmd.RunE(cmd, args)
@@ -232,7 +232,7 @@ func TestRunAddLabel(t *testing.T) {
 
 func TestAddLabelNoArgs(t *testing.T) {
 	fSys := filesys.MakeFsInMemory()
-	v := validators.MakeHappyMapValidator(t)
+	v := valtest_test.MakeHappyMapValidator(t)
 	cmd := newCmdAddLabel(fSys, v.Validator)
 	err := cmd.Execute()
 	v.VerifyNoCall()
@@ -246,7 +246,7 @@ func TestAddLabelNoArgs(t *testing.T) {
 
 func TestAddLabelInvalidFormat(t *testing.T) {
 	fSys := filesys.MakeFsInMemory()
-	v := validators.MakeSadMapValidator(t)
+	v := valtest_test.MakeSadMapValidator(t)
 	cmd := newCmdAddLabel(fSys, v.Validator)
 	args := []string{"exclamation!:point"}
 	err := cmd.RunE(cmd, args)
@@ -261,7 +261,7 @@ func TestAddLabelInvalidFormat(t *testing.T) {
 
 func TestAddLabelNoKey(t *testing.T) {
 	fSys := filesys.MakeFsInMemory()
-	v := validators.MakeHappyMapValidator(t)
+	v := valtest_test.MakeHappyMapValidator(t)
 	cmd := newCmdAddLabel(fSys, v.Validator)
 	args := []string{":nokey"}
 	err := cmd.RunE(cmd, args)
@@ -276,8 +276,8 @@ func TestAddLabelNoKey(t *testing.T) {
 
 func TestAddLabelTooManyColons(t *testing.T) {
 	fSys := filesys.MakeFsInMemory()
-	testutils.WriteTestKustomization(fSys)
-	v := validators.MakeHappyMapValidator(t)
+	testutils_test.WriteTestKustomization(fSys)
+	v := valtest_test.MakeHappyMapValidator(t)
 	cmd := newCmdAddLabel(fSys, v.Validator)
 	args := []string{"key:v1:v2"}
 	err := cmd.RunE(cmd, args)
@@ -289,8 +289,8 @@ func TestAddLabelTooManyColons(t *testing.T) {
 
 func TestAddLabelNoValue(t *testing.T) {
 	fSys := filesys.MakeFsInMemory()
-	testutils.WriteTestKustomization(fSys)
-	v := validators.MakeHappyMapValidator(t)
+	testutils_test.WriteTestKustomization(fSys)
+	v := valtest_test.MakeHappyMapValidator(t)
 	cmd := newCmdAddLabel(fSys, v.Validator)
 	args := []string{"no,value:"}
 	err := cmd.RunE(cmd, args)
@@ -302,8 +302,8 @@ func TestAddLabelNoValue(t *testing.T) {
 
 func TestAddLabelMultipleArgs(t *testing.T) {
 	fSys := filesys.MakeFsInMemory()
-	testutils.WriteTestKustomization(fSys)
-	v := validators.MakeHappyMapValidator(t)
+	testutils_test.WriteTestKustomization(fSys)
+	v := valtest_test.MakeHappyMapValidator(t)
 	cmd := newCmdAddLabel(fSys, v.Validator)
 	args := []string{"this:input", "has:spaces"}
 	err := cmd.RunE(cmd, args)
@@ -318,8 +318,8 @@ func TestAddLabelMultipleArgs(t *testing.T) {
 
 func TestAddLabelForce(t *testing.T) {
 	fSys := filesys.MakeFsInMemory()
-	testutils.WriteTestKustomization(fSys)
-	v := validators.MakeHappyMapValidator(t)
+	testutils_test.WriteTestKustomization(fSys)
+	v := valtest_test.MakeHappyMapValidator(t)
 	cmd := newCmdAddLabel(fSys, v.Validator)
 	args := []string{"key:foo"}
 	err := cmd.RunE(cmd, args)
@@ -329,7 +329,7 @@ func TestAddLabelForce(t *testing.T) {
 	}
 	// trying to add the same label again should not work
 	args = []string{"key:bar"}
-	v = validators.MakeHappyMapValidator(t)
+	v = valtest_test.MakeHappyMapValidator(t)
 	cmd = newCmdAddLabel(fSys, v.Validator)
 	err = cmd.RunE(cmd, args)
 	v.VerifyCall()
@@ -340,7 +340,7 @@ func TestAddLabelForce(t *testing.T) {
 		t.Errorf("expected an error")
 	}
 	// but trying to add it with --force should
-	v = validators.MakeHappyMapValidator(t)
+	v = valtest_test.MakeHappyMapValidator(t)
 	cmd = newCmdAddLabel(fSys, v.Validator)
 	cmd.Flag("force").Value.Set("true")
 	err = cmd.RunE(cmd, args)

kustomize/internal/commands/edit/add/addpatch_test.go

@@ -23,7 +23,7 @@ func TestAddPatchHappyPath(t *testing.T) {
 	fSys := filesys.MakeFsInMemory()
 	fSys.WriteFile(patchFileName, []byte(patchFileContent))
 	fSys.WriteFile(patchFileName+"another", []byte(patchFileContent))
-	testutils.WriteTestKustomization(fSys)
+	testutils_test.WriteTestKustomization(fSys)
 
 	cmd := newCmdAddPatch(fSys)
 	args := []string{patchFileName + "*"}
@@ -31,7 +31,7 @@ func TestAddPatchHappyPath(t *testing.T) {
 	if err != nil {
 		t.Errorf("unexpected cmd error: %v", err)
 	}
-	content, err := testutils.ReadTestKustomization(fSys)
+	content, err := testutils_test.ReadTestKustomization(fSys)
 	if err != nil {
 		t.Errorf("unexpected read error: %v", err)
 	}
@@ -46,7 +46,7 @@ func TestAddPatchHappyPath(t *testing.T) {
 func TestAddPatchAlreadyThere(t *testing.T) {
 	fSys := filesys.MakeFsInMemory()
 	fSys.WriteFile(patchFileName, []byte(patchFileContent))
-	testutils.WriteTestKustomization(fSys)
+	testutils_test.WriteTestKustomization(fSys)
 
 	cmd := newCmdAddPatch(fSys)
 	args := []string{patchFileName}

kustomize/internal/commands/edit/add/addresource_test.go

@@ -23,7 +23,7 @@ func TestAddResourceHappyPath(t *testing.T) {
 	fSys := filesys.MakeFsInMemory()
 	fSys.WriteFile(resourceFileName, []byte(resourceFileContent))
 	fSys.WriteFile(resourceFileName+"another", []byte(resourceFileContent))
-	testutils.WriteTestKustomization(fSys)
+	testutils_test.WriteTestKustomization(fSys)
 
 	cmd := newCmdAddResource(fSys)
 	args := []string{resourceFileName + "*"}
@@ -31,7 +31,7 @@ func TestAddResourceHappyPath(t *testing.T) {
 	if err != nil {
 		t.Errorf("unexpected cmd error: %v", err)
 	}
-	content, err := testutils.ReadTestKustomization(fSys)
+	content, err := testutils_test.ReadTestKustomization(fSys)
 	if err != nil {
 		t.Errorf("unexpected read error: %v", err)
 	}
@@ -46,7 +46,7 @@ func TestAddResourceHappyPath(t *testing.T) {
 func TestAddResourceAlreadyThere(t *testing.T) {
 	fSys := filesys.MakeFsInMemory()
 	fSys.WriteFile(resourceFileName, []byte(resourceFileContent))
-	testutils.WriteTestKustomization(fSys)
+	testutils_test.WriteTestKustomization(fSys)
 
 	cmd := newCmdAddResource(fSys)
 	args := []string{resourceFileName}

kustomize/internal/commands/edit/add/all.go

@@ -6,7 +6,7 @@ package add
 import (
 	"github.com/spf13/cobra"
 	"sigs.k8s.io/kustomize/v3/api/filesys"
-	"sigs.k8s.io/kustomize/v3/pkg/ifc"
+	"sigs.k8s.io/kustomize/v3/api/ifc"
 )
 
 // NewCmdAdd returns an instance of 'add' subcommand.

kustomize/internal/commands/edit/add/configmap.go

@@ -7,8 +7,8 @@ import (
 	"github.com/spf13/cobra"
 	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile"
 	"sigs.k8s.io/kustomize/v3/api/filesys"
+	"sigs.k8s.io/kustomize/v3/api/ifc"
 	"sigs.k8s.io/kustomize/v3/api/types"
-	"sigs.k8s.io/kustomize/v3/pkg/ifc"
 )
 
 // newCmdAddConfigMap returns a new command.

kustomize/internal/commands/edit/add/configmap_test.go

@@ -8,9 +8,9 @@ import (
 
 	"sigs.k8s.io/kustomize/v3/api/filesys"
 	"sigs.k8s.io/kustomize/v3/api/kv"
+	"sigs.k8s.io/kustomize/v3/api/loader"
+	"sigs.k8s.io/kustomize/v3/api/testutils/valtest"
 	"sigs.k8s.io/kustomize/v3/api/types"
-	"sigs.k8s.io/kustomize/v3/pkg/loader"
-	"sigs.k8s.io/kustomize/v3/pkg/validators"
 )
 
 func TestNewAddConfigMapIsNotNil(t *testing.T) {
@@ -19,7 +19,7 @@ func TestNewAddConfigMapIsNotNil(t *testing.T) {
 		fSys,
 		kv.NewLoader(
 			loader.NewFileLoaderAtCwd(fSys),
-			validators.MakeFakeValidator()),
+			valtest_test.MakeFakeValidator()),
 			nil) == nil {
 		t.Fatal("newCmdAddConfigMap shouldn't be nil")
 	}

kustomize/internal/commands/edit/add/secret.go

@@ -7,8 +7,8 @@ import (
 	"github.com/spf13/cobra"
 	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile"
 	"sigs.k8s.io/kustomize/v3/api/filesys"
+	"sigs.k8s.io/kustomize/v3/api/ifc"
 	"sigs.k8s.io/kustomize/v3/api/types"
-	"sigs.k8s.io/kustomize/v3/pkg/ifc"
 )
 
 // newCmdAddSecret returns a new command.

kustomize/internal/commands/edit/add/secret_test.go

@@ -9,9 +9,9 @@ import (
 	"sigs.k8s.io/kustomize/v3/api/kv"
 
 	"sigs.k8s.io/kustomize/v3/api/filesys"
+	"sigs.k8s.io/kustomize/v3/api/loader"
+	"sigs.k8s.io/kustomize/v3/api/testutils/valtest"
 	"sigs.k8s.io/kustomize/v3/api/types"
-	"sigs.k8s.io/kustomize/v3/pkg/loader"
-	"sigs.k8s.io/kustomize/v3/pkg/validators"
 )
 
 func TestNewCmdAddSecretIsNotNil(t *testing.T) {
@@ -20,7 +20,7 @@ func TestNewCmdAddSecretIsNotNil(t *testing.T) {
 		fSys,
 		kv.NewLoader(
 			loader.NewFileLoaderAtCwd(fSys),
-			validators.MakeFakeValidator()),
+			valtest_test.MakeFakeValidator()),
 		nil) == nil {
 		t.Fatal("newCmdAddSecret shouldn't be nil")
 	}

kustomize/internal/commands/edit/all.go

@@ -10,9 +10,9 @@ import (
 	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/edit/remove"
 	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/edit/set"
 	"sigs.k8s.io/kustomize/v3/api/filesys"
+	"sigs.k8s.io/kustomize/v3/api/ifc"
 	"sigs.k8s.io/kustomize/v3/api/kv"
-	"sigs.k8s.io/kustomize/v3/pkg/ifc"
-	"sigs.k8s.io/kustomize/v3/pkg/loader"
+	"sigs.k8s.io/kustomize/v3/api/loader"
 )
 
 // NewCmdEdit returns an instance of 'edit' subcommand.

kustomize/internal/commands/edit/fix/fix_test.go

@@ -13,14 +13,14 @@ import (
 
 func TestFix(t *testing.T) {
 	fSys := filesys.MakeFsInMemory()
-	testutils.WriteTestKustomizationWith(fSys, []byte(`nameprefix: some-prefix-`))
+	testutils_test.WriteTestKustomizationWith(fSys, []byte(`nameprefix: some-prefix-`))
 
 	cmd := NewCmdFix(fSys)
 	err := cmd.RunE(cmd, nil)
 	if err != nil {
 		t.Errorf("unexpected cmd error: %v", err)
 	}
-	content, err := testutils.ReadTestKustomization(fSys)
+	content, err := testutils_test.ReadTestKustomization(fSys)
 	if err != nil {
 		t.Errorf("unexpected read error: %v", err)
 	}

kustomize/internal/commands/edit/remove/all.go

@@ -6,7 +6,7 @@ package remove
 import (
 	"github.com/spf13/cobra"
 	"sigs.k8s.io/kustomize/v3/api/filesys"
-	"sigs.k8s.io/kustomize/v3/pkg/ifc"
+	"sigs.k8s.io/kustomize/v3/api/ifc"
 )
 
 // NewCmdRemove returns an instance of 'remove' subcommand.

kustomize/internal/commands/edit/remove/removemetadata_test.go

@@ -11,8 +11,8 @@ import (
 	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile"
 	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils"
 	"sigs.k8s.io/kustomize/v3/api/filesys"
+	"sigs.k8s.io/kustomize/v3/api/testutils/valtest"
 	"sigs.k8s.io/kustomize/v3/api/types"
-	"sigs.k8s.io/kustomize/v3/pkg/validators"
 )
 
 func makeKustomizationFS() filesys.FileSystem {
@@ -20,7 +20,7 @@ func makeKustomizationFS() filesys.FileSystem {
 	commonLabels := []string{"label1: val1", "label2: val2"}
 	commonAnnotations := []string{"annotation1: val1", "annotation2: val2"}
 
-	testutils.WriteTestKustomizationWith(fSys, []byte(
+	testutils_test.WriteTestKustomizationWith(fSys, []byte(
 		fmt.Sprintf("commonLabels:\n  %s\ncommonAnnotations:\n  %s",
 			strings.Join(commonLabels, "\n  "), strings.Join(commonAnnotations, "\n  "))))
 	return fSys
@@ -73,7 +73,7 @@ func TestRemoveAnnotation(t *testing.T) {
 func TestRemoveAnnotationIgnore(t *testing.T) {
 	fSys := makeKustomizationFS()
 
-	v := validators.MakeHappyMapValidator(t)
+	v := valtest_test.MakeHappyMapValidator(t)
 	cmd := newCmdRemoveAnnotation(fSys, v.ValidatorArray)
 	cmd.Flag("ignore-non-existence").Value.Set("true")
 	args := []string{"annotation3"}
@@ -87,9 +87,9 @@ func TestRemoveAnnotationIgnore(t *testing.T) {
 
 func TestRemoveAnnotationNoDefinition(t *testing.T) {
 	fSys := filesys.MakeFsInMemory()
-	testutils.WriteTestKustomizationWith(fSys, []byte(""))
+	testutils_test.WriteTestKustomizationWith(fSys, []byte(""))
 
-	v := validators.MakeHappyMapValidator(t)
+	v := valtest_test.MakeHappyMapValidator(t)
 	cmd := newCmdRemoveAnnotation(fSys, v.ValidatorArray)
 	args := []string{"annotation1,annotation2"}
 	err := cmd.RunE(cmd, args)
@@ -105,9 +105,9 @@ func TestRemoveAnnotationNoDefinition(t *testing.T) {
 
 func TestRemoveAnnotationNoDefinitionIgnore(t *testing.T) {
 	fSys := filesys.MakeFsInMemory()
-	testutils.WriteTestKustomizationWith(fSys, []byte(""))
+	testutils_test.WriteTestKustomizationWith(fSys, []byte(""))
 
-	v := validators.MakeHappyMapValidator(t)
+	v := valtest_test.MakeHappyMapValidator(t)
 	cmd := newCmdRemoveLabel(fSys, v.ValidatorArray)
 	cmd.Flag("ignore-non-existence").Value.Set("true")
 	args := []string{"annotation1,annotation2"}
@@ -122,7 +122,7 @@ func TestRemoveAnnotationNoDefinitionIgnore(t *testing.T) {
 func TestRemoveAnnotationNoArgs(t *testing.T) {
 	fSys := makeKustomizationFS()
 
-	v := validators.MakeHappyMapValidator(t)
+	v := valtest_test.MakeHappyMapValidator(t)
 	cmd := newCmdRemoveAnnotation(fSys, v.ValidatorArray)
 	err := cmd.Execute()
 	v.VerifyNoCall()
@@ -138,7 +138,7 @@ func TestRemoveAnnotationNoArgs(t *testing.T) {
 func TestRemoveAnnotationInvalidFormat(t *testing.T) {
 	fSys := makeKustomizationFS()
 
-	v := validators.MakeSadMapValidator(t)
+	v := valtest_test.MakeSadMapValidator(t)
 	cmd := newCmdRemoveAnnotation(fSys, v.ValidatorArray)
 	args := []string{"nospecialchars%^=@"}
 	err := cmd.RunE(cmd, args)
@@ -155,7 +155,7 @@ func TestRemoveAnnotationInvalidFormat(t *testing.T) {
 func TestRemoveAnnotationMultipleArgs(t *testing.T) {
 	fSys := makeKustomizationFS()
 
-	v := validators.MakeHappyMapValidator(t)
+	v := valtest_test.MakeHappyMapValidator(t)
 	cmd := newCmdRemoveAnnotation(fSys, v.ValidatorArray)
 	args := []string{"annotation1,annotation2"}
 	err := cmd.RunE(cmd, args)
@@ -177,7 +177,7 @@ func TestRemoveAnnotationMultipleArgs(t *testing.T) {
 func TestRemoveAnnotationMultipleArgsInvalidFormat(t *testing.T) {
 	fSys := makeKustomizationFS()
 
-	v := validators.MakeSadMapValidator(t)
+	v := valtest_test.MakeSadMapValidator(t)
 	cmd := newCmdRemoveAnnotation(fSys, v.ValidatorArray)
 	args := []string{"annotation1", "annotation2"}
 	err := cmd.RunE(cmd, args)
@@ -221,7 +221,7 @@ func TestRemoveLabel(t *testing.T) {
 func TestRemoveLabelIgnore(t *testing.T) {
 	fSys := makeKustomizationFS()
 
-	v := validators.MakeHappyMapValidator(t)
+	v := valtest_test.MakeHappyMapValidator(t)
 	cmd := newCmdRemoveLabel(fSys, v.ValidatorArray)
 	cmd.Flag("ignore-non-existence").Value.Set("true")
 	args := []string{"label3"}
@@ -235,9 +235,9 @@ func TestRemoveLabelIgnore(t *testing.T) {
 
 func TestRemoveLabelNoDefinition(t *testing.T) {
 	fSys := filesys.MakeFsInMemory()
-	testutils.WriteTestKustomizationWith(fSys, []byte(""))
+	testutils_test.WriteTestKustomizationWith(fSys, []byte(""))
 
-	v := validators.MakeHappyMapValidator(t)
+	v := valtest_test.MakeHappyMapValidator(t)
 	cmd := newCmdRemoveLabel(fSys, v.ValidatorArray)
 	args := []string{"label1,label2"}
 	err := cmd.RunE(cmd, args)
@@ -253,9 +253,9 @@ func TestRemoveLabelNoDefinition(t *testing.T) {
 
 func TestRemoveLabelNoDefinitionIgnore(t *testing.T) {
 	fSys := filesys.MakeFsInMemory()
-	testutils.WriteTestKustomizationWith(fSys, []byte(""))
+	testutils_test.WriteTestKustomizationWith(fSys, []byte(""))
 
-	v := validators.MakeHappyMapValidator(t)
+	v := valtest_test.MakeHappyMapValidator(t)
 	cmd := newCmdRemoveLabel(fSys, v.ValidatorArray)
 	cmd.Flag("ignore-non-existence").Value.Set("true")
 	args := []string{"label1,label2"}
@@ -270,7 +270,7 @@ func TestRemoveLabelNoDefinitionIgnore(t *testing.T) {
 func TestRemoveLabelNoArgs(t *testing.T) {
 	fSys := makeKustomizationFS()
 
-	v := validators.MakeHappyMapValidator(t)
+	v := valtest_test.MakeHappyMapValidator(t)
 	cmd := newCmdRemoveLabel(fSys, v.ValidatorArray)
 	err := cmd.Execute()
 	v.VerifyNoCall()
@@ -286,7 +286,7 @@ func TestRemoveLabelNoArgs(t *testing.T) {
 func TestRemoveLabelInvalidFormat(t *testing.T) {
 	fSys := makeKustomizationFS()
 
-	v := validators.MakeSadMapValidator(t)
+	v := valtest_test.MakeSadMapValidator(t)
 	cmd := newCmdRemoveLabel(fSys, v.ValidatorArray)
 	args := []string{"exclamation!"}
 	err := cmd.RunE(cmd, args)
@@ -303,7 +303,7 @@ func TestRemoveLabelInvalidFormat(t *testing.T) {
 func TestRemoveLabelMultipleArgs(t *testing.T) {
 	fSys := makeKustomizationFS()
 
-	v := validators.MakeHappyMapValidator(t)
+	v := valtest_test.MakeHappyMapValidator(t)
 	cmd := newCmdRemoveLabel(fSys, v.ValidatorArray)
 	args := []string{"label1,label2"}
 	err := cmd.RunE(cmd, args)
@@ -325,7 +325,7 @@ func TestRemoveLabelMultipleArgs(t *testing.T) {
 func TestRemoveLabelMultipleArgsInvalidFormat(t *testing.T) {
 	fSys := makeKustomizationFS()
 
-	v := validators.MakeSadMapValidator(t)
+	v := valtest_test.MakeSadMapValidator(t)
 	cmd := newCmdRemoveLabel(fSys, v.ValidatorArray)
 	args := []string{"label1", "label2"}
 	err := cmd.RunE(cmd, args)

kustomize/internal/commands/edit/remove/removepatch_test.go

@@ -24,7 +24,7 @@ func makeKustomizationPatchFS() filesys.FileSystem {
 	fSys := filesys.MakeFsInMemory()
 	patches := []string{"patch1.yaml", "patch2.yaml"}
 
-	testutils.WriteTestKustomizationWith(fSys, []byte(
+	testutils_test.WriteTestKustomizationWith(fSys, []byte(
 		fmt.Sprintf("patchesStrategicMerge:\n  - %s",
 			strings.Join(patches, "\n  - "))))
 

kustomize/internal/commands/edit/remove/removeresource_test.go

@@ -126,7 +126,7 @@ func TestRemoveResources(t *testing.T) {
 	for _, tc := range testCases {
 		t.Run(tc.description, func(t *testing.T) {
 			fSys := filesys.MakeFsInMemory()
-			testutils.WriteTestKustomizationWith(
+			testutils_test.WriteTestKustomizationWith(
 				fSys,
 				[]byte(fmt.Sprintf(
 					"resources:\n  - %s", strings.Join(tc.given.resources, "\n  - "))))
@@ -141,7 +141,7 @@ func TestRemoveResources(t *testing.T) {
 				}
 				return
 			}
-			content, err := testutils.ReadTestKustomization(fSys)
+			content, err := testutils_test.ReadTestKustomization(fSys)
 			if err != nil {
 				t.Errorf("unexpected read error: %v", err)
 			}

kustomize/internal/commands/edit/set/all.go

@@ -6,7 +6,7 @@ package set
 import (
 	"github.com/spf13/cobra"
 	"sigs.k8s.io/kustomize/v3/api/filesys"
-	"sigs.k8s.io/kustomize/v3/pkg/ifc"
+	"sigs.k8s.io/kustomize/v3/api/ifc"
 )
 
 // NewCmdSet returns an instance of 'set' subcommand.

kustomize/internal/commands/edit/set/set_name_prefix_test.go

@@ -17,7 +17,7 @@ const (
 
 func TestSetNamePrefixHappyPath(t *testing.T) {
 	fSys := filesys.MakeFsInMemory()
-	testutils.WriteTestKustomization(fSys)
+	testutils_test.WriteTestKustomization(fSys)
 
 	cmd := newCmdSetNamePrefix(fSys)
 	args := []string{goodPrefixValue}
@@ -25,7 +25,7 @@ func TestSetNamePrefixHappyPath(t *testing.T) {
 	if err != nil {
 		t.Errorf("unexpected cmd error: %v", err)
 	}
-	content, err := testutils.ReadTestKustomization(fSys)
+	content, err := testutils_test.ReadTestKustomization(fSys)
 	if err != nil {
 		t.Errorf("unexpected read error: %v", err)
 	}

kustomize/internal/commands/edit/set/set_name_suffix_test.go

@@ -17,7 +17,7 @@ const (
 
 func TestSetNameSuffixHappyPath(t *testing.T) {
 	fSys := filesys.MakeFsInMemory()
-	testutils.WriteTestKustomization(fSys)
+	testutils_test.WriteTestKustomization(fSys)
 
 	cmd := newCmdSetNameSuffix(fSys)
 	args := []string{goodSuffixValue}
@@ -25,7 +25,7 @@ func TestSetNameSuffixHappyPath(t *testing.T) {
 	if err != nil {
 		t.Errorf("unexpected cmd error: %v", err)
 	}
-	content, err := testutils.ReadTestKustomization(fSys)
+	content, err := testutils_test.ReadTestKustomization(fSys)
 	if err != nil {
 		t.Errorf("unexpected read error: %v", err)
 	}

kustomize/internal/commands/edit/set/setimage_test.go

@@ -195,11 +195,11 @@ func TestSetImage(t *testing.T) {
 
 			if len(tc.given.infileImages) > 0 {
 				// write file with infileImages
-				testutils.WriteTestKustomizationWith(
+				testutils_test.WriteTestKustomizationWith(
 					fSys,
 					[]byte(strings.Join(tc.given.infileImages, "\n")))
 			} else {
-				testutils.WriteTestKustomization(fSys)
+				testutils_test.WriteTestKustomization(fSys)
 			}
 
 			// act
@@ -211,7 +211,7 @@ func TestSetImage(t *testing.T) {
 				t.FailNow()
 			}
 
-			content, err := testutils.ReadTestKustomization(fSys)
+			content, err := testutils_test.ReadTestKustomization(fSys)
 			if err != nil {
 				t.Errorf("unexpected read error: %v", err)
 				t.FailNow()

kustomize/internal/commands/edit/set/setnamespace.go

@@ -11,7 +11,7 @@ import (
 	"github.com/spf13/cobra"
 	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile"
 	"sigs.k8s.io/kustomize/v3/api/filesys"
-	"sigs.k8s.io/kustomize/v3/pkg/ifc"
+	"sigs.k8s.io/kustomize/v3/api/ifc"
 )
 
 type setNamespaceOptions struct {

kustomize/internal/commands/edit/set/setnamespace_test.go

@@ -10,7 +10,7 @@ import (
 
 	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils"
 	"sigs.k8s.io/kustomize/v3/api/filesys"
-	"sigs.k8s.io/kustomize/v3/pkg/validators"
+	"sigs.k8s.io/kustomize/v3/api/testutils/valtest"
 )
 
 const (
@@ -19,15 +19,15 @@ const (
 
 func TestSetNamespaceHappyPath(t *testing.T) {
 	fSys := filesys.MakeFsInMemory()
-	testutils.WriteTestKustomization(fSys)
+	testutils_test.WriteTestKustomization(fSys)
 
-	cmd := newCmdSetNamespace(fSys, validators.MakeFakeValidator())
+	cmd := newCmdSetNamespace(fSys, valtest_test.MakeFakeValidator())
 	args := []string{goodNamespaceValue}
 	err := cmd.RunE(cmd, args)
 	if err != nil {
 		t.Errorf("unexpected cmd error: %v", err)
 	}
-	content, err := testutils.ReadTestKustomization(fSys)
+	content, err := testutils_test.ReadTestKustomization(fSys)
 	if err != nil {
 		t.Errorf("unexpected read error: %v", err)
 	}
@@ -39,9 +39,9 @@ func TestSetNamespaceHappyPath(t *testing.T) {
 
 func TestSetNamespaceOverride(t *testing.T) {
 	fSys := filesys.MakeFsInMemory()
-	testutils.WriteTestKustomization(fSys)
+	testutils_test.WriteTestKustomization(fSys)
 
-	cmd := newCmdSetNamespace(fSys, validators.MakeFakeValidator())
+	cmd := newCmdSetNamespace(fSys, valtest_test.MakeFakeValidator())
 	args := []string{goodNamespaceValue}
 	err := cmd.RunE(cmd, args)
 	if err != nil {
@@ -52,7 +52,7 @@ func TestSetNamespaceOverride(t *testing.T) {
 	if err != nil {
 		t.Errorf("unexpected cmd error: %v", err)
 	}
-	content, err := testutils.ReadTestKustomization(fSys)
+	content, err := testutils_test.ReadTestKustomization(fSys)
 	if err != nil {
 		t.Errorf("unexpected read error: %v", err)
 	}
@@ -65,7 +65,7 @@ func TestSetNamespaceOverride(t *testing.T) {
 func TestSetNamespaceNoArgs(t *testing.T) {
 	fSys := filesys.MakeFsInMemory()
 
-	cmd := newCmdSetNamespace(fSys, validators.MakeFakeValidator())
+	cmd := newCmdSetNamespace(fSys, valtest_test.MakeFakeValidator())
 	err := cmd.Execute()
 	if err == nil {
 		t.Errorf("expected error: %v", err)
@@ -78,7 +78,7 @@ func TestSetNamespaceNoArgs(t *testing.T) {
 func TestSetNamespaceInvalid(t *testing.T) {
 	fSys := filesys.MakeFsInMemory()
 
-	cmd := newCmdSetNamespace(fSys, validators.MakeFakeValidator())
+	cmd := newCmdSetNamespace(fSys, valtest_test.MakeFakeValidator())
 	args := []string{"/badnamespace/"}
 	err := cmd.RunE(cmd, args)
 	if err == nil {

kustomize/internal/commands/edit/set/setreplicas_test.go

@@ -115,11 +115,11 @@ func TestSetReplicas(t *testing.T) {
 
 			if len(tc.given.infileReplicas) > 0 {
 				// write file with infileReplicas
-				testutils.WriteTestKustomizationWith(
+				testutils_test.WriteTestKustomizationWith(
 					fSys,
 					[]byte(strings.Join(tc.given.infileReplicas, "\n")))
 			} else {
-				testutils.WriteTestKustomization(fSys)
+				testutils_test.WriteTestKustomization(fSys)
 			}
 
 			// act
@@ -131,7 +131,7 @@ func TestSetReplicas(t *testing.T) {
 				t.FailNow()
 			}
 
-			content, err := testutils.ReadTestKustomization(fSys)
+			content, err := testutils_test.ReadTestKustomization(fSys)
 			if err != nil {
 				t.Errorf("unexpected read error: %v", err)
 				t.FailNow()

kustomize/internal/commands/kustfile/kustomizationfile_test.go

@@ -58,7 +58,7 @@ func TestWriteAndRead(t *testing.T) {
 	}
 
 	fSys := filesys.MakeFsInMemory()
-	testutils.WriteTestKustomization(fSys)
+	testutils_test.WriteTestKustomization(fSys)
 	mf, err := NewKustomizationFile(fSys)
 	if err != nil {
 		t.Fatalf("Unexpected Error: %v", err)
@@ -144,7 +144,7 @@ patchesStrategicMerge:
 - pod.yaml
 `)
 	fSys := filesys.MakeFsInMemory()
-	testutils.WriteTestKustomizationWith(fSys, kustomizationContentWithComments)
+	testutils_test.WriteTestKustomizationWith(fSys, kustomizationContentWithComments)
 	mf, err := NewKustomizationFile(fSys)
 	if err != nil {
 		t.Fatalf("Unexpected Error: %v", err)
@@ -236,7 +236,7 @@ generatorOptions:
   disableNameSuffixHash: true
 `)
 	fSys := filesys.MakeFsInMemory()
-	testutils.WriteTestKustomizationWith(
+	testutils_test.WriteTestKustomizationWith(
 		fSys, kustomizationContentWithComments)
 	mf, err := NewKustomizationFile(fSys)
 	if err != nil {
@@ -274,7 +274,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 `)
 	fSys := filesys.MakeFsInMemory()
-	testutils.WriteTestKustomizationWith(
+	testutils_test.WriteTestKustomizationWith(
 		fSys, kustomizationContentWithComments)
 	mf, err := NewKustomizationFile(fSys)
 	if err != nil {
@@ -320,7 +320,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 `)
 	fSys := filesys.MakeFsInMemory()
-	testutils.WriteTestKustomizationWith(fSys, kustomizationContentWithComments)
+	testutils_test.WriteTestKustomizationWith(fSys, kustomizationContentWithComments)
 	mf, err := NewKustomizationFile(fSys)
 	if err != nil {
 		t.Fatalf("Unexpected Error: %v", err)

kustomize/internal/commands/testutils/testutils.go

@@ -1,7 +1,7 @@
 // Copyright 2019 The Kubernetes Authors.
 // SPDX-License-Identifier: Apache-2.0
 
-package testutils
+package testutils_test
 
 import (
 	"sigs.k8s.io/kustomize/v3/api/filesys"

pkg/accumulator/loadconfigfromcrds.go

@@ -11,9 +11,9 @@ import (
 	"github.com/pkg/errors"
 	"k8s.io/kube-openapi/pkg/common"
 	"sigs.k8s.io/kustomize/v3/api/builtinconfig"
+	"sigs.k8s.io/kustomize/v3/api/ifc"
 	"sigs.k8s.io/kustomize/v3/api/resid"
 	"sigs.k8s.io/kustomize/v3/api/types"
-	"sigs.k8s.io/kustomize/v3/pkg/ifc"
 	"sigs.k8s.io/yaml"
 )
 

pkg/accumulator/loadconfigfromcrds_test.go

@@ -8,11 +8,11 @@ import (
 	"testing"
 
 	"sigs.k8s.io/kustomize/v3/api/builtinconfig"
+	"sigs.k8s.io/kustomize/v3/api/ifc"
 	"sigs.k8s.io/kustomize/v3/api/resid"
 	"sigs.k8s.io/kustomize/v3/api/types"
 	"sigs.k8s.io/kustomize/v3/internal/loadertest"
 	. "sigs.k8s.io/kustomize/v3/pkg/accumulator"
-	"sigs.k8s.io/kustomize/v3/pkg/ifc"
 )
 
 // This defines two CRD's:  Bee and MyKind.

pkg/accumulator/namereferencetransformer.go

@@ -9,9 +9,9 @@ import (
 
 	"sigs.k8s.io/kustomize/v3/api/builtinconfig"
 	"sigs.k8s.io/kustomize/v3/api/resid"
+	"sigs.k8s.io/kustomize/v3/api/resmap"
+	"sigs.k8s.io/kustomize/v3/api/resource"
 	"sigs.k8s.io/kustomize/v3/api/transform"
-	"sigs.k8s.io/kustomize/v3/pkg/resmap"
-	"sigs.k8s.io/kustomize/v3/pkg/resource"
 )
 
 type nameReferenceTransformer struct {

pkg/accumulator/namereferencetransformer_test.go

@@ -9,10 +9,10 @@ import (
 
 	"sigs.k8s.io/kustomize/v3/api/builtinconfig"
 	"sigs.k8s.io/kustomize/v3/api/resid"
+	"sigs.k8s.io/kustomize/v3/api/resmap"
+	"sigs.k8s.io/kustomize/v3/api/resource"
+	"sigs.k8s.io/kustomize/v3/api/testutils/resmaptest"
 	"sigs.k8s.io/kustomize/v3/k8sdeps/kunstruct"
-	"sigs.k8s.io/kustomize/v3/pkg/resmap"
-	"sigs.k8s.io/kustomize/v3/pkg/resmaptest"
-	"sigs.k8s.io/kustomize/v3/pkg/resource"
 )
 
 func TestNameReferenceHappyRun(t *testing.T) {

pkg/accumulator/refvartransformer.go

@@ -6,10 +6,10 @@ package accumulator
 import (
 	"fmt"
 
+	"sigs.k8s.io/kustomize/v3/api/resmap"
 	"sigs.k8s.io/kustomize/v3/api/transform"
 	"sigs.k8s.io/kustomize/v3/api/types"
 	"sigs.k8s.io/kustomize/v3/pkg/expansion"
-	"sigs.k8s.io/kustomize/v3/pkg/resmap"
 )
 
 type refVarTransformer struct {

pkg/accumulator/refvartransformer_test.go

@@ -8,11 +8,11 @@ import (
 	"testing"
 
 	"sigs.k8s.io/kustomize/v3/api/resid"
+	"sigs.k8s.io/kustomize/v3/api/resmap"
+	"sigs.k8s.io/kustomize/v3/api/resource"
+	"sigs.k8s.io/kustomize/v3/api/testutils/resmaptest"
 	"sigs.k8s.io/kustomize/v3/api/types"
 	"sigs.k8s.io/kustomize/v3/k8sdeps/kunstruct"
-	"sigs.k8s.io/kustomize/v3/pkg/resmap"
-	"sigs.k8s.io/kustomize/v3/pkg/resmaptest"
-	"sigs.k8s.io/kustomize/v3/pkg/resource"
 )
 
 func TestRefVarTransformer(t *testing.T) {

pkg/accumulator/resaccumulator.go

@@ -10,8 +10,8 @@ import (
 
 	"sigs.k8s.io/kustomize/v3/api/builtinconfig"
 	"sigs.k8s.io/kustomize/v3/api/resid"
+	"sigs.k8s.io/kustomize/v3/api/resmap"
 	"sigs.k8s.io/kustomize/v3/api/types"
-	"sigs.k8s.io/kustomize/v3/pkg/resmap"
 )
 
 // ResAccumulator accumulates resources and the rules

pkg/accumulator/resaccumulator_test.go

@@ -12,12 +12,12 @@ import (
 
 	"sigs.k8s.io/kustomize/v3/api/builtinconfig"
 	"sigs.k8s.io/kustomize/v3/api/resid"
+	"sigs.k8s.io/kustomize/v3/api/resmap"
+	"sigs.k8s.io/kustomize/v3/api/resource"
+	"sigs.k8s.io/kustomize/v3/api/testutils/resmaptest"
 	"sigs.k8s.io/kustomize/v3/api/types"
 	"sigs.k8s.io/kustomize/v3/k8sdeps/kunstruct"
 	. "sigs.k8s.io/kustomize/v3/pkg/accumulator"
-	"sigs.k8s.io/kustomize/v3/pkg/resmap"
-	"sigs.k8s.io/kustomize/v3/pkg/resmaptest"
-	"sigs.k8s.io/kustomize/v3/pkg/resource"
 )
 
 func makeResAccumulator(t *testing.T) (*ResAccumulator, *resource.Factory) {

pkg/plugins/builtins.go

@@ -4,7 +4,7 @@
 package plugins
 
 import (
-	"sigs.k8s.io/kustomize/v3/pkg/resmap"
+	"sigs.k8s.io/kustomize/v3/api/resmap"
 	"sigs.k8s.io/kustomize/v3/plugin/builtin"
 )
 

pkg/plugins/execplugin.go

@@ -14,8 +14,8 @@ import (
 
 	"github.com/pkg/errors"
 	"sigs.k8s.io/kustomize/v3/api/resid"
+	"sigs.k8s.io/kustomize/v3/api/resmap"
 	"sigs.k8s.io/kustomize/v3/api/types"
-	"sigs.k8s.io/kustomize/v3/pkg/resmap"
 	"sigs.k8s.io/yaml"
 )
 

pkg/plugins/execplugin_test.go

@@ -8,12 +8,12 @@ import (
 	"strings"
 	"testing"
 
+	"sigs.k8s.io/kustomize/v3/api/resmap"
+	"sigs.k8s.io/kustomize/v3/api/resource"
+	"sigs.k8s.io/kustomize/v3/api/testutils/valtest"
 	"sigs.k8s.io/kustomize/v3/api/types"
 	"sigs.k8s.io/kustomize/v3/internal/loadertest"
 	"sigs.k8s.io/kustomize/v3/k8sdeps/kunstruct"
-	"sigs.k8s.io/kustomize/v3/pkg/resmap"
-	"sigs.k8s.io/kustomize/v3/pkg/resource"
-	"sigs.k8s.io/kustomize/v3/pkg/validators"
 )
 
 func TestExecPluginConfig(t *testing.T) {
@@ -22,7 +22,7 @@ func TestExecPluginConfig(t *testing.T) {
 		resource.NewFactory(
 			kunstruct.NewKunstructuredFactoryImpl()), nil)
 	ldr := loadertest.NewFakeLoader(path)
-	v := validators.MakeFakeValidator()
+	v := valtest_test.MakeFakeValidator()
 	pluginConfig := rf.RF().FromMap(
 		map[string]interface{}{
 			"apiVersion": "someteam.example.com/v1",

pkg/plugins/loader.go

@@ -11,11 +11,11 @@ import (
 	"strings"
 
 	"github.com/pkg/errors"
+	"sigs.k8s.io/kustomize/v3/api/ifc"
 	"sigs.k8s.io/kustomize/v3/api/resid"
+	"sigs.k8s.io/kustomize/v3/api/resmap"
+	"sigs.k8s.io/kustomize/v3/api/resource"
 	"sigs.k8s.io/kustomize/v3/api/types"
-	"sigs.k8s.io/kustomize/v3/pkg/ifc"
-	"sigs.k8s.io/kustomize/v3/pkg/resmap"
-	"sigs.k8s.io/kustomize/v3/pkg/resource"
 )
 
 type Loader struct {

pkg/plugins/loader_test.go

@@ -7,12 +7,12 @@ import (
 	"sigs.k8s.io/kustomize/v3/api/kusttest"
 	"testing"
 
+	"sigs.k8s.io/kustomize/v3/api/resmap"
+	"sigs.k8s.io/kustomize/v3/api/resource"
+	"sigs.k8s.io/kustomize/v3/api/testutils/valtest"
 	"sigs.k8s.io/kustomize/v3/internal/loadertest"
 	"sigs.k8s.io/kustomize/v3/k8sdeps/kunstruct"
 	. "sigs.k8s.io/kustomize/v3/pkg/plugins"
-	"sigs.k8s.io/kustomize/v3/pkg/resmap"
-	"sigs.k8s.io/kustomize/v3/pkg/resource"
-	"sigs.k8s.io/kustomize/v3/pkg/validators"
 )
 
 const (
@@ -67,7 +67,7 @@ func TestLoader(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	_, err = pLdr.LoadGenerators(ldr, validators.MakeFakeValidator(), m)
+	_, err = pLdr.LoadGenerators(ldr, valtest_test.MakeFakeValidator(), m)
 	if err != nil {
 		t.Fatal(err)
 	}

pkg/target/baseandoverlaysmall_test.go

@@ -21,7 +21,7 @@ import (
 	"testing"
 
 	"sigs.k8s.io/kustomize/v3/api/kusttest"
-	"sigs.k8s.io/kustomize/v3/pkg/loader"
+	"sigs.k8s.io/kustomize/v3/api/loader"
 	"sigs.k8s.io/kustomize/v3/pkg/plugins"
 )
 

pkg/target/kusttarget.go

@@ -15,12 +15,12 @@ import (
 
 	"github.com/pkg/errors"
 	"sigs.k8s.io/kustomize/v3/api/builtinconfig"
+	"sigs.k8s.io/kustomize/v3/api/ifc"
+	"sigs.k8s.io/kustomize/v3/api/resmap"
 	"sigs.k8s.io/kustomize/v3/api/types"
 	"sigs.k8s.io/kustomize/v3/pkg/accumulator"
-	"sigs.k8s.io/kustomize/v3/pkg/ifc"
 	"sigs.k8s.io/kustomize/v3/pkg/pgmconfig"
 	"sigs.k8s.io/kustomize/v3/pkg/plugins"
-	"sigs.k8s.io/kustomize/v3/pkg/resmap"
 	"sigs.k8s.io/kustomize/v3/plugin/builtin"
 	"sigs.k8s.io/yaml"
 )

pkg/target/kusttarget_configplugin.go

@@ -5,9 +5,9 @@ package target
 
 import (
 	"sigs.k8s.io/kustomize/v3/api/builtinconfig"
+	"sigs.k8s.io/kustomize/v3/api/resmap"
 	"sigs.k8s.io/kustomize/v3/api/types"
 	"sigs.k8s.io/kustomize/v3/pkg/plugins"
-	"sigs.k8s.io/kustomize/v3/pkg/resmap"
 )
 
 // Functions dedicated to configuring the builtin

pkg/target/kusttarget_test.go

@@ -9,15 +9,15 @@ import (
 	"strings"
 	"testing"
 
+	"sigs.k8s.io/kustomize/v3/api/ifc"
 	"sigs.k8s.io/kustomize/v3/api/kusttest"
 	"sigs.k8s.io/kustomize/v3/api/resid"
+	"sigs.k8s.io/kustomize/v3/api/resmap"
+	"sigs.k8s.io/kustomize/v3/api/resource"
+	"sigs.k8s.io/kustomize/v3/api/testutils/valtest"
 	"sigs.k8s.io/kustomize/v3/api/types"
 	"sigs.k8s.io/kustomize/v3/internal/loadertest"
-	"sigs.k8s.io/kustomize/v3/pkg/ifc"
-	"sigs.k8s.io/kustomize/v3/pkg/resmap"
-	"sigs.k8s.io/kustomize/v3/pkg/resource"
 	. "sigs.k8s.io/kustomize/v3/pkg/target"
-	"sigs.k8s.io/kustomize/v3/pkg/validators"
 )
 
 const (
@@ -186,7 +186,7 @@ func TestResources(t *testing.T) {
 func TestKustomizationNotFound(t *testing.T) {
 	_, err := NewKustTarget(
 		loadertest.NewFakeLoader("/foo"),
-		validators.MakeFakeValidator(), nil, nil, nil)
+		valtest_test.MakeFakeValidator(), nil, nil, nil)
 	if err == nil {
 		t.Fatalf("expected an error")
 	}

pkg/target/plugindir_test.go

@@ -11,14 +11,14 @@ import (
 
 	"sigs.k8s.io/kustomize/v3/api/filesys"
 	"sigs.k8s.io/kustomize/v3/api/kusttest"
+	"sigs.k8s.io/kustomize/v3/api/loader"
+	"sigs.k8s.io/kustomize/v3/api/resmap"
+	"sigs.k8s.io/kustomize/v3/api/resource"
+	"sigs.k8s.io/kustomize/v3/api/testutils/valtest"
 	"sigs.k8s.io/kustomize/v3/k8sdeps/kunstruct"
 	"sigs.k8s.io/kustomize/v3/k8sdeps/transformer"
-	"sigs.k8s.io/kustomize/v3/pkg/loader"
 	"sigs.k8s.io/kustomize/v3/pkg/plugins"
-	"sigs.k8s.io/kustomize/v3/pkg/resmap"
-	"sigs.k8s.io/kustomize/v3/pkg/resource"
 	"sigs.k8s.io/kustomize/v3/pkg/target"
-	"sigs.k8s.io/kustomize/v3/pkg/validators"
 )
 
 func TestPluginDir(t *testing.T) {
@@ -66,7 +66,7 @@ metadata:
 
 	pl := plugins.NewLoader(plugins.ActivePluginConfig(), rf)
 	tg, err := target.NewKustTarget(
-		ldr, validators.MakeFakeValidator(), rf, transformer.NewFactoryImpl(), pl)
+		ldr, valtest_test.MakeFakeValidator(), rf, transformer.NewFactoryImpl(), pl)
 	if err != nil {
 		t.Fatalf("err %v", err)
 	}

plugin/builtin/AnnotationsTransformer.go

@@ -2,9 +2,9 @@
 package builtin
 
 import (
+	"sigs.k8s.io/kustomize/v3/api/resmap"
 	"sigs.k8s.io/kustomize/v3/api/transform"
 	"sigs.k8s.io/kustomize/v3/api/types"
-	"sigs.k8s.io/kustomize/v3/pkg/resmap"
 	"sigs.k8s.io/yaml"
 )
 

plugin/builtin/ConfigMapGenerator.go

@@ -3,8 +3,8 @@ package builtin
 
 import (
 	"sigs.k8s.io/kustomize/v3/api/kv"
+	"sigs.k8s.io/kustomize/v3/api/resmap"
 	"sigs.k8s.io/kustomize/v3/api/types"
-	"sigs.k8s.io/kustomize/v3/pkg/resmap"
 	"sigs.k8s.io/yaml"
 )
 

plugin/builtin/HashTransformer.go

@@ -4,8 +4,8 @@ package builtin
 import (
 	"fmt"
 
-	"sigs.k8s.io/kustomize/v3/pkg/ifc"
-	"sigs.k8s.io/kustomize/v3/pkg/resmap"
+	"sigs.k8s.io/kustomize/v3/api/ifc"
+	"sigs.k8s.io/kustomize/v3/api/resmap"
 )
 
 type HashTransformerPlugin struct {

plugin/builtin/ImageTagTransformer.go

@@ -8,7 +8,7 @@ import (
 	"sigs.k8s.io/kustomize/v3/api/types"
 	"strings"
 
-	"sigs.k8s.io/kustomize/v3/pkg/resmap"
+	"sigs.k8s.io/kustomize/v3/api/resmap"
 	"sigs.k8s.io/yaml"
 )
 

plugin/builtin/InventoryTransformer.go

@@ -7,10 +7,10 @@ import (
 	"sigs.k8s.io/kustomize/v3/api/hasher"
 	"sigs.k8s.io/kustomize/v3/api/kv"
 	"sigs.k8s.io/kustomize/v3/api/resid"
+	"sigs.k8s.io/kustomize/v3/api/resmap"
+	"sigs.k8s.io/kustomize/v3/api/resource"
 	"sigs.k8s.io/kustomize/v3/api/types"
 	"sigs.k8s.io/kustomize/v3/pkg/inventory"
-	"sigs.k8s.io/kustomize/v3/pkg/resmap"
-	"sigs.k8s.io/kustomize/v3/pkg/resource"
 	"sigs.k8s.io/yaml"
 )
 

plugin/builtin/LabelTransformer.go

@@ -2,9 +2,9 @@
 package builtin
 
 import (
+	"sigs.k8s.io/kustomize/v3/api/resmap"
 	"sigs.k8s.io/kustomize/v3/api/transform"
 	"sigs.k8s.io/kustomize/v3/api/types"
-	"sigs.k8s.io/kustomize/v3/pkg/resmap"
 	"sigs.k8s.io/yaml"
 )
 

plugin/builtin/LegacyOrderTransformer.go

@@ -5,8 +5,8 @@ import (
 	"sort"
 
 	"github.com/pkg/errors"
-	"sigs.k8s.io/kustomize/v3/pkg/resmap"
-	"sigs.k8s.io/kustomize/v3/pkg/resource"
+	"sigs.k8s.io/kustomize/v3/api/resmap"
+	"sigs.k8s.io/kustomize/v3/api/resource"
 )
 
 // Sort the resources using an ordering defined in the Gvk class.

plugin/builtin/NamespaceTransformer.go

@@ -6,9 +6,9 @@ import (
 	"sigs.k8s.io/kustomize/v3/api/transform"
 
 	"sigs.k8s.io/kustomize/v3/api/resid"
+	"sigs.k8s.io/kustomize/v3/api/resmap"
+	"sigs.k8s.io/kustomize/v3/api/resource"
 	"sigs.k8s.io/kustomize/v3/api/types"
-	"sigs.k8s.io/kustomize/v3/pkg/resmap"
-	"sigs.k8s.io/kustomize/v3/pkg/resource"
 	"sigs.k8s.io/yaml"
 )
 

plugin/builtin/PatchJson6902Transformer.go

@@ -6,10 +6,10 @@ import (
 
 	"github.com/evanphx/json-patch"
 	"github.com/pkg/errors"
+	"sigs.k8s.io/kustomize/v3/api/ifc"
 	"sigs.k8s.io/kustomize/v3/api/resid"
+	"sigs.k8s.io/kustomize/v3/api/resmap"
 	"sigs.k8s.io/kustomize/v3/api/types"
-	"sigs.k8s.io/kustomize/v3/pkg/ifc"
-	"sigs.k8s.io/kustomize/v3/pkg/resmap"
 	"sigs.k8s.io/yaml"
 )
 

plugin/builtin/PatchStrategicMergeTransformer.go

@@ -4,9 +4,9 @@ package builtin
 import (
 	"fmt"
 
+	"sigs.k8s.io/kustomize/v3/api/resmap"
+	"sigs.k8s.io/kustomize/v3/api/resource"
 	"sigs.k8s.io/kustomize/v3/api/types"
-	"sigs.k8s.io/kustomize/v3/pkg/resmap"
-	"sigs.k8s.io/kustomize/v3/pkg/resource"
 	"sigs.k8s.io/yaml"
 )
 

plugin/builtin/PatchTransformer.go

@@ -6,9 +6,9 @@ import (
 
 	"github.com/evanphx/json-patch"
 	"github.com/pkg/errors"
+	"sigs.k8s.io/kustomize/v3/api/resmap"
+	"sigs.k8s.io/kustomize/v3/api/resource"
 	"sigs.k8s.io/kustomize/v3/api/types"
-	"sigs.k8s.io/kustomize/v3/pkg/resmap"
-	"sigs.k8s.io/kustomize/v3/pkg/resource"
 	"sigs.k8s.io/yaml"
 )
 

plugin/builtin/PrefixSuffixTransformer.go

@@ -8,7 +8,7 @@ import (
 	"sigs.k8s.io/kustomize/v3/api/types"
 
 	"sigs.k8s.io/kustomize/v3/api/resid"
-	"sigs.k8s.io/kustomize/v3/pkg/resmap"
+	"sigs.k8s.io/kustomize/v3/api/resmap"
 	"sigs.k8s.io/yaml"
 )
 

plugin/builtin/ReplicaCountTransformer.go

@@ -6,8 +6,8 @@ import (
 	"sigs.k8s.io/kustomize/v3/api/transform"
 
 	"sigs.k8s.io/kustomize/v3/api/resid"
+	"sigs.k8s.io/kustomize/v3/api/resmap"
 	"sigs.k8s.io/kustomize/v3/api/types"
-	"sigs.k8s.io/kustomize/v3/pkg/resmap"
 	"sigs.k8s.io/yaml"
 )
 

plugin/builtin/SecretGenerator.go

@@ -3,8 +3,8 @@ package builtin
 
 import (
 	"sigs.k8s.io/kustomize/v3/api/kv"
+	"sigs.k8s.io/kustomize/v3/api/resmap"
 	"sigs.k8s.io/kustomize/v3/api/types"
-	"sigs.k8s.io/kustomize/v3/pkg/resmap"
 	"sigs.k8s.io/yaml"
 )