diff --git a/pkg/plugins/loader_test.go b/pkg/plugins/loader_test.go index 05b175818..d158cf1d3 100644 --- a/pkg/plugins/loader_test.go +++ b/pkg/plugins/loader_test.go @@ -9,6 +9,7 @@ import ( "sigs.k8s.io/kustomize/v3/internal/loadertest" "sigs.k8s.io/kustomize/v3/k8sdeps/kunstruct" . "sigs.k8s.io/kustomize/v3/pkg/plugins" + plugins_test "sigs.k8s.io/kustomize/v3/pkg/plugins/test" "sigs.k8s.io/kustomize/v3/pkg/resmap" "sigs.k8s.io/kustomize/v3/pkg/resource" ) @@ -41,7 +42,7 @@ port: "12345" ) func TestLoader(t *testing.T) { - tc := NewEnvForTest(t).Set() + tc := plugins_test.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildGoPlugin( diff --git a/pkg/plugins/envfortest.go b/pkg/plugins/test/envfortest.go similarity index 91% rename from pkg/plugins/envfortest.go rename to pkg/plugins/test/envfortest.go index 928d32646..c92f996ff 100644 --- a/pkg/plugins/envfortest.go +++ b/pkg/plugins/test/envfortest.go @@ -1,7 +1,7 @@ // Copyright 2019 The Kubernetes Authors. // SPDX-License-Identifier: Apache-2.0 -package plugins +package test import ( "io/ioutil" @@ -12,13 +12,14 @@ import ( "testing" "sigs.k8s.io/kustomize/v3/pkg/pgmconfig" + "sigs.k8s.io/kustomize/v3/pkg/plugins" ) // EnvForTest manages the plugin test environment. // It sets/resets XDG_CONFIG_HOME, makes/removes a temp objRoot. type EnvForTest struct { t *testing.T - compiler *Compiler + compiler *plugins.Compiler workDir string oldXdg string wasSet bool @@ -61,7 +62,7 @@ func (x *EnvForTest) BuildExecPlugin(g, v, k string) { } } -func (x *EnvForTest) makeCompiler() *Compiler { +func (x *EnvForTest) makeCompiler() *plugins.Compiler { // The plugin loader wants to find object code under // $XDG_CONFIG_HOME/kustomize/plugins // and the compiler writes object code to @@ -73,11 +74,11 @@ func (x *EnvForTest) makeCompiler() *Compiler { if err != nil { x.t.Error(err) } - srcRoot, err := DefaultSrcRoot() + srcRoot, err := plugins.DefaultSrcRoot() if err != nil { x.t.Error(err) } - return NewCompiler(srcRoot, objRoot) + return plugins.NewCompiler(srcRoot, objRoot) } func (x *EnvForTest) createWorkDir() { diff --git a/pkg/target/chartinflatorplugin_test.go b/pkg/target/chartinflatorplugin_test.go index 2124f0887..73bfffb98 100644 --- a/pkg/target/chartinflatorplugin_test.go +++ b/pkg/target/chartinflatorplugin_test.go @@ -28,7 +28,7 @@ import ( // TODO: Download and inflate the chart, and check that // in for the test. func TestChartInflatorPlugin(t *testing.T) { - tc := plugins.NewEnvForTest(t).Set() + tc := plugins_test.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildExecPlugin( diff --git a/pkg/target/diamondcomposition_test.go b/pkg/target/diamondcomposition_test.go index 137f2e21c..9e8ce00e5 100644 --- a/pkg/target/diamondcomposition_test.go +++ b/pkg/target/diamondcomposition_test.go @@ -9,8 +9,8 @@ import ( "strings" "testing" - "sigs.k8s.io/kustomize/v3/pkg/kusttest" - "sigs.k8s.io/kustomize/v3/pkg/plugins" + kusttest_test "sigs.k8s.io/kustomize/v3/pkg/kusttest" + plugins_test "sigs.k8s.io/kustomize/v3/pkg/plugins/test" ) const patchAddProbe = ` @@ -340,7 +340,7 @@ patchesStrategicMerge: } func TestIssue1251_Plugins_ProdVsDev(t *testing.T) { - tc := plugins.NewEnvForTest(t).Set() + tc := plugins_test.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildGoPlugin( @@ -380,7 +380,7 @@ transformers: } func TestIssue1251_Plugins_Local(t *testing.T) { - tc := plugins.NewEnvForTest(t).Set() + tc := plugins_test.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildGoPlugin( @@ -430,7 +430,7 @@ jsonOp: '%s' // Remote in the sense that they are bundled in a different kustomization. func TestIssue1251_Plugins_Bundled(t *testing.T) { - tc := plugins.NewEnvForTest(t).Set() + tc := plugins_test.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildGoPlugin( diff --git a/pkg/target/plugindir_test.go b/pkg/target/plugindir_test.go index 11b03b4e6..e804b5b76 100644 --- a/pkg/target/plugindir_test.go +++ b/pkg/target/plugindir_test.go @@ -12,9 +12,10 @@ import ( "sigs.k8s.io/kustomize/v3/k8sdeps/kunstruct" "sigs.k8s.io/kustomize/v3/k8sdeps/transformer" "sigs.k8s.io/kustomize/v3/pkg/fs" - "sigs.k8s.io/kustomize/v3/pkg/kusttest" + kusttest_test "sigs.k8s.io/kustomize/v3/pkg/kusttest" "sigs.k8s.io/kustomize/v3/pkg/loader" "sigs.k8s.io/kustomize/v3/pkg/plugins" + plugins_test "sigs.k8s.io/kustomize/v3/pkg/plugins/test" "sigs.k8s.io/kustomize/v3/pkg/resmap" "sigs.k8s.io/kustomize/v3/pkg/resource" "sigs.k8s.io/kustomize/v3/pkg/target" @@ -22,7 +23,7 @@ import ( ) func TestPluginDir(t *testing.T) { - tc := plugins.NewEnvForTest(t).Set() + tc := plugins_test.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildExecPlugin( diff --git a/pkg/target/transformerplugin_test.go b/pkg/target/transformerplugin_test.go index a0e9be73a..922292e2c 100644 --- a/pkg/target/transformerplugin_test.go +++ b/pkg/target/transformerplugin_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "sigs.k8s.io/kustomize/v3/pkg/kusttest" - "sigs.k8s.io/kustomize/v3/pkg/plugins" + kusttest_test "sigs.k8s.io/kustomize/v3/pkg/kusttest" + plugins_test "sigs.k8s.io/kustomize/v3/pkg/plugins/test" ) func writeDeployment(th *kusttest_test.KustTestHarness, path string) { @@ -50,7 +50,7 @@ metadata: } func TestOrderedTransformers(t *testing.T) { - tc := plugins.NewEnvForTest(t).Set() + tc := plugins_test.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildGoPlugin( @@ -96,7 +96,7 @@ spec: } func TestPluginsNotEnabled(t *testing.T) { - tc := plugins.NewEnvForTest(t).Set() + tc := plugins_test.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildGoPlugin( @@ -119,7 +119,7 @@ transformers: } func TestSedTransformer(t *testing.T) { - tc := plugins.NewEnvForTest(t).Set() + tc := plugins_test.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildExecPlugin( @@ -187,7 +187,7 @@ metadata: } func TestTransformedTransformers(t *testing.T) { - tc := plugins.NewEnvForTest(t).Set() + tc := plugins_test.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildGoPlugin( diff --git a/plugin/builtin/annotationstransformer/AnnotationsTransformer_test.go b/plugin/builtin/annotationstransformer/AnnotationsTransformer_test.go index 3bc732c24..661e94a54 100644 --- a/plugin/builtin/annotationstransformer/AnnotationsTransformer_test.go +++ b/plugin/builtin/annotationstransformer/AnnotationsTransformer_test.go @@ -7,11 +7,11 @@ import ( "testing" "sigs.k8s.io/kustomize/v3/pkg/kusttest" - "sigs.k8s.io/kustomize/v3/pkg/plugins" + plugins_test "sigs.k8s.io/kustomize/v3/pkg/plugins/test" ) func TestAnnotationsTransformer(t *testing.T) { - tc := plugins.NewEnvForTest(t).Set() + tc := plugins_test.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildGoPlugin( diff --git a/plugin/builtin/configmapgenerator/ConfigMapGenerator_test.go b/plugin/builtin/configmapgenerator/ConfigMapGenerator_test.go index 95d0ab844..0c51e7b2f 100644 --- a/plugin/builtin/configmapgenerator/ConfigMapGenerator_test.go +++ b/plugin/builtin/configmapgenerator/ConfigMapGenerator_test.go @@ -7,11 +7,11 @@ import ( "testing" "sigs.k8s.io/kustomize/v3/pkg/kusttest" - "sigs.k8s.io/kustomize/v3/pkg/plugins" + plugins_test "sigs.k8s.io/kustomize/v3/pkg/plugins/test" ) func TestConfigMapGenerator(t *testing.T) { - tc := plugins.NewEnvForTest(t).Set() + tc := plugins_test.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildGoPlugin( diff --git a/plugin/builtin/hashtransformer/HashTransformer_test.go b/plugin/builtin/hashtransformer/HashTransformer_test.go index 7595520db..310262689 100644 --- a/plugin/builtin/hashtransformer/HashTransformer_test.go +++ b/plugin/builtin/hashtransformer/HashTransformer_test.go @@ -7,11 +7,11 @@ import ( "testing" "sigs.k8s.io/kustomize/v3/pkg/kusttest" - "sigs.k8s.io/kustomize/v3/pkg/plugins" + plugins_test "sigs.k8s.io/kustomize/v3/pkg/plugins/test" ) func TestHashTransformer(t *testing.T) { - tc := plugins.NewEnvForTest(t).Set() + tc := plugins_test.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildGoPlugin( diff --git a/plugin/builtin/imagetagtransformer/ImageTagTransformer_test.go b/plugin/builtin/imagetagtransformer/ImageTagTransformer_test.go index cb895aa3f..0e374fffe 100644 --- a/plugin/builtin/imagetagtransformer/ImageTagTransformer_test.go +++ b/plugin/builtin/imagetagtransformer/ImageTagTransformer_test.go @@ -7,11 +7,11 @@ import ( "testing" "sigs.k8s.io/kustomize/v3/pkg/kusttest" - "sigs.k8s.io/kustomize/v3/pkg/plugins" + plugins_test "sigs.k8s.io/kustomize/v3/pkg/plugins/test" ) func TestImageTagTransformer(t *testing.T) { - tc := plugins.NewEnvForTest(t).Set() + tc := plugins_test.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildGoPlugin( diff --git a/plugin/builtin/inventorytransformer/InventoryTransformer_test.go b/plugin/builtin/inventorytransformer/InventoryTransformer_test.go index df3be48f9..b7a6384f4 100644 --- a/plugin/builtin/inventorytransformer/InventoryTransformer_test.go +++ b/plugin/builtin/inventorytransformer/InventoryTransformer_test.go @@ -6,8 +6,8 @@ package main_test import ( "testing" - "sigs.k8s.io/kustomize/v3/pkg/kusttest" - "sigs.k8s.io/kustomize/v3/pkg/plugins" + kusttest_test "sigs.k8s.io/kustomize/v3/pkg/kusttest" + plugins_test "sigs.k8s.io/kustomize/v3/pkg/plugins/test" ) const ( @@ -59,7 +59,7 @@ metadata: ) func TestInventoryTransformerCollect(t *testing.T) { - tc := plugins.NewEnvForTest(t).Set() + tc := plugins_test.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildGoPlugin( @@ -80,7 +80,7 @@ policy: GarbageCollect } func TestInventoryTransformerIgnore(t *testing.T) { - tc := plugins.NewEnvForTest(t).Set() + tc := plugins_test.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildGoPlugin( @@ -101,7 +101,7 @@ policy: GarbageIgnore } func TestInventoryTransformerDefaultPolicy(t *testing.T) { - tc := plugins.NewEnvForTest(t).Set() + tc := plugins_test.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildGoPlugin( diff --git a/plugin/builtin/labeltransformer/LabelTransformer_test.go b/plugin/builtin/labeltransformer/LabelTransformer_test.go index 3f67a2ae4..630d1c06b 100644 --- a/plugin/builtin/labeltransformer/LabelTransformer_test.go +++ b/plugin/builtin/labeltransformer/LabelTransformer_test.go @@ -7,11 +7,11 @@ import ( "testing" "sigs.k8s.io/kustomize/v3/pkg/kusttest" - "sigs.k8s.io/kustomize/v3/pkg/plugins" + plugins_test "sigs.k8s.io/kustomize/v3/pkg/plugins/test" ) func TestLabelTransformer(t *testing.T) { - tc := plugins.NewEnvForTest(t).Set() + tc := plugins_test.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildGoPlugin( diff --git a/plugin/builtin/legacyordertransformer/LegacyOrderTransformer_test.go b/plugin/builtin/legacyordertransformer/LegacyOrderTransformer_test.go index e58a75089..21fc786b8 100644 --- a/plugin/builtin/legacyordertransformer/LegacyOrderTransformer_test.go +++ b/plugin/builtin/legacyordertransformer/LegacyOrderTransformer_test.go @@ -7,11 +7,11 @@ import ( "testing" "sigs.k8s.io/kustomize/v3/pkg/kusttest" - "sigs.k8s.io/kustomize/v3/pkg/plugins" + plugins_test "sigs.k8s.io/kustomize/v3/pkg/plugins/test" ) func TestLegacyOrderTransformer(t *testing.T) { - tc := plugins.NewEnvForTest(t).Set() + tc := plugins_test.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildGoPlugin( diff --git a/plugin/builtin/namespacetransformer/NamespaceTransformer_test.go b/plugin/builtin/namespacetransformer/NamespaceTransformer_test.go index 8ddff877c..d0d393235 100644 --- a/plugin/builtin/namespacetransformer/NamespaceTransformer_test.go +++ b/plugin/builtin/namespacetransformer/NamespaceTransformer_test.go @@ -7,11 +7,11 @@ import ( "testing" "sigs.k8s.io/kustomize/v3/pkg/kusttest" - "sigs.k8s.io/kustomize/v3/pkg/plugins" + plugins_test "sigs.k8s.io/kustomize/v3/pkg/plugins/test" ) func TestNamespaceTransformer1(t *testing.T) { - tc := plugins.NewEnvForTest(t).Set() + tc := plugins_test.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildGoPlugin( @@ -174,7 +174,7 @@ metadata: } func TestNamespaceTransformerClusterLevelKinds(t *testing.T) { - tc := plugins.NewEnvForTest(t).Set() + tc := plugins_test.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildGoPlugin( diff --git a/plugin/builtin/patchjson6902transformer/PatchJson6902Transformer_test.go b/plugin/builtin/patchjson6902transformer/PatchJson6902Transformer_test.go index 6e820c13b..abdcd1a9c 100644 --- a/plugin/builtin/patchjson6902transformer/PatchJson6902Transformer_test.go +++ b/plugin/builtin/patchjson6902transformer/PatchJson6902Transformer_test.go @@ -8,7 +8,7 @@ import ( "testing" "sigs.k8s.io/kustomize/v3/pkg/kusttest" - "sigs.k8s.io/kustomize/v3/pkg/plugins" + plugins_test "sigs.k8s.io/kustomize/v3/pkg/plugins/test" ) const target = ` @@ -29,7 +29,7 @@ spec: ` func TestPatchJson6902TransformerMissingFile(t *testing.T) { - tc := plugins.NewEnvForTest(t).Set() + tc := plugins_test.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildGoPlugin( @@ -58,7 +58,7 @@ path: jsonpatch.json } func TestBadPatchJson6902Transformer(t *testing.T) { - tc := plugins.NewEnvForTest(t).Set() + tc := plugins_test.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildGoPlugin( @@ -87,7 +87,7 @@ jsonOp: 'thisIsNotAPatch' } func TestBothEmptyJson6902Transformer(t *testing.T) { - tc := plugins.NewEnvForTest(t).Set() + tc := plugins_test.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildGoPlugin( @@ -115,7 +115,7 @@ target: } func TestBothSpecifiedJson6902Transformer(t *testing.T) { - tc := plugins.NewEnvForTest(t).Set() + tc := plugins_test.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildGoPlugin( @@ -151,7 +151,7 @@ jsonOp: '[{"op": "add", "path": "/spec/template/spec/dnsPolicy", "value": "Clust } func TestPatchJson6902TransformerFromJsonFile(t *testing.T) { - tc := plugins.NewEnvForTest(t).Set() + tc := plugins_test.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildGoPlugin( @@ -201,7 +201,7 @@ spec: } func TestPatchJson6902TransformerFromYamlFile(t *testing.T) { - tc := plugins.NewEnvForTest(t).Set() + tc := plugins_test.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildGoPlugin( @@ -251,7 +251,7 @@ spec: } func TestPatchJson6902TransformerWithInline(t *testing.T) { - tc := plugins.NewEnvForTest(t).Set() + tc := plugins_test.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildGoPlugin( diff --git a/plugin/builtin/prefixsuffixtransformer/PrefixSuffixTransformer_test.go b/plugin/builtin/prefixsuffixtransformer/PrefixSuffixTransformer_test.go index 2e9fe90b9..d494840a2 100644 --- a/plugin/builtin/prefixsuffixtransformer/PrefixSuffixTransformer_test.go +++ b/plugin/builtin/prefixsuffixtransformer/PrefixSuffixTransformer_test.go @@ -7,11 +7,11 @@ import ( "testing" "sigs.k8s.io/kustomize/v3/pkg/kusttest" - "sigs.k8s.io/kustomize/v3/pkg/plugins" + plugins_test "sigs.k8s.io/kustomize/v3/pkg/plugins/test" ) func TestPrefixSuffixTransformer(t *testing.T) { - tc := plugins.NewEnvForTest(t).Set() + tc := plugins_test.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildGoPlugin( diff --git a/plugin/builtin/replicacounttransformer/ReplicaCountTransformer_test.go b/plugin/builtin/replicacounttransformer/ReplicaCountTransformer_test.go index f7e947e58..b56b4d292 100644 --- a/plugin/builtin/replicacounttransformer/ReplicaCountTransformer_test.go +++ b/plugin/builtin/replicacounttransformer/ReplicaCountTransformer_test.go @@ -7,11 +7,11 @@ import ( "testing" "sigs.k8s.io/kustomize/v3/pkg/kusttest" - "sigs.k8s.io/kustomize/v3/pkg/plugins" + plugins_test "sigs.k8s.io/kustomize/v3/pkg/plugins/test" ) func TestReplicaCountTransformer(t *testing.T) { - tc := plugins.NewEnvForTest(t).Set() + tc := plugins_test.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildGoPlugin( diff --git a/plugin/builtin/secretgenerator/SecretGenerator_test.go b/plugin/builtin/secretgenerator/SecretGenerator_test.go index eb62bcb41..18561f1fe 100644 --- a/plugin/builtin/secretgenerator/SecretGenerator_test.go +++ b/plugin/builtin/secretgenerator/SecretGenerator_test.go @@ -7,11 +7,11 @@ import ( "testing" "sigs.k8s.io/kustomize/v3/pkg/kusttest" - "sigs.k8s.io/kustomize/v3/pkg/plugins" + plugins_test "sigs.k8s.io/kustomize/v3/pkg/plugins/test" ) func TestSecretGenerator(t *testing.T) { - tc := plugins.NewEnvForTest(t).Set() + tc := plugins_test.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildGoPlugin( diff --git a/plugin/someteam.example.com/v1/bashedconfigmap/BashedConfigMap_test.go b/plugin/someteam.example.com/v1/bashedconfigmap/BashedConfigMap_test.go index efacc7db0..752223e07 100644 --- a/plugin/someteam.example.com/v1/bashedconfigmap/BashedConfigMap_test.go +++ b/plugin/someteam.example.com/v1/bashedconfigmap/BashedConfigMap_test.go @@ -7,11 +7,11 @@ import ( "testing" "sigs.k8s.io/kustomize/v3/pkg/kusttest" - "sigs.k8s.io/kustomize/v3/pkg/plugins" + plugins_test "sigs.k8s.io/kustomize/v3/pkg/plugins/test" ) func TestBashedConfigMapPlugin(t *testing.T) { - tc := plugins.NewEnvForTest(t).Set() + tc := plugins_test.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildExecPlugin( diff --git a/plugin/someteam.example.com/v1/chartinflator/ChartInflator_test.go b/plugin/someteam.example.com/v1/chartinflator/ChartInflator_test.go index 3dbaff303..a1f284b3c 100644 --- a/plugin/someteam.example.com/v1/chartinflator/ChartInflator_test.go +++ b/plugin/someteam.example.com/v1/chartinflator/ChartInflator_test.go @@ -11,7 +11,7 @@ import ( "testing" "sigs.k8s.io/kustomize/v3/pkg/kusttest" - "sigs.k8s.io/kustomize/v3/pkg/plugins" + plugins_test "sigs.k8s.io/kustomize/v3/pkg/plugins/test" ) // This test requires having the helm binary on the PATH. @@ -19,7 +19,7 @@ import ( // TODO: Download and inflate the chart, and check that // in for the test. func TestChartInflator(t *testing.T) { - tc := plugins.NewEnvForTest(t).Set() + tc := plugins_test.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildExecPlugin( diff --git a/plugin/someteam.example.com/v1/dateprefixer/DatePrefixer_test.go b/plugin/someteam.example.com/v1/dateprefixer/DatePrefixer_test.go index 8942da7df..a9b03edfa 100644 --- a/plugin/someteam.example.com/v1/dateprefixer/DatePrefixer_test.go +++ b/plugin/someteam.example.com/v1/dateprefixer/DatePrefixer_test.go @@ -7,11 +7,11 @@ import ( "testing" "sigs.k8s.io/kustomize/v3/pkg/kusttest" - "sigs.k8s.io/kustomize/v3/pkg/plugins" + plugins_test "sigs.k8s.io/kustomize/v3/pkg/plugins/test" ) func TestDatePrefixerPlugin(t *testing.T) { - tc := plugins.NewEnvForTest(t).Set() + tc := plugins_test.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildGoPlugin( diff --git a/plugin/someteam.example.com/v1/printworkdir/PrintWorkDir_test.go b/plugin/someteam.example.com/v1/printworkdir/PrintWorkDir_test.go index 119ea120b..f40cf3b15 100644 --- a/plugin/someteam.example.com/v1/printworkdir/PrintWorkDir_test.go +++ b/plugin/someteam.example.com/v1/printworkdir/PrintWorkDir_test.go @@ -8,7 +8,7 @@ import ( "testing" "sigs.k8s.io/kustomize/v3/pkg/kusttest" - "sigs.k8s.io/kustomize/v3/pkg/plugins" + plugins_test "sigs.k8s.io/kustomize/v3/pkg/plugins/test" ) func shouldContain(t *testing.T, s []byte, x string) { @@ -18,7 +18,7 @@ func shouldContain(t *testing.T, s []byte, x string) { } func TestPrintWorkDirPlugin(t *testing.T) { - tc := plugins.NewEnvForTest(t).Set() + tc := plugins_test.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildExecPlugin( diff --git a/plugin/someteam.example.com/v1/secretsfromdatabase/SecretsFromDatabase_test.go b/plugin/someteam.example.com/v1/secretsfromdatabase/SecretsFromDatabase_test.go index 1730910d2..7303e908b 100644 --- a/plugin/someteam.example.com/v1/secretsfromdatabase/SecretsFromDatabase_test.go +++ b/plugin/someteam.example.com/v1/secretsfromdatabase/SecretsFromDatabase_test.go @@ -7,11 +7,11 @@ import ( "testing" "sigs.k8s.io/kustomize/v3/pkg/kusttest" - "sigs.k8s.io/kustomize/v3/pkg/plugins" + plugins_test "sigs.k8s.io/kustomize/v3/pkg/plugins/test" ) func TestSecretsFromDatabasePlugin(t *testing.T) { - tc := plugins.NewEnvForTest(t).Set() + tc := plugins_test.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildGoPlugin( diff --git a/plugin/someteam.example.com/v1/sedtransformer/SedTransformer_test.go b/plugin/someteam.example.com/v1/sedtransformer/SedTransformer_test.go index dcb6e3829..138eca617 100644 --- a/plugin/someteam.example.com/v1/sedtransformer/SedTransformer_test.go +++ b/plugin/someteam.example.com/v1/sedtransformer/SedTransformer_test.go @@ -7,11 +7,11 @@ import ( "testing" "sigs.k8s.io/kustomize/v3/pkg/kusttest" - "sigs.k8s.io/kustomize/v3/pkg/plugins" + plugins_test "sigs.k8s.io/kustomize/v3/pkg/plugins/test" ) func TestSedTransformer(t *testing.T) { - tc := plugins.NewEnvForTest(t).Set() + tc := plugins_test.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildExecPlugin("someteam.example.com", "v1", "SedTransformer") diff --git a/plugin/someteam.example.com/v1/someservicegenerator/SomeServiceGenerator_test.go b/plugin/someteam.example.com/v1/someservicegenerator/SomeServiceGenerator_test.go index a7413c374..01fd098ee 100644 --- a/plugin/someteam.example.com/v1/someservicegenerator/SomeServiceGenerator_test.go +++ b/plugin/someteam.example.com/v1/someservicegenerator/SomeServiceGenerator_test.go @@ -7,11 +7,11 @@ import ( "testing" "sigs.k8s.io/kustomize/v3/pkg/kusttest" - "sigs.k8s.io/kustomize/v3/pkg/plugins" + plugins_test "sigs.k8s.io/kustomize/v3/pkg/plugins/test" ) func TestSomeServiceGeneratorPlugin(t *testing.T) { - tc := plugins.NewEnvForTest(t).Set() + tc := plugins_test.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildGoPlugin( diff --git a/plugin/someteam.example.com/v1/stringprefixer/StringPrefixer_test.go b/plugin/someteam.example.com/v1/stringprefixer/StringPrefixer_test.go index 612e95425..8fc6f87cd 100644 --- a/plugin/someteam.example.com/v1/stringprefixer/StringPrefixer_test.go +++ b/plugin/someteam.example.com/v1/stringprefixer/StringPrefixer_test.go @@ -7,11 +7,11 @@ import ( "testing" "sigs.k8s.io/kustomize/v3/pkg/kusttest" - "sigs.k8s.io/kustomize/v3/pkg/plugins" + plugins_test "sigs.k8s.io/kustomize/v3/pkg/plugins/test" ) func TestStringPrefixerPlugin(t *testing.T) { - tc := plugins.NewEnvForTest(t).Set() + tc := plugins_test.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildGoPlugin( diff --git a/plugin/someteam.example.com/v1/validator/validator_test.go b/plugin/someteam.example.com/v1/validator/validator_test.go index 8b7d79eda..4ba067d56 100644 --- a/plugin/someteam.example.com/v1/validator/validator_test.go +++ b/plugin/someteam.example.com/v1/validator/validator_test.go @@ -10,11 +10,11 @@ import ( "testing" "sigs.k8s.io/kustomize/v3/pkg/kusttest" - "sigs.k8s.io/kustomize/v3/pkg/plugins" + plugins_test "sigs.k8s.io/kustomize/v3/pkg/plugins/test" ) func TestValidatorHappy(t *testing.T) { - tc := plugins.NewEnvForTest(t).Set() + tc := plugins_test.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildExecPlugin("someteam.example.com", "v1", "Validator") @@ -49,7 +49,7 @@ metadata: } func TestValidatorUnHappy(t *testing.T) { - tc := plugins.NewEnvForTest(t).Set() + tc := plugins_test.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildExecPlugin("someteam.example.com", "v1", "Validator")