From 9fa0391ce969ad307ca46b3752d02ee81e9e53c6 Mon Sep 17 00:00:00 2001 From: jregan Date: Wed, 6 Nov 2019 19:25:47 -0800 Subject: [PATCH] Remove remaining plugins packages from external API. --- api/internal/accumulator/loadconfigfromcrds.go | 2 +- api/internal/accumulator/loadconfigfromcrds_test.go | 2 +- api/internal/accumulator/namereferencetransformer.go | 2 +- api/internal/accumulator/namereferencetransformer_test.go | 2 +- api/internal/accumulator/resaccumulator.go | 2 +- api/internal/accumulator/resaccumulator_test.go | 2 +- api/{ => internal}/plugins/builtinconfig/doc.go | 0 .../plugins/builtinconfig/loaddefaultconfig.go | 0 .../plugins/builtinconfig/loaddefaultconfig_test.go | 0 .../plugins/builtinconfig/namebackreferences.go | 0 .../plugins/builtinconfig/namebackreferences_test.go | 0 .../plugins/builtinconfig/transformerconfig.go | 0 .../plugins/builtinconfig/transformerconfig_test.go | 2 +- .../plugins/builtinhelpers/builtinplugintype_string.go | 0 api/{ => internal}/plugins/builtinhelpers/builtins.go | 0 .../plugins/builtinhelpers/generateBuiltins.sh | 0 api/{ => internal}/plugins/compiler/compiler.go | 0 api/{ => internal}/plugins/compiler/compiler_test.go | 2 +- api/{ => internal}/plugins/doc.go | 0 api/{ => internal}/plugins/execplugin/execplugin.go | 0 api/{ => internal}/plugins/execplugin/execplugin_test.go | 4 ++-- api/{ => internal}/plugins/loader/loader.go | 4 ++-- api/{ => internal}/plugins/loader/loader_test.go | 2 +- api/internal/target/kusttarget.go | 6 +++--- api/internal/target/kusttarget_configplugin.go | 4 ++-- api/internal/target/plugindir_test.go | 2 +- api/krusty/kustomizer.go | 2 +- api/testutils/kusttest/kusttestharness.go | 2 +- api/testutils/kusttest/plugintestenv.go | 2 +- api/transform/maptransformer_test.go | 2 +- examples/configureBuiltinPlugin.md | 2 +- travis/pre-commit.sh | 2 +- 32 files changed, 25 insertions(+), 25 deletions(-) rename api/{ => internal}/plugins/builtinconfig/doc.go (100%) rename api/{ => internal}/plugins/builtinconfig/loaddefaultconfig.go (100%) rename api/{ => internal}/plugins/builtinconfig/loaddefaultconfig_test.go (100%) rename api/{ => internal}/plugins/builtinconfig/namebackreferences.go (100%) rename api/{ => internal}/plugins/builtinconfig/namebackreferences_test.go (100%) rename api/{ => internal}/plugins/builtinconfig/transformerconfig.go (100%) rename api/{ => internal}/plugins/builtinconfig/transformerconfig_test.go (98%) rename api/{ => internal}/plugins/builtinhelpers/builtinplugintype_string.go (100%) rename api/{ => internal}/plugins/builtinhelpers/builtins.go (100%) rename api/{ => internal}/plugins/builtinhelpers/generateBuiltins.sh (100%) rename api/{ => internal}/plugins/compiler/compiler.go (100%) rename api/{ => internal}/plugins/compiler/compiler_test.go (96%) rename api/{ => internal}/plugins/doc.go (100%) rename api/{ => internal}/plugins/execplugin/execplugin.go (100%) rename api/{ => internal}/plugins/execplugin/execplugin_test.go (97%) rename api/{ => internal}/plugins/loader/loader.go (98%) rename api/{ => internal}/plugins/loader/loader_test.go (96%) diff --git a/api/internal/accumulator/loadconfigfromcrds.go b/api/internal/accumulator/loadconfigfromcrds.go index 66c77dcb4..db94eea7a 100644 --- a/api/internal/accumulator/loadconfigfromcrds.go +++ b/api/internal/accumulator/loadconfigfromcrds.go @@ -11,7 +11,7 @@ import ( "github.com/pkg/errors" "k8s.io/kube-openapi/pkg/common" "sigs.k8s.io/kustomize/api/ifc" - "sigs.k8s.io/kustomize/api/plugins/builtinconfig" + "sigs.k8s.io/kustomize/api/internal/plugins/builtinconfig" "sigs.k8s.io/kustomize/api/resid" "sigs.k8s.io/kustomize/api/types" "sigs.k8s.io/yaml" diff --git a/api/internal/accumulator/loadconfigfromcrds_test.go b/api/internal/accumulator/loadconfigfromcrds_test.go index 7b94df104..b58df4672 100644 --- a/api/internal/accumulator/loadconfigfromcrds_test.go +++ b/api/internal/accumulator/loadconfigfromcrds_test.go @@ -10,7 +10,7 @@ import ( "sigs.k8s.io/kustomize/api/ifc" . "sigs.k8s.io/kustomize/api/internal/accumulator" "sigs.k8s.io/kustomize/api/internal/loadertest" - "sigs.k8s.io/kustomize/api/plugins/builtinconfig" + "sigs.k8s.io/kustomize/api/internal/plugins/builtinconfig" "sigs.k8s.io/kustomize/api/resid" "sigs.k8s.io/kustomize/api/types" ) diff --git a/api/internal/accumulator/namereferencetransformer.go b/api/internal/accumulator/namereferencetransformer.go index 0380189b4..6d82a4f10 100644 --- a/api/internal/accumulator/namereferencetransformer.go +++ b/api/internal/accumulator/namereferencetransformer.go @@ -7,7 +7,7 @@ import ( "fmt" "log" - "sigs.k8s.io/kustomize/api/plugins/builtinconfig" + "sigs.k8s.io/kustomize/api/internal/plugins/builtinconfig" "sigs.k8s.io/kustomize/api/resid" "sigs.k8s.io/kustomize/api/resmap" "sigs.k8s.io/kustomize/api/resource" diff --git a/api/internal/accumulator/namereferencetransformer_test.go b/api/internal/accumulator/namereferencetransformer_test.go index bc2a4bd12..df8db067c 100644 --- a/api/internal/accumulator/namereferencetransformer_test.go +++ b/api/internal/accumulator/namereferencetransformer_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" + "sigs.k8s.io/kustomize/api/internal/plugins/builtinconfig" "sigs.k8s.io/kustomize/api/k8sdeps/kunstruct" - "sigs.k8s.io/kustomize/api/plugins/builtinconfig" "sigs.k8s.io/kustomize/api/resid" "sigs.k8s.io/kustomize/api/resmap" "sigs.k8s.io/kustomize/api/resource" diff --git a/api/internal/accumulator/resaccumulator.go b/api/internal/accumulator/resaccumulator.go index bdd53fb7b..f1e744d94 100644 --- a/api/internal/accumulator/resaccumulator.go +++ b/api/internal/accumulator/resaccumulator.go @@ -8,7 +8,7 @@ import ( "log" "strings" - "sigs.k8s.io/kustomize/api/plugins/builtinconfig" + "sigs.k8s.io/kustomize/api/internal/plugins/builtinconfig" "sigs.k8s.io/kustomize/api/resid" "sigs.k8s.io/kustomize/api/resmap" "sigs.k8s.io/kustomize/api/types" diff --git a/api/internal/accumulator/resaccumulator_test.go b/api/internal/accumulator/resaccumulator_test.go index 5d2d17a18..e61e57bfb 100644 --- a/api/internal/accumulator/resaccumulator_test.go +++ b/api/internal/accumulator/resaccumulator_test.go @@ -11,8 +11,8 @@ import ( "testing" . "sigs.k8s.io/kustomize/api/internal/accumulator" + "sigs.k8s.io/kustomize/api/internal/plugins/builtinconfig" "sigs.k8s.io/kustomize/api/k8sdeps/kunstruct" - "sigs.k8s.io/kustomize/api/plugins/builtinconfig" "sigs.k8s.io/kustomize/api/resid" "sigs.k8s.io/kustomize/api/resmap" "sigs.k8s.io/kustomize/api/resource" diff --git a/api/plugins/builtinconfig/doc.go b/api/internal/plugins/builtinconfig/doc.go similarity index 100% rename from api/plugins/builtinconfig/doc.go rename to api/internal/plugins/builtinconfig/doc.go diff --git a/api/plugins/builtinconfig/loaddefaultconfig.go b/api/internal/plugins/builtinconfig/loaddefaultconfig.go similarity index 100% rename from api/plugins/builtinconfig/loaddefaultconfig.go rename to api/internal/plugins/builtinconfig/loaddefaultconfig.go diff --git a/api/plugins/builtinconfig/loaddefaultconfig_test.go b/api/internal/plugins/builtinconfig/loaddefaultconfig_test.go similarity index 100% rename from api/plugins/builtinconfig/loaddefaultconfig_test.go rename to api/internal/plugins/builtinconfig/loaddefaultconfig_test.go diff --git a/api/plugins/builtinconfig/namebackreferences.go b/api/internal/plugins/builtinconfig/namebackreferences.go similarity index 100% rename from api/plugins/builtinconfig/namebackreferences.go rename to api/internal/plugins/builtinconfig/namebackreferences.go diff --git a/api/plugins/builtinconfig/namebackreferences_test.go b/api/internal/plugins/builtinconfig/namebackreferences_test.go similarity index 100% rename from api/plugins/builtinconfig/namebackreferences_test.go rename to api/internal/plugins/builtinconfig/namebackreferences_test.go diff --git a/api/plugins/builtinconfig/transformerconfig.go b/api/internal/plugins/builtinconfig/transformerconfig.go similarity index 100% rename from api/plugins/builtinconfig/transformerconfig.go rename to api/internal/plugins/builtinconfig/transformerconfig.go diff --git a/api/plugins/builtinconfig/transformerconfig_test.go b/api/internal/plugins/builtinconfig/transformerconfig_test.go similarity index 98% rename from api/plugins/builtinconfig/transformerconfig_test.go rename to api/internal/plugins/builtinconfig/transformerconfig_test.go index c5211a263..905cb9b1b 100644 --- a/api/plugins/builtinconfig/transformerconfig_test.go +++ b/api/internal/plugins/builtinconfig/transformerconfig_test.go @@ -7,7 +7,7 @@ import ( "reflect" "testing" - . "sigs.k8s.io/kustomize/api/plugins/builtinconfig" + . "sigs.k8s.io/kustomize/api/internal/plugins/builtinconfig" "sigs.k8s.io/kustomize/api/resid" "sigs.k8s.io/kustomize/api/types" ) diff --git a/api/plugins/builtinhelpers/builtinplugintype_string.go b/api/internal/plugins/builtinhelpers/builtinplugintype_string.go similarity index 100% rename from api/plugins/builtinhelpers/builtinplugintype_string.go rename to api/internal/plugins/builtinhelpers/builtinplugintype_string.go diff --git a/api/plugins/builtinhelpers/builtins.go b/api/internal/plugins/builtinhelpers/builtins.go similarity index 100% rename from api/plugins/builtinhelpers/builtins.go rename to api/internal/plugins/builtinhelpers/builtins.go diff --git a/api/plugins/builtinhelpers/generateBuiltins.sh b/api/internal/plugins/builtinhelpers/generateBuiltins.sh similarity index 100% rename from api/plugins/builtinhelpers/generateBuiltins.sh rename to api/internal/plugins/builtinhelpers/generateBuiltins.sh diff --git a/api/plugins/compiler/compiler.go b/api/internal/plugins/compiler/compiler.go similarity index 100% rename from api/plugins/compiler/compiler.go rename to api/internal/plugins/compiler/compiler.go diff --git a/api/plugins/compiler/compiler_test.go b/api/internal/plugins/compiler/compiler_test.go similarity index 96% rename from api/plugins/compiler/compiler_test.go rename to api/internal/plugins/compiler/compiler_test.go index 022a51b86..3cd3a91ba 100644 --- a/api/plugins/compiler/compiler_test.go +++ b/api/internal/plugins/compiler/compiler_test.go @@ -10,7 +10,7 @@ import ( "testing" "sigs.k8s.io/kustomize/api/filesys" - . "sigs.k8s.io/kustomize/api/plugins/compiler" + . "sigs.k8s.io/kustomize/api/internal/plugins/compiler" ) // Regression coverage over compiler behavior. diff --git a/api/plugins/doc.go b/api/internal/plugins/doc.go similarity index 100% rename from api/plugins/doc.go rename to api/internal/plugins/doc.go diff --git a/api/plugins/execplugin/execplugin.go b/api/internal/plugins/execplugin/execplugin.go similarity index 100% rename from api/plugins/execplugin/execplugin.go rename to api/internal/plugins/execplugin/execplugin.go diff --git a/api/plugins/execplugin/execplugin_test.go b/api/internal/plugins/execplugin/execplugin_test.go similarity index 97% rename from api/plugins/execplugin/execplugin_test.go rename to api/internal/plugins/execplugin/execplugin_test.go index 6dd20ae95..9974ff96a 100644 --- a/api/plugins/execplugin/execplugin_test.go +++ b/api/internal/plugins/execplugin/execplugin_test.go @@ -9,10 +9,10 @@ import ( "testing" "sigs.k8s.io/kustomize/api/internal/loadertest" + . "sigs.k8s.io/kustomize/api/internal/plugins/execplugin" + "sigs.k8s.io/kustomize/api/internal/plugins/loader" "sigs.k8s.io/kustomize/api/k8sdeps/kunstruct" "sigs.k8s.io/kustomize/api/konfig" - . "sigs.k8s.io/kustomize/api/plugins/execplugin" - "sigs.k8s.io/kustomize/api/plugins/loader" "sigs.k8s.io/kustomize/api/resmap" "sigs.k8s.io/kustomize/api/resource" valtest_test "sigs.k8s.io/kustomize/api/testutils/valtest" diff --git a/api/plugins/loader/loader.go b/api/internal/plugins/loader/loader.go similarity index 98% rename from api/plugins/loader/loader.go rename to api/internal/plugins/loader/loader.go index 7c9eedcff..fc18d6a75 100644 --- a/api/plugins/loader/loader.go +++ b/api/internal/plugins/loader/loader.go @@ -13,9 +13,9 @@ import ( "github.com/pkg/errors" "sigs.k8s.io/kustomize/api/ifc" + "sigs.k8s.io/kustomize/api/internal/plugins/builtinhelpers" + "sigs.k8s.io/kustomize/api/internal/plugins/execplugin" "sigs.k8s.io/kustomize/api/konfig" - "sigs.k8s.io/kustomize/api/plugins/builtinhelpers" - "sigs.k8s.io/kustomize/api/plugins/execplugin" "sigs.k8s.io/kustomize/api/resid" "sigs.k8s.io/kustomize/api/resmap" "sigs.k8s.io/kustomize/api/resource" diff --git a/api/plugins/loader/loader_test.go b/api/internal/plugins/loader/loader_test.go similarity index 96% rename from api/plugins/loader/loader_test.go rename to api/internal/plugins/loader/loader_test.go index 271ebb345..1985053a5 100644 --- a/api/plugins/loader/loader_test.go +++ b/api/internal/plugins/loader/loader_test.go @@ -7,9 +7,9 @@ import ( "testing" "sigs.k8s.io/kustomize/api/internal/loadertest" + . "sigs.k8s.io/kustomize/api/internal/plugins/loader" "sigs.k8s.io/kustomize/api/k8sdeps/kunstruct" "sigs.k8s.io/kustomize/api/konfig" - . "sigs.k8s.io/kustomize/api/plugins/loader" "sigs.k8s.io/kustomize/api/resmap" "sigs.k8s.io/kustomize/api/resource" kusttest_test "sigs.k8s.io/kustomize/api/testutils/kusttest" diff --git a/api/internal/target/kusttarget.go b/api/internal/target/kusttarget.go index bcfb31d3e..093fe57d4 100644 --- a/api/internal/target/kusttarget.go +++ b/api/internal/target/kusttarget.go @@ -16,10 +16,10 @@ import ( "sigs.k8s.io/kustomize/api/builtins" "sigs.k8s.io/kustomize/api/ifc" "sigs.k8s.io/kustomize/api/internal/accumulator" + "sigs.k8s.io/kustomize/api/internal/plugins/builtinconfig" + "sigs.k8s.io/kustomize/api/internal/plugins/builtinhelpers" + "sigs.k8s.io/kustomize/api/internal/plugins/loader" "sigs.k8s.io/kustomize/api/konfig" - "sigs.k8s.io/kustomize/api/plugins/builtinconfig" - "sigs.k8s.io/kustomize/api/plugins/builtinhelpers" - "sigs.k8s.io/kustomize/api/plugins/loader" "sigs.k8s.io/kustomize/api/resmap" "sigs.k8s.io/kustomize/api/transform" "sigs.k8s.io/kustomize/api/types" diff --git a/api/internal/target/kusttarget_configplugin.go b/api/internal/target/kusttarget_configplugin.go index 390bcd49b..60fb9afa5 100644 --- a/api/internal/target/kusttarget_configplugin.go +++ b/api/internal/target/kusttarget_configplugin.go @@ -4,8 +4,8 @@ package target import ( - "sigs.k8s.io/kustomize/api/plugins/builtinconfig" - "sigs.k8s.io/kustomize/api/plugins/builtinhelpers" + "sigs.k8s.io/kustomize/api/internal/plugins/builtinconfig" + "sigs.k8s.io/kustomize/api/internal/plugins/builtinhelpers" "sigs.k8s.io/kustomize/api/resmap" "sigs.k8s.io/kustomize/api/types" ) diff --git a/api/internal/target/plugindir_test.go b/api/internal/target/plugindir_test.go index f169e9722..2f7bff1eb 100644 --- a/api/internal/target/plugindir_test.go +++ b/api/internal/target/plugindir_test.go @@ -10,12 +10,12 @@ import ( "testing" "sigs.k8s.io/kustomize/api/filesys" + pLdr "sigs.k8s.io/kustomize/api/internal/plugins/loader" . "sigs.k8s.io/kustomize/api/internal/target" "sigs.k8s.io/kustomize/api/k8sdeps/kunstruct" "sigs.k8s.io/kustomize/api/k8sdeps/transformer" "sigs.k8s.io/kustomize/api/konfig" fLdr "sigs.k8s.io/kustomize/api/loader" - pLdr "sigs.k8s.io/kustomize/api/plugins/loader" "sigs.k8s.io/kustomize/api/resmap" "sigs.k8s.io/kustomize/api/resource" kusttest_test "sigs.k8s.io/kustomize/api/testutils/kusttest" diff --git a/api/krusty/kustomizer.go b/api/krusty/kustomizer.go index 307ea7dc9..ec14a041f 100644 --- a/api/krusty/kustomizer.go +++ b/api/krusty/kustomizer.go @@ -6,12 +6,12 @@ package krusty import ( "sigs.k8s.io/kustomize/api/builtins" "sigs.k8s.io/kustomize/api/filesys" + pLdr "sigs.k8s.io/kustomize/api/internal/plugins/loader" "sigs.k8s.io/kustomize/api/internal/target" "sigs.k8s.io/kustomize/api/k8sdeps/kunstruct" "sigs.k8s.io/kustomize/api/k8sdeps/transformer" "sigs.k8s.io/kustomize/api/k8sdeps/validator" fLdr "sigs.k8s.io/kustomize/api/loader" - pLdr "sigs.k8s.io/kustomize/api/plugins/loader" "sigs.k8s.io/kustomize/api/resmap" "sigs.k8s.io/kustomize/api/resource" "sigs.k8s.io/kustomize/api/types" diff --git a/api/testutils/kusttest/kusttestharness.go b/api/testutils/kusttest/kusttestharness.go index f4084bb67..ddfc0d24b 100644 --- a/api/testutils/kusttest/kusttestharness.go +++ b/api/testutils/kusttest/kusttestharness.go @@ -10,13 +10,13 @@ import ( "testing" "sigs.k8s.io/kustomize/api/internal/loadertest" + pLdr "sigs.k8s.io/kustomize/api/internal/plugins/loader" "sigs.k8s.io/kustomize/api/internal/target" "sigs.k8s.io/kustomize/api/k8sdeps/kunstruct" "sigs.k8s.io/kustomize/api/k8sdeps/transformer" "sigs.k8s.io/kustomize/api/konfig" "sigs.k8s.io/kustomize/api/konfig/builtinpluginconsts" fLdr "sigs.k8s.io/kustomize/api/loader" - pLdr "sigs.k8s.io/kustomize/api/plugins/loader" "sigs.k8s.io/kustomize/api/resmap" "sigs.k8s.io/kustomize/api/resource" valtest_test "sigs.k8s.io/kustomize/api/testutils/valtest" diff --git a/api/testutils/kusttest/plugintestenv.go b/api/testutils/kusttest/plugintestenv.go index 3a655c6be..1fcd6bcba 100644 --- a/api/testutils/kusttest/plugintestenv.go +++ b/api/testutils/kusttest/plugintestenv.go @@ -12,8 +12,8 @@ import ( "testing" "sigs.k8s.io/kustomize/api/filesys" + "sigs.k8s.io/kustomize/api/internal/plugins/compiler" "sigs.k8s.io/kustomize/api/konfig" - "sigs.k8s.io/kustomize/api/plugins/compiler" ) // PluginTestEnv manages the plugin test environment. diff --git a/api/transform/maptransformer_test.go b/api/transform/maptransformer_test.go index 8689aaf73..67a5cf028 100644 --- a/api/transform/maptransformer_test.go +++ b/api/transform/maptransformer_test.go @@ -6,8 +6,8 @@ package transform_test import ( "testing" + "sigs.k8s.io/kustomize/api/internal/plugins/builtinconfig" "sigs.k8s.io/kustomize/api/k8sdeps/kunstruct" - "sigs.k8s.io/kustomize/api/plugins/builtinconfig" "sigs.k8s.io/kustomize/api/resource" "sigs.k8s.io/kustomize/api/testutils/resmaptest" . "sigs.k8s.io/kustomize/api/transform" diff --git a/examples/configureBuiltinPlugin.md b/examples/configureBuiltinPlugin.md index cd968c9f1..c2e606db1 100644 --- a/examples/configureBuiltinPlugin.md +++ b/examples/configureBuiltinPlugin.md @@ -4,7 +4,7 @@ [plugin]: ../docs/plugins [fields]: ../docs/fields.md [fields in a kustomization file]: ../docs/fields.md -[TransformerConfig]: ../api/plugins/builtinconfig/transformerconfig.go +[TransformerConfig]: ../api/internal/plugins/builtinconfig/transformerconfig.go [kustomization]: ../docs/glossary.md#kustomization # Customizing kustomize diff --git a/travis/pre-commit.sh b/travis/pre-commit.sh index 7df329297..edbe98d7c 100755 --- a/travis/pre-commit.sh +++ b/travis/pre-commit.sh @@ -97,7 +97,7 @@ function testExamplesAgainstLocalHead { function generateCode { echo "preferredGoPath = $preferredGoPath" - ./api/plugins/builtinhelpers/generateBuiltins.sh $preferredGoPath + ./api/internal/plugins/builtinhelpers/generateBuiltins.sh $preferredGoPath } # This script tries to work for both travis