diff --git a/filesys/confirmeddir.go b/api/filesys/confirmeddir.go similarity index 100% rename from filesys/confirmeddir.go rename to api/filesys/confirmeddir.go diff --git a/filesys/confirmeddir_test.go b/api/filesys/confirmeddir_test.go similarity index 94% rename from filesys/confirmeddir_test.go rename to api/filesys/confirmeddir_test.go index b8cc2e29d..9cdb55a09 100644 --- a/filesys/confirmeddir_test.go +++ b/api/filesys/confirmeddir_test.go @@ -1,11 +1,13 @@ // Copyright 2019 The Kubernetes Authors. // SPDX-License-Identifier: Apache-2.0 -package filesys +package filesys_test import ( "path/filepath" "testing" + + . "sigs.k8s.io/kustomize/v3/api/filesys" ) func TestJoin(t *testing.T) { @@ -27,7 +29,8 @@ func TestJoin(t *testing.T) { } func TestHasPrefix_Slash(t *testing.T) { - d, f, err := MakeFsInMemory().CleanedAbs("/") + fSys := MakeFsInMemory() + d, f, err := fSys.CleanedAbs("/") if err != nil { t.Fatalf("unexpected err: %v", err) } diff --git a/filesys/file.go b/api/filesys/file.go similarity index 100% rename from filesys/file.go rename to api/filesys/file.go diff --git a/filesys/fileinmemory.go b/api/filesys/fileinmemory.go similarity index 100% rename from filesys/fileinmemory.go rename to api/filesys/fileinmemory.go diff --git a/filesys/fileondisk.go b/api/filesys/fileondisk.go similarity index 100% rename from filesys/fileondisk.go rename to api/filesys/fileondisk.go diff --git a/filesys/filesystem.go b/api/filesys/filesystem.go similarity index 100% rename from filesys/filesystem.go rename to api/filesys/filesystem.go diff --git a/filesys/fsinmemory.go b/api/filesys/fsinmemory.go similarity index 100% rename from filesys/fsinmemory.go rename to api/filesys/fsinmemory.go diff --git a/filesys/fsinmemory_test.go b/api/filesys/fsinmemory_test.go similarity index 98% rename from filesys/fsinmemory_test.go rename to api/filesys/fsinmemory_test.go index c99ee577a..3611599ee 100644 --- a/filesys/fsinmemory_test.go +++ b/api/filesys/fsinmemory_test.go @@ -1,12 +1,14 @@ // Copyright 2019 The Kubernetes Authors. // SPDX-License-Identifier: Apache-2.0 -package filesys +package filesys_test import ( "bytes" "reflect" "testing" + + . "sigs.k8s.io/kustomize/v3/api/filesys" ) func TestExists(t *testing.T) { diff --git a/filesys/fsondisk.go b/api/filesys/fsondisk.go similarity index 100% rename from filesys/fsondisk.go rename to api/filesys/fsondisk.go diff --git a/filesys/fsondisk_test.go b/api/filesys/fsondisk_test.go similarity index 98% rename from filesys/fsondisk_test.go rename to api/filesys/fsondisk_test.go index 1db88c218..b3513c2a5 100644 --- a/filesys/fsondisk_test.go +++ b/api/filesys/fsondisk_test.go @@ -1,7 +1,7 @@ // Copyright 2019 The Kubernetes Authors. // SPDX-License-Identifier: Apache-2.0 -package filesys +package filesys_test import ( "io/ioutil" @@ -10,6 +10,8 @@ import ( "path/filepath" "reflect" "testing" + + . "sigs.k8s.io/kustomize/v3/api/filesys" ) func makeTestDir(t *testing.T) (FileSystem, string) { diff --git a/filesys/rpath.go b/api/filesys/rpath.go similarity index 100% rename from filesys/rpath.go rename to api/filesys/rpath.go diff --git a/hasher/hasher.go b/api/hasher/hasher.go similarity index 100% rename from hasher/hasher.go rename to api/hasher/hasher.go diff --git a/hasher/hasher_test.go b/api/hasher/hasher_test.go similarity index 95% rename from hasher/hasher_test.go rename to api/hasher/hasher_test.go index 95ee3624b..327a945b6 100644 --- a/hasher/hasher_test.go +++ b/api/hasher/hasher_test.go @@ -6,7 +6,7 @@ package hasher_test import ( "testing" - . "sigs.k8s.io/kustomize/v3/hasher" + . "sigs.k8s.io/kustomize/v3/api/hasher" ) func TestSortArrayAndComputeHash(t *testing.T) { diff --git a/kustapiversion/main.go b/api/kustapiversion/main.go similarity index 92% rename from kustapiversion/main.go rename to api/kustapiversion/main.go index 87a7982c7..f90bef1dd 100644 --- a/kustapiversion/main.go +++ b/api/kustapiversion/main.go @@ -8,7 +8,7 @@ import ( "fmt" "os" - "sigs.k8s.io/kustomize/v3/provenance" + "sigs.k8s.io/kustomize/v3/api/provenance" ) // TODO: delete this when we find a better way to generate release notes. diff --git a/pkg/kusttest/kusttestharness.go b/api/kusttest/kusttestharness.go similarity index 93% rename from pkg/kusttest/kusttestharness.go rename to api/kusttest/kusttestharness.go index 6a98e056b..31d2ff7a3 100644 --- a/pkg/kusttest/kusttestharness.go +++ b/api/kusttest/kusttestharness.go @@ -9,6 +9,7 @@ import ( "strings" "testing" + "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" @@ -20,10 +21,12 @@ import ( "sigs.k8s.io/kustomize/v3/pkg/target" "sigs.k8s.io/kustomize/v3/pkg/transformers/config/defaultconfig" "sigs.k8s.io/kustomize/v3/pkg/validators" - "sigs.k8s.io/kustomize/v3/types" ) -// KustTestHarness helps test kustomization generation and transformation. +// KustTestHarness is an environment for running a kustomize build, +// aka a run of MakeCustomizedResMap. It holds a file loader +// presumably primed with an in-memory file system, a plugin +// loader, factories to make what it needs, etc. type KustTestHarness struct { t *testing.T rf *resmap.Factory @@ -36,12 +39,12 @@ func NewKustTestHarness(t *testing.T, path string) *KustTestHarness { t, path, loader.RestrictionRootOnly, plugins.DefaultPluginConfig()) } -func NewKustTestPluginHarness(t *testing.T, path string) *KustTestHarness { +func NewKustTestHarnessAllowPlugins(t *testing.T, path string) *KustTestHarness { return NewKustTestHarnessFull( t, path, loader.RestrictionRootOnly, plugins.ActivePluginConfig()) } -func NewKustTestNoLoadRestrictorHarness(t *testing.T, path string) *KustTestHarness { +func NewKustTestHarnessNoLoadRestrictor(t *testing.T, path string) *KustTestHarness { return NewKustTestHarnessFull( t, path, loader.RestrictionNone, plugins.DefaultPluginConfig()) } diff --git a/pluglib/envfortest.go b/api/kusttest/plugintestenv.go similarity index 73% rename from pluglib/envfortest.go rename to api/kusttest/plugintestenv.go index eef203ab2..acf4d470c 100644 --- a/pluglib/envfortest.go +++ b/api/kusttest/plugintestenv.go @@ -1,7 +1,7 @@ // Copyright 2019 The Kubernetes Authors. // SPDX-License-Identifier: Apache-2.0 -package pluglib +package kusttest_test import ( "io/ioutil" @@ -15,9 +15,10 @@ import ( "sigs.k8s.io/kustomize/v3/pkg/plugins" ) -// EnvForTest manages the plugin test environment. -// It sets/resets XDG_CONFIG_HOME, makes/removes a temp objRoot. -type EnvForTest struct { +// PluginTestEnv manages the plugin test environment. +// It sets/resets XDG_CONFIG_HOME, makes/removes a temp objRoot, +// manages a plugin compiler, etc. +type PluginTestEnv struct { t *testing.T compiler *plugins.Compiler workDir string @@ -25,30 +26,30 @@ type EnvForTest struct { wasSet bool } -func NewEnvForTest(t *testing.T) *EnvForTest { - return &EnvForTest{t: t} +func NewPluginTestEnv(t *testing.T) *PluginTestEnv { + return &PluginTestEnv{t: t} } -func (x *EnvForTest) Set() *EnvForTest { +func (x *PluginTestEnv) Set() *PluginTestEnv { x.createWorkDir() x.compiler = x.makeCompiler() x.setEnv() return x } -func (x *EnvForTest) Reset() { +func (x *PluginTestEnv) Reset() { x.resetEnv() x.removeWorkDir() } -func (x *EnvForTest) BuildGoPlugin(g, v, k string) { +func (x *PluginTestEnv) BuildGoPlugin(g, v, k string) { err := x.compiler.Compile(g, v, k) if err != nil { x.t.Errorf("compile failed: %v", err) } } -func (x *EnvForTest) BuildExecPlugin(g, v, k string) { +func (x *PluginTestEnv) BuildExecPlugin(g, v, k string) { lowK := strings.ToLower(k) obj := filepath.Join(x.compiler.ObjRoot(), g, v, lowK, k) src := filepath.Join(x.compiler.SrcRoot(), g, v, lowK, k) @@ -62,7 +63,7 @@ func (x *EnvForTest) BuildExecPlugin(g, v, k string) { } } -func (x *EnvForTest) makeCompiler() *plugins.Compiler { +func (x *PluginTestEnv) makeCompiler() *plugins.Compiler { // The plugin loader wants to find object code under // $XDG_CONFIG_HOME/kustomize/plugins // and the compiler writes object code to @@ -81,7 +82,7 @@ func (x *EnvForTest) makeCompiler() *plugins.Compiler { return plugins.NewCompiler(srcRoot, objRoot) } -func (x *EnvForTest) createWorkDir() { +func (x *PluginTestEnv) createWorkDir() { var err error x.workDir, err = ioutil.TempDir("", "kustomize-plugin-tests") if err != nil { @@ -89,7 +90,7 @@ func (x *EnvForTest) createWorkDir() { } } -func (x *EnvForTest) removeWorkDir() { +func (x *PluginTestEnv) removeWorkDir() { err := os.RemoveAll(x.workDir) if err != nil { x.t.Errorf( @@ -97,12 +98,12 @@ func (x *EnvForTest) removeWorkDir() { } } -func (x *EnvForTest) setEnv() { +func (x *PluginTestEnv) setEnv() { x.oldXdg, x.wasSet = os.LookupEnv(pgmconfig.XdgConfigHome) os.Setenv(pgmconfig.XdgConfigHome, x.workDir) } -func (x *EnvForTest) resetEnv() { +func (x *PluginTestEnv) resetEnv() { if x.wasSet { os.Setenv(pgmconfig.XdgConfigHome, x.oldXdg) } else { diff --git a/kv/kv.go b/api/kv/kv.go similarity index 99% rename from kv/kv.go rename to api/kv/kv.go index 973bd4e4d..562699838 100644 --- a/kv/kv.go +++ b/api/kv/kv.go @@ -14,8 +14,8 @@ import ( "unicode/utf8" "github.com/pkg/errors" + "sigs.k8s.io/kustomize/v3/api/types" "sigs.k8s.io/kustomize/v3/pkg/ifc" - "sigs.k8s.io/kustomize/v3/types" ) var utf8bom = []byte{0xEF, 0xBB, 0xBF} diff --git a/kv/kv_test.go b/api/kv/kv_test.go similarity index 96% rename from kv/kv_test.go rename to api/kv/kv_test.go index dba73ce92..152b07c9f 100644 --- a/kv/kv_test.go +++ b/api/kv/kv_test.go @@ -7,10 +7,10 @@ import ( "reflect" "testing" - "sigs.k8s.io/kustomize/v3/filesys" + "sigs.k8s.io/kustomize/v3/api/filesys" + "sigs.k8s.io/kustomize/v3/api/types" ldr "sigs.k8s.io/kustomize/v3/pkg/loader" "sigs.k8s.io/kustomize/v3/pkg/validators" - "sigs.k8s.io/kustomize/v3/types" ) func makeKvLoader(fSys filesys.FileSystem) *loader { diff --git a/provenance/provenance.go b/api/provenance/provenance.go similarity index 100% rename from provenance/provenance.go rename to api/provenance/provenance.go diff --git a/pkg/gvk/gvk.go b/api/resid/gvk.go similarity index 95% rename from pkg/gvk/gvk.go rename to api/resid/gvk.go index 93ee10362..fa50a47a0 100644 --- a/pkg/gvk/gvk.go +++ b/api/resid/gvk.go @@ -1,7 +1,7 @@ // Copyright 2019 The Kubernetes Authors. // SPDX-License-Identifier: Apache-2.0 -package gvk +package resid import ( "strings" @@ -22,10 +22,10 @@ func FromKind(k string) Gvk { } } -// FromString makes a Gvk with a string, +// GvkFromString makes a Gvk with a string, // which is constructed by String() function -func FromString(s string) Gvk { - values := strings.Split(s, separator) +func GvkFromString(s string) Gvk { + values := strings.Split(s, fieldSep) g := values[0] if g == noGroup { g = "" @@ -50,7 +50,7 @@ const ( noGroup = "~G" noVersion = "~V" noKind = "~K" - separator = "_" + fieldSep = "_" ) // String returns a string representation of the GVK. @@ -67,7 +67,7 @@ func (x Gvk) String() string { if k == "" { k = noKind } - return strings.Join([]string{g, v, k}, separator) + return strings.Join([]string{g, v, k}, fieldSep) } // Equals returns true if the Gvk's have equal fields. diff --git a/pkg/gvk/gvk_test.go b/api/resid/gvk_test.go similarity index 99% rename from pkg/gvk/gvk_test.go rename to api/resid/gvk_test.go index ed0dc8b16..8957ae53a 100644 --- a/pkg/gvk/gvk_test.go +++ b/api/resid/gvk_test.go @@ -14,9 +14,11 @@ See the License for the specific language governing permissions and limitations under the License. */ -package gvk +package resid -import "testing" +import ( + "testing" +) var equalsTests = []struct { x1 Gvk diff --git a/pkg/resid/resid.go b/api/resid/resid.go similarity index 91% rename from pkg/resid/resid.go rename to api/resid/resid.go index 335fb9211..28310e8f3 100644 --- a/pkg/resid/resid.go +++ b/api/resid/resid.go @@ -5,14 +5,12 @@ package resid import ( "strings" - - "sigs.k8s.io/kustomize/v3/pkg/gvk" ) // ResId is an identifier of a k8s resource object. type ResId struct { // Gvk of the resource. - gvk.Gvk `json:",inline,omitempty" yaml:",inline,omitempty"` + Gvk `json:",inline,omitempty" yaml:",inline,omitempty"` // Name of the resource before transformation. Name string `json:"name,omitempty" yaml:"name,omitempty"` @@ -26,18 +24,18 @@ type ResId struct { // NewResIdWithNamespace creates new ResId // in a given namespace. -func NewResIdWithNamespace(k gvk.Gvk, n, ns string) ResId { +func NewResIdWithNamespace(k Gvk, n, ns string) ResId { return ResId{Gvk: k, Name: n, Namespace: ns} } // NewResId creates new ResId. -func NewResId(k gvk.Gvk, n string) ResId { +func NewResId(k Gvk, n string) ResId { return ResId{Gvk: k, Name: n} } // NewResIdKindOnly creates a new ResId. func NewResIdKindOnly(k string, n string) ResId { - return ResId{Gvk: gvk.FromKind(k), Name: n} + return ResId{Gvk: FromKind(k), Name: n} } const ( @@ -64,7 +62,7 @@ func (id ResId) String() string { func FromString(s string) ResId { values := strings.Split(s, separator) - g := gvk.FromString(values[0]) + g := GvkFromString(values[0]) ns := values[1] if ns == noNamespace { diff --git a/pkg/resid/resid_test.go b/api/resid/resid_test.go similarity index 72% rename from pkg/resid/resid_test.go rename to api/resid/resid_test.go index b74f2be39..ec2cf8404 100644 --- a/pkg/resid/resid_test.go +++ b/api/resid/resid_test.go @@ -5,18 +5,16 @@ package resid import ( "testing" - - "sigs.k8s.io/kustomize/v3/pkg/gvk" ) -var stringTests = []struct { +var resIdStringTests = []struct { x ResId s string }{ { ResId{ Namespace: "ns", - Gvk: gvk.Gvk{Group: "g", Version: "v", Kind: "k"}, + Gvk: Gvk{Group: "g", Version: "v", Kind: "k"}, Name: "nm", }, "g_v_k|ns|nm", @@ -24,7 +22,7 @@ var stringTests = []struct { { ResId{ Namespace: "ns", - Gvk: gvk.Gvk{Version: "v", Kind: "k"}, + Gvk: Gvk{Version: "v", Kind: "k"}, Name: "nm", }, "~G_v_k|ns|nm", @@ -32,7 +30,7 @@ var stringTests = []struct { { ResId{ Namespace: "ns", - Gvk: gvk.Gvk{Kind: "k"}, + Gvk: Gvk{Kind: "k"}, Name: "nm", }, "~G_~V_k|ns|nm", @@ -40,34 +38,34 @@ var stringTests = []struct { { ResId{ Namespace: "ns", - Gvk: gvk.Gvk{}, + Gvk: Gvk{}, Name: "nm", }, "~G_~V_~K|ns|nm", }, { ResId{ - Gvk: gvk.Gvk{}, + Gvk: Gvk{}, Name: "nm", }, "~G_~V_~K|~X|nm", }, { ResId{ - Gvk: gvk.Gvk{}, + Gvk: Gvk{}, Name: "nm", }, "~G_~V_~K|~X|nm", }, { ResId{ - Gvk: gvk.Gvk{}, + Gvk: Gvk{}, }, "~G_~V_~K|~X|~N", }, { ResId{ - Gvk: gvk.Gvk{}, + Gvk: Gvk{}, }, "~G_~V_~K|~X|~N", }, @@ -77,8 +75,8 @@ var stringTests = []struct { }, } -func TestString(t *testing.T) { - for _, hey := range stringTests { +func TestResIdString(t *testing.T) { + for _, hey := range resIdStringTests { if hey.x.String() != hey.s { t.Fatalf("Actual: %v, Expected: '%s'", hey.x, hey.s) } @@ -92,7 +90,7 @@ var gvknStringTests = []struct { { ResId{ Namespace: "ns", - Gvk: gvk.Gvk{Group: "g", Version: "v", Kind: "k"}, + Gvk: Gvk{Group: "g", Version: "v", Kind: "k"}, Name: "nm", }, "g_v_k|nm", @@ -100,7 +98,7 @@ var gvknStringTests = []struct { { ResId{ Namespace: "ns", - Gvk: gvk.Gvk{Version: "v", Kind: "k"}, + Gvk: Gvk{Version: "v", Kind: "k"}, Name: "nm", }, "~G_v_k|nm", @@ -108,7 +106,7 @@ var gvknStringTests = []struct { { ResId{ Namespace: "ns", - Gvk: gvk.Gvk{Kind: "k"}, + Gvk: Gvk{Kind: "k"}, Name: "nm", }, "~G_~V_k|nm", @@ -116,34 +114,34 @@ var gvknStringTests = []struct { { ResId{ Namespace: "ns", - Gvk: gvk.Gvk{}, + Gvk: Gvk{}, Name: "nm", }, "~G_~V_~K|nm", }, { ResId{ - Gvk: gvk.Gvk{}, + Gvk: Gvk{}, Name: "nm", }, "~G_~V_~K|nm", }, { ResId{ - Gvk: gvk.Gvk{}, + Gvk: Gvk{}, Name: "nm", }, "~G_~V_~K|nm", }, { ResId{ - Gvk: gvk.Gvk{}, + Gvk: Gvk{}, }, "~G_~V_~K|", }, { ResId{ - Gvk: gvk.Gvk{}, + Gvk: Gvk{}, }, "~G_~V_~K|", }, @@ -161,7 +159,7 @@ func TestGvknString(t *testing.T) { } } -func TestEquals(t *testing.T) { +func TestResIdEquals(t *testing.T) { var GvknEqualsTest = []struct { id1 ResId @@ -173,12 +171,12 @@ func TestEquals(t *testing.T) { { id1: ResId{ Namespace: "X", - Gvk: gvk.Gvk{Group: "g", Version: "v", Kind: "k"}, + Gvk: Gvk{Group: "g", Version: "v", Kind: "k"}, Name: "nm", }, id2: ResId{ Namespace: "X", - Gvk: gvk.Gvk{Group: "g", Version: "v", Kind: "k"}, + Gvk: Gvk{Group: "g", Version: "v", Kind: "k"}, Name: "nm", }, gVknResult: true, @@ -188,12 +186,12 @@ func TestEquals(t *testing.T) { { id1: ResId{ Namespace: "X", - Gvk: gvk.Gvk{Group: "g", Version: "v", Kind: "k"}, + Gvk: Gvk{Group: "g", Version: "v", Kind: "k"}, Name: "nm", }, id2: ResId{ Namespace: "Z", - Gvk: gvk.Gvk{Group: "g", Version: "v", Kind: "k"}, + Gvk: Gvk{Group: "g", Version: "v", Kind: "k"}, Name: "nm", }, gVknResult: true, @@ -203,11 +201,11 @@ func TestEquals(t *testing.T) { { id1: ResId{ Namespace: "X", - Gvk: gvk.Gvk{Group: "g", Version: "v", Kind: "k"}, + Gvk: Gvk{Group: "g", Version: "v", Kind: "k"}, Name: "nm", }, id2: ResId{ - Gvk: gvk.Gvk{Group: "g", Version: "v", Kind: "k"}, + Gvk: Gvk{Group: "g", Version: "v", Kind: "k"}, Name: "nm", }, gVknResult: true, @@ -217,12 +215,12 @@ func TestEquals(t *testing.T) { { id1: ResId{ Namespace: "X", - Gvk: gvk.Gvk{Version: "v", Kind: "k"}, + Gvk: Gvk{Version: "v", Kind: "k"}, Name: "nm", }, id2: ResId{ Namespace: "Z", - Gvk: gvk.Gvk{Version: "v", Kind: "k"}, + Gvk: Gvk{Version: "v", Kind: "k"}, Name: "nm", }, gVknResult: true, @@ -232,12 +230,12 @@ func TestEquals(t *testing.T) { { id1: ResId{ Namespace: "X", - Gvk: gvk.Gvk{Kind: "k"}, + Gvk: Gvk{Kind: "k"}, Name: "nm", }, id2: ResId{ Namespace: "Z", - Gvk: gvk.Gvk{Kind: "k"}, + Gvk: Gvk{Kind: "k"}, Name: "nm", }, gVknResult: true, @@ -246,11 +244,11 @@ func TestEquals(t *testing.T) { }, { id1: ResId{ - Gvk: gvk.Gvk{Kind: "k"}, + Gvk: Gvk{Kind: "k"}, Name: "nm", }, id2: ResId{ - Gvk: gvk.Gvk{Kind: "k"}, + Gvk: Gvk{Kind: "k"}, Name: "nm2", }, gVknResult: false, @@ -259,11 +257,11 @@ func TestEquals(t *testing.T) { }, { id1: ResId{ - Gvk: gvk.Gvk{Kind: "k"}, + Gvk: Gvk{Kind: "k"}, Name: "nm", }, id2: ResId{ - Gvk: gvk.Gvk{Kind: "Node"}, + Gvk: Gvk{Kind: "Node"}, Name: "nm", }, gVknResult: false, @@ -272,11 +270,11 @@ func TestEquals(t *testing.T) { }, { id1: ResId{ - Gvk: gvk.Gvk{Kind: "Node"}, + Gvk: Gvk{Kind: "Node"}, Name: "nm1", }, id2: ResId{ - Gvk: gvk.Gvk{Kind: "Node"}, + Gvk: Gvk{Kind: "Node"}, Name: "nm2", }, gVknResult: false, @@ -286,11 +284,11 @@ func TestEquals(t *testing.T) { { id1: ResId{ Namespace: "default", - Gvk: gvk.Gvk{Kind: "k"}, + Gvk: Gvk{Kind: "k"}, Name: "nm1", }, id2: ResId{ - Gvk: gvk.Gvk{Kind: "k"}, + Gvk: Gvk{Kind: "k"}, Name: "nm2", }, gVknResult: false, @@ -331,34 +329,34 @@ func TestEquals(t *testing.T) { var ids = []ResId{ { Namespace: "ns", - Gvk: gvk.Gvk{Group: "g", Version: "v", Kind: "k"}, + Gvk: Gvk{Group: "g", Version: "v", Kind: "k"}, Name: "nm", }, { Namespace: "ns", - Gvk: gvk.Gvk{Version: "v", Kind: "k"}, + Gvk: Gvk{Version: "v", Kind: "k"}, Name: "nm", }, { Namespace: "ns", - Gvk: gvk.Gvk{Kind: "k"}, + Gvk: Gvk{Kind: "k"}, Name: "nm", }, { Namespace: "ns", - Gvk: gvk.Gvk{}, + Gvk: Gvk{}, Name: "nm", }, { - Gvk: gvk.Gvk{}, + Gvk: Gvk{}, Name: "nm", }, { - Gvk: gvk.Gvk{}, + Gvk: Gvk{}, Name: "nm", }, { - Gvk: gvk.Gvk{}, + Gvk: Gvk{}, }, } @@ -378,7 +376,7 @@ func TestEffectiveNamespace(t *testing.T) { }{ { id: ResId{ - Gvk: gvk.Gvk{Group: "g", Version: "v", Kind: "Node"}, + Gvk: Gvk{Group: "g", Version: "v", Kind: "Node"}, Name: "nm", }, expected: TotallyNotANamespace, @@ -386,7 +384,7 @@ func TestEffectiveNamespace(t *testing.T) { { id: ResId{ Namespace: "foo", - Gvk: gvk.Gvk{Group: "g", Version: "v", Kind: "Node"}, + Gvk: Gvk{Group: "g", Version: "v", Kind: "Node"}, Name: "nm", }, expected: TotallyNotANamespace, @@ -394,7 +392,7 @@ func TestEffectiveNamespace(t *testing.T) { { id: ResId{ Namespace: "foo", - Gvk: gvk.Gvk{Group: "g", Version: "v", Kind: "k"}, + Gvk: Gvk{Group: "g", Version: "v", Kind: "k"}, Name: "nm", }, expected: "foo", @@ -402,14 +400,14 @@ func TestEffectiveNamespace(t *testing.T) { { id: ResId{ Namespace: "", - Gvk: gvk.Gvk{Group: "g", Version: "v", Kind: "k"}, + Gvk: Gvk{Group: "g", Version: "v", Kind: "k"}, Name: "nm", }, expected: DefaultNamespace, }, { id: ResId{ - Gvk: gvk.Gvk{Group: "g", Version: "v", Kind: "k"}, + Gvk: Gvk{Group: "g", Version: "v", Kind: "k"}, Name: "nm", }, expected: DefaultNamespace, diff --git a/types/configmapargs.go b/api/types/configmapargs.go similarity index 100% rename from types/configmapargs.go rename to api/types/configmapargs.go diff --git a/types/doc.go b/api/types/doc.go similarity index 100% rename from types/doc.go rename to api/types/doc.go diff --git a/types/fix.go b/api/types/fix.go similarity index 100% rename from types/fix.go rename to api/types/fix.go diff --git a/types/garbagepolicy.go b/api/types/garbagepolicy.go similarity index 100% rename from types/garbagepolicy.go rename to api/types/garbagepolicy.go diff --git a/types/garbagepolicy_string.go b/api/types/garbagepolicy_string.go similarity index 100% rename from types/garbagepolicy_string.go rename to api/types/garbagepolicy_string.go diff --git a/types/genargs.go b/api/types/genargs.go similarity index 100% rename from types/genargs.go rename to api/types/genargs.go diff --git a/types/genargs_test.go b/api/types/genargs_test.go similarity index 94% rename from types/genargs_test.go rename to api/types/genargs_test.go index 01f316447..5698537b2 100644 --- a/types/genargs_test.go +++ b/api/types/genargs_test.go @@ -6,7 +6,7 @@ package types_test import ( "testing" - . "sigs.k8s.io/kustomize/v3/types" + . "sigs.k8s.io/kustomize/v3/api/types" ) func TestGenArgs_String(t *testing.T) { diff --git a/types/generationbehavior.go b/api/types/generationbehavior.go similarity index 100% rename from types/generationbehavior.go rename to api/types/generationbehavior.go diff --git a/types/generatorargs.go b/api/types/generatorargs.go similarity index 100% rename from types/generatorargs.go rename to api/types/generatorargs.go diff --git a/types/generatoroptions.go b/api/types/generatoroptions.go similarity index 100% rename from types/generatoroptions.go rename to api/types/generatoroptions.go diff --git a/types/image.go b/api/types/image.go similarity index 100% rename from types/image.go rename to api/types/image.go diff --git a/types/inventory.go b/api/types/inventory.go similarity index 100% rename from types/inventory.go rename to api/types/inventory.go diff --git a/types/kustomization.go b/api/types/kustomization.go similarity index 100% rename from types/kustomization.go rename to api/types/kustomization.go diff --git a/types/kvpairsources.go b/api/types/kvpairsources.go similarity index 100% rename from types/kvpairsources.go rename to api/types/kvpairsources.go diff --git a/types/objectmeta.go b/api/types/objectmeta.go similarity index 100% rename from types/objectmeta.go rename to api/types/objectmeta.go diff --git a/types/pair.go b/api/types/pair.go similarity index 100% rename from types/pair.go rename to api/types/pair.go diff --git a/types/patch.go b/api/types/patch.go similarity index 100% rename from types/patch.go rename to api/types/patch.go diff --git a/types/patchjson6902.go b/api/types/patchjson6902.go similarity index 100% rename from types/patchjson6902.go rename to api/types/patchjson6902.go diff --git a/types/patchstrategicmerge.go b/api/types/patchstrategicmerge.go similarity index 100% rename from types/patchstrategicmerge.go rename to api/types/patchstrategicmerge.go diff --git a/types/patchtarget.go b/api/types/patchtarget.go similarity index 74% rename from types/patchtarget.go rename to api/types/patchtarget.go index b3492515c..e2962c8cb 100644 --- a/types/patchtarget.go +++ b/api/types/patchtarget.go @@ -3,11 +3,13 @@ package types -import "sigs.k8s.io/kustomize/v3/pkg/gvk" +import ( + "sigs.k8s.io/kustomize/v3/api/resid" +) // PatchTarget represents the kubernetes object that the patch is applied to type PatchTarget struct { - gvk.Gvk `json:",inline,omitempty" yaml:",inline,omitempty"` + resid.Gvk `json:",inline,omitempty" yaml:",inline,omitempty"` Namespace string `json:"namespace,omitempty" yaml:"namespace,omitempty"` Name string `json:"name" yaml:"name"` } diff --git a/types/pluginconfig.go b/api/types/pluginconfig.go similarity index 100% rename from types/pluginconfig.go rename to api/types/pluginconfig.go diff --git a/types/replica.go b/api/types/replica.go similarity index 100% rename from types/replica.go rename to api/types/replica.go diff --git a/types/secretargs.go b/api/types/secretargs.go similarity index 100% rename from types/secretargs.go rename to api/types/secretargs.go diff --git a/types/selector.go b/api/types/selector.go similarity index 89% rename from types/selector.go rename to api/types/selector.go index 76d433e21..f6d45ddd0 100644 --- a/types/selector.go +++ b/api/types/selector.go @@ -3,13 +3,15 @@ package types -import "sigs.k8s.io/kustomize/v3/pkg/gvk" +import ( + "sigs.k8s.io/kustomize/v3/api/resid" +) // Selector specifies a set of resources. // Any resource that matches intersection of all conditions // is included in this set. type Selector struct { - gvk.Gvk `json:",inline,omitempty" yaml:",inline,omitempty"` + resid.Gvk `json:",inline,omitempty" yaml:",inline,omitempty"` Namespace string `json:"namespace,omitempty" yaml:"namespace,omitempty"` Name string `json:"name,omitempty" yaml:"name,omitempty"` diff --git a/types/typemeta.go b/api/types/typemeta.go similarity index 100% rename from types/typemeta.go rename to api/types/typemeta.go diff --git a/types/var.go b/api/types/var.go similarity index 97% rename from types/var.go rename to api/types/var.go index a856c0013..323bee097 100644 --- a/types/var.go +++ b/api/types/var.go @@ -9,7 +9,7 @@ import ( "sort" "strings" - "sigs.k8s.io/kustomize/v3/pkg/gvk" + "sigs.k8s.io/kustomize/v3/api/resid" ) const defaultFieldPath = "metadata.name" @@ -40,13 +40,13 @@ type Var struct { // for Var.ObjRef type Target struct { APIVersion string `json:"apiVersion,omitempty" yaml:"apiVersion,omitempty"` - gvk.Gvk `json:",inline,omitempty" yaml:",inline,omitempty"` + resid.Gvk `json:",inline,omitempty" yaml:",inline,omitempty"` Name string `json:"name" yaml:"name"` Namespace string `json:"namespace,omitempty" yaml:"namespace,omitempty"` } // GVK returns the Gvk object in Target -func (t *Target) GVK() gvk.Gvk { +func (t *Target) GVK() resid.Gvk { if t.APIVersion == "" { return t.Gvk } diff --git a/types/var_test.go b/api/types/var_test.go similarity index 88% rename from types/var_test.go rename to api/types/var_test.go index f4452901f..10ff62f1d 100644 --- a/types/var_test.go +++ b/api/types/var_test.go @@ -9,13 +9,13 @@ import ( "testing" "gopkg.in/yaml.v2" - "sigs.k8s.io/kustomize/v3/pkg/gvk" + "sigs.k8s.io/kustomize/v3/api/resid" ) func TestGVK(t *testing.T) { type testcase struct { data string - expected gvk.Gvk + expected resid.Gvk } testcases := []testcase{ @@ -25,7 +25,7 @@ apiVersion: v1 kind: Secret name: my-secret `, - expected: gvk.Gvk{Group: "", Version: "v1", Kind: "Secret"}, + expected: resid.Gvk{Group: "", Version: "v1", Kind: "Secret"}, }, { data: ` @@ -33,7 +33,7 @@ apiVersion: myapps/v1 kind: MyKind name: my-kind `, - expected: gvk.Gvk{Group: "myapps", Version: "v1", Kind: "MyKind"}, + expected: resid.Gvk{Group: "myapps", Version: "v1", Kind: "MyKind"}, }, { data: ` @@ -41,7 +41,7 @@ version: v2 kind: MyKind name: my-kind `, - expected: gvk.Gvk{Version: "v2", Kind: "MyKind"}, + expected: resid.Gvk{Version: "v2", Kind: "MyKind"}, }, } @@ -61,7 +61,7 @@ func TestDefaulting(t *testing.T) { v := &Var{ Name: "SOME_VARIABLE_NAME", ObjRef: Target{ - Gvk: gvk.Gvk{ + Gvk: resid.Gvk{ Version: "v1", Kind: "Secret", }, @@ -82,21 +82,21 @@ func TestVarSet(t *testing.T) { Name: "SHELLVARS", ObjRef: Target{ APIVersion: "v7", - Gvk: gvk.Gvk{Kind: "ConfigMap"}, + Gvk: resid.Gvk{Kind: "ConfigMap"}, Name: "bash"}, }, { Name: "BACKEND", ObjRef: Target{ APIVersion: "v7", - Gvk: gvk.Gvk{Kind: "Deployment"}, + Gvk: resid.Gvk{Kind: "Deployment"}, Name: "myTiredBackend"}, }, { Name: "AWARD", ObjRef: Target{ APIVersion: "v7", - Gvk: gvk.Gvk{Kind: "Service"}, + Gvk: resid.Gvk{Kind: "Service"}, Name: "nobelPrize"}, FieldRef: FieldSelector{FieldPath: "some.arbitrary.path"}, }, diff --git a/docs/plugins/builtins.md b/docs/plugins/builtins.md index ff557fbe2..74d2bd5f5 100644 --- a/docs/plugins/builtins.md +++ b/docs/plugins/builtins.md @@ -33,16 +33,16 @@ be defaulted. The latter method allows for complete plugin argument specification. -[types.GeneratorOptions]: ../../types/generatoroptions.go -[types.SecretArgs]: ../../types/secretargs.go -[types.ConfigMapArgs]: ../../types/configmapargs.go +[types.GeneratorOptions]: ../../api/types/generatoroptions.go +[types.SecretArgs]: ../../api/types/secretargs.go +[types.ConfigMapArgs]: ../../api/types/configmapargs.go [config.FieldSpec]: ../../pkg/transformers/config/fieldspec.go -[types.ObjectMeta]: ../../types/objectmeta.go -[types.Selector]: ../../types/selector.go -[types.Replica]: ../../types/replica.go -[types.PatchStrategicMerge]: ../../types/patchstrategicmerge.go -[types.PatchTarget]: ../../types/patchtarget.go -[image.Image]: ../../types/image.go +[types.ObjectMeta]: ../../api/types/objectmeta.go +[types.Selector]: ../../api/types/selector.go +[types.Replica]: ../../api/types/replica.go +[types.PatchStrategicMerge]: ../../api/types/patchstrategicmerge.go +[types.PatchTarget]: ../../api/types/patchtarget.go +[image.Image]: ../../api/types/image.go ## _AnnotationTransformer_ ### Usage via `kustomization.yaml` diff --git a/internal/loadertest/fakeloader.go b/internal/loadertest/fakeloader.go index 9dabe4bbb..5c7972f24 100644 --- a/internal/loadertest/fakeloader.go +++ b/internal/loadertest/fakeloader.go @@ -7,7 +7,7 @@ package loadertest import ( "log" - "sigs.k8s.io/kustomize/v3/filesys" + "sigs.k8s.io/kustomize/v3/api/filesys" "sigs.k8s.io/kustomize/v3/pkg/ifc" "sigs.k8s.io/kustomize/v3/pkg/loader" ) diff --git a/k8sdeps/configmapandsecret/configmapfactory.go b/k8sdeps/configmapandsecret/configmapfactory.go index 0c834fa63..e00798c2e 100644 --- a/k8sdeps/configmapandsecret/configmapfactory.go +++ b/k8sdeps/configmapandsecret/configmapfactory.go @@ -10,7 +10,7 @@ import ( "github.com/pkg/errors" "k8s.io/api/core/v1" - "sigs.k8s.io/kustomize/v3/types" + "sigs.k8s.io/kustomize/v3/api/types" ) func makeFreshConfigMap( diff --git a/k8sdeps/configmapandsecret/configmapfactory_test.go b/k8sdeps/configmapandsecret/configmapfactory_test.go index ca3b33391..761c8801d 100644 --- a/k8sdeps/configmapandsecret/configmapfactory_test.go +++ b/k8sdeps/configmapandsecret/configmapfactory_test.go @@ -10,11 +10,11 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "sigs.k8s.io/kustomize/v3/filesys" - "sigs.k8s.io/kustomize/v3/kv" + "sigs.k8s.io/kustomize/v3/api/filesys" + "sigs.k8s.io/kustomize/v3/api/kv" + "sigs.k8s.io/kustomize/v3/api/types" "sigs.k8s.io/kustomize/v3/pkg/loader" "sigs.k8s.io/kustomize/v3/pkg/validators" - "sigs.k8s.io/kustomize/v3/types" ) func makeEnvConfigMap(name string) *corev1.ConfigMap { diff --git a/k8sdeps/configmapandsecret/factory.go b/k8sdeps/configmapandsecret/factory.go index 15004afc8..babf07a8d 100644 --- a/k8sdeps/configmapandsecret/factory.go +++ b/k8sdeps/configmapandsecret/factory.go @@ -4,8 +4,8 @@ package configmapandsecret import ( + "sigs.k8s.io/kustomize/v3/api/types" "sigs.k8s.io/kustomize/v3/pkg/ifc" - "sigs.k8s.io/kustomize/v3/types" ) // Factory makes ConfigMaps and Secrets. diff --git a/k8sdeps/configmapandsecret/secretfactory.go b/k8sdeps/configmapandsecret/secretfactory.go index 3ff954e3b..1852f724a 100644 --- a/k8sdeps/configmapandsecret/secretfactory.go +++ b/k8sdeps/configmapandsecret/secretfactory.go @@ -7,7 +7,7 @@ import ( "fmt" corev1 "k8s.io/api/core/v1" - "sigs.k8s.io/kustomize/v3/types" + "sigs.k8s.io/kustomize/v3/api/types" ) func makeFreshSecret( diff --git a/k8sdeps/configmapandsecret/secretfactory_test.go b/k8sdeps/configmapandsecret/secretfactory_test.go index 929b729d0..10a5eb4ee 100644 --- a/k8sdeps/configmapandsecret/secretfactory_test.go +++ b/k8sdeps/configmapandsecret/secretfactory_test.go @@ -9,11 +9,11 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "sigs.k8s.io/kustomize/v3/filesys" - "sigs.k8s.io/kustomize/v3/kv" + "sigs.k8s.io/kustomize/v3/api/filesys" + "sigs.k8s.io/kustomize/v3/api/kv" + "sigs.k8s.io/kustomize/v3/api/types" "sigs.k8s.io/kustomize/v3/pkg/loader" "sigs.k8s.io/kustomize/v3/pkg/validators" - "sigs.k8s.io/kustomize/v3/types" ) func makeEnvSecret(name string) *corev1.Secret { diff --git a/k8sdeps/kunstruct/factory.go b/k8sdeps/kunstruct/factory.go index ffb48e9a7..3718ea5c7 100644 --- a/k8sdeps/kunstruct/factory.go +++ b/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/types" "sigs.k8s.io/kustomize/v3/k8sdeps/configmapandsecret" "sigs.k8s.io/kustomize/v3/pkg/ifc" - "sigs.k8s.io/kustomize/v3/types" ) // KunstructuredFactoryImpl hides construction using apimachinery types. diff --git a/k8sdeps/kunstruct/hasher.go b/k8sdeps/kunstruct/hasher.go index c3f22a35c..838c05d81 100644 --- a/k8sdeps/kunstruct/hasher.go +++ b/k8sdeps/kunstruct/hasher.go @@ -9,7 +9,7 @@ import ( "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" - "sigs.k8s.io/kustomize/v3/hasher" + "sigs.k8s.io/kustomize/v3/api/hasher" "sigs.k8s.io/kustomize/v3/pkg/ifc" ) diff --git a/k8sdeps/kunstruct/unstructadapter.go b/k8sdeps/kunstruct/unstructadapter.go index 85014e2c8..02a35abc5 100644 --- a/k8sdeps/kunstruct/unstructadapter.go +++ b/k8sdeps/kunstruct/unstructadapter.go @@ -16,7 +16,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/strategicpatch" "k8s.io/client-go/kubernetes/scheme" - "sigs.k8s.io/kustomize/v3/pkg/gvk" + "sigs.k8s.io/kustomize/v3/api/resid" "sigs.k8s.io/kustomize/v3/pkg/ifc" ) @@ -45,9 +45,9 @@ func NewKunstructuredFromObject(obj runtime.Object) (ifc.Kunstructured, error) { } // GetGvk returns the Gvk name of the object. -func (fs *UnstructAdapter) GetGvk() gvk.Gvk { +func (fs *UnstructAdapter) GetGvk() resid.Gvk { x := fs.GroupVersionKind() - return gvk.Gvk{ + return resid.Gvk{ Group: x.Group, Version: x.Version, Kind: x.Kind, @@ -55,7 +55,7 @@ func (fs *UnstructAdapter) GetGvk() gvk.Gvk { } // SetGvk set the Gvk of the object to the input Gvk -func (fs *UnstructAdapter) SetGvk(g gvk.Gvk) { +func (fs *UnstructAdapter) SetGvk(g resid.Gvk) { fs.SetGroupVersionKind(toSchemaGvk(g)) } @@ -332,7 +332,7 @@ func (fs *UnstructAdapter) Patch(patch ifc.Kunstructured) error { } // toSchemaGvk converts to a schema.GroupVersionKind. -func toSchemaGvk(x gvk.Gvk) schema.GroupVersionKind { +func toSchemaGvk(x resid.Gvk) schema.GroupVersionKind { return schema.GroupVersionKind{ Group: x.Group, Version: x.Version, diff --git a/k8sdeps/transformer/patch/conflictdetector.go b/k8sdeps/transformer/patch/conflictdetector.go index e5d9acf27..4ce9f718d 100644 --- a/k8sdeps/transformer/patch/conflictdetector.go +++ b/k8sdeps/transformer/patch/conflictdetector.go @@ -7,15 +7,14 @@ import ( "encoding/json" "fmt" - "k8s.io/apimachinery/pkg/runtime/schema" - "k8s.io/client-go/kubernetes/scheme" - "sigs.k8s.io/kustomize/v3/pkg/gvk" - "sigs.k8s.io/kustomize/v3/pkg/resmap" - - "github.com/evanphx/json-patch" + jsonpatch "github.com/evanphx/json-patch" "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/mergepatch" "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" ) @@ -188,7 +187,7 @@ func MergePatches(patches []*resource.Resource, } // toSchemaGvk converts to a schema.GroupVersionKind. -func toSchemaGvk(x gvk.Gvk) schema.GroupVersionKind { +func toSchemaGvk(x resid.Gvk) schema.GroupVersionKind { return schema.GroupVersionKind{ Group: x.Group, Version: x.Version, diff --git a/kustomize/internal/commands/build/build.go b/kustomize/internal/commands/build/build.go index 09fd01db1..78e085b56 100644 --- a/kustomize/internal/commands/build/build.go +++ b/kustomize/internal/commands/build/build.go @@ -10,7 +10,7 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "sigs.k8s.io/kustomize/v3/filesys" + "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/pkg/pgmconfig" diff --git a/kustomize/internal/commands/commands.go b/kustomize/internal/commands/commands.go index af57e397c..6605c50cd 100644 --- a/kustomize/internal/commands/commands.go +++ b/kustomize/internal/commands/commands.go @@ -14,7 +14,7 @@ import ( "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/create" "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/edit" "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/version" - "sigs.k8s.io/kustomize/v3/filesys" + "sigs.k8s.io/kustomize/v3/api/filesys" "sigs.k8s.io/kustomize/v3/k8sdeps/kunstruct" "sigs.k8s.io/kustomize/v3/k8sdeps/transformer" "sigs.k8s.io/kustomize/v3/k8sdeps/validator" diff --git a/kustomize/internal/commands/config/config.go b/kustomize/internal/commands/config/config.go index c1a4284d2..c73ab3ba5 100644 --- a/kustomize/internal/commands/config/config.go +++ b/kustomize/internal/commands/config/config.go @@ -9,7 +9,7 @@ import ( "github.com/spf13/cobra" - "sigs.k8s.io/kustomize/v3/filesys" + "sigs.k8s.io/kustomize/v3/api/filesys" "sigs.k8s.io/kustomize/v3/pkg/transformers/config/defaultconfig" ) diff --git a/kustomize/internal/commands/config/config_test.go b/kustomize/internal/commands/config/config_test.go index bf5939949..6e872d5be 100644 --- a/kustomize/internal/commands/config/config_test.go +++ b/kustomize/internal/commands/config/config_test.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - "sigs.k8s.io/kustomize/v3/filesys" + "sigs.k8s.io/kustomize/v3/api/filesys" ) func TestValidate(t *testing.T) { diff --git a/kustomize/internal/commands/create/create.go b/kustomize/internal/commands/create/create.go index 25452e8b5..73f12e8da 100644 --- a/kustomize/internal/commands/create/create.go +++ b/kustomize/internal/commands/create/create.go @@ -12,7 +12,7 @@ import ( "github.com/spf13/cobra" "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile" "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/util" - "sigs.k8s.io/kustomize/v3/filesys" + "sigs.k8s.io/kustomize/v3/api/filesys" "sigs.k8s.io/kustomize/v3/pkg/ifc" "sigs.k8s.io/kustomize/v3/pkg/pgmconfig" ) diff --git a/kustomize/internal/commands/create/create_test.go b/kustomize/internal/commands/create/create_test.go index 81561d6f0..469a8194a 100644 --- a/kustomize/internal/commands/create/create_test.go +++ b/kustomize/internal/commands/create/create_test.go @@ -8,9 +8,9 @@ import ( "testing" "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile" - "sigs.k8s.io/kustomize/v3/filesys" + "sigs.k8s.io/kustomize/v3/api/filesys" + "sigs.k8s.io/kustomize/v3/api/types" "sigs.k8s.io/kustomize/v3/k8sdeps/kunstruct" - "sigs.k8s.io/kustomize/v3/types" ) var factory = kunstruct.NewKunstructuredFactoryImpl() diff --git a/kustomize/internal/commands/edit/add/addbase.go b/kustomize/internal/commands/edit/add/addbase.go index fc69e91a6..ab498e24d 100644 --- a/kustomize/internal/commands/edit/add/addbase.go +++ b/kustomize/internal/commands/edit/add/addbase.go @@ -10,7 +10,7 @@ import ( "github.com/spf13/cobra" "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile" - "sigs.k8s.io/kustomize/v3/filesys" + "sigs.k8s.io/kustomize/v3/api/filesys" ) type addBaseOptions struct { diff --git a/kustomize/internal/commands/edit/add/addbase_test.go b/kustomize/internal/commands/edit/add/addbase_test.go index 672557976..1af5d3b5a 100644 --- a/kustomize/internal/commands/edit/add/addbase_test.go +++ b/kustomize/internal/commands/edit/add/addbase_test.go @@ -9,7 +9,7 @@ import ( "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile" "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils" - "sigs.k8s.io/kustomize/v3/filesys" + "sigs.k8s.io/kustomize/v3/api/filesys" ) const ( diff --git a/kustomize/internal/commands/edit/add/addmetadata.go b/kustomize/internal/commands/edit/add/addmetadata.go index cd25f7592..c8985ce8b 100644 --- a/kustomize/internal/commands/edit/add/addmetadata.go +++ b/kustomize/internal/commands/edit/add/addmetadata.go @@ -9,9 +9,9 @@ import ( "github.com/spf13/cobra" "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile" "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/util" - "sigs.k8s.io/kustomize/v3/filesys" + "sigs.k8s.io/kustomize/v3/api/filesys" + "sigs.k8s.io/kustomize/v3/api/types" "sigs.k8s.io/kustomize/v3/pkg/pgmconfig" - "sigs.k8s.io/kustomize/v3/types" ) // kindOfAdd is the kind of metadata being added: label or annotation diff --git a/kustomize/internal/commands/edit/add/addmetadata_test.go b/kustomize/internal/commands/edit/add/addmetadata_test.go index 5f4157795..446b3ff8f 100644 --- a/kustomize/internal/commands/edit/add/addmetadata_test.go +++ b/kustomize/internal/commands/edit/add/addmetadata_test.go @@ -8,9 +8,9 @@ import ( "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile" "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils" - "sigs.k8s.io/kustomize/v3/filesys" + "sigs.k8s.io/kustomize/v3/api/filesys" + "sigs.k8s.io/kustomize/v3/api/types" "sigs.k8s.io/kustomize/v3/pkg/validators" - "sigs.k8s.io/kustomize/v3/types" ) func makeKustomization(t *testing.T) *types.Kustomization { diff --git a/kustomize/internal/commands/edit/add/addpatch.go b/kustomize/internal/commands/edit/add/addpatch.go index 00c8667f3..a6952484c 100644 --- a/kustomize/internal/commands/edit/add/addpatch.go +++ b/kustomize/internal/commands/edit/add/addpatch.go @@ -10,7 +10,7 @@ import ( "github.com/spf13/cobra" "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile" "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/util" - "sigs.k8s.io/kustomize/v3/filesys" + "sigs.k8s.io/kustomize/v3/api/filesys" "sigs.k8s.io/kustomize/v3/pkg/patch" ) diff --git a/kustomize/internal/commands/edit/add/addpatch_test.go b/kustomize/internal/commands/edit/add/addpatch_test.go index 3e58aba01..4bb39df03 100644 --- a/kustomize/internal/commands/edit/add/addpatch_test.go +++ b/kustomize/internal/commands/edit/add/addpatch_test.go @@ -8,7 +8,7 @@ import ( "testing" "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils" - "sigs.k8s.io/kustomize/v3/filesys" + "sigs.k8s.io/kustomize/v3/api/filesys" ) const ( diff --git a/kustomize/internal/commands/edit/add/addresource.go b/kustomize/internal/commands/edit/add/addresource.go index abdaa9ece..3e7b27ab6 100644 --- a/kustomize/internal/commands/edit/add/addresource.go +++ b/kustomize/internal/commands/edit/add/addresource.go @@ -10,7 +10,7 @@ import ( "github.com/spf13/cobra" "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile" "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/util" - "sigs.k8s.io/kustomize/v3/filesys" + "sigs.k8s.io/kustomize/v3/api/filesys" ) type addResourceOptions struct { diff --git a/kustomize/internal/commands/edit/add/addresource_test.go b/kustomize/internal/commands/edit/add/addresource_test.go index b5edf7093..f9aba9586 100644 --- a/kustomize/internal/commands/edit/add/addresource_test.go +++ b/kustomize/internal/commands/edit/add/addresource_test.go @@ -8,7 +8,7 @@ import ( "testing" "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils" - "sigs.k8s.io/kustomize/v3/filesys" + "sigs.k8s.io/kustomize/v3/api/filesys" ) const ( diff --git a/kustomize/internal/commands/edit/add/all.go b/kustomize/internal/commands/edit/add/all.go index b5d9cf256..03102a300 100644 --- a/kustomize/internal/commands/edit/add/all.go +++ b/kustomize/internal/commands/edit/add/all.go @@ -5,7 +5,7 @@ package add import ( "github.com/spf13/cobra" - "sigs.k8s.io/kustomize/v3/filesys" + "sigs.k8s.io/kustomize/v3/api/filesys" "sigs.k8s.io/kustomize/v3/pkg/ifc" ) diff --git a/kustomize/internal/commands/edit/add/configmap.go b/kustomize/internal/commands/edit/add/configmap.go index ab1fd5bb8..e51a37ab8 100644 --- a/kustomize/internal/commands/edit/add/configmap.go +++ b/kustomize/internal/commands/edit/add/configmap.go @@ -6,9 +6,9 @@ package add import ( "github.com/spf13/cobra" "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile" - "sigs.k8s.io/kustomize/v3/filesys" + "sigs.k8s.io/kustomize/v3/api/filesys" + "sigs.k8s.io/kustomize/v3/api/types" "sigs.k8s.io/kustomize/v3/pkg/ifc" - "sigs.k8s.io/kustomize/v3/types" ) // newCmdAddConfigMap returns a new command. diff --git a/kustomize/internal/commands/edit/add/configmap_test.go b/kustomize/internal/commands/edit/add/configmap_test.go index 090e4dfe2..c1397f462 100644 --- a/kustomize/internal/commands/edit/add/configmap_test.go +++ b/kustomize/internal/commands/edit/add/configmap_test.go @@ -6,11 +6,11 @@ package add import ( "testing" - "sigs.k8s.io/kustomize/v3/filesys" - "sigs.k8s.io/kustomize/v3/kv" + "sigs.k8s.io/kustomize/v3/api/filesys" + "sigs.k8s.io/kustomize/v3/api/kv" + "sigs.k8s.io/kustomize/v3/api/types" "sigs.k8s.io/kustomize/v3/pkg/loader" "sigs.k8s.io/kustomize/v3/pkg/validators" - "sigs.k8s.io/kustomize/v3/types" ) func TestNewAddConfigMapIsNotNil(t *testing.T) { diff --git a/kustomize/internal/commands/edit/add/flagsandargs.go b/kustomize/internal/commands/edit/add/flagsandargs.go index 941ba1cd5..7d6e7afe9 100644 --- a/kustomize/internal/commands/edit/add/flagsandargs.go +++ b/kustomize/internal/commands/edit/add/flagsandargs.go @@ -8,7 +8,7 @@ import ( "strings" "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/util" - "sigs.k8s.io/kustomize/v3/filesys" + "sigs.k8s.io/kustomize/v3/api/filesys" ) // flagsAndArgs encapsulates the options for add secret/configmap commands. diff --git a/kustomize/internal/commands/edit/add/flagsandargs_test.go b/kustomize/internal/commands/edit/add/flagsandargs_test.go index 369bc8d27..a971b59ff 100644 --- a/kustomize/internal/commands/edit/add/flagsandargs_test.go +++ b/kustomize/internal/commands/edit/add/flagsandargs_test.go @@ -7,7 +7,7 @@ import ( "reflect" "testing" - "sigs.k8s.io/kustomize/v3/filesys" + "sigs.k8s.io/kustomize/v3/api/filesys" ) func TestDataValidation_NoName(t *testing.T) { diff --git a/kustomize/internal/commands/edit/add/secret.go b/kustomize/internal/commands/edit/add/secret.go index ff36eb578..1273b9745 100644 --- a/kustomize/internal/commands/edit/add/secret.go +++ b/kustomize/internal/commands/edit/add/secret.go @@ -6,9 +6,9 @@ package add import ( "github.com/spf13/cobra" "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile" - "sigs.k8s.io/kustomize/v3/filesys" + "sigs.k8s.io/kustomize/v3/api/filesys" + "sigs.k8s.io/kustomize/v3/api/types" "sigs.k8s.io/kustomize/v3/pkg/ifc" - "sigs.k8s.io/kustomize/v3/types" ) // newCmdAddSecret returns a new command. diff --git a/kustomize/internal/commands/edit/add/secret_test.go b/kustomize/internal/commands/edit/add/secret_test.go index d70df7934..f21ccf075 100644 --- a/kustomize/internal/commands/edit/add/secret_test.go +++ b/kustomize/internal/commands/edit/add/secret_test.go @@ -6,12 +6,12 @@ package add import ( "testing" - "sigs.k8s.io/kustomize/v3/kv" + "sigs.k8s.io/kustomize/v3/api/kv" - "sigs.k8s.io/kustomize/v3/filesys" + "sigs.k8s.io/kustomize/v3/api/filesys" + "sigs.k8s.io/kustomize/v3/api/types" "sigs.k8s.io/kustomize/v3/pkg/loader" "sigs.k8s.io/kustomize/v3/pkg/validators" - "sigs.k8s.io/kustomize/v3/types" ) func TestNewCmdAddSecretIsNotNil(t *testing.T) { diff --git a/kustomize/internal/commands/edit/all.go b/kustomize/internal/commands/edit/all.go index 80b3bfc4e..5685e8b0e 100644 --- a/kustomize/internal/commands/edit/all.go +++ b/kustomize/internal/commands/edit/all.go @@ -9,8 +9,8 @@ import ( "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/edit/fix" "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/filesys" - "sigs.k8s.io/kustomize/v3/kv" + "sigs.k8s.io/kustomize/v3/api/filesys" + "sigs.k8s.io/kustomize/v3/api/kv" "sigs.k8s.io/kustomize/v3/pkg/ifc" "sigs.k8s.io/kustomize/v3/pkg/loader" ) diff --git a/kustomize/internal/commands/edit/fix/fix.go b/kustomize/internal/commands/edit/fix/fix.go index d80eeb583..ab2ebd4fe 100644 --- a/kustomize/internal/commands/edit/fix/fix.go +++ b/kustomize/internal/commands/edit/fix/fix.go @@ -6,7 +6,7 @@ package fix import ( "github.com/spf13/cobra" "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile" - "sigs.k8s.io/kustomize/v3/filesys" + "sigs.k8s.io/kustomize/v3/api/filesys" ) // NewCmdFix returns an instance of 'fix' subcommand. diff --git a/kustomize/internal/commands/edit/fix/fix_test.go b/kustomize/internal/commands/edit/fix/fix_test.go index fca7cb87d..cc93af23d 100644 --- a/kustomize/internal/commands/edit/fix/fix_test.go +++ b/kustomize/internal/commands/edit/fix/fix_test.go @@ -8,7 +8,7 @@ import ( "testing" "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils" - "sigs.k8s.io/kustomize/v3/filesys" + "sigs.k8s.io/kustomize/v3/api/filesys" ) func TestFix(t *testing.T) { diff --git a/kustomize/internal/commands/edit/remove/all.go b/kustomize/internal/commands/edit/remove/all.go index c05768e32..2b7efd482 100644 --- a/kustomize/internal/commands/edit/remove/all.go +++ b/kustomize/internal/commands/edit/remove/all.go @@ -5,7 +5,7 @@ package remove import ( "github.com/spf13/cobra" - "sigs.k8s.io/kustomize/v3/filesys" + "sigs.k8s.io/kustomize/v3/api/filesys" "sigs.k8s.io/kustomize/v3/pkg/ifc" ) diff --git a/kustomize/internal/commands/edit/remove/removemetadata.go b/kustomize/internal/commands/edit/remove/removemetadata.go index 5ff2f9752..4d61e8b56 100644 --- a/kustomize/internal/commands/edit/remove/removemetadata.go +++ b/kustomize/internal/commands/edit/remove/removemetadata.go @@ -9,9 +9,9 @@ import ( "github.com/spf13/cobra" "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile" - "sigs.k8s.io/kustomize/v3/filesys" + "sigs.k8s.io/kustomize/v3/api/filesys" + "sigs.k8s.io/kustomize/v3/api/types" "sigs.k8s.io/kustomize/v3/pkg/pgmconfig" - "sigs.k8s.io/kustomize/v3/types" ) // kindOfAdd is the kind of metadata being added: label or annotation diff --git a/kustomize/internal/commands/edit/remove/removemetadata_test.go b/kustomize/internal/commands/edit/remove/removemetadata_test.go index c3de106f1..965118600 100644 --- a/kustomize/internal/commands/edit/remove/removemetadata_test.go +++ b/kustomize/internal/commands/edit/remove/removemetadata_test.go @@ -10,9 +10,9 @@ import ( "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile" "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils" - "sigs.k8s.io/kustomize/v3/filesys" + "sigs.k8s.io/kustomize/v3/api/filesys" + "sigs.k8s.io/kustomize/v3/api/types" "sigs.k8s.io/kustomize/v3/pkg/validators" - "sigs.k8s.io/kustomize/v3/types" ) func makeKustomizationFS() filesys.FileSystem { diff --git a/kustomize/internal/commands/edit/remove/removepatch.go b/kustomize/internal/commands/edit/remove/removepatch.go index 925c7569c..9a561f3a8 100644 --- a/kustomize/internal/commands/edit/remove/removepatch.go +++ b/kustomize/internal/commands/edit/remove/removepatch.go @@ -10,7 +10,7 @@ import ( "github.com/spf13/cobra" "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile" "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/util" - "sigs.k8s.io/kustomize/v3/filesys" + "sigs.k8s.io/kustomize/v3/api/filesys" "sigs.k8s.io/kustomize/v3/pkg/patch" "sigs.k8s.io/kustomize/v3/pkg/pgmconfig" ) diff --git a/kustomize/internal/commands/edit/remove/removepatch_test.go b/kustomize/internal/commands/edit/remove/removepatch_test.go index 60c095d76..2a48702f0 100644 --- a/kustomize/internal/commands/edit/remove/removepatch_test.go +++ b/kustomize/internal/commands/edit/remove/removepatch_test.go @@ -9,7 +9,7 @@ import ( "testing" "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils" - "sigs.k8s.io/kustomize/v3/filesys" + "sigs.k8s.io/kustomize/v3/api/filesys" "sigs.k8s.io/kustomize/v3/pkg/patch" ) diff --git a/kustomize/internal/commands/edit/remove/removeresource.go b/kustomize/internal/commands/edit/remove/removeresource.go index 67c6be1d4..e4f4cabb7 100644 --- a/kustomize/internal/commands/edit/remove/removeresource.go +++ b/kustomize/internal/commands/edit/remove/removeresource.go @@ -9,7 +9,7 @@ import ( "github.com/spf13/cobra" "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile" - "sigs.k8s.io/kustomize/v3/filesys" + "sigs.k8s.io/kustomize/v3/api/filesys" "sigs.k8s.io/kustomize/v3/pkg/pgmconfig" ) diff --git a/kustomize/internal/commands/edit/remove/removeresource_test.go b/kustomize/internal/commands/edit/remove/removeresource_test.go index 8af4df273..c77bedb42 100644 --- a/kustomize/internal/commands/edit/remove/removeresource_test.go +++ b/kustomize/internal/commands/edit/remove/removeresource_test.go @@ -10,7 +10,7 @@ import ( "testing" "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils" - "sigs.k8s.io/kustomize/v3/filesys" + "sigs.k8s.io/kustomize/v3/api/filesys" ) func TestRemoveResources(t *testing.T) { diff --git a/kustomize/internal/commands/edit/set/all.go b/kustomize/internal/commands/edit/set/all.go index ed31084ea..7327f9684 100644 --- a/kustomize/internal/commands/edit/set/all.go +++ b/kustomize/internal/commands/edit/set/all.go @@ -5,7 +5,7 @@ package set import ( "github.com/spf13/cobra" - "sigs.k8s.io/kustomize/v3/filesys" + "sigs.k8s.io/kustomize/v3/api/filesys" "sigs.k8s.io/kustomize/v3/pkg/ifc" ) diff --git a/kustomize/internal/commands/edit/set/set_name_prefix.go b/kustomize/internal/commands/edit/set/set_name_prefix.go index bbed17bd2..735de4c69 100644 --- a/kustomize/internal/commands/edit/set/set_name_prefix.go +++ b/kustomize/internal/commands/edit/set/set_name_prefix.go @@ -8,7 +8,7 @@ import ( "github.com/spf13/cobra" "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile" - "sigs.k8s.io/kustomize/v3/filesys" + "sigs.k8s.io/kustomize/v3/api/filesys" ) type setNamePrefixOptions struct { diff --git a/kustomize/internal/commands/edit/set/set_name_prefix_test.go b/kustomize/internal/commands/edit/set/set_name_prefix_test.go index 9f9cfb263..762e20c62 100644 --- a/kustomize/internal/commands/edit/set/set_name_prefix_test.go +++ b/kustomize/internal/commands/edit/set/set_name_prefix_test.go @@ -8,7 +8,7 @@ import ( "testing" "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils" - "sigs.k8s.io/kustomize/v3/filesys" + "sigs.k8s.io/kustomize/v3/api/filesys" ) const ( diff --git a/kustomize/internal/commands/edit/set/set_name_suffix.go b/kustomize/internal/commands/edit/set/set_name_suffix.go index 865397d65..db2901fa2 100644 --- a/kustomize/internal/commands/edit/set/set_name_suffix.go +++ b/kustomize/internal/commands/edit/set/set_name_suffix.go @@ -8,7 +8,7 @@ import ( "github.com/spf13/cobra" "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile" - "sigs.k8s.io/kustomize/v3/filesys" + "sigs.k8s.io/kustomize/v3/api/filesys" ) type setNameSuffixOptions struct { diff --git a/kustomize/internal/commands/edit/set/set_name_suffix_test.go b/kustomize/internal/commands/edit/set/set_name_suffix_test.go index 24bfe1616..4a3f76c72 100644 --- a/kustomize/internal/commands/edit/set/set_name_suffix_test.go +++ b/kustomize/internal/commands/edit/set/set_name_suffix_test.go @@ -8,7 +8,7 @@ import ( "testing" "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils" - "sigs.k8s.io/kustomize/v3/filesys" + "sigs.k8s.io/kustomize/v3/api/filesys" ) const ( diff --git a/kustomize/internal/commands/edit/set/setimage.go b/kustomize/internal/commands/edit/set/setimage.go index 0a7303b1a..0f0baa1e2 100644 --- a/kustomize/internal/commands/edit/set/setimage.go +++ b/kustomize/internal/commands/edit/set/setimage.go @@ -6,13 +6,13 @@ package set import ( "errors" "regexp" - "sigs.k8s.io/kustomize/v3/types" + "sigs.k8s.io/kustomize/v3/api/types" "sort" "strings" "github.com/spf13/cobra" "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile" - "sigs.k8s.io/kustomize/v3/filesys" + "sigs.k8s.io/kustomize/v3/api/filesys" ) type setImageOptions struct { diff --git a/kustomize/internal/commands/edit/set/setimage_test.go b/kustomize/internal/commands/edit/set/setimage_test.go index 00f49b4eb..e46a6793f 100644 --- a/kustomize/internal/commands/edit/set/setimage_test.go +++ b/kustomize/internal/commands/edit/set/setimage_test.go @@ -9,7 +9,7 @@ import ( "testing" "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils" - "sigs.k8s.io/kustomize/v3/filesys" + "sigs.k8s.io/kustomize/v3/api/filesys" ) func TestSetImage(t *testing.T) { diff --git a/kustomize/internal/commands/edit/set/setnamespace.go b/kustomize/internal/commands/edit/set/setnamespace.go index 5ee96be4b..ee1c184fd 100644 --- a/kustomize/internal/commands/edit/set/setnamespace.go +++ b/kustomize/internal/commands/edit/set/setnamespace.go @@ -10,7 +10,7 @@ import ( "github.com/spf13/cobra" "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile" - "sigs.k8s.io/kustomize/v3/filesys" + "sigs.k8s.io/kustomize/v3/api/filesys" "sigs.k8s.io/kustomize/v3/pkg/ifc" ) diff --git a/kustomize/internal/commands/edit/set/setnamespace_test.go b/kustomize/internal/commands/edit/set/setnamespace_test.go index b2aacc36d..81b75faad 100644 --- a/kustomize/internal/commands/edit/set/setnamespace_test.go +++ b/kustomize/internal/commands/edit/set/setnamespace_test.go @@ -9,7 +9,7 @@ import ( "testing" "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils" - "sigs.k8s.io/kustomize/v3/filesys" + "sigs.k8s.io/kustomize/v3/api/filesys" "sigs.k8s.io/kustomize/v3/pkg/validators" ) diff --git a/kustomize/internal/commands/edit/set/setreplicas.go b/kustomize/internal/commands/edit/set/setreplicas.go index e2ee4b364..279ee66cf 100644 --- a/kustomize/internal/commands/edit/set/setreplicas.go +++ b/kustomize/internal/commands/edit/set/setreplicas.go @@ -11,8 +11,8 @@ import ( "github.com/spf13/cobra" "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile" - "sigs.k8s.io/kustomize/v3/filesys" - "sigs.k8s.io/kustomize/v3/types" + "sigs.k8s.io/kustomize/v3/api/filesys" + "sigs.k8s.io/kustomize/v3/api/types" ) type setReplicasOptions struct { diff --git a/kustomize/internal/commands/edit/set/setreplicas_test.go b/kustomize/internal/commands/edit/set/setreplicas_test.go index 255008e1d..e09bc3503 100644 --- a/kustomize/internal/commands/edit/set/setreplicas_test.go +++ b/kustomize/internal/commands/edit/set/setreplicas_test.go @@ -9,7 +9,7 @@ import ( "testing" "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils" - "sigs.k8s.io/kustomize/v3/filesys" + "sigs.k8s.io/kustomize/v3/api/filesys" ) func TestSetReplicas(t *testing.T) { diff --git a/kustomize/internal/commands/kustfile/kustomizationfile.go b/kustomize/internal/commands/kustfile/kustomizationfile.go index 55e85168f..0dd2e4270 100644 --- a/kustomize/internal/commands/kustfile/kustomizationfile.go +++ b/kustomize/internal/commands/kustfile/kustomizationfile.go @@ -13,9 +13,9 @@ import ( "regexp" "strings" - "sigs.k8s.io/kustomize/v3/filesys" + "sigs.k8s.io/kustomize/v3/api/filesys" + "sigs.k8s.io/kustomize/v3/api/types" "sigs.k8s.io/kustomize/v3/pkg/pgmconfig" - "sigs.k8s.io/kustomize/v3/types" "sigs.k8s.io/yaml" ) diff --git a/kustomize/internal/commands/kustfile/kustomizationfile_test.go b/kustomize/internal/commands/kustfile/kustomizationfile_test.go index 05d3f3bcd..d1d67842b 100644 --- a/kustomize/internal/commands/kustfile/kustomizationfile_test.go +++ b/kustomize/internal/commands/kustfile/kustomizationfile_test.go @@ -10,9 +10,9 @@ import ( "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils" - "sigs.k8s.io/kustomize/v3/filesys" + "sigs.k8s.io/kustomize/v3/api/filesys" + "sigs.k8s.io/kustomize/v3/api/types" "sigs.k8s.io/kustomize/v3/pkg/pgmconfig" - "sigs.k8s.io/kustomize/v3/types" ) func TestFieldOrder(t *testing.T) { diff --git a/kustomize/internal/commands/testutils/testutils.go b/kustomize/internal/commands/testutils/testutils.go index 8965eb1f8..5db8609a4 100644 --- a/kustomize/internal/commands/testutils/testutils.go +++ b/kustomize/internal/commands/testutils/testutils.go @@ -4,7 +4,7 @@ package testutils import ( - "sigs.k8s.io/kustomize/v3/filesys" + "sigs.k8s.io/kustomize/v3/api/filesys" "sigs.k8s.io/kustomize/v3/pkg/pgmconfig" ) diff --git a/kustomize/internal/commands/util/util.go b/kustomize/internal/commands/util/util.go index 5732a9add..cc41b46eb 100644 --- a/kustomize/internal/commands/util/util.go +++ b/kustomize/internal/commands/util/util.go @@ -8,7 +8,7 @@ import ( "log" "strings" - "sigs.k8s.io/kustomize/v3/filesys" + "sigs.k8s.io/kustomize/v3/api/filesys" ) // GlobPatterns accepts a slice of glob strings and returns the set of diff --git a/kustomize/internal/commands/version/version.go b/kustomize/internal/commands/version/version.go index f4600ff3a..8fd247655 100644 --- a/kustomize/internal/commands/version/version.go +++ b/kustomize/internal/commands/version/version.go @@ -7,7 +7,7 @@ import ( "io" "github.com/spf13/cobra" - "sigs.k8s.io/kustomize/v3/provenance" + "sigs.k8s.io/kustomize/v3/api/provenance" ) // NewCmdVersion makes a new version command. diff --git a/pkg/accumulator/resaccumulator.go b/pkg/accumulator/resaccumulator.go index dc44a3052..5f378e14d 100644 --- a/pkg/accumulator/resaccumulator.go +++ b/pkg/accumulator/resaccumulator.go @@ -8,11 +8,11 @@ import ( "log" "strings" - "sigs.k8s.io/kustomize/v3/pkg/resid" + "sigs.k8s.io/kustomize/v3/api/resid" + "sigs.k8s.io/kustomize/v3/api/types" "sigs.k8s.io/kustomize/v3/pkg/resmap" "sigs.k8s.io/kustomize/v3/pkg/transformers" "sigs.k8s.io/kustomize/v3/pkg/transformers/config" - "sigs.k8s.io/kustomize/v3/types" ) // ResAccumulator accumulates resources and the rules diff --git a/pkg/accumulator/resaccumulator_test.go b/pkg/accumulator/resaccumulator_test.go index f4492ae44..52d432822 100644 --- a/pkg/accumulator/resaccumulator_test.go +++ b/pkg/accumulator/resaccumulator_test.go @@ -10,14 +10,14 @@ import ( "strings" "testing" + "sigs.k8s.io/kustomize/v3/api/resid" + "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/gvk" "sigs.k8s.io/kustomize/v3/pkg/resmap" "sigs.k8s.io/kustomize/v3/pkg/resmaptest" "sigs.k8s.io/kustomize/v3/pkg/resource" "sigs.k8s.io/kustomize/v3/pkg/transformers/config" - "sigs.k8s.io/kustomize/v3/types" ) func makeResAccumulator(t *testing.T) (*ResAccumulator, *resource.Factory) { @@ -75,13 +75,13 @@ func TestResolveVarsHappy(t *testing.T) { { Name: "SERVICE_ONE", ObjRef: types.Target{ - Gvk: gvk.Gvk{Version: "v1", Kind: "Service"}, + Gvk: resid.Gvk{Version: "v1", Kind: "Service"}, Name: "backendOne"}, }, { Name: "SERVICE_TWO", ObjRef: types.Target{ - Gvk: gvk.Gvk{Version: "v1", Kind: "Service"}, + Gvk: resid.Gvk{Version: "v1", Kind: "Service"}, Name: "backendTwo"}, }, }) @@ -104,13 +104,13 @@ func TestResolveVarsOneUnused(t *testing.T) { { Name: "SERVICE_ONE", ObjRef: types.Target{ - Gvk: gvk.Gvk{Version: "v1", Kind: "Service"}, + Gvk: resid.Gvk{Version: "v1", Kind: "Service"}, Name: "backendOne"}, }, { Name: "SERVICE_UNUSED", ObjRef: types.Target{ - Gvk: gvk.Gvk{Version: "v1", Kind: "Service"}, + Gvk: resid.Gvk{Version: "v1", Kind: "Service"}, Name: "backendTwo"}, }, }) @@ -165,7 +165,7 @@ func TestResolveVarsVarNeedsDisambiguation(t *testing.T) { { Name: "SERVICE_ONE", ObjRef: types.Target{ - Gvk: gvk.Gvk{Version: "v1", Kind: "Service"}, + Gvk: resid.Gvk{Version: "v1", Kind: "Service"}, Name: "backendOne", }, }, @@ -204,7 +204,7 @@ func makeVarToNamepaceAndPath( return types.Var{ Name: name, ObjRef: types.Target{ - Gvk: gvk.Gvk{Version: "v1", Kind: "ConfigMap"}, + Gvk: resid.Gvk{Version: "v1", Kind: "ConfigMap"}, Name: "environment", Namespace: namespace, }, @@ -266,7 +266,7 @@ func TestResolveVarsGoodResIdBadField(t *testing.T) { { Name: "SERVICE_ONE", ObjRef: types.Target{ - Gvk: gvk.Gvk{Version: "v1", Kind: "Service"}, + Gvk: resid.Gvk{Version: "v1", Kind: "Service"}, Name: "backendOne"}, FieldRef: types.FieldSelector{FieldPath: "nope_nope_nope"}, }, @@ -291,7 +291,7 @@ func TestResolveVarsUnmappableVar(t *testing.T) { { Name: "SERVICE_THREE", ObjRef: types.Target{ - Gvk: gvk.Gvk{Version: "v1", Kind: "Service"}, + Gvk: resid.Gvk{Version: "v1", Kind: "Service"}, Name: "doesNotExist"}, }, }) @@ -315,7 +315,7 @@ func TestResolveVarsWithNoambiguation(t *testing.T) { { Name: "SERVICE_ONE", ObjRef: types.Target{ - Gvk: gvk.Gvk{Version: "v1", Kind: "Service"}, + Gvk: resid.Gvk{Version: "v1", Kind: "Service"}, Name: "backendOne", }, }, @@ -370,7 +370,7 @@ func TestResolveVarsWithNoambiguation(t *testing.T) { { Name: "SUB_SERVICE_ONE", ObjRef: types.Target{ - Gvk: gvk.Gvk{Version: "v1", Kind: "Service"}, + Gvk: resid.Gvk{Version: "v1", Kind: "Service"}, Name: "backendOne", }, }, diff --git a/pkg/git/cloner.go b/pkg/git/cloner.go index 23586ab83..0320748ef 100644 --- a/pkg/git/cloner.go +++ b/pkg/git/cloner.go @@ -9,7 +9,7 @@ import ( "os/exec" "github.com/pkg/errors" - "sigs.k8s.io/kustomize/v3/filesys" + "sigs.k8s.io/kustomize/v3/api/filesys" ) // Cloner is a function that can clone a git repo. diff --git a/pkg/git/repospec.go b/pkg/git/repospec.go index fac4ebaa5..391e30e3d 100644 --- a/pkg/git/repospec.go +++ b/pkg/git/repospec.go @@ -9,7 +9,7 @@ import ( "regexp" "strings" - "sigs.k8s.io/kustomize/v3/filesys" + "sigs.k8s.io/kustomize/v3/api/filesys" ) // Used as a temporary non-empty occupant of the cloneDir diff --git a/pkg/ifc/ifc.go b/pkg/ifc/ifc.go index 2b802cf71..6292c9571 100644 --- a/pkg/ifc/ifc.go +++ b/pkg/ifc/ifc.go @@ -5,8 +5,8 @@ package ifc import ( - "sigs.k8s.io/kustomize/v3/pkg/gvk" - "sigs.k8s.io/kustomize/v3/types" + "sigs.k8s.io/kustomize/v3/api/resid" + "sigs.k8s.io/kustomize/v3/api/types" ) // Validator provides functions to validate annotations and labels @@ -55,8 +55,8 @@ type Kunstructured interface { GetMap(path string) (map[string]interface{}, error) MarshalJSON() ([]byte, error) UnmarshalJSON([]byte) error - GetGvk() gvk.Gvk - SetGvk(gvk.Gvk) + GetGvk() resid.Gvk + SetGvk(resid.Gvk) GetKind() string GetName() string SetName(string) diff --git a/pkg/inventory/inventory.go b/pkg/inventory/inventory.go index 4e76a3534..347b403cf 100644 --- a/pkg/inventory/inventory.go +++ b/pkg/inventory/inventory.go @@ -6,7 +6,7 @@ package inventory import ( "encoding/json" - "sigs.k8s.io/kustomize/v3/pkg/resid" + "sigs.k8s.io/kustomize/v3/api/resid" ) //Refs is a reference map. Each key is the id diff --git a/pkg/inventory/inventory_test.go b/pkg/inventory/inventory_test.go index 37fc71e97..6f1700896 100644 --- a/pkg/inventory/inventory_test.go +++ b/pkg/inventory/inventory_test.go @@ -19,7 +19,7 @@ package inventory import ( "testing" - "sigs.k8s.io/kustomize/v3/pkg/resid" + "sigs.k8s.io/kustomize/v3/api/resid" ) func makeRefs() (Refs, Refs) { diff --git a/pkg/loader/fileloader.go b/pkg/loader/fileloader.go index db1fc88b0..897f4ef73 100644 --- a/pkg/loader/fileloader.go +++ b/pkg/loader/fileloader.go @@ -9,7 +9,7 @@ import ( "path/filepath" "strings" - "sigs.k8s.io/kustomize/v3/filesys" + "sigs.k8s.io/kustomize/v3/api/filesys" "sigs.k8s.io/kustomize/v3/pkg/git" "sigs.k8s.io/kustomize/v3/pkg/ifc" ) diff --git a/pkg/loader/fileloader_test.go b/pkg/loader/fileloader_test.go index 87e654db6..cd5c5c4c6 100644 --- a/pkg/loader/fileloader_test.go +++ b/pkg/loader/fileloader_test.go @@ -25,7 +25,7 @@ import ( "strings" "testing" - "sigs.k8s.io/kustomize/v3/filesys" + "sigs.k8s.io/kustomize/v3/api/filesys" "sigs.k8s.io/kustomize/v3/pkg/git" "sigs.k8s.io/kustomize/v3/pkg/ifc" "sigs.k8s.io/kustomize/v3/pkg/pgmconfig" diff --git a/pkg/loader/loader.go b/pkg/loader/loader.go index 4c4b1fe74..68b02c514 100644 --- a/pkg/loader/loader.go +++ b/pkg/loader/loader.go @@ -5,7 +5,7 @@ package loader import ( - "sigs.k8s.io/kustomize/v3/filesys" + "sigs.k8s.io/kustomize/v3/api/filesys" "sigs.k8s.io/kustomize/v3/pkg/git" "sigs.k8s.io/kustomize/v3/pkg/ifc" ) diff --git a/pkg/loader/loadrestrictions.go b/pkg/loader/loadrestrictions.go index 9794a15a4..bf002d523 100644 --- a/pkg/loader/loadrestrictions.go +++ b/pkg/loader/loadrestrictions.go @@ -7,7 +7,7 @@ import ( "fmt" "github.com/spf13/pflag" - "sigs.k8s.io/kustomize/v3/filesys" + "sigs.k8s.io/kustomize/v3/api/filesys" ) //go:generate stringer -type=loadRestrictions diff --git a/pkg/loader/loadrestrictions_test.go b/pkg/loader/loadrestrictions_test.go index 502a2ed5d..d142d2b24 100644 --- a/pkg/loader/loadrestrictions_test.go +++ b/pkg/loader/loadrestrictions_test.go @@ -20,7 +20,7 @@ import ( "strings" "testing" - "sigs.k8s.io/kustomize/v3/filesys" + "sigs.k8s.io/kustomize/v3/api/filesys" ) func TestRestrictionNone(t *testing.T) { diff --git a/pkg/patch/strategicmerge.go b/pkg/patch/strategicmerge.go index 8ef7d64df..e2c08dc2b 100644 --- a/pkg/patch/strategicmerge.go +++ b/pkg/patch/strategicmerge.go @@ -16,7 +16,7 @@ limitations under the License. package patch -import "sigs.k8s.io/kustomize/v3/types" +import "sigs.k8s.io/kustomize/v3/api/types" // Append appends a slice of patch paths to a PatchStrategicMerge slice func Append(patches []types.PatchStrategicMerge, paths ...string) []types.PatchStrategicMerge { diff --git a/pkg/patch/strategicmerge_test.go b/pkg/patch/strategicmerge_test.go index dbd3e33df..83e095252 100644 --- a/pkg/patch/strategicmerge_test.go +++ b/pkg/patch/strategicmerge_test.go @@ -6,7 +6,7 @@ package patch import ( "testing" - "sigs.k8s.io/kustomize/v3/types" + "sigs.k8s.io/kustomize/v3/api/types" ) func buildPatchStrategicMergeSlice(patchStrings []string) []types.PatchStrategicMerge { diff --git a/pkg/plugins/config.go b/pkg/plugins/config.go index 9f847a7b2..fef0ac34c 100644 --- a/pkg/plugins/config.go +++ b/pkg/plugins/config.go @@ -10,8 +10,8 @@ import ( "runtime" "github.com/spf13/pflag" + "sigs.k8s.io/kustomize/v3/api/types" "sigs.k8s.io/kustomize/v3/pkg/pgmconfig" - "sigs.k8s.io/kustomize/v3/types" ) const ( diff --git a/pkg/plugins/execplugin.go b/pkg/plugins/execplugin.go index 15cbe1da1..f5ae3b9e4 100644 --- a/pkg/plugins/execplugin.go +++ b/pkg/plugins/execplugin.go @@ -13,9 +13,9 @@ import ( "strings" "github.com/pkg/errors" - "sigs.k8s.io/kustomize/v3/pkg/resid" + "sigs.k8s.io/kustomize/v3/api/resid" + "sigs.k8s.io/kustomize/v3/api/types" "sigs.k8s.io/kustomize/v3/pkg/resmap" - "sigs.k8s.io/kustomize/v3/types" "sigs.k8s.io/yaml" ) diff --git a/pkg/plugins/execplugin_test.go b/pkg/plugins/execplugin_test.go index 0b2722850..f62709988 100644 --- a/pkg/plugins/execplugin_test.go +++ b/pkg/plugins/execplugin_test.go @@ -8,12 +8,12 @@ import ( "strings" "testing" + "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" - "sigs.k8s.io/kustomize/v3/types" ) func TestExecPluginConfig(t *testing.T) { diff --git a/pkg/plugins/loader.go b/pkg/plugins/loader.go index 50b4c24c3..46d33ccff 100644 --- a/pkg/plugins/loader.go +++ b/pkg/plugins/loader.go @@ -11,12 +11,11 @@ import ( "strings" "github.com/pkg/errors" - "sigs.k8s.io/kustomize/v3/pkg/gvk" + "sigs.k8s.io/kustomize/v3/api/resid" + "sigs.k8s.io/kustomize/v3/api/types" "sigs.k8s.io/kustomize/v3/pkg/ifc" - "sigs.k8s.io/kustomize/v3/pkg/resid" "sigs.k8s.io/kustomize/v3/pkg/resmap" "sigs.k8s.io/kustomize/v3/pkg/resource" - "sigs.k8s.io/kustomize/v3/types" ) type Loader struct { @@ -131,7 +130,7 @@ func (l *Loader) loadAndConfigurePlugin( return c, nil } -func (l *Loader) makeBuiltinPlugin(r gvk.Gvk) (resmap.Configurable, error) { +func (l *Loader) makeBuiltinPlugin(r resid.Gvk) (resmap.Configurable, error) { bpt := GetBuiltinPluginType(r.Kind) if f, ok := GeneratorFactories[bpt]; ok { return f(), nil diff --git a/pkg/plugins/loader_test.go b/pkg/plugins/loader_test.go index 727e4dc55..b2ff740ac 100644 --- a/pkg/plugins/loader_test.go +++ b/pkg/plugins/loader_test.go @@ -4,6 +4,7 @@ package plugins_test import ( + "sigs.k8s.io/kustomize/v3/api/kusttest" "testing" "sigs.k8s.io/kustomize/v3/internal/loadertest" @@ -12,7 +13,6 @@ import ( "sigs.k8s.io/kustomize/v3/pkg/resmap" "sigs.k8s.io/kustomize/v3/pkg/resource" "sigs.k8s.io/kustomize/v3/pkg/validators" - "sigs.k8s.io/kustomize/v3/pluglib" ) const ( @@ -43,7 +43,7 @@ port: "12345" ) func TestLoader(t *testing.T) { - tc := pluglib.NewEnvForTest(t).Set() + tc := kusttest_test.NewPluginTestEnv(t).Set() defer tc.Reset() tc.BuildGoPlugin( diff --git a/pkg/resmap/factory.go b/pkg/resmap/factory.go index c81d962cb..131e9ef4a 100644 --- a/pkg/resmap/factory.go +++ b/pkg/resmap/factory.go @@ -5,10 +5,10 @@ package resmap import ( "github.com/pkg/errors" + "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" - "sigs.k8s.io/kustomize/v3/types" ) // Factory makes instances of ResMap. diff --git a/pkg/resmap/factory_test.go b/pkg/resmap/factory_test.go index 72b09ac06..ebfdfdb5f 100644 --- a/pkg/resmap/factory_test.go +++ b/pkg/resmap/factory_test.go @@ -6,18 +6,18 @@ package resmap_test import ( "encoding/base64" "reflect" + "sigs.k8s.io/kustomize/v3/api/resid" "testing" - "sigs.k8s.io/kustomize/v3/filesys" + "sigs.k8s.io/kustomize/v3/api/filesys" + "sigs.k8s.io/kustomize/v3/api/kv" + "sigs.k8s.io/kustomize/v3/api/types" "sigs.k8s.io/kustomize/v3/internal/loadertest" - "sigs.k8s.io/kustomize/v3/kv" - "sigs.k8s.io/kustomize/v3/pkg/gvk" "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" - "sigs.k8s.io/kustomize/v3/types" ) func TestFromFile(t *testing.T) { @@ -108,7 +108,7 @@ metadata: } } -var cmap = gvk.Gvk{Version: "v1", Kind: "ConfigMap"} +var cmap = resid.Gvk{Version: "v1", Kind: "ConfigMap"} func TestNewFromConfigMaps(t *testing.T) { type testCase struct { diff --git a/pkg/resmap/idslice.go b/pkg/resmap/idslice.go index c273250f8..b84f6df67 100644 --- a/pkg/resmap/idslice.go +++ b/pkg/resmap/idslice.go @@ -19,7 +19,7 @@ package resmap import ( "sort" - "sigs.k8s.io/kustomize/v3/pkg/resid" + "sigs.k8s.io/kustomize/v3/api/resid" ) // IdSlice implements the sort interface. diff --git a/pkg/resmap/idslice_test.go b/pkg/resmap/idslice_test.go index 015edf2fa..2d4258ffd 100644 --- a/pkg/resmap/idslice_test.go +++ b/pkg/resmap/idslice_test.go @@ -21,7 +21,7 @@ import ( "sort" "testing" - "sigs.k8s.io/kustomize/v3/pkg/resid" + "sigs.k8s.io/kustomize/v3/api/resid" ) func TestLess(t *testing.T) { diff --git a/pkg/resmap/resmap.go b/pkg/resmap/resmap.go index 2fda0c622..5e725a5e2 100644 --- a/pkg/resmap/resmap.go +++ b/pkg/resmap/resmap.go @@ -11,10 +11,10 @@ import ( "regexp" "github.com/pkg/errors" + "sigs.k8s.io/kustomize/v3/api/resid" + "sigs.k8s.io/kustomize/v3/api/types" "sigs.k8s.io/kustomize/v3/pkg/ifc" - "sigs.k8s.io/kustomize/v3/pkg/resid" "sigs.k8s.io/kustomize/v3/pkg/resource" - "sigs.k8s.io/kustomize/v3/types" "sigs.k8s.io/yaml" ) diff --git a/pkg/resmap/resmap_test.go b/pkg/resmap/resmap_test.go index a3617a4c1..0769be132 100644 --- a/pkg/resmap/resmap_test.go +++ b/pkg/resmap/resmap_test.go @@ -9,12 +9,12 @@ import ( "strings" "testing" + "sigs.k8s.io/kustomize/v3/api/resid" + "sigs.k8s.io/kustomize/v3/api/types" "sigs.k8s.io/kustomize/v3/k8sdeps/kunstruct" - "sigs.k8s.io/kustomize/v3/pkg/resid" . "sigs.k8s.io/kustomize/v3/pkg/resmap" "sigs.k8s.io/kustomize/v3/pkg/resmaptest" "sigs.k8s.io/kustomize/v3/pkg/resource" - "sigs.k8s.io/kustomize/v3/types" ) var rf = resource.NewFactory( diff --git a/pkg/resmap/selector_test.go b/pkg/resmap/selector_test.go index 4dd3786bc..ffa8a522c 100644 --- a/pkg/resmap/selector_test.go +++ b/pkg/resmap/selector_test.go @@ -4,11 +4,11 @@ package resmap_test import ( + "sigs.k8s.io/kustomize/v3/api/resid" "testing" - "sigs.k8s.io/kustomize/v3/pkg/gvk" + "sigs.k8s.io/kustomize/v3/api/types" "sigs.k8s.io/kustomize/v3/pkg/resmap" - "sigs.k8s.io/kustomize/v3/types" ) func setupRMForPatchTargets(t *testing.T) resmap.ResMap { @@ -81,7 +81,7 @@ func TestFindPatchTargets(t *testing.T) { }, { target: types.Selector{ - Gvk: gvk.Gvk{ + Gvk: resid.Gvk{ Kind: "Kind1", }, Name: "name.*", @@ -116,7 +116,7 @@ func TestFindPatchTargets(t *testing.T) { target: types.Selector{ Namespace: "default", Name: "name.*", - Gvk: gvk.Gvk{ + Gvk: resid.Gvk{ Kind: "Kind1", }, }, diff --git a/pkg/resmaptest/rmbuilder.go b/pkg/resmaptest/rmbuilder.go index 87ef5f231..6817abd55 100644 --- a/pkg/resmaptest/rmbuilder.go +++ b/pkg/resmaptest/rmbuilder.go @@ -6,7 +6,7 @@ package resmaptest_test import ( "testing" - "sigs.k8s.io/kustomize/v3/pkg/resid" + "sigs.k8s.io/kustomize/v3/api/resid" "sigs.k8s.io/kustomize/v3/pkg/resmap" "sigs.k8s.io/kustomize/v3/pkg/resource" ) diff --git a/pkg/resource/factory.go b/pkg/resource/factory.go index 1b5986840..e8c7284fd 100644 --- a/pkg/resource/factory.go +++ b/pkg/resource/factory.go @@ -9,9 +9,9 @@ import ( "log" "strings" + "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/types" ) // Factory makes instances of Resource. diff --git a/pkg/resource/factory_test.go b/pkg/resource/factory_test.go index 8b0fdd478..a3b85f8d1 100644 --- a/pkg/resource/factory_test.go +++ b/pkg/resource/factory_test.go @@ -20,9 +20,9 @@ import ( "reflect" "testing" + "sigs.k8s.io/kustomize/v3/api/types" "sigs.k8s.io/kustomize/v3/internal/loadertest" . "sigs.k8s.io/kustomize/v3/pkg/resource" - "sigs.k8s.io/kustomize/v3/types" ) func TestSliceFromPatches(t *testing.T) { diff --git a/pkg/resource/resource.go b/pkg/resource/resource.go index d012d054c..7fd4dcc48 100644 --- a/pkg/resource/resource.go +++ b/pkg/resource/resource.go @@ -8,9 +8,9 @@ import ( "reflect" "strings" + "sigs.k8s.io/kustomize/v3/api/resid" + "sigs.k8s.io/kustomize/v3/api/types" "sigs.k8s.io/kustomize/v3/pkg/ifc" - "sigs.k8s.io/kustomize/v3/pkg/resid" - "sigs.k8s.io/kustomize/v3/types" "sigs.k8s.io/yaml" ) diff --git a/pkg/resource/resource_test.go b/pkg/resource/resource_test.go index 21a000acb..edee1ff48 100644 --- a/pkg/resource/resource_test.go +++ b/pkg/resource/resource_test.go @@ -20,11 +20,10 @@ import ( "reflect" "testing" + "sigs.k8s.io/kustomize/v3/api/resid" + "sigs.k8s.io/kustomize/v3/api/types" "sigs.k8s.io/kustomize/v3/k8sdeps/kunstruct" - "sigs.k8s.io/kustomize/v3/pkg/gvk" - "sigs.k8s.io/kustomize/v3/pkg/resid" . "sigs.k8s.io/kustomize/v3/pkg/resource" - "sigs.k8s.io/kustomize/v3/types" ) var factory = NewFactory( @@ -99,11 +98,11 @@ func TestResourceId(t *testing.T) { { in: testConfigMap, id: resid.NewResIdWithNamespace( - gvk.Gvk{Version: "v1", Kind: "ConfigMap"}, "winnie", "hundred-acre-wood"), + resid.Gvk{Version: "v1", Kind: "ConfigMap"}, "winnie", "hundred-acre-wood"), }, { in: testDeployment, - id: resid.NewResId(gvk.Gvk{Group: "apps", Version: "v1", Kind: "Deployment"}, "pooh"), + id: resid.NewResId(resid.Gvk{Group: "apps", Version: "v1", Kind: "Deployment"}, "pooh"), }, } for _, test := range tests { @@ -122,12 +121,12 @@ func TestDeepCopy(t *testing.T) { "name": "pooh", }, }) - r.AppendRefBy(resid.NewResId(gvk.Gvk{Group: "somegroup", Kind: "MyKind"}, "random")) + r.AppendRefBy(resid.NewResId(resid.Gvk{Group: "somegroup", Kind: "MyKind"}, "random")) var1 := types.Var{ Name: "SERVICE_ONE", ObjRef: types.Target{ - Gvk: gvk.Gvk{Version: "v1", Kind: "Service"}, + Gvk: resid.Gvk{Version: "v1", Kind: "Service"}, Name: "backendOne"}, } r.AppendRefVarName(var1) diff --git a/pkg/target/baseandoverlaymedium_test.go b/pkg/target/baseandoverlaymedium_test.go index 383bee7ca..1a406e187 100644 --- a/pkg/target/baseandoverlaymedium_test.go +++ b/pkg/target/baseandoverlaymedium_test.go @@ -6,7 +6,7 @@ package target_test import ( "testing" - "sigs.k8s.io/kustomize/v3/pkg/kusttest" + "sigs.k8s.io/kustomize/v3/api/kusttest" ) func writeMediumBase(th *kusttest_test.KustTestHarness) { diff --git a/pkg/target/baseandoverlaysmall_test.go b/pkg/target/baseandoverlaysmall_test.go index 73d71c645..ab0ebcf1a 100644 --- a/pkg/target/baseandoverlaysmall_test.go +++ b/pkg/target/baseandoverlaysmall_test.go @@ -20,7 +20,7 @@ import ( "strings" "testing" - "sigs.k8s.io/kustomize/v3/pkg/kusttest" + "sigs.k8s.io/kustomize/v3/api/kusttest" "sigs.k8s.io/kustomize/v3/pkg/loader" "sigs.k8s.io/kustomize/v3/pkg/plugins" ) diff --git a/pkg/target/basereusenameprefix_test.go b/pkg/target/basereusenameprefix_test.go index 6b20662a7..68d0999ae 100644 --- a/pkg/target/basereusenameprefix_test.go +++ b/pkg/target/basereusenameprefix_test.go @@ -6,7 +6,7 @@ package target_test import ( "testing" - "sigs.k8s.io/kustomize/v3/pkg/kusttest" + "sigs.k8s.io/kustomize/v3/api/kusttest" ) // Here is a structure of a kustomization of two components, component1 diff --git a/pkg/target/chartinflatorplugin_test.go b/pkg/target/chartinflatorplugin_test.go index 35daa0e3b..2dddc7bb7 100644 --- a/pkg/target/chartinflatorplugin_test.go +++ b/pkg/target/chartinflatorplugin_test.go @@ -11,9 +11,7 @@ import ( "regexp" "testing" - "sigs.k8s.io/kustomize/v3/pluglib" - - "sigs.k8s.io/kustomize/v3/pkg/kusttest" + "sigs.k8s.io/kustomize/v3/api/kusttest" ) // This is an example of using a helm chart as a base, @@ -30,13 +28,13 @@ import ( // TODO: Download and inflate the chart, and check that // in for the test. func TestChartInflatorPlugin(t *testing.T) { - tc := pluglib.NewEnvForTest(t).Set() + tc := kusttest_test.NewPluginTestEnv(t).Set() defer tc.Reset() tc.BuildExecPlugin( "someteam.example.com", "v1", "ChartInflator") - th := kusttest_test.NewKustTestPluginHarness(t, "/app") + th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app") th.WriteK("/app", ` generators: - chartInflator.yaml diff --git a/pkg/target/complexcomposition_test.go b/pkg/target/complexcomposition_test.go index 669827842..6d175d5af 100644 --- a/pkg/target/complexcomposition_test.go +++ b/pkg/target/complexcomposition_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "sigs.k8s.io/kustomize/v3/pkg/kusttest" + "sigs.k8s.io/kustomize/v3/api/kusttest" ) const httpsService = ` @@ -303,7 +303,7 @@ func writePatchingTransformersRaw(th *kusttest_test.KustTestHarness) { // respect to the overlays, and avoids the need to relax load // restrictions on file paths reaching outside the `dev` and // `prod` kustomization roots. I.e. with bases tests can use -// NewKustTestHarness instead of NewKustTestNoLoadRestrictorHarness. +// NewKustTestHarness instead of NewKustTestHarnessNoLoadRestrictor. // // Using transformer plugins from _bases_ means the plugin config // must be self-contained, i.e. the config may not have fields that @@ -404,7 +404,7 @@ metadata: ` func TestComplexComposition_Dev_SuccessWithRawTransformers(t *testing.T) { - th := kusttest_test.NewKustTestNoLoadRestrictorHarness(t, "/app/dev") + th := kusttest_test.NewKustTestHarnessNoLoadRestrictor(t, "/app/dev") writeStatefulSetBase(th) writePatchingTransformersRaw(th) th.WriteK("/app/dev", ` @@ -513,7 +513,7 @@ metadata: ` func TestComplexComposition_Prod_SuccessWithRawTransformers(t *testing.T) { - th := kusttest_test.NewKustTestNoLoadRestrictorHarness(t, "/app/prod") + th := kusttest_test.NewKustTestHarnessNoLoadRestrictor(t, "/app/prod") writeStatefulSetBase(th) writePatchingTransformersRaw(th) th.WriteK("/app/prod", ` diff --git a/pkg/target/configmaps_test.go b/pkg/target/configmaps_test.go index 3df0e9ae6..dad2bf4dd 100644 --- a/pkg/target/configmaps_test.go +++ b/pkg/target/configmaps_test.go @@ -19,7 +19,7 @@ package target_test import ( "testing" - "sigs.k8s.io/kustomize/v3/pkg/kusttest" + "sigs.k8s.io/kustomize/v3/api/kusttest" ) // Generate a Secret and a ConfigMap from the same data diff --git a/pkg/target/crd_test.go b/pkg/target/crd_test.go index fed98588f..1adcf56aa 100644 --- a/pkg/target/crd_test.go +++ b/pkg/target/crd_test.go @@ -19,7 +19,7 @@ package target_test import ( "testing" - "sigs.k8s.io/kustomize/v3/pkg/kusttest" + "sigs.k8s.io/kustomize/v3/api/kusttest" ) func writeBaseWithCrd(th *kusttest_test.KustTestHarness) { diff --git a/pkg/target/customconfig_test.go b/pkg/target/customconfig_test.go index 8a6fd0cf1..fc4dcecf6 100644 --- a/pkg/target/customconfig_test.go +++ b/pkg/target/customconfig_test.go @@ -19,7 +19,7 @@ package target_test import ( "testing" - "sigs.k8s.io/kustomize/v3/pkg/kusttest" + "sigs.k8s.io/kustomize/v3/api/kusttest" ) func makeBaseReferencingCustomConfig(th *kusttest_test.KustTestHarness) { diff --git a/pkg/target/customconfigofbuiltinplugin_test.go b/pkg/target/customconfigofbuiltinplugin_test.go index 8c5309be6..e1cb3c631 100644 --- a/pkg/target/customconfigofbuiltinplugin_test.go +++ b/pkg/target/customconfigofbuiltinplugin_test.go @@ -6,21 +6,20 @@ package target_test import ( "testing" - "sigs.k8s.io/kustomize/v3/pkg/kusttest" - "sigs.k8s.io/kustomize/v3/pluglib" + "sigs.k8s.io/kustomize/v3/api/kusttest" ) // Demo custom configuration of a builtin transformation. // This is a NamePrefixer that only touches Deployments // and Services. func TestCustomNamePrefixer(t *testing.T) { - tc := pluglib.NewEnvForTest(t).Set() + tc := kusttest_test.NewPluginTestEnv(t).Set() defer tc.Reset() tc.BuildGoPlugin( "builtin", "", "PrefixSuffixTransformer") - th := kusttest_test.NewKustTestPluginHarness(t, "/app") + th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app") th.WriteK("/app", ` resources: @@ -103,7 +102,7 @@ metadata: // Demo custom configuration as a base. func TestReusableCustomNamePrefixer(t *testing.T) { - tc := pluglib.NewEnvForTest(t).Set() + tc := kusttest_test.NewPluginTestEnv(t).Set() defer tc.Reset() tc.BuildGoPlugin( @@ -111,7 +110,7 @@ func TestReusableCustomNamePrefixer(t *testing.T) { tc.BuildGoPlugin( "builtin", "", "LabelTransformer") - th := kusttest_test.NewKustTestPluginHarness(t, "/app/foo") + th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app/foo") // This kustomization file contains resources that // all happen to be plugin configurations. This makes diff --git a/pkg/target/diamondcomposition_test.go b/pkg/target/diamondcomposition_test.go index 8cbed2018..719e727c8 100644 --- a/pkg/target/diamondcomposition_test.go +++ b/pkg/target/diamondcomposition_test.go @@ -9,8 +9,7 @@ import ( "strings" "testing" - "sigs.k8s.io/kustomize/v3/pkg/kusttest" - "sigs.k8s.io/kustomize/v3/pluglib" + "sigs.k8s.io/kustomize/v3/api/kusttest" ) const patchAddProbe = ` @@ -232,7 +231,7 @@ func definePatchDirStructure(th *kusttest_test.KustTestHarness) { // Fails due to file load restrictor. func TestIssue1251_Patches_ProdVsDev_Failure(t *testing.T) { - th := kusttest_test.NewKustTestPluginHarness(t, "/app/prod") + th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app/prod") definePatchDirStructure(th) th.WriteK("/app/prod", ` @@ -305,7 +304,7 @@ spec: // the kustomization root), opening the user to whatever // threat the load restrictor was meant to address. func TestIssue1251_Patches_ProdVsDev(t *testing.T) { - th := kusttest_test.NewKustTestNoLoadRestrictorHarness(t, "/app/prod") + th := kusttest_test.NewKustTestHarnessNoLoadRestrictor(t, "/app/prod") definePatchDirStructure(th) th.WriteK("/app/prod", ` @@ -321,7 +320,7 @@ patchesStrategicMerge: } th.AssertActualEqualsExpected(m, prodDevMergeResult1) - th = kusttest_test.NewKustTestNoLoadRestrictorHarness(t, "/app/dev") + th = kusttest_test.NewKustTestHarnessNoLoadRestrictor(t, "/app/dev") definePatchDirStructure(th) th.WriteK("/app/dev", ` @@ -340,13 +339,13 @@ patchesStrategicMerge: } func TestIssue1251_Plugins_ProdVsDev(t *testing.T) { - tc := pluglib.NewEnvForTest(t).Set() + tc := kusttest_test.NewPluginTestEnv(t).Set() defer tc.Reset() tc.BuildGoPlugin( "builtin", "", "PatchJson6902Transformer") - th := kusttest_test.NewKustTestPluginHarness(t, "/app/prod") + th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app/prod") defineTransformerDirStructure(th) th.WriteK("/app/prod", ` resources: @@ -362,7 +361,7 @@ transformers: } th.AssertActualEqualsExpected(m, prodDevMergeResult1) - th = kusttest_test.NewKustTestPluginHarness(t, "/app/dev") + th = kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app/dev") defineTransformerDirStructure(th) th.WriteK("/app/dev", ` resources: @@ -380,13 +379,13 @@ transformers: } func TestIssue1251_Plugins_Local(t *testing.T) { - tc := pluglib.NewEnvForTest(t).Set() + tc := kusttest_test.NewPluginTestEnv(t).Set() defer tc.Reset() tc.BuildGoPlugin( "builtin", "", "PatchJson6902Transformer") - th := kusttest_test.NewKustTestPluginHarness(t, "/app/composite") + th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app/composite") writeDeploymentBase(th) writeJsonTransformerPluginConfig( @@ -430,13 +429,13 @@ jsonOp: '%s' // Remote in the sense that they are bundled in a different kustomization. func TestIssue1251_Plugins_Bundled(t *testing.T) { - tc := pluglib.NewEnvForTest(t).Set() + tc := kusttest_test.NewPluginTestEnv(t).Set() defer tc.Reset() tc.BuildGoPlugin( "builtin", "", "PatchJson6902Transformer") - th := kusttest_test.NewKustTestPluginHarness(t, "/app/composite") + th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app/composite") writeDeploymentBase(th) th.WriteK("/app/patches", ` diff --git a/pkg/target/diamonds_test.go b/pkg/target/diamonds_test.go index 6e0d004da..ef0aab708 100644 --- a/pkg/target/diamonds_test.go +++ b/pkg/target/diamonds_test.go @@ -6,7 +6,7 @@ package target_test import ( "testing" - "sigs.k8s.io/kustomize/v3/pkg/kusttest" + "sigs.k8s.io/kustomize/v3/api/kusttest" ) // Here's a structure of two kustomizations, diff --git a/pkg/target/extendedpatch_test.go b/pkg/target/extendedpatch_test.go index ed9760b3d..110fcdeaa 100644 --- a/pkg/target/extendedpatch_test.go +++ b/pkg/target/extendedpatch_test.go @@ -6,7 +6,7 @@ package target_test import ( "testing" - "sigs.k8s.io/kustomize/v3/pkg/kusttest" + "sigs.k8s.io/kustomize/v3/api/kusttest" ) func makeCommonFileForExtendedPatchTest(th *kusttest_test.KustTestHarness) { diff --git a/pkg/target/generatormergeandreplace_test.go b/pkg/target/generatormergeandreplace_test.go index a1751fe88..124c7b44b 100644 --- a/pkg/target/generatormergeandreplace_test.go +++ b/pkg/target/generatormergeandreplace_test.go @@ -20,7 +20,7 @@ import ( "strings" "testing" - "sigs.k8s.io/kustomize/v3/pkg/kusttest" + "sigs.k8s.io/kustomize/v3/api/kusttest" ) func TestSimpleBase(t *testing.T) { diff --git a/pkg/target/generatoroptions_test.go b/pkg/target/generatoroptions_test.go index 8d8e09bd5..4ff16c2a7 100644 --- a/pkg/target/generatoroptions_test.go +++ b/pkg/target/generatoroptions_test.go @@ -19,7 +19,7 @@ package target_test import ( "testing" - "sigs.k8s.io/kustomize/v3/pkg/kusttest" + "sigs.k8s.io/kustomize/v3/api/kusttest" ) func TestSecretGenerator(t *testing.T) { diff --git a/pkg/target/inlinepatch_test.go b/pkg/target/inlinepatch_test.go index 7b8930e94..55803bba5 100644 --- a/pkg/target/inlinepatch_test.go +++ b/pkg/target/inlinepatch_test.go @@ -6,7 +6,7 @@ package target_test import ( "testing" - "sigs.k8s.io/kustomize/v3/pkg/kusttest" + "sigs.k8s.io/kustomize/v3/api/kusttest" ) func makeResourcesForPatchTest(th *kusttest_test.KustTestHarness) { diff --git a/pkg/target/kusttarget.go b/pkg/target/kusttarget.go index efe984f09..e500659d2 100644 --- a/pkg/target/kusttarget.go +++ b/pkg/target/kusttarget.go @@ -13,6 +13,7 @@ import ( "strings" "github.com/pkg/errors" + "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" @@ -21,7 +22,6 @@ import ( "sigs.k8s.io/kustomize/v3/pkg/transformers" "sigs.k8s.io/kustomize/v3/pkg/transformers/config" "sigs.k8s.io/kustomize/v3/plugin/builtin" - "sigs.k8s.io/kustomize/v3/types" "sigs.k8s.io/yaml" ) diff --git a/pkg/target/kusttarget_configplugin.go b/pkg/target/kusttarget_configplugin.go index 703fded34..9b3209375 100644 --- a/pkg/target/kusttarget_configplugin.go +++ b/pkg/target/kusttarget_configplugin.go @@ -4,10 +4,10 @@ package target import ( + "sigs.k8s.io/kustomize/v3/api/types" "sigs.k8s.io/kustomize/v3/pkg/plugins" "sigs.k8s.io/kustomize/v3/pkg/resmap" "sigs.k8s.io/kustomize/v3/pkg/transformers/config" - "sigs.k8s.io/kustomize/v3/types" ) // Functions dedicated to configuring the builtin diff --git a/pkg/target/kusttarget_test.go b/pkg/target/kusttarget_test.go index 632490d39..4d5058b0e 100644 --- a/pkg/target/kusttarget_test.go +++ b/pkg/target/kusttarget_test.go @@ -9,15 +9,15 @@ import ( "strings" "testing" + "sigs.k8s.io/kustomize/v3/api/kusttest" + "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/gvk" "sigs.k8s.io/kustomize/v3/pkg/ifc" - "sigs.k8s.io/kustomize/v3/pkg/kusttest" "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" - "sigs.k8s.io/kustomize/v3/types" ) const ( @@ -281,7 +281,7 @@ var someVars = []types.Var{ Name: "AWARD", ObjRef: types.Target{ APIVersion: "v7", - Gvk: gvk.Gvk{Kind: "Service"}, + Gvk: resid.Gvk{Kind: "Service"}, Name: "nobelPrize"}, FieldRef: types.FieldSelector{FieldPath: "some.arbitrary.path"}, }, @@ -289,21 +289,21 @@ var someVars = []types.Var{ Name: "BIRD", ObjRef: types.Target{ APIVersion: "v300", - Gvk: gvk.Gvk{Kind: "Service"}, + Gvk: resid.Gvk{Kind: "Service"}, Name: "heron"}, FieldRef: types.FieldSelector{FieldPath: "metadata.name"}, }, { Name: "FRUIT", ObjRef: types.Target{ - Gvk: gvk.Gvk{Kind: "Service"}, + Gvk: resid.Gvk{Kind: "Service"}, Name: "apple"}, FieldRef: types.FieldSelector{FieldPath: "metadata.name"}, }, { Name: "VEGETABLE", ObjRef: types.Target{ - Gvk: gvk.Gvk{Kind: "Leafy"}, + Gvk: resid.Gvk{Kind: "Leafy"}, Name: "kale"}, FieldRef: types.FieldSelector{FieldPath: "metadata.name"}, }, diff --git a/pkg/target/multiplepatch_test.go b/pkg/target/multiplepatch_test.go index 7c91262ce..e0efb6bb3 100644 --- a/pkg/target/multiplepatch_test.go +++ b/pkg/target/multiplepatch_test.go @@ -20,7 +20,7 @@ import ( "strings" "testing" - "sigs.k8s.io/kustomize/v3/pkg/kusttest" + "sigs.k8s.io/kustomize/v3/api/kusttest" ) func makeCommonFileForMultiplePatchTest(th *kusttest_test.KustTestHarness) { diff --git a/pkg/target/namespacedgenerators_test.go b/pkg/target/namespacedgenerators_test.go index 9d59d48ba..c831b5992 100644 --- a/pkg/target/namespacedgenerators_test.go +++ b/pkg/target/namespacedgenerators_test.go @@ -19,7 +19,7 @@ package target_test import ( "testing" - "sigs.k8s.io/kustomize/v3/pkg/kusttest" + "sigs.k8s.io/kustomize/v3/api/kusttest" ) func TestNamespacedGenerator(t *testing.T) { diff --git a/pkg/target/namespaces_test.go b/pkg/target/namespaces_test.go index 6cb5630c1..f82ddb28f 100644 --- a/pkg/target/namespaces_test.go +++ b/pkg/target/namespaces_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "sigs.k8s.io/kustomize/v3/pkg/kusttest" + "sigs.k8s.io/kustomize/v3/api/kusttest" ) func TestNamespacedSecrets(t *testing.T) { diff --git a/pkg/target/nullvalues_test.go b/pkg/target/nullvalues_test.go index 09e4fee08..854a68238 100644 --- a/pkg/target/nullvalues_test.go +++ b/pkg/target/nullvalues_test.go @@ -19,7 +19,7 @@ package target_test import ( "testing" - "sigs.k8s.io/kustomize/v3/pkg/kusttest" + "sigs.k8s.io/kustomize/v3/api/kusttest" ) func TestNullValues(t *testing.T) { diff --git a/pkg/target/plugindir_test.go b/pkg/target/plugindir_test.go index 9afa37950..310638c8e 100644 --- a/pkg/target/plugindir_test.go +++ b/pkg/target/plugindir_test.go @@ -9,12 +9,10 @@ import ( "path/filepath" "testing" - "sigs.k8s.io/kustomize/v3/pluglib" - - "sigs.k8s.io/kustomize/v3/filesys" + "sigs.k8s.io/kustomize/v3/api/filesys" + "sigs.k8s.io/kustomize/v3/api/kusttest" "sigs.k8s.io/kustomize/v3/k8sdeps/kunstruct" "sigs.k8s.io/kustomize/v3/k8sdeps/transformer" - "sigs.k8s.io/kustomize/v3/pkg/kusttest" "sigs.k8s.io/kustomize/v3/pkg/loader" "sigs.k8s.io/kustomize/v3/pkg/plugins" "sigs.k8s.io/kustomize/v3/pkg/resmap" @@ -24,7 +22,7 @@ import ( ) func TestPluginDir(t *testing.T) { - tc := pluglib.NewEnvForTest(t).Set() + tc := kusttest_test.NewPluginTestEnv(t).Set() defer tc.Reset() tc.BuildExecPlugin( diff --git a/pkg/target/pruneconfigmap_test.go b/pkg/target/pruneconfigmap_test.go index c96d02f92..4315d3ab9 100644 --- a/pkg/target/pruneconfigmap_test.go +++ b/pkg/target/pruneconfigmap_test.go @@ -19,7 +19,7 @@ package target_test import ( "testing" - "sigs.k8s.io/kustomize/v3/pkg/kusttest" + "sigs.k8s.io/kustomize/v3/api/kusttest" ) func TestPruneConfigMap(t *testing.T) { diff --git a/pkg/target/resourceconflict_test.go b/pkg/target/resourceconflict_test.go index f33218e6f..21feeb556 100644 --- a/pkg/target/resourceconflict_test.go +++ b/pkg/target/resourceconflict_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "sigs.k8s.io/kustomize/v3/pkg/kusttest" + "sigs.k8s.io/kustomize/v3/api/kusttest" ) func writeBase(th *kusttest_test.KustTestHarness) { diff --git a/pkg/target/transformerplugin_test.go b/pkg/target/transformerplugin_test.go index c0d81f61a..fa744b461 100644 --- a/pkg/target/transformerplugin_test.go +++ b/pkg/target/transformerplugin_test.go @@ -7,8 +7,7 @@ import ( "strings" "testing" - "sigs.k8s.io/kustomize/v3/pkg/kusttest" - "sigs.k8s.io/kustomize/v3/pluglib" + "sigs.k8s.io/kustomize/v3/api/kusttest" ) func writeDeployment(th *kusttest_test.KustTestHarness, path string) { @@ -50,7 +49,7 @@ metadata: } func TestOrderedTransformers(t *testing.T) { - tc := pluglib.NewEnvForTest(t).Set() + tc := kusttest_test.NewPluginTestEnv(t).Set() defer tc.Reset() tc.BuildGoPlugin( @@ -59,7 +58,7 @@ func TestOrderedTransformers(t *testing.T) { tc.BuildGoPlugin( "someteam.example.com", "v1", "DatePrefixer") - th := kusttest_test.NewKustTestPluginHarness(t, "/app") + th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app") th.WriteK("/app", ` resources: - deployment.yaml @@ -96,7 +95,7 @@ spec: } func TestPluginsNotEnabled(t *testing.T) { - tc := pluglib.NewEnvForTest(t).Set() + tc := kusttest_test.NewPluginTestEnv(t).Set() defer tc.Reset() tc.BuildGoPlugin( @@ -119,13 +118,13 @@ transformers: } func TestSedTransformer(t *testing.T) { - tc := pluglib.NewEnvForTest(t).Set() + tc := kusttest_test.NewPluginTestEnv(t).Set() defer tc.Reset() tc.BuildExecPlugin( "someteam.example.com", "v1", "SedTransformer") - th := kusttest_test.NewKustTestPluginHarness(t, "/app") + th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app") th.WriteK("/app", ` resources: - configmap.yaml @@ -187,7 +186,7 @@ metadata: } func TestTransformedTransformers(t *testing.T) { - tc := pluglib.NewEnvForTest(t).Set() + tc := kusttest_test.NewPluginTestEnv(t).Set() defer tc.Reset() tc.BuildGoPlugin( @@ -196,7 +195,7 @@ func TestTransformedTransformers(t *testing.T) { tc.BuildGoPlugin( "someteam.example.com", "v1", "DatePrefixer") - th := kusttest_test.NewKustTestPluginHarness(t, "/app/overlay") + th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app/overlay") th.WriteK("/app/base", ` resources: diff --git a/pkg/target/transformersarrays_test.go b/pkg/target/transformersarrays_test.go index b4c18b2b6..638a3e29d 100644 --- a/pkg/target/transformersarrays_test.go +++ b/pkg/target/transformersarrays_test.go @@ -6,7 +6,7 @@ package target_test import ( "testing" - "sigs.k8s.io/kustomize/v3/pkg/kusttest" + "sigs.k8s.io/kustomize/v3/api/kusttest" ) func makeStatefulSetKustomization(th *kusttest_test.KustTestHarness) { diff --git a/pkg/target/transformersimage_test.go b/pkg/target/transformersimage_test.go index a77f00d7f..94109a4d5 100644 --- a/pkg/target/transformersimage_test.go +++ b/pkg/target/transformersimage_test.go @@ -19,7 +19,7 @@ package target_test import ( "testing" - "sigs.k8s.io/kustomize/v3/pkg/kusttest" + "sigs.k8s.io/kustomize/v3/api/kusttest" ) func makeTransfomersImageBase(th *kusttest_test.KustTestHarness) { diff --git a/pkg/target/variableref_test.go b/pkg/target/variableref_test.go index 22048e89f..89cd2b0dd 100644 --- a/pkg/target/variableref_test.go +++ b/pkg/target/variableref_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "sigs.k8s.io/kustomize/v3/pkg/kusttest" + "sigs.k8s.io/kustomize/v3/api/kusttest" ) func TestBasicVariableRef(t *testing.T) { diff --git a/pkg/transformers/config/factory_test.go b/pkg/transformers/config/factory_test.go index 656c9ea05..491e6cad1 100644 --- a/pkg/transformers/config/factory_test.go +++ b/pkg/transformers/config/factory_test.go @@ -5,10 +5,10 @@ package config import ( "reflect" + "sigs.k8s.io/kustomize/v3/api/resid" "testing" "sigs.k8s.io/kustomize/v3/internal/loadertest" - "sigs.k8s.io/kustomize/v3/pkg/gvk" ) func TestMakeDefaultConfig(t *testing.T) { @@ -31,7 +31,7 @@ namePrefix: expected := &TransformerConfig{ NamePrefix: []FieldSpec{ { - Gvk: gvk.Gvk{Kind: "SomeKind"}, + Gvk: resid.Gvk{Kind: "SomeKind"}, Path: "nameprefix/path", }, }, diff --git a/pkg/transformers/config/factorycrd.go b/pkg/transformers/config/factorycrd.go index 248e1e799..a5daa3a2a 100644 --- a/pkg/transformers/config/factorycrd.go +++ b/pkg/transformers/config/factorycrd.go @@ -18,12 +18,12 @@ package config import ( "encoding/json" + "sigs.k8s.io/kustomize/v3/api/resid" "strings" "github.com/go-openapi/spec" "github.com/pkg/errors" "k8s.io/kube-openapi/pkg/common" - "sigs.k8s.io/kustomize/v3/pkg/gvk" "sigs.k8s.io/kustomize/v3/pkg/ifc" "sigs.k8s.io/yaml" ) @@ -88,10 +88,10 @@ func makeConfigFromApiMap(m nameToApiMap) (*TransformerConfig, error) { // TODO: Get Group and Version for CRD from the // openAPI definition once // "x-kubernetes-group-version-kind" is available in CRD -func makeGvkFromTypeName(n string) gvk.Gvk { +func makeGvkFromTypeName(n string) resid.Gvk { names := strings.Split(n, ".") kind := names[len(names)-1] - return gvk.Gvk{Kind: kind} + return resid.Gvk{Kind: kind} } func looksLikeAk8sType(properties myProperties) bool { @@ -133,7 +133,7 @@ const ( // loadCrdIntoConfig loads a CRD spec into a TransformerConfig func loadCrdIntoConfig( - theConfig *TransformerConfig, theGvk gvk.Gvk, theMap nameToApiMap, + theConfig *TransformerConfig, theGvk resid.Gvk, theMap nameToApiMap, typeName string, path []string) (err error) { api, ok := theMap[typeName] if !ok { @@ -174,7 +174,7 @@ func loadCrdIntoConfig( } err = theConfig.AddNamereferenceFieldSpec( NameBackReferences{ - Gvk: gvk.Gvk{Kind: kind, Version: version}, + Gvk: resid.Gvk{Kind: kind, Version: version}, FieldSpecs: []FieldSpec{ makeFs(theGvk, append(path, propName, nameKey))}, }) @@ -192,7 +192,7 @@ func loadCrdIntoConfig( return nil } -func makeFs(in gvk.Gvk, path []string) FieldSpec { +func makeFs(in resid.Gvk, path []string) FieldSpec { return FieldSpec{ CreateIfNotPresent: false, Gvk: in, diff --git a/pkg/transformers/config/factorycrd_test.go b/pkg/transformers/config/factorycrd_test.go index 17aaec9e9..7ab5e34e5 100644 --- a/pkg/transformers/config/factorycrd_test.go +++ b/pkg/transformers/config/factorycrd_test.go @@ -18,10 +18,10 @@ package config import ( "reflect" + "sigs.k8s.io/kustomize/v3/api/resid" "testing" "sigs.k8s.io/kustomize/v3/internal/loadertest" - "sigs.k8s.io/kustomize/v3/pkg/gvk" "sigs.k8s.io/kustomize/v3/pkg/ifc" ) @@ -157,21 +157,21 @@ func makeLoader(t *testing.T) ifc.Loader { func TestLoadCRDs(t *testing.T) { nbrs := []NameBackReferences{ { - Gvk: gvk.Gvk{Kind: "Secret", Version: "v1"}, + Gvk: resid.Gvk{Kind: "Secret", Version: "v1"}, FieldSpecs: []FieldSpec{ { CreateIfNotPresent: false, - Gvk: gvk.Gvk{Kind: "MyKind"}, + Gvk: resid.Gvk{Kind: "MyKind"}, Path: "spec/secretRef/name", }, }, }, { - Gvk: gvk.Gvk{Kind: "Bee", Version: "v1beta1"}, + Gvk: resid.Gvk{Kind: "Bee", Version: "v1beta1"}, FieldSpecs: []FieldSpec{ { CreateIfNotPresent: false, - Gvk: gvk.Gvk{Kind: "MyKind"}, + Gvk: resid.Gvk{Kind: "MyKind"}, Path: "spec/beeRef/name", }, }, diff --git a/pkg/transformers/config/fieldspec.go b/pkg/transformers/config/fieldspec.go index e746f889a..2a88d3660 100644 --- a/pkg/transformers/config/fieldspec.go +++ b/pkg/transformers/config/fieldspec.go @@ -18,9 +18,8 @@ package config import ( "fmt" + "sigs.k8s.io/kustomize/v3/api/resid" "strings" - - "sigs.k8s.io/kustomize/v3/pkg/gvk" ) // FieldSpec completely specifies a kustomizable field in @@ -42,7 +41,7 @@ import ( // create: true // } type FieldSpec struct { - gvk.Gvk `json:",inline,omitempty" yaml:",inline,omitempty"` + resid.Gvk `json:",inline,omitempty" yaml:",inline,omitempty"` Path string `json:"path,omitempty" yaml:"path,omitempty"` CreateIfNotPresent bool `json:"create,omitempty" yaml:"create,omitempty"` } diff --git a/pkg/transformers/config/fieldspec_test.go b/pkg/transformers/config/fieldspec_test.go index a7029fb87..80d142b24 100644 --- a/pkg/transformers/config/fieldspec_test.go +++ b/pkg/transformers/config/fieldspec_test.go @@ -1,18 +1,5 @@ -/* -Copyright 2018 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ +// Copyright 2019 The Kubernetes Authors. +// SPDX-License-Identifier: Apache-2.0 package config @@ -22,7 +9,7 @@ import ( "strings" "testing" - "sigs.k8s.io/kustomize/v3/pkg/gvk" + "sigs.k8s.io/kustomize/v3/api/resid" ) func TestPathSlice(t *testing.T) { @@ -61,19 +48,19 @@ var mergeTests = []struct { fsSlice{ { Path: "whatever", - Gvk: gvk.Gvk{Group: "apple"}, + Gvk: resid.Gvk{Group: "apple"}, CreateIfNotPresent: false, }, { Path: "whatever", - Gvk: gvk.Gvk{Group: "pear"}, + Gvk: resid.Gvk{Group: "pear"}, CreateIfNotPresent: false, }, }, fsSlice{ { Path: "home", - Gvk: gvk.Gvk{Group: "beans"}, + Gvk: resid.Gvk{Group: "beans"}, CreateIfNotPresent: false, }, }, @@ -81,17 +68,17 @@ var mergeTests = []struct { fsSlice{ { Path: "whatever", - Gvk: gvk.Gvk{Group: "apple"}, + Gvk: resid.Gvk{Group: "apple"}, CreateIfNotPresent: false, }, { Path: "whatever", - Gvk: gvk.Gvk{Group: "pear"}, + Gvk: resid.Gvk{Group: "pear"}, CreateIfNotPresent: false, }, { Path: "home", - Gvk: gvk.Gvk{Group: "beans"}, + Gvk: resid.Gvk{Group: "beans"}, CreateIfNotPresent: false, }, }, @@ -101,19 +88,19 @@ var mergeTests = []struct { fsSlice{ { Path: "whatever", - Gvk: gvk.Gvk{Group: "apple"}, + Gvk: resid.Gvk{Group: "apple"}, CreateIfNotPresent: false, }, { Path: "whatever", - Gvk: gvk.Gvk{Group: "pear"}, + Gvk: resid.Gvk{Group: "pear"}, CreateIfNotPresent: false, }, }, fsSlice{ { Path: "whatever", - Gvk: gvk.Gvk{Group: "apple"}, + Gvk: resid.Gvk{Group: "apple"}, CreateIfNotPresent: false, }, }, @@ -121,12 +108,12 @@ var mergeTests = []struct { fsSlice{ { Path: "whatever", - Gvk: gvk.Gvk{Group: "apple"}, + Gvk: resid.Gvk{Group: "apple"}, CreateIfNotPresent: false, }, { Path: "whatever", - Gvk: gvk.Gvk{Group: "pear"}, + Gvk: resid.Gvk{Group: "pear"}, CreateIfNotPresent: false, }, }, @@ -136,19 +123,19 @@ var mergeTests = []struct { fsSlice{ { Path: "whatever", - Gvk: gvk.Gvk{Group: "apple"}, + Gvk: resid.Gvk{Group: "apple"}, CreateIfNotPresent: false, }, { Path: "whatever", - Gvk: gvk.Gvk{Group: "pear"}, + Gvk: resid.Gvk{Group: "pear"}, CreateIfNotPresent: false, }, }, fsSlice{ { Path: "whatever", - Gvk: gvk.Gvk{Group: "apple"}, + Gvk: resid.Gvk{Group: "apple"}, CreateIfNotPresent: true, }, }, diff --git a/pkg/transformers/config/namebackreferences.go b/pkg/transformers/config/namebackreferences.go index c27674bd4..13dd9dd9c 100644 --- a/pkg/transformers/config/namebackreferences.go +++ b/pkg/transformers/config/namebackreferences.go @@ -17,9 +17,8 @@ limitations under the License. package config import ( + "sigs.k8s.io/kustomize/v3/api/resid" "strings" - - "sigs.k8s.io/kustomize/v3/pkg/gvk" ) // NameBackReferences is an association between a gvk.GVK and a list @@ -51,7 +50,7 @@ import ( // (etc.) // } type NameBackReferences struct { - gvk.Gvk `json:",inline,omitempty" yaml:",inline,omitempty"` + resid.Gvk `json:",inline,omitempty" yaml:",inline,omitempty"` FieldSpecs fsSlice `json:"FieldSpecs,omitempty" yaml:"FieldSpecs,omitempty"` } diff --git a/pkg/transformers/config/namebackreferences_test.go b/pkg/transformers/config/namebackreferences_test.go index 5658ed396..0d0713642 100644 --- a/pkg/transformers/config/namebackreferences_test.go +++ b/pkg/transformers/config/namebackreferences_test.go @@ -18,22 +18,21 @@ package config import ( "reflect" + "sigs.k8s.io/kustomize/v3/api/resid" "testing" - - "sigs.k8s.io/kustomize/v3/pkg/gvk" ) func TestMergeAll(t *testing.T) { fsSlice1 := []FieldSpec{ { - Gvk: gvk.Gvk{ + Gvk: resid.Gvk{ Kind: "Pod", }, Path: "path/to/a/name", CreateIfNotPresent: false, }, { - Gvk: gvk.Gvk{ + Gvk: resid.Gvk{ Kind: "Deployment", }, Path: "another/path/to/some/name", @@ -42,14 +41,14 @@ func TestMergeAll(t *testing.T) { } fsSlice2 := []FieldSpec{ { - Gvk: gvk.Gvk{ + Gvk: resid.Gvk{ Kind: "Job", }, Path: "morepath/to/name", CreateIfNotPresent: false, }, { - Gvk: gvk.Gvk{ + Gvk: resid.Gvk{ Kind: "StatefulSet", }, Path: "yet/another/path/to/a/name", @@ -59,13 +58,13 @@ func TestMergeAll(t *testing.T) { nbrsSlice1 := nbrSlice{ { - Gvk: gvk.Gvk{ + Gvk: resid.Gvk{ Kind: "ConfigMap", }, FieldSpecs: fsSlice1, }, { - Gvk: gvk.Gvk{ + Gvk: resid.Gvk{ Kind: "Secret", }, FieldSpecs: fsSlice2, @@ -73,13 +72,13 @@ func TestMergeAll(t *testing.T) { } nbrsSlice2 := nbrSlice{ { - Gvk: gvk.Gvk{ + Gvk: resid.Gvk{ Kind: "ConfigMap", }, FieldSpecs: fsSlice1, }, { - Gvk: gvk.Gvk{ + Gvk: resid.Gvk{ Kind: "Secret", }, FieldSpecs: fsSlice2, @@ -87,13 +86,13 @@ func TestMergeAll(t *testing.T) { } expected := nbrSlice{ { - Gvk: gvk.Gvk{ + Gvk: resid.Gvk{ Kind: "ConfigMap", }, FieldSpecs: fsSlice1, }, { - Gvk: gvk.Gvk{ + Gvk: resid.Gvk{ Kind: "Secret", }, FieldSpecs: fsSlice2, diff --git a/pkg/transformers/config/transformerconfig_test.go b/pkg/transformers/config/transformerconfig_test.go index 00e9ee497..b39bfdd43 100644 --- a/pkg/transformers/config/transformerconfig_test.go +++ b/pkg/transformers/config/transformerconfig_test.go @@ -17,23 +17,22 @@ limitations under the License. package config import ( + "sigs.k8s.io/kustomize/v3/api/resid" "testing" "reflect" - - "sigs.k8s.io/kustomize/v3/pkg/gvk" ) func TestAddNamereferenceFieldSpec(t *testing.T) { cfg := &TransformerConfig{} nbrs := NameBackReferences{ - Gvk: gvk.Gvk{ + Gvk: resid.Gvk{ Kind: "KindA", }, FieldSpecs: []FieldSpec{ { - Gvk: gvk.Gvk{ + Gvk: resid.Gvk{ Kind: "KindB", }, Path: "path/to/a/field", @@ -55,7 +54,7 @@ func TestAddFieldSpecs(t *testing.T) { cfg := &TransformerConfig{} fieldSpec := FieldSpec{ - Gvk: gvk.Gvk{Group: "GroupA", Kind: "KindB"}, + Gvk: resid.Gvk{Group: "GroupA", Kind: "KindB"}, Path: "path/to/a/field", CreateIfNotPresent: true, } @@ -93,12 +92,12 @@ func TestAddFieldSpecs(t *testing.T) { func TestMerge(t *testing.T) { nameReference := []NameBackReferences{ { - Gvk: gvk.Gvk{ + Gvk: resid.Gvk{ Kind: "KindA", }, FieldSpecs: []FieldSpec{ { - Gvk: gvk.Gvk{ + Gvk: resid.Gvk{ Kind: "KindB", }, Path: "path/to/a/field", @@ -107,12 +106,12 @@ func TestMerge(t *testing.T) { }, }, { - Gvk: gvk.Gvk{ + Gvk: resid.Gvk{ Kind: "KindA", }, FieldSpecs: []FieldSpec{ { - Gvk: gvk.Gvk{ + Gvk: resid.Gvk{ Kind: "KindC", }, Path: "path/to/a/field", @@ -123,12 +122,12 @@ func TestMerge(t *testing.T) { } fieldSpecs := []FieldSpec{ { - Gvk: gvk.Gvk{Group: "GroupA", Kind: "KindB"}, + Gvk: resid.Gvk{Group: "GroupA", Kind: "KindB"}, Path: "path/to/a/field", CreateIfNotPresent: true, }, { - Gvk: gvk.Gvk{Group: "GroupA", Kind: "KindC"}, + Gvk: resid.Gvk{Group: "GroupA", Kind: "KindC"}, Path: "path/to/a/field", CreateIfNotPresent: true, }, diff --git a/pkg/transformers/namereference.go b/pkg/transformers/namereference.go index e57d01f05..378701894 100644 --- a/pkg/transformers/namereference.go +++ b/pkg/transformers/namereference.go @@ -6,10 +6,10 @@ package transformers import ( "fmt" "log" + "sigs.k8s.io/kustomize/v3/api/resid" "sigs.k8s.io/kustomize/v3/pkg/resource" - "sigs.k8s.io/kustomize/v3/pkg/gvk" "sigs.k8s.io/kustomize/v3/pkg/resmap" "sigs.k8s.io/kustomize/v3/pkg/transformers/config" ) @@ -115,7 +115,7 @@ func (o *nameReferenceTransformer) Transform(m resmap.ResMap) error { func (o *nameReferenceTransformer) selectReferral( oldName string, referrer *resource.Resource, - target gvk.Gvk, + target resid.Gvk, referralCandidates resmap.ResMap, referralCandidateSubset []*resource.Resource) (interface{}, interface{}, error) { @@ -146,7 +146,7 @@ func (o *nameReferenceTransformer) selectReferral( func (o *nameReferenceTransformer) getSimpleNameField( oldName string, referrer *resource.Resource, - target gvk.Gvk, + target resid.Gvk, referralCandidates resmap.ResMap, referralCandidateSubset []*resource.Resource) (interface{}, error) { @@ -161,7 +161,7 @@ func (o *nameReferenceTransformer) getSimpleNameField( func (o *nameReferenceTransformer) getNameAndNsStruct( inMap map[string]interface{}, referrer *resource.Resource, - target gvk.Gvk, + target resid.Gvk, referralCandidates resmap.ResMap) (interface{}, error) { // Example: @@ -209,7 +209,7 @@ func (o *nameReferenceTransformer) getNameAndNsStruct( func (o *nameReferenceTransformer) getNewNameFunc( referrer *resource.Resource, - target gvk.Gvk, + target resid.Gvk, referralCandidates resmap.ResMap) func(in interface{}) (interface{}, error) { return func(in interface{}) (interface{}, error) { switch in.(type) { diff --git a/pkg/transformers/namereference_test.go b/pkg/transformers/namereference_test.go index 0f87e75b6..264be3dce 100644 --- a/pkg/transformers/namereference_test.go +++ b/pkg/transformers/namereference_test.go @@ -7,9 +7,8 @@ import ( "strings" "testing" + "sigs.k8s.io/kustomize/v3/api/resid" "sigs.k8s.io/kustomize/v3/k8sdeps/kunstruct" - "sigs.k8s.io/kustomize/v3/pkg/gvk" - "sigs.k8s.io/kustomize/v3/pkg/resid" "sigs.k8s.io/kustomize/v3/pkg/resmap" "sigs.k8s.io/kustomize/v3/pkg/resmaptest" "sigs.k8s.io/kustomize/v3/pkg/resource" @@ -877,9 +876,9 @@ func TestNameReferenceClusterWide(t *testing.T) { }).ResMap() clusterRoleId := resid.NewResId( - gvk.Gvk{Group: "rbac.authorization.k8s.io", Version: "v1", Kind: "ClusterRole"}, modifiedname) + resid.Gvk{Group: "rbac.authorization.k8s.io", Version: "v1", Kind: "ClusterRole"}, modifiedname) clusterRoleBindingId := resid.NewResId( - gvk.Gvk{Group: "rbac.authorization.k8s.io", Version: "v1", Kind: "ClusterRoleBinding"}, modifiedname) + resid.Gvk{Group: "rbac.authorization.k8s.io", Version: "v1", Kind: "ClusterRoleBinding"}, modifiedname) clusterRole, _ := expected.GetByCurrentId(clusterRoleId) clusterRole.AppendRefBy(clusterRoleBindingId) @@ -1005,9 +1004,9 @@ func TestNameReferenceNamespaceTransformation(t *testing.T) { }).ResMap() clusterRoleId := resid.NewResId( - gvk.Gvk{Group: "rbac.authorization.k8s.io", Version: "v1", Kind: "ClusterRole"}, modifiedname) + resid.Gvk{Group: "rbac.authorization.k8s.io", Version: "v1", Kind: "ClusterRole"}, modifiedname) clusterRoleBindingId := resid.NewResId( - gvk.Gvk{Group: "rbac.authorization.k8s.io", Version: "v1", Kind: "ClusterRoleBinding"}, modifiedname) + resid.Gvk{Group: "rbac.authorization.k8s.io", Version: "v1", Kind: "ClusterRoleBinding"}, modifiedname) clusterRole, _ := expected.GetByCurrentId(clusterRoleId) clusterRole.AppendRefBy(clusterRoleBindingId) diff --git a/pkg/transformers/refvars_test.go b/pkg/transformers/refvars_test.go index 0dc5e58a0..ce2e0f917 100644 --- a/pkg/transformers/refvars_test.go +++ b/pkg/transformers/refvars_test.go @@ -5,9 +5,9 @@ package transformers import ( "reflect" + "sigs.k8s.io/kustomize/v3/api/resid" "testing" - "sigs.k8s.io/kustomize/v3/pkg/gvk" "sigs.k8s.io/kustomize/v3/pkg/resmap" "sigs.k8s.io/kustomize/v3/pkg/resmaptest" "sigs.k8s.io/kustomize/v3/pkg/transformers/config" @@ -38,11 +38,11 @@ func TestVarRef(t *testing.T) { "BOO": true, }, fs: []config.FieldSpec{ - {Gvk: gvk.Gvk{Version: "v1", Kind: "ConfigMap"}, Path: "data/map"}, - {Gvk: gvk.Gvk{Version: "v1", Kind: "ConfigMap"}, Path: "data/slice"}, - {Gvk: gvk.Gvk{Version: "v1", Kind: "ConfigMap"}, Path: "data/interface"}, - {Gvk: gvk.Gvk{Version: "v1", Kind: "ConfigMap"}, Path: "data/nil"}, - {Gvk: gvk.Gvk{Version: "v1", Kind: "ConfigMap"}, Path: "data/num"}, + {Gvk: resid.Gvk{Version: "v1", Kind: "ConfigMap"}, Path: "data/map"}, + {Gvk: resid.Gvk{Version: "v1", Kind: "ConfigMap"}, Path: "data/slice"}, + {Gvk: resid.Gvk{Version: "v1", Kind: "ConfigMap"}, Path: "data/interface"}, + {Gvk: resid.Gvk{Version: "v1", Kind: "ConfigMap"}, Path: "data/nil"}, + {Gvk: resid.Gvk{Version: "v1", Kind: "ConfigMap"}, Path: "data/num"}, }, res: resmaptest_test.NewRmBuilder(t, rf). Add(map[string]interface{}{ diff --git a/plugin/builtin/ConfigMapGenerator.go b/plugin/builtin/ConfigMapGenerator.go index 36297f56a..c8bbb6283 100644 --- a/plugin/builtin/ConfigMapGenerator.go +++ b/plugin/builtin/ConfigMapGenerator.go @@ -2,9 +2,9 @@ package builtin import ( - "sigs.k8s.io/kustomize/v3/kv" + "sigs.k8s.io/kustomize/v3/api/kv" + "sigs.k8s.io/kustomize/v3/api/types" "sigs.k8s.io/kustomize/v3/pkg/resmap" - "sigs.k8s.io/kustomize/v3/types" "sigs.k8s.io/yaml" ) diff --git a/plugin/builtin/ImageTagTransformer.go b/plugin/builtin/ImageTagTransformer.go index 3535090f7..9f13b891c 100644 --- a/plugin/builtin/ImageTagTransformer.go +++ b/plugin/builtin/ImageTagTransformer.go @@ -4,7 +4,7 @@ package builtin import ( "fmt" "regexp" - "sigs.k8s.io/kustomize/v3/types" + "sigs.k8s.io/kustomize/v3/api/types" "strings" "sigs.k8s.io/kustomize/v3/pkg/resmap" diff --git a/plugin/builtin/InventoryTransformer.go b/plugin/builtin/InventoryTransformer.go index 69e20166d..3dbc38614 100644 --- a/plugin/builtin/InventoryTransformer.go +++ b/plugin/builtin/InventoryTransformer.go @@ -4,13 +4,13 @@ package builtin import ( "fmt" - "sigs.k8s.io/kustomize/v3/hasher" - "sigs.k8s.io/kustomize/v3/kv" + "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/types" "sigs.k8s.io/kustomize/v3/pkg/inventory" - "sigs.k8s.io/kustomize/v3/pkg/resid" "sigs.k8s.io/kustomize/v3/pkg/resmap" "sigs.k8s.io/kustomize/v3/pkg/resource" - "sigs.k8s.io/kustomize/v3/types" "sigs.k8s.io/yaml" ) diff --git a/plugin/builtin/NamespaceTransformer.go b/plugin/builtin/NamespaceTransformer.go index 9015cee50..adf01e381 100644 --- a/plugin/builtin/NamespaceTransformer.go +++ b/plugin/builtin/NamespaceTransformer.go @@ -4,12 +4,12 @@ package builtin import ( "fmt" - "sigs.k8s.io/kustomize/v3/pkg/resid" + "sigs.k8s.io/kustomize/v3/api/resid" + "sigs.k8s.io/kustomize/v3/api/types" "sigs.k8s.io/kustomize/v3/pkg/resmap" "sigs.k8s.io/kustomize/v3/pkg/resource" "sigs.k8s.io/kustomize/v3/pkg/transformers" "sigs.k8s.io/kustomize/v3/pkg/transformers/config" - "sigs.k8s.io/kustomize/v3/types" "sigs.k8s.io/yaml" ) diff --git a/plugin/builtin/PatchJson6902Transformer.go b/plugin/builtin/PatchJson6902Transformer.go index 2695a0036..d11d857c6 100644 --- a/plugin/builtin/PatchJson6902Transformer.go +++ b/plugin/builtin/PatchJson6902Transformer.go @@ -6,11 +6,10 @@ import ( "github.com/evanphx/json-patch" "github.com/pkg/errors" - "sigs.k8s.io/kustomize/v3/pkg/gvk" + "sigs.k8s.io/kustomize/v3/api/resid" + "sigs.k8s.io/kustomize/v3/api/types" "sigs.k8s.io/kustomize/v3/pkg/ifc" - "sigs.k8s.io/kustomize/v3/pkg/resid" "sigs.k8s.io/kustomize/v3/pkg/resmap" - "sigs.k8s.io/kustomize/v3/types" "sigs.k8s.io/yaml" ) @@ -70,7 +69,7 @@ func (p *PatchJson6902TransformerPlugin) Config( func (p *PatchJson6902TransformerPlugin) Transform(m resmap.ResMap) error { id := resid.NewResIdWithNamespace( - gvk.Gvk{ + resid.Gvk{ Group: p.Target.Group, Version: p.Target.Version, Kind: p.Target.Kind, diff --git a/plugin/builtin/PatchStrategicMergeTransformer.go b/plugin/builtin/PatchStrategicMergeTransformer.go index 6fb8d5dba..b5f4f81cf 100644 --- a/plugin/builtin/PatchStrategicMergeTransformer.go +++ b/plugin/builtin/PatchStrategicMergeTransformer.go @@ -4,9 +4,9 @@ package builtin import ( "fmt" + "sigs.k8s.io/kustomize/v3/api/types" "sigs.k8s.io/kustomize/v3/pkg/resmap" "sigs.k8s.io/kustomize/v3/pkg/resource" - "sigs.k8s.io/kustomize/v3/types" "sigs.k8s.io/yaml" ) diff --git a/plugin/builtin/PatchTransformer.go b/plugin/builtin/PatchTransformer.go index a6639e844..97efc7dda 100644 --- a/plugin/builtin/PatchTransformer.go +++ b/plugin/builtin/PatchTransformer.go @@ -6,9 +6,9 @@ import ( "github.com/evanphx/json-patch" "github.com/pkg/errors" + "sigs.k8s.io/kustomize/v3/api/types" "sigs.k8s.io/kustomize/v3/pkg/resmap" "sigs.k8s.io/kustomize/v3/pkg/resource" - "sigs.k8s.io/kustomize/v3/types" "sigs.k8s.io/yaml" ) diff --git a/plugin/builtin/PrefixSuffixTransformer.go b/plugin/builtin/PrefixSuffixTransformer.go index b19dbca5d..af83bd6b0 100644 --- a/plugin/builtin/PrefixSuffixTransformer.go +++ b/plugin/builtin/PrefixSuffixTransformer.go @@ -5,8 +5,7 @@ import ( "errors" "fmt" - "sigs.k8s.io/kustomize/v3/pkg/gvk" - "sigs.k8s.io/kustomize/v3/pkg/resid" + "sigs.k8s.io/kustomize/v3/api/resid" "sigs.k8s.io/kustomize/v3/pkg/resmap" "sigs.k8s.io/kustomize/v3/pkg/transformers" "sigs.k8s.io/kustomize/v3/pkg/transformers/config" @@ -23,10 +22,10 @@ type PrefixSuffixTransformerPlugin struct { // Not placed in a file yet due to lack of demand. var prefixSuffixFieldSpecsToSkip = []config.FieldSpec{ { - Gvk: gvk.Gvk{Kind: "CustomResourceDefinition"}, + Gvk: resid.Gvk{Kind: "CustomResourceDefinition"}, }, { - Gvk: gvk.Gvk{Group: "apiregistration.k8s.io", Kind: "APIService"}, + Gvk: resid.Gvk{Group: "apiregistration.k8s.io", Kind: "APIService"}, }, } diff --git a/plugin/builtin/ReplicaCountTransformer.go b/plugin/builtin/ReplicaCountTransformer.go index ab1399b43..f05f263a2 100644 --- a/plugin/builtin/ReplicaCountTransformer.go +++ b/plugin/builtin/ReplicaCountTransformer.go @@ -4,11 +4,11 @@ package builtin import ( "fmt" - "sigs.k8s.io/kustomize/v3/pkg/resid" + "sigs.k8s.io/kustomize/v3/api/resid" + "sigs.k8s.io/kustomize/v3/api/types" "sigs.k8s.io/kustomize/v3/pkg/resmap" "sigs.k8s.io/kustomize/v3/pkg/transformers" "sigs.k8s.io/kustomize/v3/pkg/transformers/config" - "sigs.k8s.io/kustomize/v3/types" "sigs.k8s.io/yaml" ) diff --git a/plugin/builtin/SecretGenerator.go b/plugin/builtin/SecretGenerator.go index 25bff6b9f..b7cc79e74 100644 --- a/plugin/builtin/SecretGenerator.go +++ b/plugin/builtin/SecretGenerator.go @@ -2,9 +2,9 @@ package builtin import ( - "sigs.k8s.io/kustomize/v3/kv" + "sigs.k8s.io/kustomize/v3/api/kv" + "sigs.k8s.io/kustomize/v3/api/types" "sigs.k8s.io/kustomize/v3/pkg/resmap" - "sigs.k8s.io/kustomize/v3/types" "sigs.k8s.io/yaml" ) diff --git a/plugin/builtin/annotationstransformer/AnnotationsTransformer_test.go b/plugin/builtin/annotationstransformer/AnnotationsTransformer_test.go index ee8f6c5bb..4b5ce5990 100644 --- a/plugin/builtin/annotationstransformer/AnnotationsTransformer_test.go +++ b/plugin/builtin/annotationstransformer/AnnotationsTransformer_test.go @@ -6,18 +6,17 @@ package main_test import ( "testing" - "sigs.k8s.io/kustomize/v3/pkg/kusttest" - "sigs.k8s.io/kustomize/v3/pluglib" + "sigs.k8s.io/kustomize/v3/api/kusttest" ) func TestAnnotationsTransformer(t *testing.T) { - tc := pluglib.NewEnvForTest(t).Set() + tc := kusttest_test.NewPluginTestEnv(t).Set() defer tc.Reset() tc.BuildGoPlugin( "builtin", "", "AnnotationsTransformer") - th := kusttest_test.NewKustTestPluginHarness(t, "/app") + th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app") rm := th.LoadAndRunTransformer(` apiVersion: builtin diff --git a/plugin/builtin/configmapgenerator/ConfigMapGenerator.go b/plugin/builtin/configmapgenerator/ConfigMapGenerator.go index 6b5909899..85687a22f 100644 --- a/plugin/builtin/configmapgenerator/ConfigMapGenerator.go +++ b/plugin/builtin/configmapgenerator/ConfigMapGenerator.go @@ -5,9 +5,9 @@ package main import ( - "sigs.k8s.io/kustomize/v3/kv" + "sigs.k8s.io/kustomize/v3/api/kv" + "sigs.k8s.io/kustomize/v3/api/types" "sigs.k8s.io/kustomize/v3/pkg/resmap" - "sigs.k8s.io/kustomize/v3/types" "sigs.k8s.io/yaml" ) diff --git a/plugin/builtin/configmapgenerator/ConfigMapGenerator_test.go b/plugin/builtin/configmapgenerator/ConfigMapGenerator_test.go index c59809976..6b1dace38 100644 --- a/plugin/builtin/configmapgenerator/ConfigMapGenerator_test.go +++ b/plugin/builtin/configmapgenerator/ConfigMapGenerator_test.go @@ -6,19 +6,17 @@ package main_test import ( "testing" - "sigs.k8s.io/kustomize/v3/pluglib" - - "sigs.k8s.io/kustomize/v3/pkg/kusttest" + "sigs.k8s.io/kustomize/v3/api/kusttest" ) func TestConfigMapGenerator(t *testing.T) { - tc := pluglib.NewEnvForTest(t).Set() + tc := kusttest_test.NewPluginTestEnv(t).Set() defer tc.Reset() tc.BuildGoPlugin( "builtin", "", "ConfigMapGenerator") - th := kusttest_test.NewKustTestPluginHarness(t, "/app") + th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app") th.WriteF("/app/devops.env", ` SERVICE_PORT=32 diff --git a/plugin/builtin/hashtransformer/HashTransformer_test.go b/plugin/builtin/hashtransformer/HashTransformer_test.go index 5170c8b07..cbd760259 100644 --- a/plugin/builtin/hashtransformer/HashTransformer_test.go +++ b/plugin/builtin/hashtransformer/HashTransformer_test.go @@ -6,19 +6,17 @@ package main_test import ( "testing" - "sigs.k8s.io/kustomize/v3/pluglib" - - "sigs.k8s.io/kustomize/v3/pkg/kusttest" + "sigs.k8s.io/kustomize/v3/api/kusttest" ) func TestHashTransformer(t *testing.T) { - tc := pluglib.NewEnvForTest(t).Set() + tc := kusttest_test.NewPluginTestEnv(t).Set() defer tc.Reset() tc.BuildGoPlugin( "builtin", "", "HashTransformer") - th := kusttest_test.NewKustTestPluginHarness(t, "/app") + th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app") rm := th.LoadAndRunTransformer(` apiVersion: builtin diff --git a/plugin/builtin/imagetagtransformer/ImageTagTransformer.go b/plugin/builtin/imagetagtransformer/ImageTagTransformer.go index 780b197f8..d3e0c11be 100644 --- a/plugin/builtin/imagetagtransformer/ImageTagTransformer.go +++ b/plugin/builtin/imagetagtransformer/ImageTagTransformer.go @@ -7,7 +7,7 @@ package main import ( "fmt" "regexp" - "sigs.k8s.io/kustomize/v3/types" + "sigs.k8s.io/kustomize/v3/api/types" "strings" "sigs.k8s.io/kustomize/v3/pkg/resmap" diff --git a/plugin/builtin/imagetagtransformer/ImageTagTransformer_test.go b/plugin/builtin/imagetagtransformer/ImageTagTransformer_test.go index 694b02095..b846d2b41 100644 --- a/plugin/builtin/imagetagtransformer/ImageTagTransformer_test.go +++ b/plugin/builtin/imagetagtransformer/ImageTagTransformer_test.go @@ -6,19 +6,17 @@ package main_test import ( "testing" - "sigs.k8s.io/kustomize/v3/pluglib" - - "sigs.k8s.io/kustomize/v3/pkg/kusttest" + "sigs.k8s.io/kustomize/v3/api/kusttest" ) func TestImageTagTransformerNewTag(t *testing.T) { - tc := pluglib.NewEnvForTest(t).Set() + tc := kusttest_test.NewPluginTestEnv(t).Set() defer tc.Reset() tc.BuildGoPlugin( "builtin", "", "ImageTagTransformer") - th := kusttest_test.NewKustTestPluginHarness(t, "/app") + th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app") rm := th.LoadAndRunTransformer(` apiVersion: builtin @@ -83,13 +81,13 @@ spec: `) } func TestImageTagTransformerNewImage(t *testing.T) { - tc := pluglib.NewEnvForTest(t).Set() + tc := kusttest_test.NewPluginTestEnv(t).Set() defer tc.Reset() tc.BuildGoPlugin( "builtin", "", "ImageTagTransformer") - th := kusttest_test.NewKustTestPluginHarness(t, "/app") + th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app") rm := th.LoadAndRunTransformer(` apiVersion: builtin @@ -155,13 +153,13 @@ spec: } func TestImageTagTransformerNewImageAndTag(t *testing.T) { - tc := pluglib.NewEnvForTest(t).Set() + tc := kusttest_test.NewPluginTestEnv(t).Set() defer tc.Reset() tc.BuildGoPlugin( "builtin", "", "ImageTagTransformer") - th := kusttest_test.NewKustTestPluginHarness(t, "/app") + th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app") rm := th.LoadAndRunTransformer(` apiVersion: builtin @@ -228,13 +226,13 @@ spec: } func TestImageTagTransformerNewDigest(t *testing.T) { - tc := pluglib.NewEnvForTest(t).Set() + tc := kusttest_test.NewPluginTestEnv(t).Set() defer tc.Reset() tc.BuildGoPlugin( "builtin", "", "ImageTagTransformer") - th := kusttest_test.NewKustTestPluginHarness(t, "/app") + th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app") rm := th.LoadAndRunTransformer(` apiVersion: builtin @@ -300,13 +298,13 @@ spec: } func TestImageTagTransformerNewImageAndDigest(t *testing.T) { - tc := pluglib.NewEnvForTest(t).Set() + tc := kusttest_test.NewPluginTestEnv(t).Set() defer tc.Reset() tc.BuildGoPlugin( "builtin", "", "ImageTagTransformer") - th := kusttest_test.NewKustTestPluginHarness(t, "/app") + th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app") rm := th.LoadAndRunTransformer(` apiVersion: builtin diff --git a/plugin/builtin/inventorytransformer/InventoryTransformer.go b/plugin/builtin/inventorytransformer/InventoryTransformer.go index 7184e532c..b99d1aef7 100644 --- a/plugin/builtin/inventorytransformer/InventoryTransformer.go +++ b/plugin/builtin/inventorytransformer/InventoryTransformer.go @@ -7,13 +7,13 @@ package main import ( "fmt" - "sigs.k8s.io/kustomize/v3/hasher" - "sigs.k8s.io/kustomize/v3/kv" + "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/types" "sigs.k8s.io/kustomize/v3/pkg/inventory" - "sigs.k8s.io/kustomize/v3/pkg/resid" "sigs.k8s.io/kustomize/v3/pkg/resmap" "sigs.k8s.io/kustomize/v3/pkg/resource" - "sigs.k8s.io/kustomize/v3/types" "sigs.k8s.io/yaml" ) diff --git a/plugin/builtin/inventorytransformer/InventoryTransformer_test.go b/plugin/builtin/inventorytransformer/InventoryTransformer_test.go index 2413e6c8c..95943834b 100644 --- a/plugin/builtin/inventorytransformer/InventoryTransformer_test.go +++ b/plugin/builtin/inventorytransformer/InventoryTransformer_test.go @@ -6,9 +6,7 @@ package main_test import ( "testing" - "sigs.k8s.io/kustomize/v3/pluglib" - - "sigs.k8s.io/kustomize/v3/pkg/kusttest" + "sigs.k8s.io/kustomize/v3/api/kusttest" ) const ( @@ -60,13 +58,13 @@ metadata: ) func TestInventoryTransformerCollect(t *testing.T) { - tc := pluglib.NewEnvForTest(t).Set() + tc := kusttest_test.NewPluginTestEnv(t).Set() defer tc.Reset() tc.BuildGoPlugin( "builtin", "", "InventoryTransformer") - th := kusttest_test.NewKustTestPluginHarness(t, "/app") + th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app") rm := th.LoadAndRunTransformer(` apiVersion: builtin @@ -81,13 +79,13 @@ policy: GarbageCollect } func TestInventoryTransformerIgnore(t *testing.T) { - tc := pluglib.NewEnvForTest(t).Set() + tc := kusttest_test.NewPluginTestEnv(t).Set() defer tc.Reset() tc.BuildGoPlugin( "builtin", "", "InventoryTransformer") - th := kusttest_test.NewKustTestPluginHarness(t, "/app") + th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app") rm := th.LoadAndRunTransformer(` apiVersion: builtin @@ -102,13 +100,13 @@ policy: GarbageIgnore } func TestInventoryTransformerDefaultPolicy(t *testing.T) { - tc := pluglib.NewEnvForTest(t).Set() + tc := kusttest_test.NewPluginTestEnv(t).Set() defer tc.Reset() tc.BuildGoPlugin( "builtin", "", "InventoryTransformer") - th := kusttest_test.NewKustTestPluginHarness(t, "/app") + th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app") rm := th.LoadAndRunTransformer(` apiVersion: builtin diff --git a/plugin/builtin/labeltransformer/LabelTransformer_test.go b/plugin/builtin/labeltransformer/LabelTransformer_test.go index 20ac41048..f8e4ad59c 100644 --- a/plugin/builtin/labeltransformer/LabelTransformer_test.go +++ b/plugin/builtin/labeltransformer/LabelTransformer_test.go @@ -6,19 +6,17 @@ package main_test import ( "testing" - "sigs.k8s.io/kustomize/v3/pluglib" - - "sigs.k8s.io/kustomize/v3/pkg/kusttest" + "sigs.k8s.io/kustomize/v3/api/kusttest" ) func TestLabelTransformer(t *testing.T) { - tc := pluglib.NewEnvForTest(t).Set() + tc := kusttest_test.NewPluginTestEnv(t).Set() defer tc.Reset() tc.BuildGoPlugin( "builtin", "", "LabelTransformer") - th := kusttest_test.NewKustTestPluginHarness(t, "/app") + th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app") rm := th.LoadAndRunTransformer(` apiVersion: builtin diff --git a/plugin/builtin/legacyordertransformer/LegacyOrderTransformer_test.go b/plugin/builtin/legacyordertransformer/LegacyOrderTransformer_test.go index eee196fdc..dc83522c0 100644 --- a/plugin/builtin/legacyordertransformer/LegacyOrderTransformer_test.go +++ b/plugin/builtin/legacyordertransformer/LegacyOrderTransformer_test.go @@ -6,19 +6,17 @@ package main_test import ( "testing" - "sigs.k8s.io/kustomize/v3/pluglib" - - "sigs.k8s.io/kustomize/v3/pkg/kusttest" + "sigs.k8s.io/kustomize/v3/api/kusttest" ) func TestLegacyOrderTransformer(t *testing.T) { - tc := pluglib.NewEnvForTest(t).Set() + tc := kusttest_test.NewPluginTestEnv(t).Set() defer tc.Reset() tc.BuildGoPlugin( "builtin", "", "LegacyOrderTransformer") - th := kusttest_test.NewKustTestPluginHarness(t, "/app") + th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app") rm := th.LoadAndRunTransformer(` apiVersion: builtin kind: LegacyOrderTransformer diff --git a/plugin/builtin/namespacetransformer/NamespaceTransformer.go b/plugin/builtin/namespacetransformer/NamespaceTransformer.go index 10895844c..ae4f2c832 100644 --- a/plugin/builtin/namespacetransformer/NamespaceTransformer.go +++ b/plugin/builtin/namespacetransformer/NamespaceTransformer.go @@ -7,12 +7,12 @@ package main import ( "fmt" - "sigs.k8s.io/kustomize/v3/pkg/resid" + "sigs.k8s.io/kustomize/v3/api/resid" + "sigs.k8s.io/kustomize/v3/api/types" "sigs.k8s.io/kustomize/v3/pkg/resmap" "sigs.k8s.io/kustomize/v3/pkg/resource" "sigs.k8s.io/kustomize/v3/pkg/transformers" "sigs.k8s.io/kustomize/v3/pkg/transformers/config" - "sigs.k8s.io/kustomize/v3/types" "sigs.k8s.io/yaml" ) diff --git a/plugin/builtin/namespacetransformer/NamespaceTransformer_test.go b/plugin/builtin/namespacetransformer/NamespaceTransformer_test.go index ab6a0fa3a..200dcfa8d 100644 --- a/plugin/builtin/namespacetransformer/NamespaceTransformer_test.go +++ b/plugin/builtin/namespacetransformer/NamespaceTransformer_test.go @@ -7,19 +7,17 @@ import ( "strings" "testing" - "sigs.k8s.io/kustomize/v3/pluglib" - - "sigs.k8s.io/kustomize/v3/pkg/kusttest" + "sigs.k8s.io/kustomize/v3/api/kusttest" ) func TestNamespaceTransformer1(t *testing.T) { - tc := pluglib.NewEnvForTest(t).Set() + tc := kusttest_test.NewPluginTestEnv(t).Set() defer tc.Reset() tc.BuildGoPlugin( "builtin", "", "NamespaceTransformer") - th := kusttest_test.NewKustTestPluginHarness(t, "/app") + th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app") rm := th.LoadAndRunTransformer(` apiVersion: builtin @@ -191,13 +189,13 @@ metadata: } func TestNamespaceTransformerClusterLevelKinds(t *testing.T) { - tc := pluglib.NewEnvForTest(t).Set() + tc := kusttest_test.NewPluginTestEnv(t).Set() defer tc.Reset() tc.BuildGoPlugin( "builtin", "", "NamespaceTransformer") - th := kusttest_test.NewKustTestPluginHarness(t, "/app") + th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app") const noChangeExpected = ` apiVersion: v1 @@ -242,13 +240,13 @@ fieldSpecs: } func TestNamespaceTransformerObjectConflict(t *testing.T) { - tc := pluglib.NewEnvForTest(t).Set() + tc := kusttest_test.NewPluginTestEnv(t).Set() defer tc.Reset() tc.BuildGoPlugin( "builtin", "", "NamespaceTransformer") - th := kusttest_test.NewKustTestPluginHarness(t, "/app") + th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app") err := th.ErrorFromLoadAndRunTransformer(` apiVersion: builtin diff --git a/plugin/builtin/patchjson6902transformer/PatchJson6902Transformer.go b/plugin/builtin/patchjson6902transformer/PatchJson6902Transformer.go index 675e07243..6513c1918 100644 --- a/plugin/builtin/patchjson6902transformer/PatchJson6902Transformer.go +++ b/plugin/builtin/patchjson6902transformer/PatchJson6902Transformer.go @@ -9,11 +9,10 @@ import ( "github.com/evanphx/json-patch" "github.com/pkg/errors" - "sigs.k8s.io/kustomize/v3/pkg/gvk" + "sigs.k8s.io/kustomize/v3/api/resid" + "sigs.k8s.io/kustomize/v3/api/types" "sigs.k8s.io/kustomize/v3/pkg/ifc" - "sigs.k8s.io/kustomize/v3/pkg/resid" "sigs.k8s.io/kustomize/v3/pkg/resmap" - "sigs.k8s.io/kustomize/v3/types" "sigs.k8s.io/yaml" ) @@ -76,7 +75,7 @@ func (p *plugin) Config( func (p *plugin) Transform(m resmap.ResMap) error { id := resid.NewResIdWithNamespace( - gvk.Gvk{ + resid.Gvk{ Group: p.Target.Group, Version: p.Target.Version, Kind: p.Target.Kind, diff --git a/plugin/builtin/patchjson6902transformer/PatchJson6902Transformer_test.go b/plugin/builtin/patchjson6902transformer/PatchJson6902Transformer_test.go index 5f374a66f..6c623a734 100644 --- a/plugin/builtin/patchjson6902transformer/PatchJson6902Transformer_test.go +++ b/plugin/builtin/patchjson6902transformer/PatchJson6902Transformer_test.go @@ -7,9 +7,7 @@ import ( "strings" "testing" - "sigs.k8s.io/kustomize/v3/pluglib" - - "sigs.k8s.io/kustomize/v3/pkg/kusttest" + "sigs.k8s.io/kustomize/v3/api/kusttest" ) const target = ` @@ -30,13 +28,13 @@ spec: ` func TestPatchJson6902TransformerMissingFile(t *testing.T) { - tc := pluglib.NewEnvForTest(t).Set() + tc := kusttest_test.NewPluginTestEnv(t).Set() defer tc.Reset() tc.BuildGoPlugin( "builtin", "", "PatchJson6902Transformer") - th := kusttest_test.NewKustTestPluginHarness(t, "/app") + th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app") _, err := th.RunTransformer(` apiVersion: builtin @@ -59,13 +57,13 @@ path: jsonpatch.json } func TestBadPatchJson6902Transformer(t *testing.T) { - tc := pluglib.NewEnvForTest(t).Set() + tc := kusttest_test.NewPluginTestEnv(t).Set() defer tc.Reset() tc.BuildGoPlugin( "builtin", "", "PatchJson6902Transformer") - th := kusttest_test.NewKustTestPluginHarness(t, "/app") + th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app") _, err := th.RunTransformer(` apiVersion: builtin @@ -88,13 +86,13 @@ jsonOp: 'thisIsNotAPatch' } func TestBothEmptyJson6902Transformer(t *testing.T) { - tc := pluglib.NewEnvForTest(t).Set() + tc := kusttest_test.NewPluginTestEnv(t).Set() defer tc.Reset() tc.BuildGoPlugin( "builtin", "", "PatchJson6902Transformer") - th := kusttest_test.NewKustTestPluginHarness(t, "/app") + th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app") _, err := th.RunTransformer(` apiVersion: builtin @@ -116,13 +114,13 @@ target: } func TestBothSpecifiedJson6902Transformer(t *testing.T) { - tc := pluglib.NewEnvForTest(t).Set() + tc := kusttest_test.NewPluginTestEnv(t).Set() defer tc.Reset() tc.BuildGoPlugin( "builtin", "", "PatchJson6902Transformer") - th := kusttest_test.NewKustTestPluginHarness(t, "/app") + th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app") th.WriteF("/app/jsonpatch.json", `[ {"op": "replace", "path": "/spec/template/spec/containers/0/name", "value": "my-nginx"}, @@ -152,13 +150,13 @@ jsonOp: '[{"op": "add", "path": "/spec/template/spec/dnsPolicy", "value": "Clust } func TestPatchJson6902TransformerFromJsonFile(t *testing.T) { - tc := pluglib.NewEnvForTest(t).Set() + tc := kusttest_test.NewPluginTestEnv(t).Set() defer tc.Reset() tc.BuildGoPlugin( "builtin", "", "PatchJson6902Transformer") - th := kusttest_test.NewKustTestPluginHarness(t, "/app") + th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app") th.WriteF("/app/jsonpatch.json", `[ {"op": "replace", "path": "/spec/template/spec/containers/0/name", "value": "my-nginx"}, @@ -202,13 +200,13 @@ spec: } func TestPatchJson6902TransformerFromYamlFile(t *testing.T) { - tc := pluglib.NewEnvForTest(t).Set() + tc := kusttest_test.NewPluginTestEnv(t).Set() defer tc.Reset() tc.BuildGoPlugin( "builtin", "", "PatchJson6902Transformer") - th := kusttest_test.NewKustTestPluginHarness(t, "/app") + th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app") th.WriteF("/app/jsonpatch.json", ` - op: add @@ -252,13 +250,13 @@ spec: } func TestPatchJson6902TransformerWithInlineJSON(t *testing.T) { - tc := pluglib.NewEnvForTest(t).Set() + tc := kusttest_test.NewPluginTestEnv(t).Set() defer tc.Reset() tc.BuildGoPlugin( "builtin", "", "PatchJson6902Transformer") - th := kusttest_test.NewKustTestPluginHarness(t, "/app") + th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app") rm := th.LoadAndRunTransformer(` apiVersion: builtin @@ -293,13 +291,13 @@ spec: } func TestPatchJson6902TransformerWithInlineYAML(t *testing.T) { - tc := pluglib.NewEnvForTest(t).Set() + tc := kusttest_test.NewPluginTestEnv(t).Set() defer tc.Reset() tc.BuildGoPlugin( "builtin", "", "PatchJson6902Transformer") - th := kusttest_test.NewKustTestPluginHarness(t, "/app") + th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app") rm := th.LoadAndRunTransformer(` apiVersion: builtin diff --git a/plugin/builtin/patchstrategicmergetransformer/PatchStrategicMergeTransformer.go b/plugin/builtin/patchstrategicmergetransformer/PatchStrategicMergeTransformer.go index 1178ee57b..948f9aabf 100644 --- a/plugin/builtin/patchstrategicmergetransformer/PatchStrategicMergeTransformer.go +++ b/plugin/builtin/patchstrategicmergetransformer/PatchStrategicMergeTransformer.go @@ -7,9 +7,9 @@ package main import ( "fmt" + "sigs.k8s.io/kustomize/v3/api/types" "sigs.k8s.io/kustomize/v3/pkg/resmap" "sigs.k8s.io/kustomize/v3/pkg/resource" - "sigs.k8s.io/kustomize/v3/types" "sigs.k8s.io/yaml" ) diff --git a/plugin/builtin/patchstrategicmergetransformer/PatchStrategicMergeTransformer_test.go b/plugin/builtin/patchstrategicmergetransformer/PatchStrategicMergeTransformer_test.go index 9e052a0da..6fd17b71d 100644 --- a/plugin/builtin/patchstrategicmergetransformer/PatchStrategicMergeTransformer_test.go +++ b/plugin/builtin/patchstrategicmergetransformer/PatchStrategicMergeTransformer_test.go @@ -8,9 +8,7 @@ import ( "strings" "testing" - "sigs.k8s.io/kustomize/v3/pluglib" - - "sigs.k8s.io/kustomize/v3/pkg/kusttest" + "sigs.k8s.io/kustomize/v3/api/kusttest" ) const ( @@ -60,12 +58,12 @@ spec: ) func TestPatchStrategicMergeTransformerMissingFile(t *testing.T) { - tc := pluglib.NewEnvForTest(t).Set() + tc := kusttest_test.NewPluginTestEnv(t).Set() defer tc.Reset() tc.BuildGoPlugin( "builtin", "", "PatchStrategicMergeTransformer") - th := kusttest_test.NewKustTestPluginHarness(t, "/app") + th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app") _, err := th.RunTransformer(` apiVersion: builtin @@ -87,13 +85,13 @@ paths: } func TestBadPatchStrategicMergeTransformer(t *testing.T) { - tc := pluglib.NewEnvForTest(t).Set() + tc := kusttest_test.NewPluginTestEnv(t).Set() defer tc.Reset() tc.BuildGoPlugin( "builtin", "", "PatchStrategicMergeTransformer") - th := kusttest_test.NewKustTestPluginHarness(t, "/app") + th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app") _, err := th.RunTransformer(` apiVersion: builtin @@ -112,13 +110,13 @@ patches: 'thisIsNotAPatch' } func TestBothEmptyPatchStrategicMergeTransformer(t *testing.T) { - tc := pluglib.NewEnvForTest(t).Set() + tc := kusttest_test.NewPluginTestEnv(t).Set() defer tc.Reset() tc.BuildGoPlugin( "builtin", "", "PatchStrategicMergeTransformer") - th := kusttest_test.NewKustTestPluginHarness(t, "/app") + th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app") _, err := th.RunTransformer(` apiVersion: builtin @@ -135,13 +133,13 @@ metadata: } func TestPatchStrategicMergeTransformerFromFiles(t *testing.T) { - tc := pluglib.NewEnvForTest(t).Set() + tc := kusttest_test.NewPluginTestEnv(t).Set() defer tc.Reset() tc.BuildGoPlugin( "builtin", "", "PatchStrategicMergeTransformer") - th := kusttest_test.NewKustTestPluginHarness(t, "/app") + th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app") th.WriteF("/app/patch.yaml", ` apiVersion: apps/v1 @@ -185,13 +183,13 @@ spec: } func TestPatchStrategicMergeTransformerWithInlineJSON(t *testing.T) { - tc := pluglib.NewEnvForTest(t).Set() + tc := kusttest_test.NewPluginTestEnv(t).Set() defer tc.Reset() tc.BuildGoPlugin( "builtin", "", "PatchStrategicMergeTransformer") - th := kusttest_test.NewKustTestPluginHarness(t, "/app") + th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app") rm := th.LoadAndRunTransformer(` apiVersion: builtin @@ -220,13 +218,13 @@ spec: } func TestPatchStrategicMergeTransformerWithInlineYAML(t *testing.T) { - tc := pluglib.NewEnvForTest(t).Set() + tc := kusttest_test.NewPluginTestEnv(t).Set() defer tc.Reset() tc.BuildGoPlugin( "builtin", "", "PatchStrategicMergeTransformer") - th := kusttest_test.NewKustTestPluginHarness(t, "/app") + th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app") rm := th.LoadAndRunTransformer(` apiVersion: builtin @@ -272,13 +270,13 @@ spec: } func TestPatchStrategicMergeTransformerMultiplePatches(t *testing.T) { - tc := pluglib.NewEnvForTest(t).Set() + tc := kusttest_test.NewPluginTestEnv(t).Set() defer tc.Reset() tc.BuildGoPlugin( "builtin", "", "PatchStrategicMergeTransformer") - th := kusttest_test.NewKustTestPluginHarness(t, "/app") + th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app") th.WriteF("/app/patch1.yaml", ` apiVersion: apps/v1 @@ -349,13 +347,13 @@ spec: } func TestStrategicMergeTransformerMultiplePatchesWithConflicts(t *testing.T) { - tc := pluglib.NewEnvForTest(t).Set() + tc := kusttest_test.NewPluginTestEnv(t).Set() defer tc.Reset() tc.BuildGoPlugin( "builtin", "", "PatchStrategicMergeTransformer") - th := kusttest_test.NewKustTestPluginHarness(t, "/app") + th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app") th.WriteF("/app/patch1.yaml", ` apiVersion: apps/v1 @@ -410,13 +408,13 @@ paths: } func TestStrategicMergeTransformerWrongNamespace(t *testing.T) { - tc := pluglib.NewEnvForTest(t).Set() + tc := kusttest_test.NewPluginTestEnv(t).Set() defer tc.Reset() tc.BuildGoPlugin( "builtin", "", "PatchStrategicMergeTransformer") - th := kusttest_test.NewKustTestPluginHarness(t, "/app") + th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app") th.WriteF("/app/patch.yaml", ` apiVersion: apps/v1 @@ -453,13 +451,13 @@ paths: } func TestStrategicMergeTransformerNoSchema(t *testing.T) { - tc := pluglib.NewEnvForTest(t).Set() + tc := kusttest_test.NewPluginTestEnv(t).Set() defer tc.Reset() tc.BuildGoPlugin( "builtin", "", "PatchStrategicMergeTransformer") - th := kusttest_test.NewKustTestPluginHarness(t, "/app") + th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app") th.WriteF("/app/patch.yaml", ` apiVersion: example.com/v1 @@ -493,13 +491,13 @@ spec: } func TestStrategicMergeTransformerNoSchemaMultiPatches(t *testing.T) { - tc := pluglib.NewEnvForTest(t).Set() + tc := kusttest_test.NewPluginTestEnv(t).Set() defer tc.Reset() tc.BuildGoPlugin( "builtin", "", "PatchStrategicMergeTransformer") - th := kusttest_test.NewKustTestPluginHarness(t, "/app") + th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app") th.WriteF("/app/patch1.yaml", ` apiVersion: example.com/v1 @@ -549,13 +547,13 @@ spec: } func TestStrategicMergeTransformerNoSchemaMultiPatchesWithConflict(t *testing.T) { - tc := pluglib.NewEnvForTest(t).Set() + tc := kusttest_test.NewPluginTestEnv(t).Set() defer tc.Reset() tc.BuildGoPlugin( "builtin", "", "PatchStrategicMergeTransformer") - th := kusttest_test.NewKustTestPluginHarness(t, "/app") + th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app") th.WriteF("/app/patch1.yaml", ` apiVersion: example.com/v1 @@ -885,13 +883,13 @@ func TestSinglePatch(t *testing.T) { }, } - tc := pluglib.NewEnvForTest(t).Set() + tc := kusttest_test.NewPluginTestEnv(t).Set() defer tc.Reset() tc.BuildGoPlugin( "builtin", "", "PatchStrategicMergeTransformer") for _, test := range tests { - th := kusttest_test.NewKustTestPluginHarness(t, fmt.Sprintf("/%s", test.name)) + th := kusttest_test.NewKustTestHarnessAllowPlugins(t, fmt.Sprintf("/%s", test.name)) th.WriteF(fmt.Sprintf("/%s/patch%d.yaml", test.name, 0), test.patch) if test.errorExpected { @@ -988,13 +986,13 @@ func TestMultiplePatches(t *testing.T) { }, } - tc := pluglib.NewEnvForTest(t).Set() + tc := kusttest_test.NewPluginTestEnv(t).Set() defer tc.Reset() tc.BuildGoPlugin( "builtin", "", "PatchStrategicMergeTransformer") for _, test := range tests { - th := kusttest_test.NewKustTestPluginHarness(t, fmt.Sprintf("/%s", test.name)) + th := kusttest_test.NewKustTestHarnessAllowPlugins(t, fmt.Sprintf("/%s", test.name)) for idx, patch := range test.patch { th.WriteF(fmt.Sprintf("/%s/patch%d.yaml", test.name, idx), patch) } @@ -1119,13 +1117,13 @@ func TestMultiplePatchesWithConflict(t *testing.T) { }, } - tc := pluglib.NewEnvForTest(t).Set() + tc := kusttest_test.NewPluginTestEnv(t).Set() defer tc.Reset() tc.BuildGoPlugin( "builtin", "", "PatchStrategicMergeTransformer") for _, test := range tests { - th := kusttest_test.NewKustTestPluginHarness(t, fmt.Sprintf("/%s", test.name)) + th := kusttest_test.NewKustTestHarnessAllowPlugins(t, fmt.Sprintf("/%s", test.name)) for idx, patch := range test.patch { th.WriteF(fmt.Sprintf("/%s/patch%d.yaml", test.name, idx), patch) } @@ -1228,13 +1226,13 @@ func TestMultipleNamespaces(t *testing.T) { }, } - tc := pluglib.NewEnvForTest(t).Set() + tc := kusttest_test.NewPluginTestEnv(t).Set() defer tc.Reset() tc.BuildGoPlugin( "builtin", "", "PatchStrategicMergeTransformer") for _, test := range tests { - th := kusttest_test.NewKustTestPluginHarness(t, fmt.Sprintf("/%s", test.name)) + th := kusttest_test.NewKustTestHarnessAllowPlugins(t, fmt.Sprintf("/%s", test.name)) for idx, patch := range test.patch { th.WriteF(fmt.Sprintf("/%s/patch%d.yaml", test.name, idx), patch) } @@ -1250,13 +1248,13 @@ func TestMultipleNamespaces(t *testing.T) { } func TestPatchStrategicMergeTransformerPatchDelete(t *testing.T) { - tc := pluglib.NewEnvForTest(t).Set() + tc := kusttest_test.NewPluginTestEnv(t).Set() defer tc.Reset() tc.BuildGoPlugin( "builtin", "", "PatchStrategicMergeTransformer") - th := kusttest_test.NewKustTestPluginHarness(t, "/app") + th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app") th.WriteF("/app/patch.yaml", ` apiVersion: apps/v1 diff --git a/plugin/builtin/patchtransformer/PatchTransformer.go b/plugin/builtin/patchtransformer/PatchTransformer.go index 55c59ab61..ceab312f1 100644 --- a/plugin/builtin/patchtransformer/PatchTransformer.go +++ b/plugin/builtin/patchtransformer/PatchTransformer.go @@ -9,9 +9,9 @@ import ( "github.com/evanphx/json-patch" "github.com/pkg/errors" + "sigs.k8s.io/kustomize/v3/api/types" "sigs.k8s.io/kustomize/v3/pkg/resmap" "sigs.k8s.io/kustomize/v3/pkg/resource" - "sigs.k8s.io/kustomize/v3/types" "sigs.k8s.io/yaml" ) diff --git a/plugin/builtin/patchtransformer/PatchTransformer_test.go b/plugin/builtin/patchtransformer/PatchTransformer_test.go index 78c7dda19..acc168c69 100644 --- a/plugin/builtin/patchtransformer/PatchTransformer_test.go +++ b/plugin/builtin/patchtransformer/PatchTransformer_test.go @@ -7,9 +7,7 @@ import ( "strings" "testing" - "sigs.k8s.io/kustomize/v3/pluglib" - - "sigs.k8s.io/kustomize/v3/pkg/kusttest" + "sigs.k8s.io/kustomize/v3/api/kusttest" ) const ( @@ -67,12 +65,12 @@ spec: ) func TestPatchTransformerMissingFile(t *testing.T) { - tc := pluglib.NewEnvForTest(t).Set() + tc := kusttest_test.NewPluginTestEnv(t).Set() defer tc.Reset() tc.BuildGoPlugin( "builtin", "", "PatchTransformer") - th := kusttest_test.NewKustTestPluginHarness(t, "/app") + th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app") _, err := th.RunTransformer(` apiVersion: builtin @@ -91,12 +89,12 @@ path: patch.yaml } func TestPatchTransformerBadPatch(t *testing.T) { - tc := pluglib.NewEnvForTest(t).Set() + tc := kusttest_test.NewPluginTestEnv(t).Set() defer tc.Reset() tc.BuildGoPlugin( "builtin", "", "PatchTransformer") - th := kusttest_test.NewKustTestPluginHarness(t, "/app") + th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app") _, err := th.RunTransformer(` apiVersion: builtin @@ -115,12 +113,12 @@ patch: "thisIsNotAPatch" } func TestPatchTransformerMissingSelector(t *testing.T) { - tc := pluglib.NewEnvForTest(t).Set() + tc := kusttest_test.NewPluginTestEnv(t).Set() defer tc.Reset() tc.BuildGoPlugin( "builtin", "", "PatchTransformer") - th := kusttest_test.NewKustTestPluginHarness(t, "/app") + th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app") _, err := th.RunTransformer(` apiVersion: builtin @@ -139,13 +137,13 @@ patch: '[{"op": "add", "path": "/spec/template/spec/dnsPolicy", "value": "Cluste } func TestPatchTransformerBothEmptyPathAndPatch(t *testing.T) { - tc := pluglib.NewEnvForTest(t).Set() + tc := kusttest_test.NewPluginTestEnv(t).Set() defer tc.Reset() tc.BuildGoPlugin( "builtin", "", "PatchTransformer") - th := kusttest_test.NewKustTestPluginHarness(t, "/app") + th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app") _, err := th.RunTransformer(` apiVersion: builtin @@ -162,13 +160,13 @@ metadata: } func TestPatchTransformerBothNonEmptyPathAndPatch(t *testing.T) { - tc := pluglib.NewEnvForTest(t).Set() + tc := kusttest_test.NewPluginTestEnv(t).Set() defer tc.Reset() tc.BuildGoPlugin( "builtin", "", "PatchTransformer") - th := kusttest_test.NewKustTestPluginHarness(t, "/app") + th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app") _, err := th.RunTransformer(` apiVersion: builtin @@ -187,13 +185,13 @@ Patch: "something" } func TestPatchTransformerFromFiles(t *testing.T) { - tc := pluglib.NewEnvForTest(t).Set() + tc := kusttest_test.NewPluginTestEnv(t).Set() defer tc.Reset() tc.BuildGoPlugin( "builtin", "", "PatchTransformer") - th := kusttest_test.NewKustTestPluginHarness(t, "/app") + th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app") th.WriteF("/app/patch.yaml", ` apiVersion: apps/v1 @@ -269,13 +267,13 @@ spec: } func TestPatchTransformerWithInline(t *testing.T) { - tc := pluglib.NewEnvForTest(t).Set() + tc := kusttest_test.NewPluginTestEnv(t).Set() defer tc.Reset() tc.BuildGoPlugin( "builtin", "", "PatchTransformer") - th := kusttest_test.NewKustTestPluginHarness(t, "/app") + th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app") rm := th.LoadAndRunTransformer(` apiVersion: builtin diff --git a/plugin/builtin/prefixsuffixtransformer/PrefixSuffixTransformer.go b/plugin/builtin/prefixsuffixtransformer/PrefixSuffixTransformer.go index d8f3772ae..15d02b0ff 100644 --- a/plugin/builtin/prefixsuffixtransformer/PrefixSuffixTransformer.go +++ b/plugin/builtin/prefixsuffixtransformer/PrefixSuffixTransformer.go @@ -8,8 +8,7 @@ import ( "errors" "fmt" - "sigs.k8s.io/kustomize/v3/pkg/gvk" - "sigs.k8s.io/kustomize/v3/pkg/resid" + "sigs.k8s.io/kustomize/v3/api/resid" "sigs.k8s.io/kustomize/v3/pkg/resmap" "sigs.k8s.io/kustomize/v3/pkg/transformers" "sigs.k8s.io/kustomize/v3/pkg/transformers/config" @@ -29,10 +28,10 @@ var KustomizePlugin plugin // Not placed in a file yet due to lack of demand. var prefixSuffixFieldSpecsToSkip = []config.FieldSpec{ { - Gvk: gvk.Gvk{Kind: "CustomResourceDefinition"}, + Gvk: resid.Gvk{Kind: "CustomResourceDefinition"}, }, { - Gvk: gvk.Gvk{Group: "apiregistration.k8s.io", Kind: "APIService"}, + Gvk: resid.Gvk{Group: "apiregistration.k8s.io", Kind: "APIService"}, }, } diff --git a/plugin/builtin/prefixsuffixtransformer/PrefixSuffixTransformer_test.go b/plugin/builtin/prefixsuffixtransformer/PrefixSuffixTransformer_test.go index 73eb48148..e831c83f3 100644 --- a/plugin/builtin/prefixsuffixtransformer/PrefixSuffixTransformer_test.go +++ b/plugin/builtin/prefixsuffixtransformer/PrefixSuffixTransformer_test.go @@ -6,19 +6,17 @@ package main_test import ( "testing" - "sigs.k8s.io/kustomize/v3/pluglib" - - "sigs.k8s.io/kustomize/v3/pkg/kusttest" + "sigs.k8s.io/kustomize/v3/api/kusttest" ) func TestPrefixSuffixTransformer(t *testing.T) { - tc := pluglib.NewEnvForTest(t).Set() + tc := kusttest_test.NewPluginTestEnv(t).Set() defer tc.Reset() tc.BuildGoPlugin( "builtin", "", "PrefixSuffixTransformer") - th := kusttest_test.NewKustTestPluginHarness(t, "/app") + th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app") rm := th.LoadAndRunTransformer(` apiVersion: builtin kind: PrefixSuffixTransformer diff --git a/plugin/builtin/replicacounttransformer/ReplicaCountTransformer.go b/plugin/builtin/replicacounttransformer/ReplicaCountTransformer.go index 4931c4252..98387ea74 100644 --- a/plugin/builtin/replicacounttransformer/ReplicaCountTransformer.go +++ b/plugin/builtin/replicacounttransformer/ReplicaCountTransformer.go @@ -7,11 +7,11 @@ package main import ( "fmt" - "sigs.k8s.io/kustomize/v3/pkg/resid" + "sigs.k8s.io/kustomize/v3/api/resid" + "sigs.k8s.io/kustomize/v3/api/types" "sigs.k8s.io/kustomize/v3/pkg/resmap" "sigs.k8s.io/kustomize/v3/pkg/transformers" "sigs.k8s.io/kustomize/v3/pkg/transformers/config" - "sigs.k8s.io/kustomize/v3/types" "sigs.k8s.io/yaml" ) diff --git a/plugin/builtin/replicacounttransformer/ReplicaCountTransformer_test.go b/plugin/builtin/replicacounttransformer/ReplicaCountTransformer_test.go index 54cb7d0bc..9f6f08e38 100644 --- a/plugin/builtin/replicacounttransformer/ReplicaCountTransformer_test.go +++ b/plugin/builtin/replicacounttransformer/ReplicaCountTransformer_test.go @@ -6,19 +6,17 @@ package main_test import ( "testing" - "sigs.k8s.io/kustomize/v3/pluglib" - - "sigs.k8s.io/kustomize/v3/pkg/kusttest" + "sigs.k8s.io/kustomize/v3/api/kusttest" ) func TestReplicaCountTransformer(t *testing.T) { - tc := pluglib.NewEnvForTest(t).Set() + tc := kusttest_test.NewPluginTestEnv(t).Set() defer tc.Reset() tc.BuildGoPlugin( "builtin", "", "ReplicaCountTransformer") - th := kusttest_test.NewKustTestPluginHarness(t, "/app") + th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app") rm := th.LoadAndRunTransformer(` apiVersion: builtin @@ -154,13 +152,13 @@ spec: } func TestMatchesCurrentID(t *testing.T) { - tc := pluglib.NewEnvForTest(t).Set() + tc := kusttest_test.NewPluginTestEnv(t).Set() defer tc.Reset() tc.BuildGoPlugin("builtin", "", "PrefixSuffixTransformer") tc.BuildGoPlugin("builtin", "", "ReplicaCountTransformer") - th := kusttest_test.NewKustTestPluginHarness(t, "/app") + th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app") rm := th.LoadAndRunTransformer(` apiVersion: builtin @@ -200,12 +198,12 @@ spec: } func TestNoMatch(t *testing.T) { - tc := pluglib.NewEnvForTest(t).Set() + tc := kusttest_test.NewPluginTestEnv(t).Set() defer tc.Reset() tc.BuildGoPlugin("builtin", "", "ReplicaCountTransformer") - th := kusttest_test.NewKustTestPluginHarness(t, "/app") + th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app") err := th.ErrorFromLoadAndRunTransformer(` apiVersion: builtin diff --git a/plugin/builtin/secretgenerator/SecretGenerator.go b/plugin/builtin/secretgenerator/SecretGenerator.go index 881a427ac..fcefb708b 100644 --- a/plugin/builtin/secretgenerator/SecretGenerator.go +++ b/plugin/builtin/secretgenerator/SecretGenerator.go @@ -5,9 +5,9 @@ package main import ( - "sigs.k8s.io/kustomize/v3/kv" + "sigs.k8s.io/kustomize/v3/api/kv" + "sigs.k8s.io/kustomize/v3/api/types" "sigs.k8s.io/kustomize/v3/pkg/resmap" - "sigs.k8s.io/kustomize/v3/types" "sigs.k8s.io/yaml" ) diff --git a/plugin/builtin/secretgenerator/SecretGenerator_test.go b/plugin/builtin/secretgenerator/SecretGenerator_test.go index 26da0a550..fa908a2dd 100644 --- a/plugin/builtin/secretgenerator/SecretGenerator_test.go +++ b/plugin/builtin/secretgenerator/SecretGenerator_test.go @@ -6,19 +6,17 @@ package main_test import ( "testing" - "sigs.k8s.io/kustomize/v3/pluglib" - - "sigs.k8s.io/kustomize/v3/pkg/kusttest" + "sigs.k8s.io/kustomize/v3/api/kusttest" ) func TestSecretGenerator(t *testing.T) { - tc := pluglib.NewEnvForTest(t).Set() + tc := kusttest_test.NewPluginTestEnv(t).Set() defer tc.Reset() tc.BuildGoPlugin( "builtin", "", "SecretGenerator") - th := kusttest_test.NewKustTestPluginHarness(t, "/app") + th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app") th.WriteF("/app/a.env", ` ROUTER_PASSWORD=admin diff --git a/plugin/someteam.example.com/v1/bashedconfigmap/BashedConfigMap_test.go b/plugin/someteam.example.com/v1/bashedconfigmap/BashedConfigMap_test.go index 581f1415c..e8abda110 100644 --- a/plugin/someteam.example.com/v1/bashedconfigmap/BashedConfigMap_test.go +++ b/plugin/someteam.example.com/v1/bashedconfigmap/BashedConfigMap_test.go @@ -6,19 +6,17 @@ package main_test import ( "testing" - "sigs.k8s.io/kustomize/v3/pluglib" - - "sigs.k8s.io/kustomize/v3/pkg/kusttest" + "sigs.k8s.io/kustomize/v3/api/kusttest" ) func TestBashedConfigMapPlugin(t *testing.T) { - tc := pluglib.NewEnvForTest(t).Set() + tc := kusttest_test.NewPluginTestEnv(t).Set() defer tc.Reset() tc.BuildExecPlugin( "someteam.example.com", "v1", "BashedConfigMap") - th := kusttest_test.NewKustTestPluginHarness(t, "/app") + th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app") m := th.LoadAndRunGenerator(` apiVersion: someteam.example.com/v1 diff --git a/plugin/someteam.example.com/v1/chartinflator/ChartInflator_test.go b/plugin/someteam.example.com/v1/chartinflator/ChartInflator_test.go index 3b2b606d2..2e29d3c84 100644 --- a/plugin/someteam.example.com/v1/chartinflator/ChartInflator_test.go +++ b/plugin/someteam.example.com/v1/chartinflator/ChartInflator_test.go @@ -11,9 +11,7 @@ import ( "regexp" "testing" - "sigs.k8s.io/kustomize/v3/pluglib" - - "sigs.k8s.io/kustomize/v3/pkg/kusttest" + "sigs.k8s.io/kustomize/v3/api/kusttest" ) // This test requires having the helm binary on the PATH. @@ -21,13 +19,13 @@ import ( // TODO: Download and inflate the chart, and check that // in for the test. func TestChartInflator(t *testing.T) { - tc := pluglib.NewEnvForTest(t).Set() + tc := kusttest_test.NewPluginTestEnv(t).Set() defer tc.Reset() tc.BuildExecPlugin( "someteam.example.com", "v1", "ChartInflator") - th := kusttest_test.NewKustTestPluginHarness(t, "/app") + th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app") m := th.LoadAndRunGenerator(` apiVersion: someteam.example.com/v1 diff --git a/plugin/someteam.example.com/v1/dateprefixer/DatePrefixer_test.go b/plugin/someteam.example.com/v1/dateprefixer/DatePrefixer_test.go index e398c2e62..929a4f9d2 100644 --- a/plugin/someteam.example.com/v1/dateprefixer/DatePrefixer_test.go +++ b/plugin/someteam.example.com/v1/dateprefixer/DatePrefixer_test.go @@ -6,18 +6,16 @@ package main_test import ( "testing" - "sigs.k8s.io/kustomize/v3/pluglib" - - "sigs.k8s.io/kustomize/v3/pkg/kusttest" + "sigs.k8s.io/kustomize/v3/api/kusttest" ) func TestDatePrefixerPlugin(t *testing.T) { - tc := pluglib.NewEnvForTest(t).Set() + tc := kusttest_test.NewPluginTestEnv(t).Set() defer tc.Reset() tc.BuildGoPlugin( "someteam.example.com", "v1", "DatePrefixer") - th := kusttest_test.NewKustTestPluginHarness(t, "/app") + th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app") m := th.LoadAndRunTransformer(` apiVersion: someteam.example.com/v1 diff --git a/plugin/someteam.example.com/v1/gogetter/GoGetter_test.go b/plugin/someteam.example.com/v1/gogetter/GoGetter_test.go index 8ef780ce1..d876e47ee 100644 --- a/plugin/someteam.example.com/v1/gogetter/GoGetter_test.go +++ b/plugin/someteam.example.com/v1/gogetter/GoGetter_test.go @@ -10,21 +10,19 @@ package main_test import ( "testing" - "sigs.k8s.io/kustomize/v3/pluglib" - - "sigs.k8s.io/kustomize/v3/pkg/kusttest" + "sigs.k8s.io/kustomize/v3/api/kusttest" ) // This test requires having the go-getter binary on the PATH. // func TestGoGetter(t *testing.T) { - tc := pluglib.NewEnvForTest(t).Set() + tc := kusttest_test.NewPluginTestEnv(t).Set() defer tc.Reset() tc.BuildExecPlugin( "someteam.example.com", "v1", "GoGetter") - th := kusttest_test.NewKustTestPluginHarness(t, "/app") + th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app") m := th.LoadAndRunGenerator(` apiVersion: someteam.example.com/v1 @@ -46,13 +44,13 @@ metadata: } func TestGoGetterUrl(t *testing.T) { - tc := pluglib.NewEnvForTest(t).Set() + tc := kusttest_test.NewPluginTestEnv(t).Set() defer tc.Reset() tc.BuildExecPlugin( "someteam.example.com", "v1", "GoGetter") - th := kusttest_test.NewKustTestPluginHarness(t, "/app") + th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app") m := th.LoadAndRunGenerator(` apiVersion: someteam.example.com/v1 @@ -75,13 +73,13 @@ metadata: } func TestGoGetterCommand(t *testing.T) { - tc := pluglib.NewEnvForTest(t).Set() + tc := kusttest_test.NewPluginTestEnv(t).Set() defer tc.Reset() tc.BuildExecPlugin( "someteam.example.com", "v1", "GoGetter") - th := kusttest_test.NewKustTestPluginHarness(t, "/app") + th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app") m := th.LoadAndRunGenerator(` apiVersion: someteam.example.com/v1 @@ -104,13 +102,13 @@ metadata: } func TestGoGetterSubPath(t *testing.T) { - tc := pluglib.NewEnvForTest(t).Set() + tc := kusttest_test.NewPluginTestEnv(t).Set() defer tc.Reset() tc.BuildExecPlugin( "someteam.example.com", "v1", "GoGetter") - th := kusttest_test.NewKustTestPluginHarness(t, "/app") + th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app") m := th.LoadAndRunGenerator(` apiVersion: someteam.example.com/v1 diff --git a/plugin/someteam.example.com/v1/printworkdir/PrintWorkDir_test.go b/plugin/someteam.example.com/v1/printworkdir/PrintWorkDir_test.go index 6c4293ee1..6853c6696 100644 --- a/plugin/someteam.example.com/v1/printworkdir/PrintWorkDir_test.go +++ b/plugin/someteam.example.com/v1/printworkdir/PrintWorkDir_test.go @@ -7,9 +7,7 @@ import ( "strings" "testing" - "sigs.k8s.io/kustomize/v3/pluglib" - - "sigs.k8s.io/kustomize/v3/pkg/kusttest" + "sigs.k8s.io/kustomize/v3/api/kusttest" ) func shouldContain(t *testing.T, s []byte, x string) { @@ -19,13 +17,13 @@ func shouldContain(t *testing.T, s []byte, x string) { } func TestPrintWorkDirPlugin(t *testing.T) { - tc := pluglib.NewEnvForTest(t).Set() + tc := kusttest_test.NewPluginTestEnv(t).Set() defer tc.Reset() tc.BuildExecPlugin( "someteam.example.com", "v1", "PrintWorkDir") - th := kusttest_test.NewKustTestPluginHarness(t, "/theAppRoot") + th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/theAppRoot") m := th.LoadAndRunGenerator(` apiVersion: someteam.example.com/v1 diff --git a/plugin/someteam.example.com/v1/secretsfromdatabase/SecretsFromDatabase.go b/plugin/someteam.example.com/v1/secretsfromdatabase/SecretsFromDatabase.go index 08f250d43..3b1334cea 100644 --- a/plugin/someteam.example.com/v1/secretsfromdatabase/SecretsFromDatabase.go +++ b/plugin/someteam.example.com/v1/secretsfromdatabase/SecretsFromDatabase.go @@ -4,9 +4,9 @@ package main import ( - "sigs.k8s.io/kustomize/v3/kv" + "sigs.k8s.io/kustomize/v3/api/kv" + "sigs.k8s.io/kustomize/v3/api/types" "sigs.k8s.io/kustomize/v3/pkg/resmap" - "sigs.k8s.io/kustomize/v3/types" "sigs.k8s.io/yaml" ) diff --git a/plugin/someteam.example.com/v1/secretsfromdatabase/SecretsFromDatabase_test.go b/plugin/someteam.example.com/v1/secretsfromdatabase/SecretsFromDatabase_test.go index 982b17fe1..b5ecfadbd 100644 --- a/plugin/someteam.example.com/v1/secretsfromdatabase/SecretsFromDatabase_test.go +++ b/plugin/someteam.example.com/v1/secretsfromdatabase/SecretsFromDatabase_test.go @@ -6,19 +6,17 @@ package main_test import ( "testing" - "sigs.k8s.io/kustomize/v3/pluglib" - - "sigs.k8s.io/kustomize/v3/pkg/kusttest" + "sigs.k8s.io/kustomize/v3/api/kusttest" ) func TestSecretsFromDatabasePlugin(t *testing.T) { - tc := pluglib.NewEnvForTest(t).Set() + tc := kusttest_test.NewPluginTestEnv(t).Set() defer tc.Reset() tc.BuildGoPlugin( "someteam.example.com", "v1", "SecretsFromDatabase") - th := kusttest_test.NewKustTestPluginHarness(t, "/app") + th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app") m := th.LoadAndRunGenerator(` apiVersion: someteam.example.com/v1 diff --git a/plugin/someteam.example.com/v1/sedtransformer/SedTransformer_test.go b/plugin/someteam.example.com/v1/sedtransformer/SedTransformer_test.go index d741f84c7..b0cb52f4f 100644 --- a/plugin/someteam.example.com/v1/sedtransformer/SedTransformer_test.go +++ b/plugin/someteam.example.com/v1/sedtransformer/SedTransformer_test.go @@ -6,17 +6,15 @@ package main_test import ( "testing" - "sigs.k8s.io/kustomize/v3/pluglib" - - "sigs.k8s.io/kustomize/v3/pkg/kusttest" + "sigs.k8s.io/kustomize/v3/api/kusttest" ) func TestSedTransformer(t *testing.T) { - tc := pluglib.NewEnvForTest(t).Set() + tc := kusttest_test.NewPluginTestEnv(t).Set() defer tc.Reset() tc.BuildExecPlugin("someteam.example.com", "v1", "SedTransformer") - th := kusttest_test.NewKustTestPluginHarness(t, "/app") + th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app") th.WriteF("/app/sed-input.txt", ` s/$FRUIT/orange/g diff --git a/plugin/someteam.example.com/v1/someservicegenerator/SomeServiceGenerator.go b/plugin/someteam.example.com/v1/someservicegenerator/SomeServiceGenerator.go index 06d9a8dea..59d552ca6 100644 --- a/plugin/someteam.example.com/v1/someservicegenerator/SomeServiceGenerator.go +++ b/plugin/someteam.example.com/v1/someservicegenerator/SomeServiceGenerator.go @@ -7,8 +7,8 @@ import ( "bytes" "text/template" + "sigs.k8s.io/kustomize/v3/api/types" "sigs.k8s.io/kustomize/v3/pkg/resmap" - "sigs.k8s.io/kustomize/v3/types" "sigs.k8s.io/yaml" ) diff --git a/plugin/someteam.example.com/v1/someservicegenerator/SomeServiceGenerator_test.go b/plugin/someteam.example.com/v1/someservicegenerator/SomeServiceGenerator_test.go index f9b8000e8..1de425aa0 100644 --- a/plugin/someteam.example.com/v1/someservicegenerator/SomeServiceGenerator_test.go +++ b/plugin/someteam.example.com/v1/someservicegenerator/SomeServiceGenerator_test.go @@ -6,19 +6,17 @@ package main_test import ( "testing" - "sigs.k8s.io/kustomize/v3/pluglib" - - "sigs.k8s.io/kustomize/v3/pkg/kusttest" + "sigs.k8s.io/kustomize/v3/api/kusttest" ) func TestSomeServiceGeneratorPlugin(t *testing.T) { - tc := pluglib.NewEnvForTest(t).Set() + tc := kusttest_test.NewPluginTestEnv(t).Set() defer tc.Reset() tc.BuildGoPlugin( "someteam.example.com", "v1", "SomeServiceGenerator") - th := kusttest_test.NewKustTestPluginHarness(t, "/app") + th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app") m := th.LoadAndRunGenerator(` apiVersion: someteam.example.com/v1 diff --git a/plugin/someteam.example.com/v1/stringprefixer/StringPrefixer.go b/plugin/someteam.example.com/v1/stringprefixer/StringPrefixer.go index 493521721..378f7d775 100644 --- a/plugin/someteam.example.com/v1/stringprefixer/StringPrefixer.go +++ b/plugin/someteam.example.com/v1/stringprefixer/StringPrefixer.go @@ -5,10 +5,10 @@ package main import ( "github.com/pkg/errors" + "sigs.k8s.io/kustomize/v3/api/types" "sigs.k8s.io/kustomize/v3/pkg/resmap" "sigs.k8s.io/kustomize/v3/pkg/transformers/config" "sigs.k8s.io/kustomize/v3/plugin/builtin" - "sigs.k8s.io/kustomize/v3/types" "sigs.k8s.io/yaml" ) diff --git a/plugin/someteam.example.com/v1/stringprefixer/StringPrefixer_test.go b/plugin/someteam.example.com/v1/stringprefixer/StringPrefixer_test.go index c954f88a4..8615c39d2 100644 --- a/plugin/someteam.example.com/v1/stringprefixer/StringPrefixer_test.go +++ b/plugin/someteam.example.com/v1/stringprefixer/StringPrefixer_test.go @@ -6,18 +6,16 @@ package main_test import ( "testing" - "sigs.k8s.io/kustomize/v3/pluglib" - - "sigs.k8s.io/kustomize/v3/pkg/kusttest" + "sigs.k8s.io/kustomize/v3/api/kusttest" ) func TestStringPrefixerPlugin(t *testing.T) { - tc := pluglib.NewEnvForTest(t).Set() + tc := kusttest_test.NewPluginTestEnv(t).Set() defer tc.Reset() tc.BuildGoPlugin( "someteam.example.com", "v1", "StringPrefixer") - th := kusttest_test.NewKustTestPluginHarness(t, "/app") + th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app") m := th.LoadAndRunTransformer(` apiVersion: someteam.example.com/v1 diff --git a/plugin/someteam.example.com/v1/validator/validator_test.go b/plugin/someteam.example.com/v1/validator/validator_test.go index 02fbe2eb6..1ec6220c3 100644 --- a/plugin/someteam.example.com/v1/validator/validator_test.go +++ b/plugin/someteam.example.com/v1/validator/validator_test.go @@ -9,17 +9,15 @@ import ( "strings" "testing" - "sigs.k8s.io/kustomize/v3/pluglib" - - "sigs.k8s.io/kustomize/v3/pkg/kusttest" + "sigs.k8s.io/kustomize/v3/api/kusttest" ) func TestValidatorHappy(t *testing.T) { - tc := pluglib.NewEnvForTest(t).Set() + tc := kusttest_test.NewPluginTestEnv(t).Set() defer tc.Reset() tc.BuildExecPlugin("someteam.example.com", "v1", "Validator") - th := kusttest_test.NewKustTestPluginHarness(t, "/app") + th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app") rm := th.LoadAndRunTransformer(` apiVersion: someteam.example.com/v1 @@ -50,11 +48,11 @@ metadata: } func TestValidatorUnHappy(t *testing.T) { - tc := pluglib.NewEnvForTest(t).Set() + tc := kusttest_test.NewPluginTestEnv(t).Set() defer tc.Reset() tc.BuildExecPlugin("someteam.example.com", "v1", "Validator") - th := kusttest_test.NewKustTestPluginHarness(t, "/app") + th := kusttest_test.NewKustTestHarnessAllowPlugins(t, "/app") err := th.ErrorFromLoadAndRunTransformer(` apiVersion: someteam.example.com/v1