diff --git a/plugin/builtin/patchstrategicmergetransformer/PatchStrategicMergeTransformer_test.go b/plugin/builtin/patchstrategicmergetransformer/PatchStrategicMergeTransformer_test.go index 6dc740795..1d2b4389c 100644 --- a/plugin/builtin/patchstrategicmergetransformer/PatchStrategicMergeTransformer_test.go +++ b/plugin/builtin/patchstrategicmergetransformer/PatchStrategicMergeTransformer_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 ( @@ -58,7 +58,7 @@ spec: ) func TestPatchStrategicMergeTransformerMissingFile(t *testing.T) { - tc := plugins.NewEnvForTest(t).Set() + tc := plugins_test.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildGoPlugin( @@ -83,7 +83,7 @@ paths: } func TestBadPatchStrategicMergeTransformer(t *testing.T) { - tc := plugins.NewEnvForTest(t).Set() + tc := plugins_test.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildGoPlugin( @@ -108,7 +108,7 @@ patches: 'thisIsNotAPatch' } func TestBothEmptyPatchStrategicMergeTransformer(t *testing.T) { - tc := plugins.NewEnvForTest(t).Set() + tc := plugins_test.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildGoPlugin( @@ -131,7 +131,7 @@ metadata: } func TestPatchStrategicMergeTransformerFromFiles(t *testing.T) { - tc := plugins.NewEnvForTest(t).Set() + tc := plugins_test.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildGoPlugin( @@ -181,7 +181,7 @@ spec: } func TestPatchStrategicMergeTransformerWithInline(t *testing.T) { - tc := plugins.NewEnvForTest(t).Set() + tc := plugins_test.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildGoPlugin( @@ -216,7 +216,7 @@ spec: } func TestPatchStrategicMergeTransformerMultiplePatches(t *testing.T) { - tc := plugins.NewEnvForTest(t).Set() + tc := plugins_test.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildGoPlugin( @@ -293,7 +293,7 @@ spec: } func TestStrategicMergeTransformerMultiplePatchesWithConflicts(t *testing.T) { - tc := plugins.NewEnvForTest(t).Set() + tc := plugins_test.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildGoPlugin( @@ -354,7 +354,7 @@ paths: } func TestStrategicMergeTransformerWrongNamespace(t *testing.T) { - tc := plugins.NewEnvForTest(t).Set() + tc := plugins_test.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildGoPlugin( @@ -397,7 +397,7 @@ paths: } func TestStrategicMergeTransformerNoSchema(t *testing.T) { - tc := plugins.NewEnvForTest(t).Set() + tc := plugins_test.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildGoPlugin( @@ -437,7 +437,7 @@ spec: } func TestStrategicMergeTransformerNoSchemaMultiPatches(t *testing.T) { - tc := plugins.NewEnvForTest(t).Set() + tc := plugins_test.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildGoPlugin( @@ -493,7 +493,7 @@ spec: } func TestStrategicMergeTransformerNoSchemaMultiPatchesWithConflict(t *testing.T) { - tc := plugins.NewEnvForTest(t).Set() + tc := plugins_test.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildGoPlugin( diff --git a/plugin/builtin/patchtransformer/PatchTransformer_test.go b/plugin/builtin/patchtransformer/PatchTransformer_test.go index 9e5787fb1..622df0132 100644 --- a/plugin/builtin/patchtransformer/PatchTransformer_test.go +++ b/plugin/builtin/patchtransformer/PatchTransformer_test.go @@ -4,10 +4,11 @@ package main_test import ( - kusttest_test "sigs.k8s.io/kustomize/v3/pkg/kusttest" - "sigs.k8s.io/kustomize/v3/pkg/plugins" "strings" "testing" + + kusttest_test "sigs.k8s.io/kustomize/v3/pkg/kusttest" + plugins_test "sigs.k8s.io/kustomize/v3/pkg/plugins/test" ) const ( @@ -65,7 +66,7 @@ spec: ) func TestPatchTransformerMissingFile(t *testing.T) { - tc := plugins.NewEnvForTest(t).Set() + tc := plugins_test.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildGoPlugin( @@ -89,7 +90,7 @@ path: patch.yaml } func TestPatchTransformerBadPatch(t *testing.T) { - tc := plugins.NewEnvForTest(t).Set() + tc := plugins_test.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildGoPlugin( @@ -113,7 +114,7 @@ patch: "thisIsNotAPatch" } func TestPatchTransformerMissingSelector(t *testing.T) { - tc := plugins.NewEnvForTest(t).Set() + tc := plugins_test.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildGoPlugin( @@ -137,7 +138,7 @@ patch: '[{"op": "add", "path": "/spec/template/spec/dnsPolicy", "value": "Cluste } func TestPatchTransformerBothEmptyPathAndPatch(t *testing.T) { - tc := plugins.NewEnvForTest(t).Set() + tc := plugins_test.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildGoPlugin( @@ -160,7 +161,7 @@ metadata: } func TestPatchTransformerBothNonEmptyPathAndPatch(t *testing.T) { - tc := plugins.NewEnvForTest(t).Set() + tc := plugins_test.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildGoPlugin( @@ -185,7 +186,7 @@ Patch: "something" } func TestPatchTransformerFromFiles(t *testing.T) { - tc := plugins.NewEnvForTest(t).Set() + tc := plugins_test.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildGoPlugin( @@ -267,7 +268,7 @@ spec: } func TestPatchTransformerWithInline(t *testing.T) { - tc := plugins.NewEnvForTest(t).Set() + tc := plugins_test.NewEnvForTest(t).Set() defer tc.Reset() tc.BuildGoPlugin(