From 2ae323bb26d65a60075465260d4860f79e4085da Mon Sep 17 00:00:00 2001 From: Donny Xia Date: Wed, 18 Nov 2020 12:07:19 -0800 Subject: [PATCH] move files into internal --- cmd/pluginator/Makefile | 2 +- .../{ => internal}/builtinplugin/builtinplugin.go | 0 .../builtinplugin/plugintype_string.go | 0 cmd/pluginator/{ => internal}/krmfunction/cmd.go | 0 .../{ => internal}/krmfunction/converter.go | 2 +- .../{ => internal}/krmfunction/converter_test.go | 0 .../internal/krmfunction/funcwrapper/statik.go | 14 ++++++++++++++ .../krmfunction/funcwrappersrc/fakeplugin.go | 0 .../krmfunction/funcwrappersrc/go.mod.src | 0 .../krmfunction/funcwrappersrc/main.go | 0 cmd/pluginator/krmfunction/funcwrapper/statik.go | 14 -------------- cmd/pluginator/main.go | 4 ++-- 12 files changed, 18 insertions(+), 18 deletions(-) rename cmd/pluginator/{ => internal}/builtinplugin/builtinplugin.go (100%) rename cmd/pluginator/{ => internal}/builtinplugin/plugintype_string.go (100%) rename cmd/pluginator/{ => internal}/krmfunction/cmd.go (100%) rename cmd/pluginator/{ => internal}/krmfunction/converter.go (97%) rename cmd/pluginator/{ => internal}/krmfunction/converter_test.go (100%) create mode 100644 cmd/pluginator/internal/krmfunction/funcwrapper/statik.go rename cmd/pluginator/{ => internal}/krmfunction/funcwrappersrc/fakeplugin.go (100%) rename cmd/pluginator/{ => internal}/krmfunction/funcwrappersrc/go.mod.src (100%) rename cmd/pluginator/{ => internal}/krmfunction/funcwrappersrc/main.go (100%) delete mode 100644 cmd/pluginator/krmfunction/funcwrapper/statik.go diff --git a/cmd/pluginator/Makefile b/cmd/pluginator/Makefile index bf9730112..2804481c1 100644 --- a/cmd/pluginator/Makefile +++ b/cmd/pluginator/Makefile @@ -13,7 +13,7 @@ test: generate generate: statik ( \ - cd krmfunction; \ + cd internal/krmfunction; \ statik -src=$(FUNC_WRAPPER_SRC_DIR) -f -p $(FUNC_WRAPPER_DST_DIR) -include=main.go,go.mod.src \ ) diff --git a/cmd/pluginator/builtinplugin/builtinplugin.go b/cmd/pluginator/internal/builtinplugin/builtinplugin.go similarity index 100% rename from cmd/pluginator/builtinplugin/builtinplugin.go rename to cmd/pluginator/internal/builtinplugin/builtinplugin.go diff --git a/cmd/pluginator/builtinplugin/plugintype_string.go b/cmd/pluginator/internal/builtinplugin/plugintype_string.go similarity index 100% rename from cmd/pluginator/builtinplugin/plugintype_string.go rename to cmd/pluginator/internal/builtinplugin/plugintype_string.go diff --git a/cmd/pluginator/krmfunction/cmd.go b/cmd/pluginator/internal/krmfunction/cmd.go similarity index 100% rename from cmd/pluginator/krmfunction/cmd.go rename to cmd/pluginator/internal/krmfunction/cmd.go diff --git a/cmd/pluginator/krmfunction/converter.go b/cmd/pluginator/internal/krmfunction/converter.go similarity index 97% rename from cmd/pluginator/krmfunction/converter.go rename to cmd/pluginator/internal/krmfunction/converter.go index da19db010..4798e92d8 100644 --- a/cmd/pluginator/krmfunction/converter.go +++ b/cmd/pluginator/internal/krmfunction/converter.go @@ -11,7 +11,7 @@ import ( "github.com/rakyll/statik/fs" // load embedded func wrapper - _ "sigs.k8s.io/kustomize/cmd/pluginator/v2/krmfunction/funcwrapper" + _ "sigs.k8s.io/kustomize/cmd/pluginator/v2/internal/krmfunction/funcwrapper" ) // Converter is a converter to convert the diff --git a/cmd/pluginator/krmfunction/converter_test.go b/cmd/pluginator/internal/krmfunction/converter_test.go similarity index 100% rename from cmd/pluginator/krmfunction/converter_test.go rename to cmd/pluginator/internal/krmfunction/converter_test.go diff --git a/cmd/pluginator/internal/krmfunction/funcwrapper/statik.go b/cmd/pluginator/internal/krmfunction/funcwrapper/statik.go new file mode 100644 index 000000000..9e7bd5b82 --- /dev/null +++ b/cmd/pluginator/internal/krmfunction/funcwrapper/statik.go @@ -0,0 +1,14 @@ +// Code generated by statik. DO NOT EDIT. + +package funcwrapper + +import ( + "github.com/rakyll/statik/fs" +) + + +func init() { + data := "PK\x03\x04\x14\x00\x08\x00\x08\x00\x98\xa0rQ\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\n\x00 \x00go.mod.srcUT\x05\x00\x01a~\xb5_\x84\xce\xc1\xae\x820\x10\x85\xe15\xf3\x14]\xde\xbb`:3T\"\x0b}\x97\x82\x15\x1b\xa8EJI\xf4\xe9\x0dq\xe5B]\x9f/9\x7f\x88\xa7<:\x15\xac\xbf\x02\xf4Q1\xb2\x01\x98\xdd-\xfb\xd9\xa9?(z\xbf\\r\x8b]\x0c:Mg\xaet\x17\xdb\xd9\xaa\x95\x91\x90\xa0H\xbeO8\xec\x13\xfa\xa8\x87\x9c\x96\x18\xfc\xc3i;y\xb5\x12\xd6h>\x89\xe1n\xc3\xb8\x99\x06\xabw\xf3\x1a\x18\x05 \xfe\xb7\x94i\xb4\x9dS\xbf\x8e\xd4\xe1\xf8\xdd\x10R)$\xc4\xcc57\"\xc4\xa5\x95\x9d\x91\xc6\xba\xaa\x15\x03\xcf\x00\x00\x00\xff\xffPK\x07\x08\xb1\xe0\xcew\x9c\x00\x00\x00\n\x01\x00\x00PK\x03\x04\x14\x00\x08\x00\x08\x00\x98\xa0rQ\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x07\x00 \x00main.goUT\x05\x00\x01a~\xb5_\x94TMo\xdb8\x10=\x93\xbfb\xd6\x87\x85\xb40$\xec-H\xe0S\x90\xec\x06m\x82 \xf5\xad\xe8\x81\xa6F\x0e!~\x08C\xaaN\x1a\xe8\xbf\x17\xd4\x87#\xa9N\x9a^\x0cx\xf4\xe6\xbd73\x9c\xc9s\xd8>*\x0f\xa5\xd2\x08\x07\xa55\xec\x10jr\x12\xbd\xc7\x02\x84-\x00\xcd\x0e\x8b\x02\x0b\x08\x0ej\xdd\xec\x95\x15\xc1Q\xc6y-d%\xf6\x08ec\xe5\x81D]#y\x92\x9c+S;\n\x90p\xb6*MXq\xb6r~\xc59[y\xb5\xf7Yu\xe63\xe5\xf2\xaa\xf1\xc1\x19\xf5\x03sQ\xab\xbc:\xf3\x05\xd6>\xaf\x1a\xeb\x035\xb2\xcbz\x1bN\xe8\x8d\xa8\x7f\x8bq\x0dI|\x1bU=\x0b\xa3\xf3\xd2\xe6% \x83\x07G\xd5\x12\x1b\x01+\x9er\x9e\xe7\xd6ie\x03\x8f\xb5\x82\x11\xca&)\xbcp\xf6]\xd0\xd0\x13\xe8=e\x97\xce\x96j\xdf\x90\xd8i\xe4\xac\x0f^\x0b\x19\x1c=\xc3\xf9\x06,\x1e\x1e\xd0\xdf\x1ecI\xca9\xeb\x19\xfeG\x1d;8\xa0\xee\xa7\xb1d\xc6\x13S\xc6\xea>+\x1fb\xc6\xdf\xc7\x1a\xb2\x87\xc9\xa7\x97\x96s&M\x11!\xaf\x88Kg\x8c\xb0E2%YwcLR@\"G\xb1\xb6\xa8q+\xeau\x8c\xc4\xfc\x99\x87\xec\xeeX\x089\xf3p\xe7\n\xfc\xa2\x95\xc4\x19gv\x13\xd0\xf8\x943\xa6\xca\x8e\xe5\xaf\x0dX\xa5;rF\x18\x1a\xb21\xcc\x19k9\x1b\xba\xd0\xf7\xef(\x1aM\x05\xe5\x86\xf0\xd6\xddO@s\xad\xeb\x19\xf2c\xa2\x9c\xb1\x88\xd8\x0c3\x1c\x86\x97\xcc\xe6\xb1\x86\xa9\xb1\x8f\xf1v\x98\xb0\x06W\xc5\x1a\x06\xf2a\x88\xd9\x96\x84\xf5\xa5#\x83\xd4W\x93^D`\xc7\xd3\xbb \xaf\x98\xa4\x1fB\x94=\xa5;\x17\xee\x94[@\xed\x11T \xfb7\x0c\xfc\x87\x16)\xee\xf0/\xf2\xd3\x89o`?\"1\xf9\x13}\xde?\x9d\xc5+\x18I{\x89l\xeb&o\xe6\xa3M\x1d\x02Vi\xce\xda\x94\x8f9\xe7\x1b\x90\xa6\xc8\xae\x9eP6\xd1\xeb\xc5\x92\xa94!\xbb'e\x83\xb6 \x12E9\xe7\xb3\xab'\x15\x92\x7fS\xceZ\xde.7\xfc\xfd\x05\x84\x7f\x86N\x8e\x0by\x0c\xcc\x92\xa2\xf6`y\xf8|\xb7\xa4\xb5J\xaf\xa1\xfbYl\xf8)G\x8b\xc3\xb1t\xd1\xcb\xf5}\x9f\\\x9c1\x14\xc5\xc7\xdc\xe3\x99\x8d\xc1O\xe3\x9f\x86\xb0\x18\x107\xa6\xd6I\x9a\x9e\xf0?R,\x94\xba*N\xd8~w\x7fK \xca\x06\xa4RH|iSH\xbe~\xdb=\x07\\\xf77(\x9d\xf4/\x1e\xe2\xecV\x90\x7f\x14:)e\x14\xfa\x19\x00\x00\xff\xffPK\x07\x08\xd7\xcf\xa4\xce}\x02\x00\x00\xba\x06\x00\x00PK\x01\x02\x14\x03\x14\x00\x08\x00\x08\x00\x98\xa0rQ\xb1\xe0\xcew\x9c\x00\x00\x00\n\x01\x00\x00\n\x00 \x00\x00\x00\x00\x00\x00\x00\x00\x00\xa0\x81\x00\x00\x00\x00go.mod.srcUT\x05\x00\x01a~\xb5_PK\x01\x02\x14\x03\x14\x00\x08\x00\x08\x00\x98\xa0rQ\xd7\xcf\xa4\xce}\x02\x00\x00\xba\x06\x00\x00\x07\x00 \x00\x00\x00\x00\x00\x00\x00\x00\x00\xa0\x81\xdd\x00\x00\x00main.goUT\x05\x00\x01a~\xb5_PK\x05\x06\x00\x00\x00\x00\x02\x00\x02\x00\x7f\x00\x00\x00\x98\x03\x00\x00\x00\x00" + fs.Register(data) + } + \ No newline at end of file diff --git a/cmd/pluginator/krmfunction/funcwrappersrc/fakeplugin.go b/cmd/pluginator/internal/krmfunction/funcwrappersrc/fakeplugin.go similarity index 100% rename from cmd/pluginator/krmfunction/funcwrappersrc/fakeplugin.go rename to cmd/pluginator/internal/krmfunction/funcwrappersrc/fakeplugin.go diff --git a/cmd/pluginator/krmfunction/funcwrappersrc/go.mod.src b/cmd/pluginator/internal/krmfunction/funcwrappersrc/go.mod.src similarity index 100% rename from cmd/pluginator/krmfunction/funcwrappersrc/go.mod.src rename to cmd/pluginator/internal/krmfunction/funcwrappersrc/go.mod.src diff --git a/cmd/pluginator/krmfunction/funcwrappersrc/main.go b/cmd/pluginator/internal/krmfunction/funcwrappersrc/main.go similarity index 100% rename from cmd/pluginator/krmfunction/funcwrappersrc/main.go rename to cmd/pluginator/internal/krmfunction/funcwrappersrc/main.go diff --git a/cmd/pluginator/krmfunction/funcwrapper/statik.go b/cmd/pluginator/krmfunction/funcwrapper/statik.go deleted file mode 100644 index b3c112e0a..000000000 --- a/cmd/pluginator/krmfunction/funcwrapper/statik.go +++ /dev/null @@ -1,14 +0,0 @@ -// Code generated by statik. DO NOT EDIT. - -package funcwrapper - -import ( - "github.com/rakyll/statik/fs" -) - - -func init() { - data := "PK\x03\x04\x14\x00\x08\x00\x08\x00K\xa7pQ\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\n\x00 \x00go.mod.srcUT\x05\x00\x01\xef\xe7\xb2_\x84\xce\xc1\xae\x820\x10\x85\xe15\xf3\x14]\xde\xbb`:3T\"\x0b}\x97\x82\x15\x1b\xa8EJI\xf4\xe9\x0dq\xe5B]\x9f/9\x7f\x88\xa7<:\x15\xac\xbf\x02\xf4Q1\xb2\x01\x98\xdd-\xfb\xd9\xa9?(z\xbf\\r\x8b]\x0c:Mg\xaet\x17\xdb\xd9\xaa\x95\x91\x90\xa0H\xbeO8\xec\x13\xfa\xa8\x87\x9c\x96\x18\xfc\xc3i;y\xb5\x12\xd6h>\x89\xe1n\xc3\xb8\x99\x06\xabw\xf3\x1a\x18\x05 \xfe\xb7\x94i\xb4\x9dS\xbf\x8e\xd4\xe1\xf8\xdd\x10R)$\xc4\xcc57\"\xc4\xa5\x95\x9d\x91\xc6\xba\xaa\x15\x03\xcf\x00\x00\x00\xff\xffPK\x07\x08\xb1\xe0\xcew\x9c\x00\x00\x00\n\x01\x00\x00PK\x03\x04\x14\x00\x08\x00\x08\x00C\xa7pQ\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x07\x00 \x00main.goUT\x05\x00\x01\xdf\xe7\xb2_\x94T\xcbn\xdb:\x10]\x93_1\xd7\x8b\x0b\xe9\xc2\x90pwA\x02\xaf\x82\xa4\x0d\xda\x04A\xea]\xd1\x05M\x8d\x1cB|\x08C\xaaN\x1a\xe8\xdf\x0b\xea\xe1H\xca\xa3\xe9\xc6\x80Gg\xce93\xc3\x99<\x87\xed\xbd\xf2P*\x8dpPZ\xc3\x0e\xa1&'\xd1{,@\xd8\x02\xd0\xec\xb0(\xb0\x80\xe0\xa0\xd6\xcd^Y\x11\x1ce\x9c\xd7BVb\x8fP6V\x1eH\xd45\x92'\xc9\xb92\xb5\xa3\x00 g\xab\xd2\x84\x15g+\xe7W\x9c\xb3\x95W{\x9fU'>S.\xaf\x1a\x1f\x9cQ\xbf0\x17\xb5\xca\xab\x13_`\xed\xf3\xaa\xb1>P#\xbb\xac\xb7\xe1\x84\xde\x88\xfa\x8f\x18\xd7\x90\xc4\xb7Q\xd5\xa30:/m^\x920xpT-\xb1\x11\xb0\xe2)\xe7yn\x9dV6\xf0X+\x18\xa1l\x92\xc2\x13g?\x05\x0d=\x81\xdeSv\xeel\xa9\xf6\x0d\x89\x9dF\xce\xfa\xe0\xa5\x90\xc1\xd1#\x9cn\xc0\xe2\xe1\x0e\xfd\xf51\x96\xa4\x9c\xb3\x9e\xe13\xea\xd8\xc1\x01u;\x8d%3\x9e\x982V\xf7U\xf9\x103\xfe=\xd6\x90\xddM>=\xb5\x9c3i\x8a\x08yF\x9c;c\x84-\x92)\xc9\xba\x1bc\x92\x02\x129\x8a\xb5E\x8dkQ\xafc$\xe6\xcf\xe6\x9cn@\x9a\"\xbbx@\xd9D\xafgK\xa6\xd2\x84\xec\x96\x94\x0d\xda&H\x14\xe5\x9c\xcf.\x1eTH\xfeO9ky\xbb\xdc\xf0\xf7\x17\x10\xfe\x1b:9.\xe410K\x8a\xda\x83\xe5\xe1\xf3\xcd\x92\xd6*\xbd\x86\xeeg\xb1\xe1-?\x1aY\xdc\x8b\xa5x\xaf\xd2\xb7{rh\xc6P\xd4\x1cs\x8f\xd75\x06\xbf\x8c\x7f\x1a\xc2b@\\\x99Z'i\xfa\x8a\xed\x91b\xa1\xd4\x99O_\xf6\xef\xdd\xb5-%(\x1b\x90J!\xf1\xa9M!\xf9\xfec\xf7\x18p\xdd\x9f\x9et\xd2\xb6x\x7f\xb3kA\xfe^\xe8\xa4\x94Q\xe8w\x00\x00\x00\xff\xffPK\x07\x08\x01S\xc7P\x7f\x02\x00\x00\xb1\x06\x00\x00PK\x01\x02\x14\x03\x14\x00\x08\x00\x08\x00K\xa7pQ\xb1\xe0\xcew\x9c\x00\x00\x00\n\x01\x00\x00\n\x00 \x00\x00\x00\x00\x00\x00\x00\x00\x00\xa0\x81\x00\x00\x00\x00go.mod.srcUT\x05\x00\x01\xef\xe7\xb2_PK\x01\x02\x14\x03\x14\x00\x08\x00\x08\x00C\xa7pQ\x01S\xc7P\x7f\x02\x00\x00\xb1\x06\x00\x00\x07\x00 \x00\x00\x00\x00\x00\x00\x00\x00\x00\xa0\x81\xdd\x00\x00\x00main.goUT\x05\x00\x01\xdf\xe7\xb2_PK\x05\x06\x00\x00\x00\x00\x02\x00\x02\x00\x7f\x00\x00\x00\x9a\x03\x00\x00\x00\x00" - fs.Register(data) - } - \ No newline at end of file diff --git a/cmd/pluginator/main.go b/cmd/pluginator/main.go index fb110ad73..1bc4315ce 100644 --- a/cmd/pluginator/main.go +++ b/cmd/pluginator/main.go @@ -9,8 +9,8 @@ import ( "os" "github.com/spf13/cobra" - "sigs.k8s.io/kustomize/cmd/pluginator/v2/builtinplugin" - "sigs.k8s.io/kustomize/cmd/pluginator/v2/krmfunction" + "sigs.k8s.io/kustomize/cmd/pluginator/v2/internal/builtinplugin" + "sigs.k8s.io/kustomize/cmd/pluginator/v2/internal/krmfunction" ) func main() {