From 3af5a8afea4bc24b7cc284f0f27450826623429d Mon Sep 17 00:00:00 2001 From: jregan Date: Sun, 20 Oct 2019 10:01:06 -0700 Subject: [PATCH] Make resource, resmap public. --- api/builtinconfig/loaddefaultconfig.go | 2 +- api/builtinconfig/transformerconfig.go | 2 +- {pkg => api}/ifc/ifc.go | 0 api/kusttest/kusttestharness.go | 14 ++-- api/kv/kv.go | 2 +- api/kv/kv_test.go | 6 +- {pkg => api}/loader/fileloader.go | 2 +- {pkg => api}/loader/fileloader_test.go | 2 +- {pkg => api}/loader/loader.go | 2 +- {pkg => api}/loader/loadrestrictions.go | 0 .../loader/loadrestrictions_string.go | 0 {pkg => api}/loader/loadrestrictions_test.go | 0 {pkg => api}/resmap/factory.go | 4 +- {pkg => api}/resmap/factory_test.go | 14 ++-- {pkg => api}/resmap/idslice.go | 0 {pkg => api}/resmap/idslice_test.go | 0 {pkg => api}/resmap/patchfactory.go | 2 +- {pkg => api}/resmap/resmap.go | 4 +- {pkg => api}/resmap/resmap_test.go | 6 +- {pkg => api}/resmap/selector_test.go | 6 +- {pkg => api}/resource/factory.go | 2 +- {pkg => api}/resource/factory_test.go | 2 +- {pkg => api}/resource/resource.go | 2 +- {pkg => api}/resource/resource_test.go | 2 +- .../testutils}/resmaptest/rmbuilder.go | 4 +- .../testutils/valtest/fakevalidator.go | 46 ++++++------- api/transform/maptransformer.go | 2 +- api/transform/maptransformer_test.go | 4 +- api/transform/multitransformer.go | 2 +- api/transform/mutatefield_test.go | 2 +- api/transform/nooptransformer.go | 2 +- internal/loadertest/fakeloader.go | 4 +- .../configmapfactory_test.go | 6 +- k8sdeps/configmapandsecret/factory.go | 2 +- .../configmapandsecret/secretfactory_test.go | 6 +- k8sdeps/kunstruct/factory.go | 2 +- k8sdeps/kunstruct/factory_test.go | 2 +- k8sdeps/kunstruct/hasher.go | 2 +- k8sdeps/kunstruct/unstructadapter.go | 2 +- k8sdeps/transformer/factory.go | 4 +- k8sdeps/transformer/patch/conflictdetector.go | 4 +- kustomize/internal/commands/build/build.go | 8 +-- kustomize/internal/commands/commands.go | 4 +- kustomize/internal/commands/create/create.go | 2 +- .../commands/edit/add/addbase_test.go | 6 +- .../commands/edit/add/addmetadata_test.go | 68 +++++++++---------- .../commands/edit/add/addpatch_test.go | 6 +- .../commands/edit/add/addresource_test.go | 6 +- kustomize/internal/commands/edit/add/all.go | 2 +- .../internal/commands/edit/add/configmap.go | 2 +- .../commands/edit/add/configmap_test.go | 6 +- .../internal/commands/edit/add/secret.go | 2 +- .../internal/commands/edit/add/secret_test.go | 6 +- kustomize/internal/commands/edit/all.go | 4 +- .../internal/commands/edit/fix/fix_test.go | 4 +- .../internal/commands/edit/remove/all.go | 2 +- .../edit/remove/removemetadata_test.go | 40 +++++------ .../commands/edit/remove/removepatch_test.go | 2 +- .../edit/remove/removeresource_test.go | 4 +- kustomize/internal/commands/edit/set/all.go | 2 +- .../commands/edit/set/set_name_prefix_test.go | 4 +- .../commands/edit/set/set_name_suffix_test.go | 4 +- .../commands/edit/set/setimage_test.go | 6 +- .../commands/edit/set/setnamespace.go | 2 +- .../commands/edit/set/setnamespace_test.go | 18 ++--- .../commands/edit/set/setreplicas_test.go | 6 +- .../kustfile/kustomizationfile_test.go | 10 +-- .../internal/commands/testutils/testutils.go | 2 +- pkg/accumulator/loadconfigfromcrds.go | 2 +- pkg/accumulator/loadconfigfromcrds_test.go | 2 +- pkg/accumulator/namereferencetransformer.go | 4 +- .../namereferencetransformer_test.go | 6 +- pkg/accumulator/refvartransformer.go | 2 +- pkg/accumulator/refvartransformer_test.go | 6 +- pkg/accumulator/resaccumulator.go | 2 +- pkg/accumulator/resaccumulator_test.go | 6 +- pkg/plugins/builtins.go | 2 +- pkg/plugins/execplugin.go | 2 +- pkg/plugins/execplugin_test.go | 8 +-- pkg/plugins/loader.go | 6 +- pkg/plugins/loader_test.go | 8 +-- pkg/target/baseandoverlaysmall_test.go | 2 +- pkg/target/kusttarget.go | 4 +- pkg/target/kusttarget_configplugin.go | 2 +- pkg/target/kusttarget_test.go | 10 +-- pkg/target/plugindir_test.go | 10 +-- plugin/builtin/AnnotationsTransformer.go | 2 +- plugin/builtin/ConfigMapGenerator.go | 2 +- plugin/builtin/HashTransformer.go | 4 +- plugin/builtin/ImageTagTransformer.go | 2 +- plugin/builtin/InventoryTransformer.go | 4 +- plugin/builtin/LabelTransformer.go | 2 +- plugin/builtin/LegacyOrderTransformer.go | 4 +- plugin/builtin/NamespaceTransformer.go | 4 +- plugin/builtin/PatchJson6902Transformer.go | 4 +- .../builtin/PatchStrategicMergeTransformer.go | 4 +- plugin/builtin/PatchTransformer.go | 4 +- plugin/builtin/PrefixSuffixTransformer.go | 2 +- plugin/builtin/ReplicaCountTransformer.go | 2 +- plugin/builtin/SecretGenerator.go | 2 +- .../AnnotationsTransformer.go | 2 +- .../configmapgenerator/ConfigMapGenerator.go | 2 +- .../hashtransformer/HashTransformer.go | 4 +- .../ImageTagTransformer.go | 2 +- .../InventoryTransformer.go | 4 +- .../labeltransformer/LabelTransformer.go | 2 +- .../LegacyOrderTransformer.go | 4 +- .../NamespaceTransformer.go | 4 +- .../PatchJson6902Transformer.go | 4 +- .../PatchStrategicMergeTransformer.go | 4 +- .../patchtransformer/PatchTransformer.go | 4 +- .../PrefixSuffixTransformer.go | 2 +- .../ReplicaCountTransformer.go | 2 +- .../secretgenerator/SecretGenerator.go | 2 +- .../v1/dateprefixer/DatePrefixer.go | 2 +- .../SecretsFromDatabase.go | 2 +- .../SomeServiceGenerator.go | 2 +- .../v1/stringprefixer/StringPrefixer.go | 2 +- 118 files changed, 288 insertions(+), 288 deletions(-) rename {pkg => api}/ifc/ifc.go (100%) rename {pkg => api}/loader/fileloader.go (99%) rename {pkg => api}/loader/fileloader_test.go (99%) rename {pkg => api}/loader/loader.go (96%) rename {pkg => api}/loader/loadrestrictions.go (100%) rename {pkg => api}/loader/loadrestrictions_string.go (100%) rename {pkg => api}/loader/loadrestrictions_test.go (100%) rename {pkg => api}/resmap/factory.go (97%) rename {pkg => api}/resmap/factory_test.go (95%) rename {pkg => api}/resmap/idslice.go (100%) rename {pkg => api}/resmap/idslice_test.go (100%) rename {pkg => api}/resmap/patchfactory.go (89%) rename {pkg => api}/resmap/resmap.go (99%) rename {pkg => api}/resmap/resmap_test.go (99%) rename {pkg => api}/resmap/selector_test.go (96%) rename {pkg => api}/resource/factory.go (99%) rename {pkg => api}/resource/factory_test.go (99%) rename {pkg => api}/resource/resource.go (99%) rename {pkg => api}/resource/resource_test.go (98%) rename {pkg => api/testutils}/resmaptest/rmbuilder.go (96%) rename pkg/validators/validators.go => api/testutils/valtest/fakevalidator.go (54%) diff --git a/api/builtinconfig/loaddefaultconfig.go b/api/builtinconfig/loaddefaultconfig.go index cd299be72..4e540a53b 100644 --- a/api/builtinconfig/loaddefaultconfig.go +++ b/api/builtinconfig/loaddefaultconfig.go @@ -4,7 +4,7 @@ package builtinconfig import ( - "sigs.k8s.io/kustomize/v3/pkg/ifc" + "sigs.k8s.io/kustomize/v3/api/ifc" "sigs.k8s.io/yaml" ) diff --git a/api/builtinconfig/transformerconfig.go b/api/builtinconfig/transformerconfig.go index 92fd0c22a..5484b2a7f 100644 --- a/api/builtinconfig/transformerconfig.go +++ b/api/builtinconfig/transformerconfig.go @@ -8,8 +8,8 @@ import ( "sort" "sigs.k8s.io/kustomize/v3/api/builtinconfig/consts" + "sigs.k8s.io/kustomize/v3/api/ifc" "sigs.k8s.io/kustomize/v3/api/types" - "sigs.k8s.io/kustomize/v3/pkg/ifc" ) // TransformerConfig holds the data needed to perform transformations. diff --git a/pkg/ifc/ifc.go b/api/ifc/ifc.go similarity index 100% rename from pkg/ifc/ifc.go rename to api/ifc/ifc.go diff --git a/api/kusttest/kusttestharness.go b/api/kusttest/kusttestharness.go index ab23ff086..9485616a3 100644 --- a/api/kusttest/kusttestharness.go +++ b/api/kusttest/kusttestharness.go @@ -10,17 +10,17 @@ import ( "testing" "sigs.k8s.io/kustomize/v3/api/builtinconfig/consts" + "sigs.k8s.io/kustomize/v3/api/loader" + "sigs.k8s.io/kustomize/v3/api/resmap" + "sigs.k8s.io/kustomize/v3/api/resource" + "sigs.k8s.io/kustomize/v3/api/testutils/valtest" "sigs.k8s.io/kustomize/v3/api/types" "sigs.k8s.io/kustomize/v3/internal/loadertest" "sigs.k8s.io/kustomize/v3/k8sdeps/kunstruct" "sigs.k8s.io/kustomize/v3/k8sdeps/transformer" - "sigs.k8s.io/kustomize/v3/pkg/loader" "sigs.k8s.io/kustomize/v3/pkg/pgmconfig" "sigs.k8s.io/kustomize/v3/pkg/plugins" - "sigs.k8s.io/kustomize/v3/pkg/resmap" - "sigs.k8s.io/kustomize/v3/pkg/resource" "sigs.k8s.io/kustomize/v3/pkg/target" - "sigs.k8s.io/kustomize/v3/pkg/validators" ) // KustTestHarness is an environment for running a kustomize build, @@ -63,7 +63,7 @@ func NewKustTestHarnessFull( func (th *KustTestHarness) MakeKustTarget() *target.KustTarget { kt, err := target.NewKustTarget( - th.ldr, validators.MakeFakeValidator(), th.rf, + th.ldr, valtest_test.MakeFakeValidator(), th.rf, transformer.NewFactoryImpl(), th.pl) if err != nil { th.t.Fatalf("Unexpected construction error %v", err) @@ -119,7 +119,7 @@ func (th *KustTestHarness) LoadAndRunGenerator( th.t.Fatalf("Err: %v", err) } g, err := th.pl.LoadGenerator( - th.ldr, validators.MakeFakeValidator(), res) + th.ldr, valtest_test.MakeFakeValidator(), res) if err != nil { th.t.Fatalf("Err: %v", err) } @@ -161,7 +161,7 @@ func (th *KustTestHarness) RunTransformerFromResMap( th.t.Fatalf("Err: %v", err) } g, err := th.pl.LoadTransformer( - th.ldr, validators.MakeFakeValidator(), transConfig) + th.ldr, valtest_test.MakeFakeValidator(), transConfig) if err != nil { return nil, err } diff --git a/api/kv/kv.go b/api/kv/kv.go index 562699838..d5f26f0e8 100644 --- a/api/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/ifc" "sigs.k8s.io/kustomize/v3/api/types" - "sigs.k8s.io/kustomize/v3/pkg/ifc" ) var utf8bom = []byte{0xEF, 0xBB, 0xBF} diff --git a/api/kv/kv_test.go b/api/kv/kv_test.go index 152b07c9f..4694a0412 100644 --- a/api/kv/kv_test.go +++ b/api/kv/kv_test.go @@ -8,15 +8,15 @@ import ( "testing" "sigs.k8s.io/kustomize/v3/api/filesys" + ldr "sigs.k8s.io/kustomize/v3/api/loader" + "sigs.k8s.io/kustomize/v3/api/testutils/valtest" "sigs.k8s.io/kustomize/v3/api/types" - ldr "sigs.k8s.io/kustomize/v3/pkg/loader" - "sigs.k8s.io/kustomize/v3/pkg/validators" ) func makeKvLoader(fSys filesys.FileSystem) *loader { return &loader{ ldr: ldr.NewFileLoaderAtRoot(fSys), - validator: validators.MakeFakeValidator()} + validator: valtest_test.MakeFakeValidator()} } func TestKeyValuesFromLines(t *testing.T) { diff --git a/pkg/loader/fileloader.go b/api/loader/fileloader.go similarity index 99% rename from pkg/loader/fileloader.go rename to api/loader/fileloader.go index 897f4ef73..f4c60aff2 100644 --- a/pkg/loader/fileloader.go +++ b/api/loader/fileloader.go @@ -10,8 +10,8 @@ import ( "strings" "sigs.k8s.io/kustomize/v3/api/filesys" + "sigs.k8s.io/kustomize/v3/api/ifc" "sigs.k8s.io/kustomize/v3/pkg/git" - "sigs.k8s.io/kustomize/v3/pkg/ifc" ) // fileLoader is a kustomization's interface to files. diff --git a/pkg/loader/fileloader_test.go b/api/loader/fileloader_test.go similarity index 99% rename from pkg/loader/fileloader_test.go rename to api/loader/fileloader_test.go index cd5c5c4c6..a27d26080 100644 --- a/pkg/loader/fileloader_test.go +++ b/api/loader/fileloader_test.go @@ -26,8 +26,8 @@ import ( "testing" "sigs.k8s.io/kustomize/v3/api/filesys" + "sigs.k8s.io/kustomize/v3/api/ifc" "sigs.k8s.io/kustomize/v3/pkg/git" - "sigs.k8s.io/kustomize/v3/pkg/ifc" "sigs.k8s.io/kustomize/v3/pkg/pgmconfig" ) diff --git a/pkg/loader/loader.go b/api/loader/loader.go similarity index 96% rename from pkg/loader/loader.go rename to api/loader/loader.go index 68b02c514..59e0a799a 100644 --- a/pkg/loader/loader.go +++ b/api/loader/loader.go @@ -6,8 +6,8 @@ package loader import ( "sigs.k8s.io/kustomize/v3/api/filesys" + "sigs.k8s.io/kustomize/v3/api/ifc" "sigs.k8s.io/kustomize/v3/pkg/git" - "sigs.k8s.io/kustomize/v3/pkg/ifc" ) // NewLoader returns a Loader pointed at the given target. diff --git a/pkg/loader/loadrestrictions.go b/api/loader/loadrestrictions.go similarity index 100% rename from pkg/loader/loadrestrictions.go rename to api/loader/loadrestrictions.go diff --git a/pkg/loader/loadrestrictions_string.go b/api/loader/loadrestrictions_string.go similarity index 100% rename from pkg/loader/loadrestrictions_string.go rename to api/loader/loadrestrictions_string.go diff --git a/pkg/loader/loadrestrictions_test.go b/api/loader/loadrestrictions_test.go similarity index 100% rename from pkg/loader/loadrestrictions_test.go rename to api/loader/loadrestrictions_test.go diff --git a/pkg/resmap/factory.go b/api/resmap/factory.go similarity index 97% rename from pkg/resmap/factory.go rename to api/resmap/factory.go index 131e9ef4a..40be42b94 100644 --- a/pkg/resmap/factory.go +++ b/api/resmap/factory.go @@ -5,10 +5,10 @@ package resmap import ( "github.com/pkg/errors" + "sigs.k8s.io/kustomize/v3/api/ifc" + "sigs.k8s.io/kustomize/v3/api/resource" "sigs.k8s.io/kustomize/v3/api/types" "sigs.k8s.io/kustomize/v3/internal/kusterr" - "sigs.k8s.io/kustomize/v3/pkg/ifc" - "sigs.k8s.io/kustomize/v3/pkg/resource" ) // Factory makes instances of ResMap. diff --git a/pkg/resmap/factory_test.go b/api/resmap/factory_test.go similarity index 95% rename from pkg/resmap/factory_test.go rename to api/resmap/factory_test.go index ebfdfdb5f..8169bc1d8 100644 --- a/pkg/resmap/factory_test.go +++ b/api/resmap/factory_test.go @@ -10,14 +10,14 @@ import ( "testing" "sigs.k8s.io/kustomize/v3/api/filesys" + "sigs.k8s.io/kustomize/v3/api/ifc" "sigs.k8s.io/kustomize/v3/api/kv" + "sigs.k8s.io/kustomize/v3/api/loader" + . "sigs.k8s.io/kustomize/v3/api/resmap" + "sigs.k8s.io/kustomize/v3/api/testutils/resmaptest" + "sigs.k8s.io/kustomize/v3/api/testutils/valtest" "sigs.k8s.io/kustomize/v3/api/types" "sigs.k8s.io/kustomize/v3/internal/loadertest" - "sigs.k8s.io/kustomize/v3/pkg/ifc" - "sigs.k8s.io/kustomize/v3/pkg/loader" - . "sigs.k8s.io/kustomize/v3/pkg/resmap" - "sigs.k8s.io/kustomize/v3/pkg/resmaptest" - "sigs.k8s.io/kustomize/v3/pkg/validators" ) func TestFromFile(t *testing.T) { @@ -120,7 +120,7 @@ func TestNewFromConfigMaps(t *testing.T) { } l := loadertest.NewFakeLoader("/whatever/project") - kvLdr := kv.NewLoader(l, validators.MakeFakeValidator()) + kvLdr := kv.NewLoader(l, valtest_test.MakeFakeValidator()) testCases := []testCase{ { description: "construct config map from env", @@ -242,7 +242,7 @@ func TestNewResMapFromSecretArgs(t *testing.T) { actual, err := rmF.NewResMapFromSecretArgs( kv.NewLoader( loader.NewFileLoaderAtRoot(fSys), - validators.MakeFakeValidator()), nil, secrets) + valtest_test.MakeFakeValidator()), nil, secrets) if err != nil { t.Fatalf("unexpected error: %v", err) } diff --git a/pkg/resmap/idslice.go b/api/resmap/idslice.go similarity index 100% rename from pkg/resmap/idslice.go rename to api/resmap/idslice.go diff --git a/pkg/resmap/idslice_test.go b/api/resmap/idslice_test.go similarity index 100% rename from pkg/resmap/idslice_test.go rename to api/resmap/idslice_test.go diff --git a/pkg/resmap/patchfactory.go b/api/resmap/patchfactory.go similarity index 89% rename from pkg/resmap/patchfactory.go rename to api/resmap/patchfactory.go index 2c082c328..ad765b679 100644 --- a/pkg/resmap/patchfactory.go +++ b/api/resmap/patchfactory.go @@ -5,7 +5,7 @@ package resmap import ( - "sigs.k8s.io/kustomize/v3/pkg/resource" + "sigs.k8s.io/kustomize/v3/api/resource" ) // PatchFactory makes transformers that require k8sdeps. diff --git a/pkg/resmap/resmap.go b/api/resmap/resmap.go similarity index 99% rename from pkg/resmap/resmap.go rename to api/resmap/resmap.go index 5e725a5e2..14bc2d187 100644 --- a/pkg/resmap/resmap.go +++ b/api/resmap/resmap.go @@ -11,10 +11,10 @@ import ( "regexp" "github.com/pkg/errors" + "sigs.k8s.io/kustomize/v3/api/ifc" "sigs.k8s.io/kustomize/v3/api/resid" + "sigs.k8s.io/kustomize/v3/api/resource" "sigs.k8s.io/kustomize/v3/api/types" - "sigs.k8s.io/kustomize/v3/pkg/ifc" - "sigs.k8s.io/kustomize/v3/pkg/resource" "sigs.k8s.io/yaml" ) diff --git a/pkg/resmap/resmap_test.go b/api/resmap/resmap_test.go similarity index 99% rename from pkg/resmap/resmap_test.go rename to api/resmap/resmap_test.go index 0769be132..57ca55c0a 100644 --- a/pkg/resmap/resmap_test.go +++ b/api/resmap/resmap_test.go @@ -10,11 +10,11 @@ import ( "testing" "sigs.k8s.io/kustomize/v3/api/resid" + . "sigs.k8s.io/kustomize/v3/api/resmap" + "sigs.k8s.io/kustomize/v3/api/resource" + "sigs.k8s.io/kustomize/v3/api/testutils/resmaptest" "sigs.k8s.io/kustomize/v3/api/types" "sigs.k8s.io/kustomize/v3/k8sdeps/kunstruct" - . "sigs.k8s.io/kustomize/v3/pkg/resmap" - "sigs.k8s.io/kustomize/v3/pkg/resmaptest" - "sigs.k8s.io/kustomize/v3/pkg/resource" ) var rf = resource.NewFactory( diff --git a/pkg/resmap/selector_test.go b/api/resmap/selector_test.go similarity index 96% rename from pkg/resmap/selector_test.go rename to api/resmap/selector_test.go index ffa8a522c..5f1b56024 100644 --- a/pkg/resmap/selector_test.go +++ b/api/resmap/selector_test.go @@ -4,14 +4,14 @@ package resmap_test import ( - "sigs.k8s.io/kustomize/v3/api/resid" "testing" + "sigs.k8s.io/kustomize/v3/api/resid" + . "sigs.k8s.io/kustomize/v3/api/resmap" "sigs.k8s.io/kustomize/v3/api/types" - "sigs.k8s.io/kustomize/v3/pkg/resmap" ) -func setupRMForPatchTargets(t *testing.T) resmap.ResMap { +func setupRMForPatchTargets(t *testing.T) ResMap { result, err := rmF.NewResMapFromBytes([]byte(` apiVersion: group1/v1 kind: Kind1 diff --git a/pkg/resource/factory.go b/api/resource/factory.go similarity index 99% rename from pkg/resource/factory.go rename to api/resource/factory.go index e8c7284fd..0dff7baf2 100644 --- a/pkg/resource/factory.go +++ b/api/resource/factory.go @@ -9,9 +9,9 @@ import ( "log" "strings" + "sigs.k8s.io/kustomize/v3/api/ifc" "sigs.k8s.io/kustomize/v3/api/types" "sigs.k8s.io/kustomize/v3/internal/kusterr" - "sigs.k8s.io/kustomize/v3/pkg/ifc" ) // Factory makes instances of Resource. diff --git a/pkg/resource/factory_test.go b/api/resource/factory_test.go similarity index 99% rename from pkg/resource/factory_test.go rename to api/resource/factory_test.go index a3b85f8d1..d25d48ade 100644 --- a/pkg/resource/factory_test.go +++ b/api/resource/factory_test.go @@ -20,9 +20,9 @@ import ( "reflect" "testing" + . "sigs.k8s.io/kustomize/v3/api/resource" "sigs.k8s.io/kustomize/v3/api/types" "sigs.k8s.io/kustomize/v3/internal/loadertest" - . "sigs.k8s.io/kustomize/v3/pkg/resource" ) func TestSliceFromPatches(t *testing.T) { diff --git a/pkg/resource/resource.go b/api/resource/resource.go similarity index 99% rename from pkg/resource/resource.go rename to api/resource/resource.go index 7fd4dcc48..f0aea4bc7 100644 --- a/pkg/resource/resource.go +++ b/api/resource/resource.go @@ -8,9 +8,9 @@ import ( "reflect" "strings" + "sigs.k8s.io/kustomize/v3/api/ifc" "sigs.k8s.io/kustomize/v3/api/resid" "sigs.k8s.io/kustomize/v3/api/types" - "sigs.k8s.io/kustomize/v3/pkg/ifc" "sigs.k8s.io/yaml" ) diff --git a/pkg/resource/resource_test.go b/api/resource/resource_test.go similarity index 98% rename from pkg/resource/resource_test.go rename to api/resource/resource_test.go index edee1ff48..1cd0f4107 100644 --- a/pkg/resource/resource_test.go +++ b/api/resource/resource_test.go @@ -21,9 +21,9 @@ import ( "testing" "sigs.k8s.io/kustomize/v3/api/resid" + . "sigs.k8s.io/kustomize/v3/api/resource" "sigs.k8s.io/kustomize/v3/api/types" "sigs.k8s.io/kustomize/v3/k8sdeps/kunstruct" - . "sigs.k8s.io/kustomize/v3/pkg/resource" ) var factory = NewFactory( diff --git a/pkg/resmaptest/rmbuilder.go b/api/testutils/resmaptest/rmbuilder.go similarity index 96% rename from pkg/resmaptest/rmbuilder.go rename to api/testutils/resmaptest/rmbuilder.go index 6817abd55..639a3e273 100644 --- a/pkg/resmaptest/rmbuilder.go +++ b/api/testutils/resmaptest/rmbuilder.go @@ -7,8 +7,8 @@ import ( "testing" "sigs.k8s.io/kustomize/v3/api/resid" - "sigs.k8s.io/kustomize/v3/pkg/resmap" - "sigs.k8s.io/kustomize/v3/pkg/resource" + "sigs.k8s.io/kustomize/v3/api/resmap" + "sigs.k8s.io/kustomize/v3/api/resource" ) // Builds ResMaps for tests, with test-aware error handling. diff --git a/pkg/validators/validators.go b/api/testutils/valtest/fakevalidator.go similarity index 54% rename from pkg/validators/validators.go rename to api/testutils/valtest/fakevalidator.go index 652fe307c..2cd459fcc 100644 --- a/pkg/validators/validators.go +++ b/api/testutils/valtest/fakevalidator.go @@ -1,8 +1,8 @@ // Copyright 2019 The Kubernetes Authors. // SPDX-License-Identifier: Apache-2.0 -// Package validators defines a FakeValidator that can be used in tests -package validators +// Package valtest_test defines a fakeValidator that can be used in tests +package valtest_test import ( "errors" @@ -10,8 +10,8 @@ import ( "testing" ) -// FakeValidator can be used in tests. -type FakeValidator struct { +// fakeValidator can be used in tests. +type fakeValidator struct { happy bool called bool t *testing.T @@ -20,53 +20,53 @@ type FakeValidator struct { // SAD is an error string. const SAD = "i'm not happy Bob, NOT HAPPY" -// MakeHappyMapValidator makes a FakeValidator that always passes. -func MakeHappyMapValidator(t *testing.T) *FakeValidator { - return &FakeValidator{happy: true, t: t} +// MakeHappyMapValidator makes a fakeValidator that always passes. +func MakeHappyMapValidator(t *testing.T) *fakeValidator { + return &fakeValidator{happy: true, t: t} } -// MakeSadMapValidator makes a FakeValidator that always fails. -func MakeSadMapValidator(t *testing.T) *FakeValidator { - return &FakeValidator{happy: false, t: t} +// MakeSadMapValidator makes a fakeValidator that always fails. +func MakeSadMapValidator(t *testing.T) *fakeValidator { + return &fakeValidator{happy: false, t: t} } // MakeFakeValidator makes an empty Fake Validator. -func MakeFakeValidator() *FakeValidator { - return &FakeValidator{} +func MakeFakeValidator() *fakeValidator { + return &fakeValidator{} } // ErrIfInvalidKey returns nil -func (v *FakeValidator) ErrIfInvalidKey(k string) error { +func (v *fakeValidator) ErrIfInvalidKey(k string) error { return nil } // IsEnvVarName returns nil -func (v *FakeValidator) IsEnvVarName(k string) error { +func (v *fakeValidator) IsEnvVarName(k string) error { return nil } // MakeAnnotationValidator returns a nil function -func (v *FakeValidator) MakeAnnotationValidator() func(map[string]string) error { +func (v *fakeValidator) MakeAnnotationValidator() func(map[string]string) error { return nil } // MakeAnnotationNameValidator returns a nil function -func (v *FakeValidator) MakeAnnotationNameValidator() func([]string) error { +func (v *fakeValidator) MakeAnnotationNameValidator() func([]string) error { return nil } // MakeLabelValidator returns a nil function -func (v *FakeValidator) MakeLabelValidator() func(map[string]string) error { +func (v *fakeValidator) MakeLabelValidator() func(map[string]string) error { return nil } // MakeLabelNameValidator returns a nil function -func (v *FakeValidator) MakeLabelNameValidator() func([]string) error { +func (v *fakeValidator) MakeLabelNameValidator() func([]string) error { return nil } // ValidateNamespace validates namespace by regexp -func (v *FakeValidator) ValidateNamespace(s string) []string { +func (v *fakeValidator) ValidateNamespace(s string) []string { pattern := regexp.MustCompile(`^[a-zA-Z].*`) if pattern.MatchString(s) { return nil @@ -77,7 +77,7 @@ func (v *FakeValidator) ValidateNamespace(s string) []string { // Validator replaces apimachinery validation in tests. // Can be set to fail or succeed to test error handling. // Can confirm if run or not run by surrounding code. -func (v *FakeValidator) Validator(_ map[string]string) error { +func (v *fakeValidator) Validator(_ map[string]string) error { v.called = true if v.happy { return nil @@ -85,7 +85,7 @@ func (v *FakeValidator) Validator(_ map[string]string) error { return errors.New(SAD) } -func (v *FakeValidator) ValidatorArray(_ []string) error { +func (v *fakeValidator) ValidatorArray(_ []string) error { v.called = true if v.happy { return nil @@ -94,14 +94,14 @@ func (v *FakeValidator) ValidatorArray(_ []string) error { } // VerifyCall returns true if Validator was used. -func (v *FakeValidator) VerifyCall() { +func (v *fakeValidator) VerifyCall() { if !v.called { v.t.Errorf("should have called Validator") } } // VerifyNoCall returns true if Validator was not used. -func (v *FakeValidator) VerifyNoCall() { +func (v *fakeValidator) VerifyNoCall() { if v.called { v.t.Errorf("should not have called Validator") } diff --git a/api/transform/maptransformer.go b/api/transform/maptransformer.go index c4ddec139..9be119a02 100644 --- a/api/transform/maptransformer.go +++ b/api/transform/maptransformer.go @@ -6,8 +6,8 @@ package transform import ( "errors" "fmt" + "sigs.k8s.io/kustomize/v3/api/resmap" "sigs.k8s.io/kustomize/v3/api/types" - "sigs.k8s.io/kustomize/v3/pkg/resmap" ) // mapTransformer applies a string->string map to fieldSpecs. diff --git a/api/transform/maptransformer_test.go b/api/transform/maptransformer_test.go index 9bd5dcb6e..d50d0dac8 100644 --- a/api/transform/maptransformer_test.go +++ b/api/transform/maptransformer_test.go @@ -7,10 +7,10 @@ import ( "testing" "sigs.k8s.io/kustomize/v3/api/builtinconfig" + "sigs.k8s.io/kustomize/v3/api/resource" + "sigs.k8s.io/kustomize/v3/api/testutils/resmaptest" . "sigs.k8s.io/kustomize/v3/api/transform" "sigs.k8s.io/kustomize/v3/k8sdeps/kunstruct" - "sigs.k8s.io/kustomize/v3/pkg/resmaptest" - "sigs.k8s.io/kustomize/v3/pkg/resource" ) var resourceFactory = resource.NewFactory(kunstruct.NewKunstructuredFactoryImpl()) diff --git a/api/transform/multitransformer.go b/api/transform/multitransformer.go index e728ee8d2..f0a8d1846 100644 --- a/api/transform/multitransformer.go +++ b/api/transform/multitransformer.go @@ -6,7 +6,7 @@ package transform import ( "fmt" - "sigs.k8s.io/kustomize/v3/pkg/resmap" + "sigs.k8s.io/kustomize/v3/api/resmap" ) // multiTransformer contains a list of transformers. diff --git a/api/transform/mutatefield_test.go b/api/transform/mutatefield_test.go index b849b3b8e..1add625b0 100644 --- a/api/transform/mutatefield_test.go +++ b/api/transform/mutatefield_test.go @@ -5,9 +5,9 @@ package transform_test import ( "fmt" + "sigs.k8s.io/kustomize/v3/api/ifc" . "sigs.k8s.io/kustomize/v3/api/transform" "sigs.k8s.io/kustomize/v3/k8sdeps/kunstruct" - "sigs.k8s.io/kustomize/v3/pkg/ifc" "testing" ) diff --git a/api/transform/nooptransformer.go b/api/transform/nooptransformer.go index 7c6c72e44..4dd96c962 100644 --- a/api/transform/nooptransformer.go +++ b/api/transform/nooptransformer.go @@ -3,7 +3,7 @@ package transform -import "sigs.k8s.io/kustomize/v3/pkg/resmap" +import "sigs.k8s.io/kustomize/v3/api/resmap" // noOpTransformer contains a no-op transformer. type noOpTransformer struct{} diff --git a/internal/loadertest/fakeloader.go b/internal/loadertest/fakeloader.go index 5c7972f24..46b854630 100644 --- a/internal/loadertest/fakeloader.go +++ b/internal/loadertest/fakeloader.go @@ -8,8 +8,8 @@ import ( "log" "sigs.k8s.io/kustomize/v3/api/filesys" - "sigs.k8s.io/kustomize/v3/pkg/ifc" - "sigs.k8s.io/kustomize/v3/pkg/loader" + "sigs.k8s.io/kustomize/v3/api/ifc" + "sigs.k8s.io/kustomize/v3/api/loader" ) // FakeLoader encapsulates the delegate Loader and the fake file system. diff --git a/k8sdeps/configmapandsecret/configmapfactory_test.go b/k8sdeps/configmapandsecret/configmapfactory_test.go index 761c8801d..079ac8091 100644 --- a/k8sdeps/configmapandsecret/configmapfactory_test.go +++ b/k8sdeps/configmapandsecret/configmapfactory_test.go @@ -12,9 +12,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/kustomize/v3/api/filesys" "sigs.k8s.io/kustomize/v3/api/kv" + "sigs.k8s.io/kustomize/v3/api/loader" + "sigs.k8s.io/kustomize/v3/api/testutils/valtest" "sigs.k8s.io/kustomize/v3/api/types" - "sigs.k8s.io/kustomize/v3/pkg/loader" - "sigs.k8s.io/kustomize/v3/pkg/validators" ) func makeEnvConfigMap(name string) *corev1.ConfigMap { @@ -144,7 +144,7 @@ func TestConstructConfigMap(t *testing.T) { []byte{0xff, 0xfd}) kvLdr := kv.NewLoader( loader.NewFileLoaderAtRoot(fSys), - validators.MakeFakeValidator()) + valtest_test.MakeFakeValidator()) for _, tc := range testCases { f := NewFactory(kvLdr, tc.options) cm, err := f.MakeConfigMap(&tc.input) diff --git a/k8sdeps/configmapandsecret/factory.go b/k8sdeps/configmapandsecret/factory.go index babf07a8d..3a338ed03 100644 --- a/k8sdeps/configmapandsecret/factory.go +++ b/k8sdeps/configmapandsecret/factory.go @@ -4,8 +4,8 @@ package configmapandsecret import ( + "sigs.k8s.io/kustomize/v3/api/ifc" "sigs.k8s.io/kustomize/v3/api/types" - "sigs.k8s.io/kustomize/v3/pkg/ifc" ) // Factory makes ConfigMaps and Secrets. diff --git a/k8sdeps/configmapandsecret/secretfactory_test.go b/k8sdeps/configmapandsecret/secretfactory_test.go index 10a5eb4ee..526f9f7d8 100644 --- a/k8sdeps/configmapandsecret/secretfactory_test.go +++ b/k8sdeps/configmapandsecret/secretfactory_test.go @@ -11,9 +11,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/kustomize/v3/api/filesys" "sigs.k8s.io/kustomize/v3/api/kv" + "sigs.k8s.io/kustomize/v3/api/loader" + "sigs.k8s.io/kustomize/v3/api/testutils/valtest" "sigs.k8s.io/kustomize/v3/api/types" - "sigs.k8s.io/kustomize/v3/pkg/loader" - "sigs.k8s.io/kustomize/v3/pkg/validators" ) func makeEnvSecret(name string) *corev1.Secret { @@ -129,7 +129,7 @@ func TestConstructSecret(t *testing.T) { fSys.WriteFile("/secret/app-init.ini", []byte("FOO=bar\nBAR=baz\n")) kvLdr := kv.NewLoader( loader.NewFileLoaderAtRoot(fSys), - validators.MakeFakeValidator()) + valtest_test.MakeFakeValidator()) for _, tc := range testCases { f := NewFactory(kvLdr, tc.options) cm, err := f.MakeSecret(&tc.input) diff --git a/k8sdeps/kunstruct/factory.go b/k8sdeps/kunstruct/factory.go index 3718ea5c7..1d104f0be 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/ifc" "sigs.k8s.io/kustomize/v3/api/types" "sigs.k8s.io/kustomize/v3/k8sdeps/configmapandsecret" - "sigs.k8s.io/kustomize/v3/pkg/ifc" ) // KunstructuredFactoryImpl hides construction using apimachinery types. diff --git a/k8sdeps/kunstruct/factory_test.go b/k8sdeps/kunstruct/factory_test.go index d0279d34e..8083645b4 100644 --- a/k8sdeps/kunstruct/factory_test.go +++ b/k8sdeps/kunstruct/factory_test.go @@ -20,7 +20,7 @@ import ( "reflect" "testing" - "sigs.k8s.io/kustomize/v3/pkg/ifc" + "sigs.k8s.io/kustomize/v3/api/ifc" ) func TestSliceFromBytes(t *testing.T) { diff --git a/k8sdeps/kunstruct/hasher.go b/k8sdeps/kunstruct/hasher.go index 838c05d81..3fb07ce8c 100644 --- a/k8sdeps/kunstruct/hasher.go +++ b/k8sdeps/kunstruct/hasher.go @@ -10,7 +10,7 @@ import ( "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "sigs.k8s.io/kustomize/v3/api/hasher" - "sigs.k8s.io/kustomize/v3/pkg/ifc" + "sigs.k8s.io/kustomize/v3/api/ifc" ) // kustHash computes a hash of an unstructured object. diff --git a/k8sdeps/kunstruct/unstructadapter.go b/k8sdeps/kunstruct/unstructadapter.go index 02a35abc5..67bbd4760 100644 --- a/k8sdeps/kunstruct/unstructadapter.go +++ b/k8sdeps/kunstruct/unstructadapter.go @@ -16,8 +16,8 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/strategicpatch" "k8s.io/client-go/kubernetes/scheme" + "sigs.k8s.io/kustomize/v3/api/ifc" "sigs.k8s.io/kustomize/v3/api/resid" - "sigs.k8s.io/kustomize/v3/pkg/ifc" ) var _ ifc.Kunstructured = &UnstructAdapter{} diff --git a/k8sdeps/transformer/factory.go b/k8sdeps/transformer/factory.go index f0cd05460..66949d78b 100644 --- a/k8sdeps/transformer/factory.go +++ b/k8sdeps/transformer/factory.go @@ -5,9 +5,9 @@ package transformer import ( + "sigs.k8s.io/kustomize/v3/api/resmap" + "sigs.k8s.io/kustomize/v3/api/resource" "sigs.k8s.io/kustomize/v3/k8sdeps/transformer/patch" - "sigs.k8s.io/kustomize/v3/pkg/resmap" - "sigs.k8s.io/kustomize/v3/pkg/resource" ) // FactoryImpl makes patch transformer and name hash transformer diff --git a/k8sdeps/transformer/patch/conflictdetector.go b/k8sdeps/transformer/patch/conflictdetector.go index 4ce9f718d..307752cdd 100644 --- a/k8sdeps/transformer/patch/conflictdetector.go +++ b/k8sdeps/transformer/patch/conflictdetector.go @@ -14,8 +14,8 @@ import ( "k8s.io/apimachinery/pkg/util/strategicpatch" "k8s.io/client-go/kubernetes/scheme" "sigs.k8s.io/kustomize/v3/api/resid" - "sigs.k8s.io/kustomize/v3/pkg/resmap" - "sigs.k8s.io/kustomize/v3/pkg/resource" + "sigs.k8s.io/kustomize/v3/api/resmap" + "sigs.k8s.io/kustomize/v3/api/resource" ) type conflictDetector interface { diff --git a/kustomize/internal/commands/build/build.go b/kustomize/internal/commands/build/build.go index 78e085b56..ef2757533 100644 --- a/kustomize/internal/commands/build/build.go +++ b/kustomize/internal/commands/build/build.go @@ -11,12 +11,12 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" "sigs.k8s.io/kustomize/v3/api/filesys" - "sigs.k8s.io/kustomize/v3/pkg/ifc" - "sigs.k8s.io/kustomize/v3/pkg/loader" + "sigs.k8s.io/kustomize/v3/api/ifc" + "sigs.k8s.io/kustomize/v3/api/loader" + "sigs.k8s.io/kustomize/v3/api/resmap" + "sigs.k8s.io/kustomize/v3/api/resource" "sigs.k8s.io/kustomize/v3/pkg/pgmconfig" "sigs.k8s.io/kustomize/v3/pkg/plugins" - "sigs.k8s.io/kustomize/v3/pkg/resmap" - "sigs.k8s.io/kustomize/v3/pkg/resource" "sigs.k8s.io/kustomize/v3/pkg/target" "sigs.k8s.io/kustomize/v3/plugin/builtin" "sigs.k8s.io/yaml" diff --git a/kustomize/internal/commands/commands.go b/kustomize/internal/commands/commands.go index 6605c50cd..5e57f25cf 100644 --- a/kustomize/internal/commands/commands.go +++ b/kustomize/internal/commands/commands.go @@ -15,12 +15,12 @@ import ( "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/edit" "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/version" "sigs.k8s.io/kustomize/v3/api/filesys" + "sigs.k8s.io/kustomize/v3/api/resmap" + "sigs.k8s.io/kustomize/v3/api/resource" "sigs.k8s.io/kustomize/v3/k8sdeps/kunstruct" "sigs.k8s.io/kustomize/v3/k8sdeps/transformer" "sigs.k8s.io/kustomize/v3/k8sdeps/validator" "sigs.k8s.io/kustomize/v3/pkg/pgmconfig" - "sigs.k8s.io/kustomize/v3/pkg/resmap" - "sigs.k8s.io/kustomize/v3/pkg/resource" ) // NewDefaultCommand returns the default (aka root) command for kustomize command. diff --git a/kustomize/internal/commands/create/create.go b/kustomize/internal/commands/create/create.go index 73f12e8da..777a5ba88 100644 --- a/kustomize/internal/commands/create/create.go +++ b/kustomize/internal/commands/create/create.go @@ -13,7 +13,7 @@ import ( "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile" "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/util" "sigs.k8s.io/kustomize/v3/api/filesys" - "sigs.k8s.io/kustomize/v3/pkg/ifc" + "sigs.k8s.io/kustomize/v3/api/ifc" "sigs.k8s.io/kustomize/v3/pkg/pgmconfig" ) diff --git a/kustomize/internal/commands/edit/add/addbase_test.go b/kustomize/internal/commands/edit/add/addbase_test.go index 1af5d3b5a..b79477825 100644 --- a/kustomize/internal/commands/edit/add/addbase_test.go +++ b/kustomize/internal/commands/edit/add/addbase_test.go @@ -22,7 +22,7 @@ func TestAddBaseHappyPath(t *testing.T) { for _, base := range bases { fSys.Mkdir(base) } - testutils.WriteTestKustomization(fSys) + testutils_test.WriteTestKustomization(fSys) cmd := newCmdAddBase(fSys) args := []string{baseDirectoryPaths} @@ -30,7 +30,7 @@ func TestAddBaseHappyPath(t *testing.T) { if err != nil { t.Errorf("unexpected cmd error: %v", err) } - content, err := testutils.ReadTestKustomization(fSys) + content, err := testutils_test.ReadTestKustomization(fSys) if err != nil { t.Errorf("unexpected read error: %v", err) } @@ -49,7 +49,7 @@ func TestAddBaseAlreadyThere(t *testing.T) { for _, base := range bases { fSys.Mkdir(base) } - testutils.WriteTestKustomization(fSys) + testutils_test.WriteTestKustomization(fSys) cmd := newCmdAddBase(fSys) args := []string{baseDirectoryPaths} diff --git a/kustomize/internal/commands/edit/add/addmetadata_test.go b/kustomize/internal/commands/edit/add/addmetadata_test.go index 446b3ff8f..f30201f7b 100644 --- a/kustomize/internal/commands/edit/add/addmetadata_test.go +++ b/kustomize/internal/commands/edit/add/addmetadata_test.go @@ -9,13 +9,13 @@ import ( "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile" "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils" "sigs.k8s.io/kustomize/v3/api/filesys" + "sigs.k8s.io/kustomize/v3/api/testutils/valtest" "sigs.k8s.io/kustomize/v3/api/types" - "sigs.k8s.io/kustomize/v3/pkg/validators" ) func makeKustomization(t *testing.T) *types.Kustomization { fSys := filesys.MakeFsInMemory() - testutils.WriteTestKustomization(fSys) + testutils_test.WriteTestKustomization(fSys) kf, err := kustfile.NewKustomizationFile(fSys) if err != nil { t.Errorf("unexpected new error %v", err) @@ -51,7 +51,7 @@ func TestRunAddAnnotation(t *testing.T) { func TestAddAnnotationNoArgs(t *testing.T) { fSys := filesys.MakeFsInMemory() - v := validators.MakeHappyMapValidator(t) + v := valtest_test.MakeHappyMapValidator(t) cmd := newCmdAddAnnotation(fSys, v.Validator) err := cmd.Execute() v.VerifyNoCall() @@ -65,7 +65,7 @@ func TestAddAnnotationNoArgs(t *testing.T) { func TestAddAnnotationInvalidFormat(t *testing.T) { fSys := filesys.MakeFsInMemory() - v := validators.MakeSadMapValidator(t) + v := valtest_test.MakeSadMapValidator(t) cmd := newCmdAddAnnotation(fSys, v.Validator) args := []string{"whatever:whatever"} err := cmd.RunE(cmd, args) @@ -80,8 +80,8 @@ func TestAddAnnotationInvalidFormat(t *testing.T) { func TestAddAnnotationManyArgs(t *testing.T) { fSys := filesys.MakeFsInMemory() - testutils.WriteTestKustomization(fSys) - v := validators.MakeHappyMapValidator(t) + testutils_test.WriteTestKustomization(fSys) + v := valtest_test.MakeHappyMapValidator(t) cmd := newCmdAddAnnotation(fSys, v.Validator) args := []string{"k1:v1,k2:v2,k3:v3,k4:v5"} err := cmd.RunE(cmd, args) @@ -93,8 +93,8 @@ func TestAddAnnotationManyArgs(t *testing.T) { func TestAddAnnotationValueQuoted(t *testing.T) { fSys := filesys.MakeFsInMemory() - testutils.WriteTestKustomization(fSys) - v := validators.MakeHappyMapValidator(t) + testutils_test.WriteTestKustomization(fSys) + v := valtest_test.MakeHappyMapValidator(t) cmd := newCmdAddAnnotation(fSys, v.Validator) args := []string{"k1:\"v1\""} err := cmd.RunE(cmd, args) @@ -106,8 +106,8 @@ func TestAddAnnotationValueQuoted(t *testing.T) { func TestAddAnnotationValueWithColon(t *testing.T) { fSys := filesys.MakeFsInMemory() - testutils.WriteTestKustomization(fSys) - v := validators.MakeHappyMapValidator(t) + testutils_test.WriteTestKustomization(fSys) + v := valtest_test.MakeHappyMapValidator(t) cmd := newCmdAddAnnotation(fSys, v.Validator) args := []string{"k1:\"v1:v2\""} err := cmd.RunE(cmd, args) @@ -119,7 +119,7 @@ func TestAddAnnotationValueWithColon(t *testing.T) { func TestAddAnnotationNoKey(t *testing.T) { fSys := filesys.MakeFsInMemory() - v := validators.MakeHappyMapValidator(t) + v := valtest_test.MakeHappyMapValidator(t) cmd := newCmdAddAnnotation(fSys, v.Validator) args := []string{":nokey"} err := cmd.RunE(cmd, args) @@ -134,8 +134,8 @@ func TestAddAnnotationNoKey(t *testing.T) { func TestAddAnnotationTooManyColons(t *testing.T) { fSys := filesys.MakeFsInMemory() - testutils.WriteTestKustomization(fSys) - v := validators.MakeHappyMapValidator(t) + testutils_test.WriteTestKustomization(fSys) + v := valtest_test.MakeHappyMapValidator(t) cmd := newCmdAddAnnotation(fSys, v.Validator) args := []string{"key:v1:v2"} err := cmd.RunE(cmd, args) @@ -147,8 +147,8 @@ func TestAddAnnotationTooManyColons(t *testing.T) { func TestAddAnnotationNoValue(t *testing.T) { fSys := filesys.MakeFsInMemory() - testutils.WriteTestKustomization(fSys) - v := validators.MakeHappyMapValidator(t) + testutils_test.WriteTestKustomization(fSys) + v := valtest_test.MakeHappyMapValidator(t) cmd := newCmdAddAnnotation(fSys, v.Validator) args := []string{"no:,value"} err := cmd.RunE(cmd, args) @@ -160,8 +160,8 @@ func TestAddAnnotationNoValue(t *testing.T) { func TestAddAnnotationMultipleArgs(t *testing.T) { fSys := filesys.MakeFsInMemory() - testutils.WriteTestKustomization(fSys) - v := validators.MakeHappyMapValidator(t) + testutils_test.WriteTestKustomization(fSys) + v := valtest_test.MakeHappyMapValidator(t) cmd := newCmdAddAnnotation(fSys, v.Validator) args := []string{"this:annotation", "has:spaces"} err := cmd.RunE(cmd, args) @@ -176,8 +176,8 @@ func TestAddAnnotationMultipleArgs(t *testing.T) { func TestAddAnnotationForce(t *testing.T) { fSys := filesys.MakeFsInMemory() - testutils.WriteTestKustomization(fSys) - v := validators.MakeHappyMapValidator(t) + testutils_test.WriteTestKustomization(fSys) + v := valtest_test.MakeHappyMapValidator(t) cmd := newCmdAddAnnotation(fSys, v.Validator) args := []string{"key:foo"} err := cmd.RunE(cmd, args) @@ -187,7 +187,7 @@ func TestAddAnnotationForce(t *testing.T) { } // trying to add the same annotation again should not work args = []string{"key:bar"} - v = validators.MakeHappyMapValidator(t) + v = valtest_test.MakeHappyMapValidator(t) cmd = newCmdAddAnnotation(fSys, v.Validator) err = cmd.RunE(cmd, args) v.VerifyCall() @@ -198,7 +198,7 @@ func TestAddAnnotationForce(t *testing.T) { t.Errorf("expected an error") } // but trying to add it with --force should - v = validators.MakeHappyMapValidator(t) + v = valtest_test.MakeHappyMapValidator(t) cmd = newCmdAddAnnotation(fSys, v.Validator) cmd.Flag("force").Value.Set("true") err = cmd.RunE(cmd, args) @@ -232,7 +232,7 @@ func TestRunAddLabel(t *testing.T) { func TestAddLabelNoArgs(t *testing.T) { fSys := filesys.MakeFsInMemory() - v := validators.MakeHappyMapValidator(t) + v := valtest_test.MakeHappyMapValidator(t) cmd := newCmdAddLabel(fSys, v.Validator) err := cmd.Execute() v.VerifyNoCall() @@ -246,7 +246,7 @@ func TestAddLabelNoArgs(t *testing.T) { func TestAddLabelInvalidFormat(t *testing.T) { fSys := filesys.MakeFsInMemory() - v := validators.MakeSadMapValidator(t) + v := valtest_test.MakeSadMapValidator(t) cmd := newCmdAddLabel(fSys, v.Validator) args := []string{"exclamation!:point"} err := cmd.RunE(cmd, args) @@ -261,7 +261,7 @@ func TestAddLabelInvalidFormat(t *testing.T) { func TestAddLabelNoKey(t *testing.T) { fSys := filesys.MakeFsInMemory() - v := validators.MakeHappyMapValidator(t) + v := valtest_test.MakeHappyMapValidator(t) cmd := newCmdAddLabel(fSys, v.Validator) args := []string{":nokey"} err := cmd.RunE(cmd, args) @@ -276,8 +276,8 @@ func TestAddLabelNoKey(t *testing.T) { func TestAddLabelTooManyColons(t *testing.T) { fSys := filesys.MakeFsInMemory() - testutils.WriteTestKustomization(fSys) - v := validators.MakeHappyMapValidator(t) + testutils_test.WriteTestKustomization(fSys) + v := valtest_test.MakeHappyMapValidator(t) cmd := newCmdAddLabel(fSys, v.Validator) args := []string{"key:v1:v2"} err := cmd.RunE(cmd, args) @@ -289,8 +289,8 @@ func TestAddLabelTooManyColons(t *testing.T) { func TestAddLabelNoValue(t *testing.T) { fSys := filesys.MakeFsInMemory() - testutils.WriteTestKustomization(fSys) - v := validators.MakeHappyMapValidator(t) + testutils_test.WriteTestKustomization(fSys) + v := valtest_test.MakeHappyMapValidator(t) cmd := newCmdAddLabel(fSys, v.Validator) args := []string{"no,value:"} err := cmd.RunE(cmd, args) @@ -302,8 +302,8 @@ func TestAddLabelNoValue(t *testing.T) { func TestAddLabelMultipleArgs(t *testing.T) { fSys := filesys.MakeFsInMemory() - testutils.WriteTestKustomization(fSys) - v := validators.MakeHappyMapValidator(t) + testutils_test.WriteTestKustomization(fSys) + v := valtest_test.MakeHappyMapValidator(t) cmd := newCmdAddLabel(fSys, v.Validator) args := []string{"this:input", "has:spaces"} err := cmd.RunE(cmd, args) @@ -318,8 +318,8 @@ func TestAddLabelMultipleArgs(t *testing.T) { func TestAddLabelForce(t *testing.T) { fSys := filesys.MakeFsInMemory() - testutils.WriteTestKustomization(fSys) - v := validators.MakeHappyMapValidator(t) + testutils_test.WriteTestKustomization(fSys) + v := valtest_test.MakeHappyMapValidator(t) cmd := newCmdAddLabel(fSys, v.Validator) args := []string{"key:foo"} err := cmd.RunE(cmd, args) @@ -329,7 +329,7 @@ func TestAddLabelForce(t *testing.T) { } // trying to add the same label again should not work args = []string{"key:bar"} - v = validators.MakeHappyMapValidator(t) + v = valtest_test.MakeHappyMapValidator(t) cmd = newCmdAddLabel(fSys, v.Validator) err = cmd.RunE(cmd, args) v.VerifyCall() @@ -340,7 +340,7 @@ func TestAddLabelForce(t *testing.T) { t.Errorf("expected an error") } // but trying to add it with --force should - v = validators.MakeHappyMapValidator(t) + v = valtest_test.MakeHappyMapValidator(t) cmd = newCmdAddLabel(fSys, v.Validator) cmd.Flag("force").Value.Set("true") err = cmd.RunE(cmd, args) diff --git a/kustomize/internal/commands/edit/add/addpatch_test.go b/kustomize/internal/commands/edit/add/addpatch_test.go index 4bb39df03..876d761b4 100644 --- a/kustomize/internal/commands/edit/add/addpatch_test.go +++ b/kustomize/internal/commands/edit/add/addpatch_test.go @@ -23,7 +23,7 @@ func TestAddPatchHappyPath(t *testing.T) { fSys := filesys.MakeFsInMemory() fSys.WriteFile(patchFileName, []byte(patchFileContent)) fSys.WriteFile(patchFileName+"another", []byte(patchFileContent)) - testutils.WriteTestKustomization(fSys) + testutils_test.WriteTestKustomization(fSys) cmd := newCmdAddPatch(fSys) args := []string{patchFileName + "*"} @@ -31,7 +31,7 @@ func TestAddPatchHappyPath(t *testing.T) { if err != nil { t.Errorf("unexpected cmd error: %v", err) } - content, err := testutils.ReadTestKustomization(fSys) + content, err := testutils_test.ReadTestKustomization(fSys) if err != nil { t.Errorf("unexpected read error: %v", err) } @@ -46,7 +46,7 @@ func TestAddPatchHappyPath(t *testing.T) { func TestAddPatchAlreadyThere(t *testing.T) { fSys := filesys.MakeFsInMemory() fSys.WriteFile(patchFileName, []byte(patchFileContent)) - testutils.WriteTestKustomization(fSys) + testutils_test.WriteTestKustomization(fSys) cmd := newCmdAddPatch(fSys) args := []string{patchFileName} diff --git a/kustomize/internal/commands/edit/add/addresource_test.go b/kustomize/internal/commands/edit/add/addresource_test.go index f9aba9586..c797e9dc0 100644 --- a/kustomize/internal/commands/edit/add/addresource_test.go +++ b/kustomize/internal/commands/edit/add/addresource_test.go @@ -23,7 +23,7 @@ func TestAddResourceHappyPath(t *testing.T) { fSys := filesys.MakeFsInMemory() fSys.WriteFile(resourceFileName, []byte(resourceFileContent)) fSys.WriteFile(resourceFileName+"another", []byte(resourceFileContent)) - testutils.WriteTestKustomization(fSys) + testutils_test.WriteTestKustomization(fSys) cmd := newCmdAddResource(fSys) args := []string{resourceFileName + "*"} @@ -31,7 +31,7 @@ func TestAddResourceHappyPath(t *testing.T) { if err != nil { t.Errorf("unexpected cmd error: %v", err) } - content, err := testutils.ReadTestKustomization(fSys) + content, err := testutils_test.ReadTestKustomization(fSys) if err != nil { t.Errorf("unexpected read error: %v", err) } @@ -46,7 +46,7 @@ func TestAddResourceHappyPath(t *testing.T) { func TestAddResourceAlreadyThere(t *testing.T) { fSys := filesys.MakeFsInMemory() fSys.WriteFile(resourceFileName, []byte(resourceFileContent)) - testutils.WriteTestKustomization(fSys) + testutils_test.WriteTestKustomization(fSys) cmd := newCmdAddResource(fSys) args := []string{resourceFileName} diff --git a/kustomize/internal/commands/edit/add/all.go b/kustomize/internal/commands/edit/add/all.go index 03102a300..0c3b5d4e9 100644 --- a/kustomize/internal/commands/edit/add/all.go +++ b/kustomize/internal/commands/edit/add/all.go @@ -6,7 +6,7 @@ package add import ( "github.com/spf13/cobra" "sigs.k8s.io/kustomize/v3/api/filesys" - "sigs.k8s.io/kustomize/v3/pkg/ifc" + "sigs.k8s.io/kustomize/v3/api/ifc" ) // NewCmdAdd returns an instance of 'add' subcommand. diff --git a/kustomize/internal/commands/edit/add/configmap.go b/kustomize/internal/commands/edit/add/configmap.go index e51a37ab8..71c9f7e59 100644 --- a/kustomize/internal/commands/edit/add/configmap.go +++ b/kustomize/internal/commands/edit/add/configmap.go @@ -7,8 +7,8 @@ import ( "github.com/spf13/cobra" "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile" "sigs.k8s.io/kustomize/v3/api/filesys" + "sigs.k8s.io/kustomize/v3/api/ifc" "sigs.k8s.io/kustomize/v3/api/types" - "sigs.k8s.io/kustomize/v3/pkg/ifc" ) // newCmdAddConfigMap returns a new command. diff --git a/kustomize/internal/commands/edit/add/configmap_test.go b/kustomize/internal/commands/edit/add/configmap_test.go index c1397f462..40fcc94e8 100644 --- a/kustomize/internal/commands/edit/add/configmap_test.go +++ b/kustomize/internal/commands/edit/add/configmap_test.go @@ -8,9 +8,9 @@ import ( "sigs.k8s.io/kustomize/v3/api/filesys" "sigs.k8s.io/kustomize/v3/api/kv" + "sigs.k8s.io/kustomize/v3/api/loader" + "sigs.k8s.io/kustomize/v3/api/testutils/valtest" "sigs.k8s.io/kustomize/v3/api/types" - "sigs.k8s.io/kustomize/v3/pkg/loader" - "sigs.k8s.io/kustomize/v3/pkg/validators" ) func TestNewAddConfigMapIsNotNil(t *testing.T) { @@ -19,7 +19,7 @@ func TestNewAddConfigMapIsNotNil(t *testing.T) { fSys, kv.NewLoader( loader.NewFileLoaderAtCwd(fSys), - validators.MakeFakeValidator()), + valtest_test.MakeFakeValidator()), nil) == nil { t.Fatal("newCmdAddConfigMap shouldn't be nil") } diff --git a/kustomize/internal/commands/edit/add/secret.go b/kustomize/internal/commands/edit/add/secret.go index 1273b9745..92ae334b6 100644 --- a/kustomize/internal/commands/edit/add/secret.go +++ b/kustomize/internal/commands/edit/add/secret.go @@ -7,8 +7,8 @@ import ( "github.com/spf13/cobra" "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile" "sigs.k8s.io/kustomize/v3/api/filesys" + "sigs.k8s.io/kustomize/v3/api/ifc" "sigs.k8s.io/kustomize/v3/api/types" - "sigs.k8s.io/kustomize/v3/pkg/ifc" ) // newCmdAddSecret returns a new command. diff --git a/kustomize/internal/commands/edit/add/secret_test.go b/kustomize/internal/commands/edit/add/secret_test.go index f21ccf075..b4d3e9100 100644 --- a/kustomize/internal/commands/edit/add/secret_test.go +++ b/kustomize/internal/commands/edit/add/secret_test.go @@ -9,9 +9,9 @@ import ( "sigs.k8s.io/kustomize/v3/api/kv" "sigs.k8s.io/kustomize/v3/api/filesys" + "sigs.k8s.io/kustomize/v3/api/loader" + "sigs.k8s.io/kustomize/v3/api/testutils/valtest" "sigs.k8s.io/kustomize/v3/api/types" - "sigs.k8s.io/kustomize/v3/pkg/loader" - "sigs.k8s.io/kustomize/v3/pkg/validators" ) func TestNewCmdAddSecretIsNotNil(t *testing.T) { @@ -20,7 +20,7 @@ func TestNewCmdAddSecretIsNotNil(t *testing.T) { fSys, kv.NewLoader( loader.NewFileLoaderAtCwd(fSys), - validators.MakeFakeValidator()), + valtest_test.MakeFakeValidator()), nil) == nil { t.Fatal("newCmdAddSecret shouldn't be nil") } diff --git a/kustomize/internal/commands/edit/all.go b/kustomize/internal/commands/edit/all.go index 5685e8b0e..07a2f0b91 100644 --- a/kustomize/internal/commands/edit/all.go +++ b/kustomize/internal/commands/edit/all.go @@ -10,9 +10,9 @@ import ( "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/edit/remove" "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/edit/set" "sigs.k8s.io/kustomize/v3/api/filesys" + "sigs.k8s.io/kustomize/v3/api/ifc" "sigs.k8s.io/kustomize/v3/api/kv" - "sigs.k8s.io/kustomize/v3/pkg/ifc" - "sigs.k8s.io/kustomize/v3/pkg/loader" + "sigs.k8s.io/kustomize/v3/api/loader" ) // NewCmdEdit returns an instance of 'edit' subcommand. diff --git a/kustomize/internal/commands/edit/fix/fix_test.go b/kustomize/internal/commands/edit/fix/fix_test.go index cc93af23d..533f2f139 100644 --- a/kustomize/internal/commands/edit/fix/fix_test.go +++ b/kustomize/internal/commands/edit/fix/fix_test.go @@ -13,14 +13,14 @@ import ( func TestFix(t *testing.T) { fSys := filesys.MakeFsInMemory() - testutils.WriteTestKustomizationWith(fSys, []byte(`nameprefix: some-prefix-`)) + testutils_test.WriteTestKustomizationWith(fSys, []byte(`nameprefix: some-prefix-`)) cmd := NewCmdFix(fSys) err := cmd.RunE(cmd, nil) if err != nil { t.Errorf("unexpected cmd error: %v", err) } - content, err := testutils.ReadTestKustomization(fSys) + content, err := testutils_test.ReadTestKustomization(fSys) if err != nil { t.Errorf("unexpected read error: %v", err) } diff --git a/kustomize/internal/commands/edit/remove/all.go b/kustomize/internal/commands/edit/remove/all.go index 2b7efd482..02f540076 100644 --- a/kustomize/internal/commands/edit/remove/all.go +++ b/kustomize/internal/commands/edit/remove/all.go @@ -6,7 +6,7 @@ package remove import ( "github.com/spf13/cobra" "sigs.k8s.io/kustomize/v3/api/filesys" - "sigs.k8s.io/kustomize/v3/pkg/ifc" + "sigs.k8s.io/kustomize/v3/api/ifc" ) // NewCmdRemove returns an instance of 'remove' subcommand. diff --git a/kustomize/internal/commands/edit/remove/removemetadata_test.go b/kustomize/internal/commands/edit/remove/removemetadata_test.go index 965118600..48486e53d 100644 --- a/kustomize/internal/commands/edit/remove/removemetadata_test.go +++ b/kustomize/internal/commands/edit/remove/removemetadata_test.go @@ -11,8 +11,8 @@ import ( "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile" "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils" "sigs.k8s.io/kustomize/v3/api/filesys" + "sigs.k8s.io/kustomize/v3/api/testutils/valtest" "sigs.k8s.io/kustomize/v3/api/types" - "sigs.k8s.io/kustomize/v3/pkg/validators" ) func makeKustomizationFS() filesys.FileSystem { @@ -20,7 +20,7 @@ func makeKustomizationFS() filesys.FileSystem { commonLabels := []string{"label1: val1", "label2: val2"} commonAnnotations := []string{"annotation1: val1", "annotation2: val2"} - testutils.WriteTestKustomizationWith(fSys, []byte( + testutils_test.WriteTestKustomizationWith(fSys, []byte( fmt.Sprintf("commonLabels:\n %s\ncommonAnnotations:\n %s", strings.Join(commonLabels, "\n "), strings.Join(commonAnnotations, "\n ")))) return fSys @@ -73,7 +73,7 @@ func TestRemoveAnnotation(t *testing.T) { func TestRemoveAnnotationIgnore(t *testing.T) { fSys := makeKustomizationFS() - v := validators.MakeHappyMapValidator(t) + v := valtest_test.MakeHappyMapValidator(t) cmd := newCmdRemoveAnnotation(fSys, v.ValidatorArray) cmd.Flag("ignore-non-existence").Value.Set("true") args := []string{"annotation3"} @@ -87,9 +87,9 @@ func TestRemoveAnnotationIgnore(t *testing.T) { func TestRemoveAnnotationNoDefinition(t *testing.T) { fSys := filesys.MakeFsInMemory() - testutils.WriteTestKustomizationWith(fSys, []byte("")) + testutils_test.WriteTestKustomizationWith(fSys, []byte("")) - v := validators.MakeHappyMapValidator(t) + v := valtest_test.MakeHappyMapValidator(t) cmd := newCmdRemoveAnnotation(fSys, v.ValidatorArray) args := []string{"annotation1,annotation2"} err := cmd.RunE(cmd, args) @@ -105,9 +105,9 @@ func TestRemoveAnnotationNoDefinition(t *testing.T) { func TestRemoveAnnotationNoDefinitionIgnore(t *testing.T) { fSys := filesys.MakeFsInMemory() - testutils.WriteTestKustomizationWith(fSys, []byte("")) + testutils_test.WriteTestKustomizationWith(fSys, []byte("")) - v := validators.MakeHappyMapValidator(t) + v := valtest_test.MakeHappyMapValidator(t) cmd := newCmdRemoveLabel(fSys, v.ValidatorArray) cmd.Flag("ignore-non-existence").Value.Set("true") args := []string{"annotation1,annotation2"} @@ -122,7 +122,7 @@ func TestRemoveAnnotationNoDefinitionIgnore(t *testing.T) { func TestRemoveAnnotationNoArgs(t *testing.T) { fSys := makeKustomizationFS() - v := validators.MakeHappyMapValidator(t) + v := valtest_test.MakeHappyMapValidator(t) cmd := newCmdRemoveAnnotation(fSys, v.ValidatorArray) err := cmd.Execute() v.VerifyNoCall() @@ -138,7 +138,7 @@ func TestRemoveAnnotationNoArgs(t *testing.T) { func TestRemoveAnnotationInvalidFormat(t *testing.T) { fSys := makeKustomizationFS() - v := validators.MakeSadMapValidator(t) + v := valtest_test.MakeSadMapValidator(t) cmd := newCmdRemoveAnnotation(fSys, v.ValidatorArray) args := []string{"nospecialchars%^=@"} err := cmd.RunE(cmd, args) @@ -155,7 +155,7 @@ func TestRemoveAnnotationInvalidFormat(t *testing.T) { func TestRemoveAnnotationMultipleArgs(t *testing.T) { fSys := makeKustomizationFS() - v := validators.MakeHappyMapValidator(t) + v := valtest_test.MakeHappyMapValidator(t) cmd := newCmdRemoveAnnotation(fSys, v.ValidatorArray) args := []string{"annotation1,annotation2"} err := cmd.RunE(cmd, args) @@ -177,7 +177,7 @@ func TestRemoveAnnotationMultipleArgs(t *testing.T) { func TestRemoveAnnotationMultipleArgsInvalidFormat(t *testing.T) { fSys := makeKustomizationFS() - v := validators.MakeSadMapValidator(t) + v := valtest_test.MakeSadMapValidator(t) cmd := newCmdRemoveAnnotation(fSys, v.ValidatorArray) args := []string{"annotation1", "annotation2"} err := cmd.RunE(cmd, args) @@ -221,7 +221,7 @@ func TestRemoveLabel(t *testing.T) { func TestRemoveLabelIgnore(t *testing.T) { fSys := makeKustomizationFS() - v := validators.MakeHappyMapValidator(t) + v := valtest_test.MakeHappyMapValidator(t) cmd := newCmdRemoveLabel(fSys, v.ValidatorArray) cmd.Flag("ignore-non-existence").Value.Set("true") args := []string{"label3"} @@ -235,9 +235,9 @@ func TestRemoveLabelIgnore(t *testing.T) { func TestRemoveLabelNoDefinition(t *testing.T) { fSys := filesys.MakeFsInMemory() - testutils.WriteTestKustomizationWith(fSys, []byte("")) + testutils_test.WriteTestKustomizationWith(fSys, []byte("")) - v := validators.MakeHappyMapValidator(t) + v := valtest_test.MakeHappyMapValidator(t) cmd := newCmdRemoveLabel(fSys, v.ValidatorArray) args := []string{"label1,label2"} err := cmd.RunE(cmd, args) @@ -253,9 +253,9 @@ func TestRemoveLabelNoDefinition(t *testing.T) { func TestRemoveLabelNoDefinitionIgnore(t *testing.T) { fSys := filesys.MakeFsInMemory() - testutils.WriteTestKustomizationWith(fSys, []byte("")) + testutils_test.WriteTestKustomizationWith(fSys, []byte("")) - v := validators.MakeHappyMapValidator(t) + v := valtest_test.MakeHappyMapValidator(t) cmd := newCmdRemoveLabel(fSys, v.ValidatorArray) cmd.Flag("ignore-non-existence").Value.Set("true") args := []string{"label1,label2"} @@ -270,7 +270,7 @@ func TestRemoveLabelNoDefinitionIgnore(t *testing.T) { func TestRemoveLabelNoArgs(t *testing.T) { fSys := makeKustomizationFS() - v := validators.MakeHappyMapValidator(t) + v := valtest_test.MakeHappyMapValidator(t) cmd := newCmdRemoveLabel(fSys, v.ValidatorArray) err := cmd.Execute() v.VerifyNoCall() @@ -286,7 +286,7 @@ func TestRemoveLabelNoArgs(t *testing.T) { func TestRemoveLabelInvalidFormat(t *testing.T) { fSys := makeKustomizationFS() - v := validators.MakeSadMapValidator(t) + v := valtest_test.MakeSadMapValidator(t) cmd := newCmdRemoveLabel(fSys, v.ValidatorArray) args := []string{"exclamation!"} err := cmd.RunE(cmd, args) @@ -303,7 +303,7 @@ func TestRemoveLabelInvalidFormat(t *testing.T) { func TestRemoveLabelMultipleArgs(t *testing.T) { fSys := makeKustomizationFS() - v := validators.MakeHappyMapValidator(t) + v := valtest_test.MakeHappyMapValidator(t) cmd := newCmdRemoveLabel(fSys, v.ValidatorArray) args := []string{"label1,label2"} err := cmd.RunE(cmd, args) @@ -325,7 +325,7 @@ func TestRemoveLabelMultipleArgs(t *testing.T) { func TestRemoveLabelMultipleArgsInvalidFormat(t *testing.T) { fSys := makeKustomizationFS() - v := validators.MakeSadMapValidator(t) + v := valtest_test.MakeSadMapValidator(t) cmd := newCmdRemoveLabel(fSys, v.ValidatorArray) args := []string{"label1", "label2"} err := cmd.RunE(cmd, args) diff --git a/kustomize/internal/commands/edit/remove/removepatch_test.go b/kustomize/internal/commands/edit/remove/removepatch_test.go index 61e0a0a9e..70f14b967 100644 --- a/kustomize/internal/commands/edit/remove/removepatch_test.go +++ b/kustomize/internal/commands/edit/remove/removepatch_test.go @@ -24,7 +24,7 @@ func makeKustomizationPatchFS() filesys.FileSystem { fSys := filesys.MakeFsInMemory() patches := []string{"patch1.yaml", "patch2.yaml"} - testutils.WriteTestKustomizationWith(fSys, []byte( + testutils_test.WriteTestKustomizationWith(fSys, []byte( fmt.Sprintf("patchesStrategicMerge:\n - %s", strings.Join(patches, "\n - ")))) diff --git a/kustomize/internal/commands/edit/remove/removeresource_test.go b/kustomize/internal/commands/edit/remove/removeresource_test.go index c77bedb42..179c8d54d 100644 --- a/kustomize/internal/commands/edit/remove/removeresource_test.go +++ b/kustomize/internal/commands/edit/remove/removeresource_test.go @@ -126,7 +126,7 @@ func TestRemoveResources(t *testing.T) { for _, tc := range testCases { t.Run(tc.description, func(t *testing.T) { fSys := filesys.MakeFsInMemory() - testutils.WriteTestKustomizationWith( + testutils_test.WriteTestKustomizationWith( fSys, []byte(fmt.Sprintf( "resources:\n - %s", strings.Join(tc.given.resources, "\n - ")))) @@ -141,7 +141,7 @@ func TestRemoveResources(t *testing.T) { } return } - content, err := testutils.ReadTestKustomization(fSys) + content, err := testutils_test.ReadTestKustomization(fSys) if err != nil { t.Errorf("unexpected read error: %v", err) } diff --git a/kustomize/internal/commands/edit/set/all.go b/kustomize/internal/commands/edit/set/all.go index 7327f9684..00ca05eea 100644 --- a/kustomize/internal/commands/edit/set/all.go +++ b/kustomize/internal/commands/edit/set/all.go @@ -6,7 +6,7 @@ package set import ( "github.com/spf13/cobra" "sigs.k8s.io/kustomize/v3/api/filesys" - "sigs.k8s.io/kustomize/v3/pkg/ifc" + "sigs.k8s.io/kustomize/v3/api/ifc" ) // NewCmdSet returns an instance of 'set' subcommand. 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 762e20c62..bac68dc66 100644 --- a/kustomize/internal/commands/edit/set/set_name_prefix_test.go +++ b/kustomize/internal/commands/edit/set/set_name_prefix_test.go @@ -17,7 +17,7 @@ const ( func TestSetNamePrefixHappyPath(t *testing.T) { fSys := filesys.MakeFsInMemory() - testutils.WriteTestKustomization(fSys) + testutils_test.WriteTestKustomization(fSys) cmd := newCmdSetNamePrefix(fSys) args := []string{goodPrefixValue} @@ -25,7 +25,7 @@ func TestSetNamePrefixHappyPath(t *testing.T) { if err != nil { t.Errorf("unexpected cmd error: %v", err) } - content, err := testutils.ReadTestKustomization(fSys) + content, err := testutils_test.ReadTestKustomization(fSys) if err != nil { t.Errorf("unexpected read error: %v", err) } 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 4a3f76c72..9de918758 100644 --- a/kustomize/internal/commands/edit/set/set_name_suffix_test.go +++ b/kustomize/internal/commands/edit/set/set_name_suffix_test.go @@ -17,7 +17,7 @@ const ( func TestSetNameSuffixHappyPath(t *testing.T) { fSys := filesys.MakeFsInMemory() - testutils.WriteTestKustomization(fSys) + testutils_test.WriteTestKustomization(fSys) cmd := newCmdSetNameSuffix(fSys) args := []string{goodSuffixValue} @@ -25,7 +25,7 @@ func TestSetNameSuffixHappyPath(t *testing.T) { if err != nil { t.Errorf("unexpected cmd error: %v", err) } - content, err := testutils.ReadTestKustomization(fSys) + content, err := testutils_test.ReadTestKustomization(fSys) if err != nil { t.Errorf("unexpected read error: %v", err) } diff --git a/kustomize/internal/commands/edit/set/setimage_test.go b/kustomize/internal/commands/edit/set/setimage_test.go index e46a6793f..0da5ae5ef 100644 --- a/kustomize/internal/commands/edit/set/setimage_test.go +++ b/kustomize/internal/commands/edit/set/setimage_test.go @@ -195,11 +195,11 @@ func TestSetImage(t *testing.T) { if len(tc.given.infileImages) > 0 { // write file with infileImages - testutils.WriteTestKustomizationWith( + testutils_test.WriteTestKustomizationWith( fSys, []byte(strings.Join(tc.given.infileImages, "\n"))) } else { - testutils.WriteTestKustomization(fSys) + testutils_test.WriteTestKustomization(fSys) } // act @@ -211,7 +211,7 @@ func TestSetImage(t *testing.T) { t.FailNow() } - content, err := testutils.ReadTestKustomization(fSys) + content, err := testutils_test.ReadTestKustomization(fSys) if err != nil { t.Errorf("unexpected read error: %v", err) t.FailNow() diff --git a/kustomize/internal/commands/edit/set/setnamespace.go b/kustomize/internal/commands/edit/set/setnamespace.go index ee1c184fd..d83fa1c2f 100644 --- a/kustomize/internal/commands/edit/set/setnamespace.go +++ b/kustomize/internal/commands/edit/set/setnamespace.go @@ -11,7 +11,7 @@ import ( "github.com/spf13/cobra" "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile" "sigs.k8s.io/kustomize/v3/api/filesys" - "sigs.k8s.io/kustomize/v3/pkg/ifc" + "sigs.k8s.io/kustomize/v3/api/ifc" ) type setNamespaceOptions struct { diff --git a/kustomize/internal/commands/edit/set/setnamespace_test.go b/kustomize/internal/commands/edit/set/setnamespace_test.go index 81b75faad..c15a7a4d2 100644 --- a/kustomize/internal/commands/edit/set/setnamespace_test.go +++ b/kustomize/internal/commands/edit/set/setnamespace_test.go @@ -10,7 +10,7 @@ import ( "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils" "sigs.k8s.io/kustomize/v3/api/filesys" - "sigs.k8s.io/kustomize/v3/pkg/validators" + "sigs.k8s.io/kustomize/v3/api/testutils/valtest" ) const ( @@ -19,15 +19,15 @@ const ( func TestSetNamespaceHappyPath(t *testing.T) { fSys := filesys.MakeFsInMemory() - testutils.WriteTestKustomization(fSys) + testutils_test.WriteTestKustomization(fSys) - cmd := newCmdSetNamespace(fSys, validators.MakeFakeValidator()) + cmd := newCmdSetNamespace(fSys, valtest_test.MakeFakeValidator()) args := []string{goodNamespaceValue} err := cmd.RunE(cmd, args) if err != nil { t.Errorf("unexpected cmd error: %v", err) } - content, err := testutils.ReadTestKustomization(fSys) + content, err := testutils_test.ReadTestKustomization(fSys) if err != nil { t.Errorf("unexpected read error: %v", err) } @@ -39,9 +39,9 @@ func TestSetNamespaceHappyPath(t *testing.T) { func TestSetNamespaceOverride(t *testing.T) { fSys := filesys.MakeFsInMemory() - testutils.WriteTestKustomization(fSys) + testutils_test.WriteTestKustomization(fSys) - cmd := newCmdSetNamespace(fSys, validators.MakeFakeValidator()) + cmd := newCmdSetNamespace(fSys, valtest_test.MakeFakeValidator()) args := []string{goodNamespaceValue} err := cmd.RunE(cmd, args) if err != nil { @@ -52,7 +52,7 @@ func TestSetNamespaceOverride(t *testing.T) { if err != nil { t.Errorf("unexpected cmd error: %v", err) } - content, err := testutils.ReadTestKustomization(fSys) + content, err := testutils_test.ReadTestKustomization(fSys) if err != nil { t.Errorf("unexpected read error: %v", err) } @@ -65,7 +65,7 @@ func TestSetNamespaceOverride(t *testing.T) { func TestSetNamespaceNoArgs(t *testing.T) { fSys := filesys.MakeFsInMemory() - cmd := newCmdSetNamespace(fSys, validators.MakeFakeValidator()) + cmd := newCmdSetNamespace(fSys, valtest_test.MakeFakeValidator()) err := cmd.Execute() if err == nil { t.Errorf("expected error: %v", err) @@ -78,7 +78,7 @@ func TestSetNamespaceNoArgs(t *testing.T) { func TestSetNamespaceInvalid(t *testing.T) { fSys := filesys.MakeFsInMemory() - cmd := newCmdSetNamespace(fSys, validators.MakeFakeValidator()) + cmd := newCmdSetNamespace(fSys, valtest_test.MakeFakeValidator()) args := []string{"/badnamespace/"} err := cmd.RunE(cmd, args) if err == nil { diff --git a/kustomize/internal/commands/edit/set/setreplicas_test.go b/kustomize/internal/commands/edit/set/setreplicas_test.go index e09bc3503..39b4bf16a 100644 --- a/kustomize/internal/commands/edit/set/setreplicas_test.go +++ b/kustomize/internal/commands/edit/set/setreplicas_test.go @@ -115,11 +115,11 @@ func TestSetReplicas(t *testing.T) { if len(tc.given.infileReplicas) > 0 { // write file with infileReplicas - testutils.WriteTestKustomizationWith( + testutils_test.WriteTestKustomizationWith( fSys, []byte(strings.Join(tc.given.infileReplicas, "\n"))) } else { - testutils.WriteTestKustomization(fSys) + testutils_test.WriteTestKustomization(fSys) } // act @@ -131,7 +131,7 @@ func TestSetReplicas(t *testing.T) { t.FailNow() } - content, err := testutils.ReadTestKustomization(fSys) + content, err := testutils_test.ReadTestKustomization(fSys) if err != nil { t.Errorf("unexpected read error: %v", err) t.FailNow() diff --git a/kustomize/internal/commands/kustfile/kustomizationfile_test.go b/kustomize/internal/commands/kustfile/kustomizationfile_test.go index d1d67842b..d2719d99c 100644 --- a/kustomize/internal/commands/kustfile/kustomizationfile_test.go +++ b/kustomize/internal/commands/kustfile/kustomizationfile_test.go @@ -58,7 +58,7 @@ func TestWriteAndRead(t *testing.T) { } fSys := filesys.MakeFsInMemory() - testutils.WriteTestKustomization(fSys) + testutils_test.WriteTestKustomization(fSys) mf, err := NewKustomizationFile(fSys) if err != nil { t.Fatalf("Unexpected Error: %v", err) @@ -144,7 +144,7 @@ patchesStrategicMerge: - pod.yaml `) fSys := filesys.MakeFsInMemory() - testutils.WriteTestKustomizationWith(fSys, kustomizationContentWithComments) + testutils_test.WriteTestKustomizationWith(fSys, kustomizationContentWithComments) mf, err := NewKustomizationFile(fSys) if err != nil { t.Fatalf("Unexpected Error: %v", err) @@ -236,7 +236,7 @@ generatorOptions: disableNameSuffixHash: true `) fSys := filesys.MakeFsInMemory() - testutils.WriteTestKustomizationWith( + testutils_test.WriteTestKustomizationWith( fSys, kustomizationContentWithComments) mf, err := NewKustomizationFile(fSys) if err != nil { @@ -274,7 +274,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization `) fSys := filesys.MakeFsInMemory() - testutils.WriteTestKustomizationWith( + testutils_test.WriteTestKustomizationWith( fSys, kustomizationContentWithComments) mf, err := NewKustomizationFile(fSys) if err != nil { @@ -320,7 +320,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization `) fSys := filesys.MakeFsInMemory() - testutils.WriteTestKustomizationWith(fSys, kustomizationContentWithComments) + testutils_test.WriteTestKustomizationWith(fSys, kustomizationContentWithComments) mf, err := NewKustomizationFile(fSys) if err != nil { t.Fatalf("Unexpected Error: %v", err) diff --git a/kustomize/internal/commands/testutils/testutils.go b/kustomize/internal/commands/testutils/testutils.go index 5db8609a4..2a4a719a0 100644 --- a/kustomize/internal/commands/testutils/testutils.go +++ b/kustomize/internal/commands/testutils/testutils.go @@ -1,7 +1,7 @@ // Copyright 2019 The Kubernetes Authors. // SPDX-License-Identifier: Apache-2.0 -package testutils +package testutils_test import ( "sigs.k8s.io/kustomize/v3/api/filesys" diff --git a/pkg/accumulator/loadconfigfromcrds.go b/pkg/accumulator/loadconfigfromcrds.go index 7dad2e2ee..ef661ff18 100644 --- a/pkg/accumulator/loadconfigfromcrds.go +++ b/pkg/accumulator/loadconfigfromcrds.go @@ -11,9 +11,9 @@ import ( "github.com/pkg/errors" "k8s.io/kube-openapi/pkg/common" "sigs.k8s.io/kustomize/v3/api/builtinconfig" + "sigs.k8s.io/kustomize/v3/api/ifc" "sigs.k8s.io/kustomize/v3/api/resid" "sigs.k8s.io/kustomize/v3/api/types" - "sigs.k8s.io/kustomize/v3/pkg/ifc" "sigs.k8s.io/yaml" ) diff --git a/pkg/accumulator/loadconfigfromcrds_test.go b/pkg/accumulator/loadconfigfromcrds_test.go index 59b3f4fa2..12a0666b9 100644 --- a/pkg/accumulator/loadconfigfromcrds_test.go +++ b/pkg/accumulator/loadconfigfromcrds_test.go @@ -8,11 +8,11 @@ import ( "testing" "sigs.k8s.io/kustomize/v3/api/builtinconfig" + "sigs.k8s.io/kustomize/v3/api/ifc" "sigs.k8s.io/kustomize/v3/api/resid" "sigs.k8s.io/kustomize/v3/api/types" "sigs.k8s.io/kustomize/v3/internal/loadertest" . "sigs.k8s.io/kustomize/v3/pkg/accumulator" - "sigs.k8s.io/kustomize/v3/pkg/ifc" ) // This defines two CRD's: Bee and MyKind. diff --git a/pkg/accumulator/namereferencetransformer.go b/pkg/accumulator/namereferencetransformer.go index 9b73c8edc..ba6ceeac8 100644 --- a/pkg/accumulator/namereferencetransformer.go +++ b/pkg/accumulator/namereferencetransformer.go @@ -9,9 +9,9 @@ import ( "sigs.k8s.io/kustomize/v3/api/builtinconfig" "sigs.k8s.io/kustomize/v3/api/resid" + "sigs.k8s.io/kustomize/v3/api/resmap" + "sigs.k8s.io/kustomize/v3/api/resource" "sigs.k8s.io/kustomize/v3/api/transform" - "sigs.k8s.io/kustomize/v3/pkg/resmap" - "sigs.k8s.io/kustomize/v3/pkg/resource" ) type nameReferenceTransformer struct { diff --git a/pkg/accumulator/namereferencetransformer_test.go b/pkg/accumulator/namereferencetransformer_test.go index 050fd40e3..c70a34ab7 100644 --- a/pkg/accumulator/namereferencetransformer_test.go +++ b/pkg/accumulator/namereferencetransformer_test.go @@ -9,10 +9,10 @@ import ( "sigs.k8s.io/kustomize/v3/api/builtinconfig" "sigs.k8s.io/kustomize/v3/api/resid" + "sigs.k8s.io/kustomize/v3/api/resmap" + "sigs.k8s.io/kustomize/v3/api/resource" + "sigs.k8s.io/kustomize/v3/api/testutils/resmaptest" "sigs.k8s.io/kustomize/v3/k8sdeps/kunstruct" - "sigs.k8s.io/kustomize/v3/pkg/resmap" - "sigs.k8s.io/kustomize/v3/pkg/resmaptest" - "sigs.k8s.io/kustomize/v3/pkg/resource" ) func TestNameReferenceHappyRun(t *testing.T) { diff --git a/pkg/accumulator/refvartransformer.go b/pkg/accumulator/refvartransformer.go index 6c0cfa25a..fd9d897d3 100644 --- a/pkg/accumulator/refvartransformer.go +++ b/pkg/accumulator/refvartransformer.go @@ -6,10 +6,10 @@ package accumulator import ( "fmt" + "sigs.k8s.io/kustomize/v3/api/resmap" "sigs.k8s.io/kustomize/v3/api/transform" "sigs.k8s.io/kustomize/v3/api/types" "sigs.k8s.io/kustomize/v3/pkg/expansion" - "sigs.k8s.io/kustomize/v3/pkg/resmap" ) type refVarTransformer struct { diff --git a/pkg/accumulator/refvartransformer_test.go b/pkg/accumulator/refvartransformer_test.go index fd2e4ea2c..dc677b12e 100644 --- a/pkg/accumulator/refvartransformer_test.go +++ b/pkg/accumulator/refvartransformer_test.go @@ -8,11 +8,11 @@ import ( "testing" "sigs.k8s.io/kustomize/v3/api/resid" + "sigs.k8s.io/kustomize/v3/api/resmap" + "sigs.k8s.io/kustomize/v3/api/resource" + "sigs.k8s.io/kustomize/v3/api/testutils/resmaptest" "sigs.k8s.io/kustomize/v3/api/types" "sigs.k8s.io/kustomize/v3/k8sdeps/kunstruct" - "sigs.k8s.io/kustomize/v3/pkg/resmap" - "sigs.k8s.io/kustomize/v3/pkg/resmaptest" - "sigs.k8s.io/kustomize/v3/pkg/resource" ) func TestRefVarTransformer(t *testing.T) { diff --git a/pkg/accumulator/resaccumulator.go b/pkg/accumulator/resaccumulator.go index ec9398afd..2f98395f9 100644 --- a/pkg/accumulator/resaccumulator.go +++ b/pkg/accumulator/resaccumulator.go @@ -10,8 +10,8 @@ import ( "sigs.k8s.io/kustomize/v3/api/builtinconfig" "sigs.k8s.io/kustomize/v3/api/resid" + "sigs.k8s.io/kustomize/v3/api/resmap" "sigs.k8s.io/kustomize/v3/api/types" - "sigs.k8s.io/kustomize/v3/pkg/resmap" ) // ResAccumulator accumulates resources and the rules diff --git a/pkg/accumulator/resaccumulator_test.go b/pkg/accumulator/resaccumulator_test.go index 8b2fbfef4..17e54eed6 100644 --- a/pkg/accumulator/resaccumulator_test.go +++ b/pkg/accumulator/resaccumulator_test.go @@ -12,12 +12,12 @@ import ( "sigs.k8s.io/kustomize/v3/api/builtinconfig" "sigs.k8s.io/kustomize/v3/api/resid" + "sigs.k8s.io/kustomize/v3/api/resmap" + "sigs.k8s.io/kustomize/v3/api/resource" + "sigs.k8s.io/kustomize/v3/api/testutils/resmaptest" "sigs.k8s.io/kustomize/v3/api/types" "sigs.k8s.io/kustomize/v3/k8sdeps/kunstruct" . "sigs.k8s.io/kustomize/v3/pkg/accumulator" - "sigs.k8s.io/kustomize/v3/pkg/resmap" - "sigs.k8s.io/kustomize/v3/pkg/resmaptest" - "sigs.k8s.io/kustomize/v3/pkg/resource" ) func makeResAccumulator(t *testing.T) (*ResAccumulator, *resource.Factory) { diff --git a/pkg/plugins/builtins.go b/pkg/plugins/builtins.go index 989a118b4..f1dc66e94 100644 --- a/pkg/plugins/builtins.go +++ b/pkg/plugins/builtins.go @@ -4,7 +4,7 @@ package plugins import ( - "sigs.k8s.io/kustomize/v3/pkg/resmap" + "sigs.k8s.io/kustomize/v3/api/resmap" "sigs.k8s.io/kustomize/v3/plugin/builtin" ) diff --git a/pkg/plugins/execplugin.go b/pkg/plugins/execplugin.go index f5ae3b9e4..8aec6333c 100644 --- a/pkg/plugins/execplugin.go +++ b/pkg/plugins/execplugin.go @@ -14,8 +14,8 @@ import ( "github.com/pkg/errors" "sigs.k8s.io/kustomize/v3/api/resid" + "sigs.k8s.io/kustomize/v3/api/resmap" "sigs.k8s.io/kustomize/v3/api/types" - "sigs.k8s.io/kustomize/v3/pkg/resmap" "sigs.k8s.io/yaml" ) diff --git a/pkg/plugins/execplugin_test.go b/pkg/plugins/execplugin_test.go index f62709988..fb65d9261 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/resmap" + "sigs.k8s.io/kustomize/v3/api/resource" + "sigs.k8s.io/kustomize/v3/api/testutils/valtest" "sigs.k8s.io/kustomize/v3/api/types" "sigs.k8s.io/kustomize/v3/internal/loadertest" "sigs.k8s.io/kustomize/v3/k8sdeps/kunstruct" - "sigs.k8s.io/kustomize/v3/pkg/resmap" - "sigs.k8s.io/kustomize/v3/pkg/resource" - "sigs.k8s.io/kustomize/v3/pkg/validators" ) func TestExecPluginConfig(t *testing.T) { @@ -22,7 +22,7 @@ func TestExecPluginConfig(t *testing.T) { resource.NewFactory( kunstruct.NewKunstructuredFactoryImpl()), nil) ldr := loadertest.NewFakeLoader(path) - v := validators.MakeFakeValidator() + v := valtest_test.MakeFakeValidator() pluginConfig := rf.RF().FromMap( map[string]interface{}{ "apiVersion": "someteam.example.com/v1", diff --git a/pkg/plugins/loader.go b/pkg/plugins/loader.go index 46d33ccff..9ddab7104 100644 --- a/pkg/plugins/loader.go +++ b/pkg/plugins/loader.go @@ -11,11 +11,11 @@ import ( "strings" "github.com/pkg/errors" + "sigs.k8s.io/kustomize/v3/api/ifc" "sigs.k8s.io/kustomize/v3/api/resid" + "sigs.k8s.io/kustomize/v3/api/resmap" + "sigs.k8s.io/kustomize/v3/api/resource" "sigs.k8s.io/kustomize/v3/api/types" - "sigs.k8s.io/kustomize/v3/pkg/ifc" - "sigs.k8s.io/kustomize/v3/pkg/resmap" - "sigs.k8s.io/kustomize/v3/pkg/resource" ) type Loader struct { diff --git a/pkg/plugins/loader_test.go b/pkg/plugins/loader_test.go index b2ff740ac..5b37d6e4e 100644 --- a/pkg/plugins/loader_test.go +++ b/pkg/plugins/loader_test.go @@ -7,12 +7,12 @@ import ( "sigs.k8s.io/kustomize/v3/api/kusttest" "testing" + "sigs.k8s.io/kustomize/v3/api/resmap" + "sigs.k8s.io/kustomize/v3/api/resource" + "sigs.k8s.io/kustomize/v3/api/testutils/valtest" "sigs.k8s.io/kustomize/v3/internal/loadertest" "sigs.k8s.io/kustomize/v3/k8sdeps/kunstruct" . "sigs.k8s.io/kustomize/v3/pkg/plugins" - "sigs.k8s.io/kustomize/v3/pkg/resmap" - "sigs.k8s.io/kustomize/v3/pkg/resource" - "sigs.k8s.io/kustomize/v3/pkg/validators" ) const ( @@ -67,7 +67,7 @@ func TestLoader(t *testing.T) { t.Fatal(err) } - _, err = pLdr.LoadGenerators(ldr, validators.MakeFakeValidator(), m) + _, err = pLdr.LoadGenerators(ldr, valtest_test.MakeFakeValidator(), m) if err != nil { t.Fatal(err) } diff --git a/pkg/target/baseandoverlaysmall_test.go b/pkg/target/baseandoverlaysmall_test.go index ab0ebcf1a..c9c60bb82 100644 --- a/pkg/target/baseandoverlaysmall_test.go +++ b/pkg/target/baseandoverlaysmall_test.go @@ -21,7 +21,7 @@ import ( "testing" "sigs.k8s.io/kustomize/v3/api/kusttest" - "sigs.k8s.io/kustomize/v3/pkg/loader" + "sigs.k8s.io/kustomize/v3/api/loader" "sigs.k8s.io/kustomize/v3/pkg/plugins" ) diff --git a/pkg/target/kusttarget.go b/pkg/target/kusttarget.go index 69b392dd9..2c17e8e46 100644 --- a/pkg/target/kusttarget.go +++ b/pkg/target/kusttarget.go @@ -15,12 +15,12 @@ import ( "github.com/pkg/errors" "sigs.k8s.io/kustomize/v3/api/builtinconfig" + "sigs.k8s.io/kustomize/v3/api/ifc" + "sigs.k8s.io/kustomize/v3/api/resmap" "sigs.k8s.io/kustomize/v3/api/types" "sigs.k8s.io/kustomize/v3/pkg/accumulator" - "sigs.k8s.io/kustomize/v3/pkg/ifc" "sigs.k8s.io/kustomize/v3/pkg/pgmconfig" "sigs.k8s.io/kustomize/v3/pkg/plugins" - "sigs.k8s.io/kustomize/v3/pkg/resmap" "sigs.k8s.io/kustomize/v3/plugin/builtin" "sigs.k8s.io/yaml" ) diff --git a/pkg/target/kusttarget_configplugin.go b/pkg/target/kusttarget_configplugin.go index a562bdcd9..aab4387d4 100644 --- a/pkg/target/kusttarget_configplugin.go +++ b/pkg/target/kusttarget_configplugin.go @@ -5,9 +5,9 @@ package target import ( "sigs.k8s.io/kustomize/v3/api/builtinconfig" + "sigs.k8s.io/kustomize/v3/api/resmap" "sigs.k8s.io/kustomize/v3/api/types" "sigs.k8s.io/kustomize/v3/pkg/plugins" - "sigs.k8s.io/kustomize/v3/pkg/resmap" ) // Functions dedicated to configuring the builtin diff --git a/pkg/target/kusttarget_test.go b/pkg/target/kusttarget_test.go index 4d5058b0e..a41378b19 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/ifc" "sigs.k8s.io/kustomize/v3/api/kusttest" "sigs.k8s.io/kustomize/v3/api/resid" + "sigs.k8s.io/kustomize/v3/api/resmap" + "sigs.k8s.io/kustomize/v3/api/resource" + "sigs.k8s.io/kustomize/v3/api/testutils/valtest" "sigs.k8s.io/kustomize/v3/api/types" "sigs.k8s.io/kustomize/v3/internal/loadertest" - "sigs.k8s.io/kustomize/v3/pkg/ifc" - "sigs.k8s.io/kustomize/v3/pkg/resmap" - "sigs.k8s.io/kustomize/v3/pkg/resource" . "sigs.k8s.io/kustomize/v3/pkg/target" - "sigs.k8s.io/kustomize/v3/pkg/validators" ) const ( @@ -186,7 +186,7 @@ func TestResources(t *testing.T) { func TestKustomizationNotFound(t *testing.T) { _, err := NewKustTarget( loadertest.NewFakeLoader("/foo"), - validators.MakeFakeValidator(), nil, nil, nil) + valtest_test.MakeFakeValidator(), nil, nil, nil) if err == nil { t.Fatalf("expected an error") } diff --git a/pkg/target/plugindir_test.go b/pkg/target/plugindir_test.go index 310638c8e..c64fe6b1b 100644 --- a/pkg/target/plugindir_test.go +++ b/pkg/target/plugindir_test.go @@ -11,14 +11,14 @@ import ( "sigs.k8s.io/kustomize/v3/api/filesys" "sigs.k8s.io/kustomize/v3/api/kusttest" + "sigs.k8s.io/kustomize/v3/api/loader" + "sigs.k8s.io/kustomize/v3/api/resmap" + "sigs.k8s.io/kustomize/v3/api/resource" + "sigs.k8s.io/kustomize/v3/api/testutils/valtest" "sigs.k8s.io/kustomize/v3/k8sdeps/kunstruct" "sigs.k8s.io/kustomize/v3/k8sdeps/transformer" - "sigs.k8s.io/kustomize/v3/pkg/loader" "sigs.k8s.io/kustomize/v3/pkg/plugins" - "sigs.k8s.io/kustomize/v3/pkg/resmap" - "sigs.k8s.io/kustomize/v3/pkg/resource" "sigs.k8s.io/kustomize/v3/pkg/target" - "sigs.k8s.io/kustomize/v3/pkg/validators" ) func TestPluginDir(t *testing.T) { @@ -66,7 +66,7 @@ metadata: pl := plugins.NewLoader(plugins.ActivePluginConfig(), rf) tg, err := target.NewKustTarget( - ldr, validators.MakeFakeValidator(), rf, transformer.NewFactoryImpl(), pl) + ldr, valtest_test.MakeFakeValidator(), rf, transformer.NewFactoryImpl(), pl) if err != nil { t.Fatalf("err %v", err) } diff --git a/plugin/builtin/AnnotationsTransformer.go b/plugin/builtin/AnnotationsTransformer.go index 0e480038a..32c0e2a02 100644 --- a/plugin/builtin/AnnotationsTransformer.go +++ b/plugin/builtin/AnnotationsTransformer.go @@ -2,9 +2,9 @@ package builtin import ( + "sigs.k8s.io/kustomize/v3/api/resmap" "sigs.k8s.io/kustomize/v3/api/transform" "sigs.k8s.io/kustomize/v3/api/types" - "sigs.k8s.io/kustomize/v3/pkg/resmap" "sigs.k8s.io/yaml" ) diff --git a/plugin/builtin/ConfigMapGenerator.go b/plugin/builtin/ConfigMapGenerator.go index c8bbb6283..54c42da07 100644 --- a/plugin/builtin/ConfigMapGenerator.go +++ b/plugin/builtin/ConfigMapGenerator.go @@ -3,8 +3,8 @@ package builtin import ( "sigs.k8s.io/kustomize/v3/api/kv" + "sigs.k8s.io/kustomize/v3/api/resmap" "sigs.k8s.io/kustomize/v3/api/types" - "sigs.k8s.io/kustomize/v3/pkg/resmap" "sigs.k8s.io/yaml" ) diff --git a/plugin/builtin/HashTransformer.go b/plugin/builtin/HashTransformer.go index 2a218f0be..04ce3c7e9 100644 --- a/plugin/builtin/HashTransformer.go +++ b/plugin/builtin/HashTransformer.go @@ -4,8 +4,8 @@ package builtin import ( "fmt" - "sigs.k8s.io/kustomize/v3/pkg/ifc" - "sigs.k8s.io/kustomize/v3/pkg/resmap" + "sigs.k8s.io/kustomize/v3/api/ifc" + "sigs.k8s.io/kustomize/v3/api/resmap" ) type HashTransformerPlugin struct { diff --git a/plugin/builtin/ImageTagTransformer.go b/plugin/builtin/ImageTagTransformer.go index 619510f93..44798ce8f 100644 --- a/plugin/builtin/ImageTagTransformer.go +++ b/plugin/builtin/ImageTagTransformer.go @@ -8,7 +8,7 @@ import ( "sigs.k8s.io/kustomize/v3/api/types" "strings" - "sigs.k8s.io/kustomize/v3/pkg/resmap" + "sigs.k8s.io/kustomize/v3/api/resmap" "sigs.k8s.io/yaml" ) diff --git a/plugin/builtin/InventoryTransformer.go b/plugin/builtin/InventoryTransformer.go index 3dbc38614..486fbb79f 100644 --- a/plugin/builtin/InventoryTransformer.go +++ b/plugin/builtin/InventoryTransformer.go @@ -7,10 +7,10 @@ import ( "sigs.k8s.io/kustomize/v3/api/hasher" "sigs.k8s.io/kustomize/v3/api/kv" "sigs.k8s.io/kustomize/v3/api/resid" + "sigs.k8s.io/kustomize/v3/api/resmap" + "sigs.k8s.io/kustomize/v3/api/resource" "sigs.k8s.io/kustomize/v3/api/types" "sigs.k8s.io/kustomize/v3/pkg/inventory" - "sigs.k8s.io/kustomize/v3/pkg/resmap" - "sigs.k8s.io/kustomize/v3/pkg/resource" "sigs.k8s.io/yaml" ) diff --git a/plugin/builtin/LabelTransformer.go b/plugin/builtin/LabelTransformer.go index 139be738f..277ab982b 100644 --- a/plugin/builtin/LabelTransformer.go +++ b/plugin/builtin/LabelTransformer.go @@ -2,9 +2,9 @@ package builtin import ( + "sigs.k8s.io/kustomize/v3/api/resmap" "sigs.k8s.io/kustomize/v3/api/transform" "sigs.k8s.io/kustomize/v3/api/types" - "sigs.k8s.io/kustomize/v3/pkg/resmap" "sigs.k8s.io/yaml" ) diff --git a/plugin/builtin/LegacyOrderTransformer.go b/plugin/builtin/LegacyOrderTransformer.go index f062b1476..b4eb161e2 100644 --- a/plugin/builtin/LegacyOrderTransformer.go +++ b/plugin/builtin/LegacyOrderTransformer.go @@ -5,8 +5,8 @@ import ( "sort" "github.com/pkg/errors" - "sigs.k8s.io/kustomize/v3/pkg/resmap" - "sigs.k8s.io/kustomize/v3/pkg/resource" + "sigs.k8s.io/kustomize/v3/api/resmap" + "sigs.k8s.io/kustomize/v3/api/resource" ) // Sort the resources using an ordering defined in the Gvk class. diff --git a/plugin/builtin/NamespaceTransformer.go b/plugin/builtin/NamespaceTransformer.go index 927d8c298..85329ac12 100644 --- a/plugin/builtin/NamespaceTransformer.go +++ b/plugin/builtin/NamespaceTransformer.go @@ -6,9 +6,9 @@ import ( "sigs.k8s.io/kustomize/v3/api/transform" "sigs.k8s.io/kustomize/v3/api/resid" + "sigs.k8s.io/kustomize/v3/api/resmap" + "sigs.k8s.io/kustomize/v3/api/resource" "sigs.k8s.io/kustomize/v3/api/types" - "sigs.k8s.io/kustomize/v3/pkg/resmap" - "sigs.k8s.io/kustomize/v3/pkg/resource" "sigs.k8s.io/yaml" ) diff --git a/plugin/builtin/PatchJson6902Transformer.go b/plugin/builtin/PatchJson6902Transformer.go index d11d857c6..82fedf077 100644 --- a/plugin/builtin/PatchJson6902Transformer.go +++ b/plugin/builtin/PatchJson6902Transformer.go @@ -6,10 +6,10 @@ import ( "github.com/evanphx/json-patch" "github.com/pkg/errors" + "sigs.k8s.io/kustomize/v3/api/ifc" "sigs.k8s.io/kustomize/v3/api/resid" + "sigs.k8s.io/kustomize/v3/api/resmap" "sigs.k8s.io/kustomize/v3/api/types" - "sigs.k8s.io/kustomize/v3/pkg/ifc" - "sigs.k8s.io/kustomize/v3/pkg/resmap" "sigs.k8s.io/yaml" ) diff --git a/plugin/builtin/PatchStrategicMergeTransformer.go b/plugin/builtin/PatchStrategicMergeTransformer.go index b5f4f81cf..f032608cd 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/resmap" + "sigs.k8s.io/kustomize/v3/api/resource" "sigs.k8s.io/kustomize/v3/api/types" - "sigs.k8s.io/kustomize/v3/pkg/resmap" - "sigs.k8s.io/kustomize/v3/pkg/resource" "sigs.k8s.io/yaml" ) diff --git a/plugin/builtin/PatchTransformer.go b/plugin/builtin/PatchTransformer.go index 97efc7dda..8a86939cc 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/resmap" + "sigs.k8s.io/kustomize/v3/api/resource" "sigs.k8s.io/kustomize/v3/api/types" - "sigs.k8s.io/kustomize/v3/pkg/resmap" - "sigs.k8s.io/kustomize/v3/pkg/resource" "sigs.k8s.io/yaml" ) diff --git a/plugin/builtin/PrefixSuffixTransformer.go b/plugin/builtin/PrefixSuffixTransformer.go index bafa71faa..407f3aee6 100644 --- a/plugin/builtin/PrefixSuffixTransformer.go +++ b/plugin/builtin/PrefixSuffixTransformer.go @@ -8,7 +8,7 @@ import ( "sigs.k8s.io/kustomize/v3/api/types" "sigs.k8s.io/kustomize/v3/api/resid" - "sigs.k8s.io/kustomize/v3/pkg/resmap" + "sigs.k8s.io/kustomize/v3/api/resmap" "sigs.k8s.io/yaml" ) diff --git a/plugin/builtin/ReplicaCountTransformer.go b/plugin/builtin/ReplicaCountTransformer.go index f0fe13c95..eee218946 100644 --- a/plugin/builtin/ReplicaCountTransformer.go +++ b/plugin/builtin/ReplicaCountTransformer.go @@ -6,8 +6,8 @@ import ( "sigs.k8s.io/kustomize/v3/api/transform" "sigs.k8s.io/kustomize/v3/api/resid" + "sigs.k8s.io/kustomize/v3/api/resmap" "sigs.k8s.io/kustomize/v3/api/types" - "sigs.k8s.io/kustomize/v3/pkg/resmap" "sigs.k8s.io/yaml" ) diff --git a/plugin/builtin/SecretGenerator.go b/plugin/builtin/SecretGenerator.go index b7cc79e74..3c93ecf60 100644 --- a/plugin/builtin/SecretGenerator.go +++ b/plugin/builtin/SecretGenerator.go @@ -3,8 +3,8 @@ package builtin import ( "sigs.k8s.io/kustomize/v3/api/kv" + "sigs.k8s.io/kustomize/v3/api/resmap" "sigs.k8s.io/kustomize/v3/api/types" - "sigs.k8s.io/kustomize/v3/pkg/resmap" "sigs.k8s.io/yaml" ) diff --git a/plugin/builtin/annotationstransformer/AnnotationsTransformer.go b/plugin/builtin/annotationstransformer/AnnotationsTransformer.go index 61a1779f0..4e48d6142 100644 --- a/plugin/builtin/annotationstransformer/AnnotationsTransformer.go +++ b/plugin/builtin/annotationstransformer/AnnotationsTransformer.go @@ -5,9 +5,9 @@ package main import ( + "sigs.k8s.io/kustomize/v3/api/resmap" "sigs.k8s.io/kustomize/v3/api/transform" "sigs.k8s.io/kustomize/v3/api/types" - "sigs.k8s.io/kustomize/v3/pkg/resmap" "sigs.k8s.io/yaml" ) diff --git a/plugin/builtin/configmapgenerator/ConfigMapGenerator.go b/plugin/builtin/configmapgenerator/ConfigMapGenerator.go index 85687a22f..42fda972b 100644 --- a/plugin/builtin/configmapgenerator/ConfigMapGenerator.go +++ b/plugin/builtin/configmapgenerator/ConfigMapGenerator.go @@ -6,8 +6,8 @@ package main import ( "sigs.k8s.io/kustomize/v3/api/kv" + "sigs.k8s.io/kustomize/v3/api/resmap" "sigs.k8s.io/kustomize/v3/api/types" - "sigs.k8s.io/kustomize/v3/pkg/resmap" "sigs.k8s.io/yaml" ) diff --git a/plugin/builtin/hashtransformer/HashTransformer.go b/plugin/builtin/hashtransformer/HashTransformer.go index 50262c749..f9783c5ae 100644 --- a/plugin/builtin/hashtransformer/HashTransformer.go +++ b/plugin/builtin/hashtransformer/HashTransformer.go @@ -7,8 +7,8 @@ package main import ( "fmt" - "sigs.k8s.io/kustomize/v3/pkg/ifc" - "sigs.k8s.io/kustomize/v3/pkg/resmap" + "sigs.k8s.io/kustomize/v3/api/ifc" + "sigs.k8s.io/kustomize/v3/api/resmap" ) type plugin struct { diff --git a/plugin/builtin/imagetagtransformer/ImageTagTransformer.go b/plugin/builtin/imagetagtransformer/ImageTagTransformer.go index 24483909a..2d91a8ccd 100644 --- a/plugin/builtin/imagetagtransformer/ImageTagTransformer.go +++ b/plugin/builtin/imagetagtransformer/ImageTagTransformer.go @@ -11,7 +11,7 @@ import ( "sigs.k8s.io/kustomize/v3/api/types" "strings" - "sigs.k8s.io/kustomize/v3/pkg/resmap" + "sigs.k8s.io/kustomize/v3/api/resmap" "sigs.k8s.io/yaml" ) diff --git a/plugin/builtin/inventorytransformer/InventoryTransformer.go b/plugin/builtin/inventorytransformer/InventoryTransformer.go index b99d1aef7..f15bf5980 100644 --- a/plugin/builtin/inventorytransformer/InventoryTransformer.go +++ b/plugin/builtin/inventorytransformer/InventoryTransformer.go @@ -10,10 +10,10 @@ import ( "sigs.k8s.io/kustomize/v3/api/hasher" "sigs.k8s.io/kustomize/v3/api/kv" "sigs.k8s.io/kustomize/v3/api/resid" + "sigs.k8s.io/kustomize/v3/api/resmap" + "sigs.k8s.io/kustomize/v3/api/resource" "sigs.k8s.io/kustomize/v3/api/types" "sigs.k8s.io/kustomize/v3/pkg/inventory" - "sigs.k8s.io/kustomize/v3/pkg/resmap" - "sigs.k8s.io/kustomize/v3/pkg/resource" "sigs.k8s.io/yaml" ) diff --git a/plugin/builtin/labeltransformer/LabelTransformer.go b/plugin/builtin/labeltransformer/LabelTransformer.go index ce074aea2..4751584c4 100644 --- a/plugin/builtin/labeltransformer/LabelTransformer.go +++ b/plugin/builtin/labeltransformer/LabelTransformer.go @@ -5,9 +5,9 @@ package main import ( + "sigs.k8s.io/kustomize/v3/api/resmap" "sigs.k8s.io/kustomize/v3/api/transform" "sigs.k8s.io/kustomize/v3/api/types" - "sigs.k8s.io/kustomize/v3/pkg/resmap" "sigs.k8s.io/yaml" ) diff --git a/plugin/builtin/legacyordertransformer/LegacyOrderTransformer.go b/plugin/builtin/legacyordertransformer/LegacyOrderTransformer.go index c4fb305b4..237fd8e2b 100644 --- a/plugin/builtin/legacyordertransformer/LegacyOrderTransformer.go +++ b/plugin/builtin/legacyordertransformer/LegacyOrderTransformer.go @@ -8,8 +8,8 @@ import ( "sort" "github.com/pkg/errors" - "sigs.k8s.io/kustomize/v3/pkg/resmap" - "sigs.k8s.io/kustomize/v3/pkg/resource" + "sigs.k8s.io/kustomize/v3/api/resmap" + "sigs.k8s.io/kustomize/v3/api/resource" ) // Sort the resources using an ordering defined in the Gvk class. diff --git a/plugin/builtin/namespacetransformer/NamespaceTransformer.go b/plugin/builtin/namespacetransformer/NamespaceTransformer.go index fc3809e2f..2468c1838 100644 --- a/plugin/builtin/namespacetransformer/NamespaceTransformer.go +++ b/plugin/builtin/namespacetransformer/NamespaceTransformer.go @@ -9,9 +9,9 @@ import ( "sigs.k8s.io/kustomize/v3/api/transform" "sigs.k8s.io/kustomize/v3/api/resid" + "sigs.k8s.io/kustomize/v3/api/resmap" + "sigs.k8s.io/kustomize/v3/api/resource" "sigs.k8s.io/kustomize/v3/api/types" - "sigs.k8s.io/kustomize/v3/pkg/resmap" - "sigs.k8s.io/kustomize/v3/pkg/resource" "sigs.k8s.io/yaml" ) diff --git a/plugin/builtin/patchjson6902transformer/PatchJson6902Transformer.go b/plugin/builtin/patchjson6902transformer/PatchJson6902Transformer.go index 6513c1918..3a6dce5f5 100644 --- a/plugin/builtin/patchjson6902transformer/PatchJson6902Transformer.go +++ b/plugin/builtin/patchjson6902transformer/PatchJson6902Transformer.go @@ -9,10 +9,10 @@ import ( "github.com/evanphx/json-patch" "github.com/pkg/errors" + "sigs.k8s.io/kustomize/v3/api/ifc" "sigs.k8s.io/kustomize/v3/api/resid" + "sigs.k8s.io/kustomize/v3/api/resmap" "sigs.k8s.io/kustomize/v3/api/types" - "sigs.k8s.io/kustomize/v3/pkg/ifc" - "sigs.k8s.io/kustomize/v3/pkg/resmap" "sigs.k8s.io/yaml" ) diff --git a/plugin/builtin/patchstrategicmergetransformer/PatchStrategicMergeTransformer.go b/plugin/builtin/patchstrategicmergetransformer/PatchStrategicMergeTransformer.go index 948f9aabf..67f291731 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/resmap" + "sigs.k8s.io/kustomize/v3/api/resource" "sigs.k8s.io/kustomize/v3/api/types" - "sigs.k8s.io/kustomize/v3/pkg/resmap" - "sigs.k8s.io/kustomize/v3/pkg/resource" "sigs.k8s.io/yaml" ) diff --git a/plugin/builtin/patchtransformer/PatchTransformer.go b/plugin/builtin/patchtransformer/PatchTransformer.go index ceab312f1..321d18951 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/resmap" + "sigs.k8s.io/kustomize/v3/api/resource" "sigs.k8s.io/kustomize/v3/api/types" - "sigs.k8s.io/kustomize/v3/pkg/resmap" - "sigs.k8s.io/kustomize/v3/pkg/resource" "sigs.k8s.io/yaml" ) diff --git a/plugin/builtin/prefixsuffixtransformer/PrefixSuffixTransformer.go b/plugin/builtin/prefixsuffixtransformer/PrefixSuffixTransformer.go index 1bb9d6081..9dd172006 100644 --- a/plugin/builtin/prefixsuffixtransformer/PrefixSuffixTransformer.go +++ b/plugin/builtin/prefixsuffixtransformer/PrefixSuffixTransformer.go @@ -11,7 +11,7 @@ import ( "sigs.k8s.io/kustomize/v3/api/types" "sigs.k8s.io/kustomize/v3/api/resid" - "sigs.k8s.io/kustomize/v3/pkg/resmap" + "sigs.k8s.io/kustomize/v3/api/resmap" "sigs.k8s.io/yaml" ) diff --git a/plugin/builtin/replicacounttransformer/ReplicaCountTransformer.go b/plugin/builtin/replicacounttransformer/ReplicaCountTransformer.go index 7656abdd6..6a43fa748 100644 --- a/plugin/builtin/replicacounttransformer/ReplicaCountTransformer.go +++ b/plugin/builtin/replicacounttransformer/ReplicaCountTransformer.go @@ -9,8 +9,8 @@ import ( "sigs.k8s.io/kustomize/v3/api/transform" "sigs.k8s.io/kustomize/v3/api/resid" + "sigs.k8s.io/kustomize/v3/api/resmap" "sigs.k8s.io/kustomize/v3/api/types" - "sigs.k8s.io/kustomize/v3/pkg/resmap" "sigs.k8s.io/yaml" ) diff --git a/plugin/builtin/secretgenerator/SecretGenerator.go b/plugin/builtin/secretgenerator/SecretGenerator.go index fcefb708b..4fcd7551c 100644 --- a/plugin/builtin/secretgenerator/SecretGenerator.go +++ b/plugin/builtin/secretgenerator/SecretGenerator.go @@ -6,8 +6,8 @@ package main import ( "sigs.k8s.io/kustomize/v3/api/kv" + "sigs.k8s.io/kustomize/v3/api/resmap" "sigs.k8s.io/kustomize/v3/api/types" - "sigs.k8s.io/kustomize/v3/pkg/resmap" "sigs.k8s.io/yaml" ) diff --git a/plugin/someteam.example.com/v1/dateprefixer/DatePrefixer.go b/plugin/someteam.example.com/v1/dateprefixer/DatePrefixer.go index ded9d7fcd..99c114fa1 100644 --- a/plugin/someteam.example.com/v1/dateprefixer/DatePrefixer.go +++ b/plugin/someteam.example.com/v1/dateprefixer/DatePrefixer.go @@ -5,8 +5,8 @@ package main import ( "github.com/pkg/errors" + "sigs.k8s.io/kustomize/v3/api/resmap" "sigs.k8s.io/kustomize/v3/api/types" - "sigs.k8s.io/kustomize/v3/pkg/resmap" "sigs.k8s.io/kustomize/v3/plugin/builtin" "sigs.k8s.io/yaml" ) diff --git a/plugin/someteam.example.com/v1/secretsfromdatabase/SecretsFromDatabase.go b/plugin/someteam.example.com/v1/secretsfromdatabase/SecretsFromDatabase.go index 3b1334cea..4243cebd6 100644 --- a/plugin/someteam.example.com/v1/secretsfromdatabase/SecretsFromDatabase.go +++ b/plugin/someteam.example.com/v1/secretsfromdatabase/SecretsFromDatabase.go @@ -5,8 +5,8 @@ package main import ( "sigs.k8s.io/kustomize/v3/api/kv" + "sigs.k8s.io/kustomize/v3/api/resmap" "sigs.k8s.io/kustomize/v3/api/types" - "sigs.k8s.io/kustomize/v3/pkg/resmap" "sigs.k8s.io/yaml" ) diff --git a/plugin/someteam.example.com/v1/someservicegenerator/SomeServiceGenerator.go b/plugin/someteam.example.com/v1/someservicegenerator/SomeServiceGenerator.go index 59d552ca6..b3e37f514 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/resmap" "sigs.k8s.io/kustomize/v3/api/types" - "sigs.k8s.io/kustomize/v3/pkg/resmap" "sigs.k8s.io/yaml" ) diff --git a/plugin/someteam.example.com/v1/stringprefixer/StringPrefixer.go b/plugin/someteam.example.com/v1/stringprefixer/StringPrefixer.go index 5d93abf68..8ee841ecf 100644 --- a/plugin/someteam.example.com/v1/stringprefixer/StringPrefixer.go +++ b/plugin/someteam.example.com/v1/stringprefixer/StringPrefixer.go @@ -5,8 +5,8 @@ package main import ( "github.com/pkg/errors" + "sigs.k8s.io/kustomize/v3/api/resmap" "sigs.k8s.io/kustomize/v3/api/types" - "sigs.k8s.io/kustomize/v3/pkg/resmap" "sigs.k8s.io/kustomize/v3/plugin/builtin" "sigs.k8s.io/yaml" )