diff --git a/api/internal/accumulator/namereferencetransformer_test.go b/api/internal/accumulator/namereferencetransformer_test.go index c70a34ab7..d7994409f 100644 --- a/api/internal/accumulator/namereferencetransformer_test.go +++ b/api/internal/accumulator/namereferencetransformer_test.go @@ -8,11 +8,11 @@ import ( "testing" "sigs.k8s.io/kustomize/v3/api/builtinconfig" + "sigs.k8s.io/kustomize/v3/api/k8sdeps/kunstruct" "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" ) func TestNameReferenceHappyRun(t *testing.T) { diff --git a/api/internal/accumulator/refvartransformer_test.go b/api/internal/accumulator/refvartransformer_test.go index dc677b12e..5eb4ddbb5 100644 --- a/api/internal/accumulator/refvartransformer_test.go +++ b/api/internal/accumulator/refvartransformer_test.go @@ -7,12 +7,12 @@ import ( "reflect" "testing" + "sigs.k8s.io/kustomize/v3/api/k8sdeps/kunstruct" "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" ) func TestRefVarTransformer(t *testing.T) { diff --git a/api/internal/accumulator/resaccumulator_test.go b/api/internal/accumulator/resaccumulator_test.go index 0fcc5225a..f78c15bb5 100644 --- a/api/internal/accumulator/resaccumulator_test.go +++ b/api/internal/accumulator/resaccumulator_test.go @@ -12,12 +12,12 @@ import ( "sigs.k8s.io/kustomize/v3/api/builtinconfig" . "sigs.k8s.io/kustomize/v3/api/internal/accumulator" + "sigs.k8s.io/kustomize/v3/api/k8sdeps/kunstruct" "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" ) func makeResAccumulator(t *testing.T) (*ResAccumulator, *resource.Factory) { diff --git a/k8sdeps/configmapandsecret/configmapfactory.go b/api/k8sdeps/configmapandsecret/configmapfactory.go similarity index 100% rename from k8sdeps/configmapandsecret/configmapfactory.go rename to api/k8sdeps/configmapandsecret/configmapfactory.go diff --git a/k8sdeps/configmapandsecret/configmapfactory_test.go b/api/k8sdeps/configmapandsecret/configmapfactory_test.go similarity index 100% rename from k8sdeps/configmapandsecret/configmapfactory_test.go rename to api/k8sdeps/configmapandsecret/configmapfactory_test.go diff --git a/k8sdeps/configmapandsecret/factory.go b/api/k8sdeps/configmapandsecret/factory.go similarity index 100% rename from k8sdeps/configmapandsecret/factory.go rename to api/k8sdeps/configmapandsecret/factory.go diff --git a/k8sdeps/configmapandsecret/secretfactory.go b/api/k8sdeps/configmapandsecret/secretfactory.go similarity index 100% rename from k8sdeps/configmapandsecret/secretfactory.go rename to api/k8sdeps/configmapandsecret/secretfactory.go diff --git a/k8sdeps/configmapandsecret/secretfactory_test.go b/api/k8sdeps/configmapandsecret/secretfactory_test.go similarity index 100% rename from k8sdeps/configmapandsecret/secretfactory_test.go rename to api/k8sdeps/configmapandsecret/secretfactory_test.go diff --git a/k8sdeps/doc.go b/api/k8sdeps/doc.go similarity index 100% rename from k8sdeps/doc.go rename to api/k8sdeps/doc.go diff --git a/k8sdeps/kunstruct/factory.go b/api/k8sdeps/kunstruct/factory.go similarity index 98% rename from k8sdeps/kunstruct/factory.go rename to api/k8sdeps/kunstruct/factory.go index 1d104f0be..74b6cd0a3 100644 --- a/k8sdeps/kunstruct/factory.go +++ b/api/k8sdeps/kunstruct/factory.go @@ -13,8 +13,8 @@ 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/k8sdeps/configmapandsecret" "sigs.k8s.io/kustomize/v3/api/types" - "sigs.k8s.io/kustomize/v3/k8sdeps/configmapandsecret" ) // KunstructuredFactoryImpl hides construction using apimachinery types. diff --git a/k8sdeps/kunstruct/factory_test.go b/api/k8sdeps/kunstruct/factory_test.go similarity index 100% rename from k8sdeps/kunstruct/factory_test.go rename to api/k8sdeps/kunstruct/factory_test.go diff --git a/k8sdeps/kunstruct/hasher.go b/api/k8sdeps/kunstruct/hasher.go similarity index 100% rename from k8sdeps/kunstruct/hasher.go rename to api/k8sdeps/kunstruct/hasher.go diff --git a/k8sdeps/kunstruct/hasher_test.go b/api/k8sdeps/kunstruct/hasher_test.go similarity index 100% rename from k8sdeps/kunstruct/hasher_test.go rename to api/k8sdeps/kunstruct/hasher_test.go diff --git a/k8sdeps/kunstruct/helper.go b/api/k8sdeps/kunstruct/helper.go similarity index 100% rename from k8sdeps/kunstruct/helper.go rename to api/k8sdeps/kunstruct/helper.go diff --git a/k8sdeps/kunstruct/helper_test.go b/api/k8sdeps/kunstruct/helper_test.go similarity index 100% rename from k8sdeps/kunstruct/helper_test.go rename to api/k8sdeps/kunstruct/helper_test.go diff --git a/k8sdeps/kunstruct/unstructadapter.go b/api/k8sdeps/kunstruct/unstructadapter.go similarity index 100% rename from k8sdeps/kunstruct/unstructadapter.go rename to api/k8sdeps/kunstruct/unstructadapter.go diff --git a/k8sdeps/kunstruct/unstructadapter_test.go b/api/k8sdeps/kunstruct/unstructadapter_test.go similarity index 100% rename from k8sdeps/kunstruct/unstructadapter_test.go rename to api/k8sdeps/kunstruct/unstructadapter_test.go diff --git a/k8sdeps/transformer/factory.go b/api/k8sdeps/transformer/factory.go similarity index 91% rename from k8sdeps/transformer/factory.go rename to api/k8sdeps/transformer/factory.go index 66949d78b..e0ece3f60 100644 --- a/k8sdeps/transformer/factory.go +++ b/api/k8sdeps/transformer/factory.go @@ -5,9 +5,9 @@ package transformer import ( + "sigs.k8s.io/kustomize/v3/api/k8sdeps/transformer/patch" "sigs.k8s.io/kustomize/v3/api/resmap" "sigs.k8s.io/kustomize/v3/api/resource" - "sigs.k8s.io/kustomize/v3/k8sdeps/transformer/patch" ) // FactoryImpl makes patch transformer and name hash transformer diff --git a/k8sdeps/transformer/patch/conflictdetector.go b/api/k8sdeps/transformer/patch/conflictdetector.go similarity index 100% rename from k8sdeps/transformer/patch/conflictdetector.go rename to api/k8sdeps/transformer/patch/conflictdetector.go diff --git a/k8sdeps/validator/validators.go b/api/k8sdeps/validator/validators.go similarity index 100% rename from k8sdeps/validator/validators.go rename to api/k8sdeps/validator/validators.go diff --git a/api/plugins/execplugin/execplugin_test.go b/api/plugins/execplugin/execplugin_test.go index b1500aff3..83475b4fb 100644 --- a/api/plugins/execplugin/execplugin_test.go +++ b/api/plugins/execplugin/execplugin_test.go @@ -9,6 +9,7 @@ import ( "testing" "sigs.k8s.io/kustomize/v3/api/internal/loadertest" + "sigs.k8s.io/kustomize/v3/api/k8sdeps/kunstruct" "sigs.k8s.io/kustomize/v3/api/plugins/config" . "sigs.k8s.io/kustomize/v3/api/plugins/execplugin" "sigs.k8s.io/kustomize/v3/api/plugins/loader" @@ -16,7 +17,6 @@ import ( "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/k8sdeps/kunstruct" ) func TestExecPluginConfig(t *testing.T) { diff --git a/api/plugins/loader/loader.go b/api/plugins/loader/loader.go index 0400c985d..9ea82380a 100644 --- a/api/plugins/loader/loader.go +++ b/api/plugins/loader/loader.go @@ -10,17 +10,15 @@ import ( "reflect" "strings" - "sigs.k8s.io/kustomize/v3/api/plugins/builtins" - "github.com/pkg/errors" "sigs.k8s.io/kustomize/v3/api/ifc" + "sigs.k8s.io/kustomize/v3/api/plugins/builtins" "sigs.k8s.io/kustomize/v3/api/plugins/config" "sigs.k8s.io/kustomize/v3/api/plugins/execplugin" "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/plugins" ) type Loader struct { @@ -176,11 +174,11 @@ func (l *Loader) loadGoPlugin(id resid.ResId) (resmap.Configurable, error) { if err != nil { return nil, errors.Wrapf(err, "plugin %s fails to load", absPath) } - symbol, err := p.Lookup(plugins.PluginSymbol) + symbol, err := p.Lookup(config.PluginSymbol) if err != nil { return nil, errors.Wrapf( err, "plugin %s doesn't have symbol %s", - regId, plugins.PluginSymbol) + regId, config.PluginSymbol) } c, ok := symbol.(resmap.Configurable) if !ok { diff --git a/api/plugins/loader/loader_test.go b/api/plugins/loader/loader_test.go index 7341d3ac0..c2df5aacf 100644 --- a/api/plugins/loader/loader_test.go +++ b/api/plugins/loader/loader_test.go @@ -7,13 +7,13 @@ import ( "testing" "sigs.k8s.io/kustomize/v3/api/internal/loadertest" + "sigs.k8s.io/kustomize/v3/api/k8sdeps/kunstruct" "sigs.k8s.io/kustomize/v3/api/plugins/config" . "sigs.k8s.io/kustomize/v3/api/plugins/loader" "sigs.k8s.io/kustomize/v3/api/resmap" "sigs.k8s.io/kustomize/v3/api/resource" "sigs.k8s.io/kustomize/v3/api/testutils/kusttest" "sigs.k8s.io/kustomize/v3/api/testutils/valtest" - "sigs.k8s.io/kustomize/v3/k8sdeps/kunstruct" ) const ( diff --git a/api/resmap/resmap_test.go b/api/resmap/resmap_test.go index 57ca55c0a..9873d285c 100644 --- a/api/resmap/resmap_test.go +++ b/api/resmap/resmap_test.go @@ -9,12 +9,12 @@ import ( "strings" "testing" + "sigs.k8s.io/kustomize/v3/api/k8sdeps/kunstruct" "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" ) var rf = resource.NewFactory( diff --git a/api/resource/resource_test.go b/api/resource/resource_test.go index 1cd0f4107..c480fc36b 100644 --- a/api/resource/resource_test.go +++ b/api/resource/resource_test.go @@ -20,10 +20,10 @@ import ( "reflect" "testing" + "sigs.k8s.io/kustomize/v3/api/k8sdeps/kunstruct" "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" ) var factory = NewFactory( diff --git a/api/target/plugindir_test.go b/api/target/plugindir_test.go index bbaea9471..42ce51838 100644 --- a/api/target/plugindir_test.go +++ b/api/target/plugindir_test.go @@ -10,6 +10,8 @@ import ( "testing" "sigs.k8s.io/kustomize/v3/api/filesys" + "sigs.k8s.io/kustomize/v3/api/k8sdeps/kunstruct" + "sigs.k8s.io/kustomize/v3/api/k8sdeps/transformer" fLdr "sigs.k8s.io/kustomize/v3/api/loader" "sigs.k8s.io/kustomize/v3/api/plugins/config" pLdr "sigs.k8s.io/kustomize/v3/api/plugins/loader" @@ -18,8 +20,6 @@ import ( "sigs.k8s.io/kustomize/v3/api/target" "sigs.k8s.io/kustomize/v3/api/testutils/kusttest" "sigs.k8s.io/kustomize/v3/api/testutils/valtest" - "sigs.k8s.io/kustomize/v3/k8sdeps/kunstruct" - "sigs.k8s.io/kustomize/v3/k8sdeps/transformer" ) func TestPluginDir(t *testing.T) { diff --git a/api/testutils/kusttest/kusttestharness.go b/api/testutils/kusttest/kusttestharness.go index 20674d5b0..b97d1b601 100644 --- a/api/testutils/kusttest/kusttestharness.go +++ b/api/testutils/kusttest/kusttestharness.go @@ -11,6 +11,8 @@ import ( "sigs.k8s.io/kustomize/v3/api/builtinconfig/consts" "sigs.k8s.io/kustomize/v3/api/internal/loadertest" + "sigs.k8s.io/kustomize/v3/api/k8sdeps/kunstruct" + "sigs.k8s.io/kustomize/v3/api/k8sdeps/transformer" fLdr "sigs.k8s.io/kustomize/v3/api/loader" "sigs.k8s.io/kustomize/v3/api/pgmconfig" "sigs.k8s.io/kustomize/v3/api/plugins/config" @@ -20,8 +22,6 @@ import ( "sigs.k8s.io/kustomize/v3/api/target" "sigs.k8s.io/kustomize/v3/api/testutils/valtest" "sigs.k8s.io/kustomize/v3/api/types" - "sigs.k8s.io/kustomize/v3/k8sdeps/kunstruct" - "sigs.k8s.io/kustomize/v3/k8sdeps/transformer" ) // KustTestHarness is an environment for running a kustomize build, diff --git a/api/transform/maptransformer_test.go b/api/transform/maptransformer_test.go index d50d0dac8..932eb7339 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/k8sdeps/kunstruct" "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" ) var resourceFactory = resource.NewFactory(kunstruct.NewKunstructuredFactoryImpl()) diff --git a/api/transform/mutatefield_test.go b/api/transform/mutatefield_test.go index d0f7425c2..8b54df2f1 100644 --- a/api/transform/mutatefield_test.go +++ b/api/transform/mutatefield_test.go @@ -8,8 +8,8 @@ import ( "testing" "sigs.k8s.io/kustomize/v3/api/ifc" + "sigs.k8s.io/kustomize/v3/api/k8sdeps/kunstruct" . "sigs.k8s.io/kustomize/v3/api/transform" - "sigs.k8s.io/kustomize/v3/k8sdeps/kunstruct" ) type noopMutator struct { diff --git a/hacks/crawl/doc/doc.go b/hacks/crawl/doc/doc.go index 44e1ac567..56a683256 100644 --- a/hacks/crawl/doc/doc.go +++ b/hacks/crawl/doc/doc.go @@ -5,9 +5,9 @@ import ( "strings" "sigs.k8s.io/kustomize/v3/api/ifc" + "sigs.k8s.io/kustomize/v3/api/k8sdeps/kunstruct" "sigs.k8s.io/kustomize/v3/api/pgmconfig" "sigs.k8s.io/kustomize/v3/api/types" - "sigs.k8s.io/kustomize/v3/k8sdeps/kunstruct" "sigs.k8s.io/yaml" ) diff --git a/kustomize/internal/commands/commands.go b/kustomize/internal/commands/commands.go index 9013f979d..0faaf8630 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/k8sdeps/kunstruct" + "sigs.k8s.io/kustomize/v3/api/k8sdeps/transformer" + "sigs.k8s.io/kustomize/v3/api/k8sdeps/validator" "sigs.k8s.io/kustomize/v3/api/pgmconfig" "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" ) // NewDefaultCommand returns the default (aka root) command for kustomize command. diff --git a/kustomize/internal/commands/create/create_test.go b/kustomize/internal/commands/create/create_test.go index 469a8194a..0fe2353b7 100644 --- a/kustomize/internal/commands/create/create_test.go +++ b/kustomize/internal/commands/create/create_test.go @@ -9,8 +9,8 @@ import ( "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile" "sigs.k8s.io/kustomize/v3/api/filesys" + "sigs.k8s.io/kustomize/v3/api/k8sdeps/kunstruct" "sigs.k8s.io/kustomize/v3/api/types" - "sigs.k8s.io/kustomize/v3/k8sdeps/kunstruct" ) var factory = kunstruct.NewKunstructuredFactoryImpl()