diff --git a/Makefile b/Makefile index dd6f13133..ff6ae677a 100644 --- a/Makefile +++ b/Makefile @@ -48,10 +48,12 @@ $(MYGOBIN)/goimports: cd api; \ go install golang.org/x/tools/cmd/goimports -# Version pinned by api/go.mod +# To pin pluginator, use this recipe instead: +# cd api; +# go install sigs.k8s.io/kustomize/pluginator/v2 $(MYGOBIN)/pluginator: - cd api; \ - go install sigs.k8s.io/kustomize/pluginator/v2 + cd pluginator; \ + go install . # Install kustomize from whatever is checked out. $(MYGOBIN)/kustomize: @@ -66,23 +68,91 @@ install-tools: \ $(MYGOBIN)/pluginator \ $(MYGOBIN)/stringer -# Builtin plugins are generated code. -# Add new items here to create new builtins. -builtinplugins = \ - api/builtins/annotationstransformer.go \ - api/builtins/configmapgenerator.go \ - api/builtins/hashtransformer.go \ - api/builtins/imagetagtransformer.go \ - api/builtins/inventorytransformer.go \ - api/builtins/labeltransformer.go \ - api/builtins/legacyordertransformer.go \ - api/builtins/namespacetransformer.go \ - api/builtins/patchjson6902transformer.go \ - api/builtins/patchstrategicmergetransformer.go \ - api/builtins/patchtransformer.go \ - api/builtins/prefixsuffixtransformer.go \ - api/builtins/replicacounttransformer.go \ - api/builtins/secretgenerator.go +### Begin kustomize plugin rules. +# +# The rules to deal with builtin plugins are a bit +# complicated because +# +# - Every builtin plugin is a Go plugin - +# meaning it gets its own module directory +# (outside of the api module) with Go +# code in a 'main' package per Go plugin rules. +# - kustomize locates plugins using the +# 'apiVersion' and 'kind' fields from the +# plugin config file. +# - k8s wants CamelCase in 'kind' fields. +# - The module name (the last name in the path) +# must be the lowercased 'kind' of the +# plugin because Go and related tools +# demand lowercase in import paths, but +# allow CamelCase in file names. +# - the generated code must live in the api +# module (it's linked into the api). + +# Where all generated builtin plugin code should go. +pGen=api/builtins +# Where the builtin Go plugin modules live. +pSrc=plugin/builtin + +_builtinplugins = \ + AnnotationsTransformer.go \ + ConfigMapGenerator.go \ + HashTransformer.go \ + ImageTagTransformer.go \ + InventoryTransformer.go \ + LabelTransformer.go \ + LegacyOrderTransformer.go \ + NamespaceTransformer.go \ + PatchJson6902Transformer.go \ + PatchStrategicMergeTransformer.go \ + PatchTransformer.go \ + PrefixSuffixTransformer.go \ + ReplicaCountTransformer.go \ + SecretGenerator.go + +# Maintaining this explicit list of generated files, and +# adding it as a dependency to a few targets, to assure +# they get recreated if deleted. The rules below on how +# to make them don't, by themselves, assure they will be +# recreated if deleted. +builtinplugins = $(patsubst %,$(pGen)/%,$(_builtinplugins)) + +# These rules are verbose, but assure that if a source file +# is modified, the corresponding generated file, and only +# that file, will be recreated. +$(pGen)/AnnotationsTransformer.go: $(pSrc)/annotationstransformer/AnnotationsTransformer.go +$(pGen)/ConfigMapGenerator.go: $(pSrc)/configmapgenerator/ConfigMapGenerator.go +$(pGen)/HashTransformer.go: $(pSrc)/hashtransformer/HashTransformer.go +$(pGen)/ImageTagTransformer.go: $(pSrc)/imagetagtransformer/ImageTagTransformer.go +$(pGen)/InventoryTransformer.go: $(pSrc)/inventorytransformer/InventoryTransformer.go +$(pGen)/LabelTransformer.go: $(pSrc)/labeltransformer/LabelTransformer.go +$(pGen)/LegacyOrderTransformer.go: $(pSrc)/legacyordertransformer/LegacyOrderTransformer.go +$(pGen)/NamespaceTransformer.go: $(pSrc)/namespacetransformer/NamespaceTransformer.go +$(pGen)/PatchJson6902Transformer.go: $(pSrc)/patchjson6902transformer/PatchJson6902Transformer.go +$(pGen)/PatchStrategicMergeTransformer.go: $(pSrc)/patchstrategicmergetransformer/PatchStrategicMergeTransformer.go +$(pGen)/PatchTransformer.go: $(pSrc)/patchtransformer/PatchTransformer.go +$(pGen)/PrefixSuffixTransformer.go: $(pSrc)/prefixsuffixtransformer/PrefixSuffixTransformer.go +$(pGen)/ReplicaCountTransformer.go: $(pSrc)/replicacounttransformer/ReplicaCountTransformer.go +$(pGen)/SecretGenerator.go: $(pSrc)/secretgenerator/SecretGenerator.go + +# The (verbose but portable) Makefile way to convert to lowercase. +toLowerCase = $(subst A,a,$(subst B,b,$(subst C,c,$(subst D,d,$(subst E,e,$(subst F,f,$(subst G,g,$(subst H,h,$(subst I,i,$(subst J,j,$(subst K,k,$(subst L,l,$(subst M,m,$(subst N,n,$(subst O,o,$(subst P,p,$(subst Q,q,$(subst R,r,$(subst S,s,$(subst T,t,$(subst U,u,$(subst V,v,$(subst W,w,$(subst X,x,$(subst Y,y,$(subst Z,z,$1)))))))))))))))))))))))))) + +$(pGen)/%.go: $(MYGOBIN)/pluginator + @echo "generating $*" + ( \ + set -e; \ + cd $(pSrc)/$(call toLowerCase,$*); \ + go generate .; \ + cd ../../../$(pGen); \ + $(MYGOBIN)/goimports -w $*.go \ + ) + +# Target is for debugging. +.PHONY: generate-kustomize-builtin-plugins +generate-kustomize-builtin-plugins: $(builtinplugins) + +### End kustomize plugin rules. .PHONY: lint-kustomize lint-kustomize: install-tools $(builtinplugins) @@ -93,22 +163,6 @@ lint-kustomize: install-tools $(builtinplugins) cd pluginator; \ $(MYGOBIN)/golangci-lint-kustomize -c ../.golangci-kustomize.yml run ./... -# TODO: modify rule to trigger on source material. E.g. editting -# plugin/builtin/namespacetransformer/NamespaceTransformer.go -# should trigger regeneration of -# api/builtins/namespacetransformer.go -# To faciliate a simple rule, rename the name of the generated -# file to CamelCase format like the source material. -api/builtins/%.go: $(MYGOBIN)/pluginator - @echo "generating $*" - ( \ - set -e; \ - cd plugin/builtin/$*; \ - go generate .; \ - cd ../../../api/builtins; \ - $(MYGOBIN)/goimports -w $*.go \ - ) - .PHONY: test-unit-kustomize-api test-unit-kustomize-api: $(builtinplugins) cd api; go test ./... diff --git a/api/builtins/annotationstransformer.go b/api/builtins/AnnotationsTransformer.go similarity index 100% rename from api/builtins/annotationstransformer.go rename to api/builtins/AnnotationsTransformer.go diff --git a/api/builtins/configmapgenerator.go b/api/builtins/ConfigMapGenerator.go similarity index 100% rename from api/builtins/configmapgenerator.go rename to api/builtins/ConfigMapGenerator.go diff --git a/api/builtins/hashtransformer.go b/api/builtins/HashTransformer.go similarity index 100% rename from api/builtins/hashtransformer.go rename to api/builtins/HashTransformer.go diff --git a/api/builtins/imagetagtransformer.go b/api/builtins/ImageTagTransformer.go similarity index 100% rename from api/builtins/imagetagtransformer.go rename to api/builtins/ImageTagTransformer.go diff --git a/api/builtins/inventorytransformer.go b/api/builtins/InventoryTransformer.go similarity index 100% rename from api/builtins/inventorytransformer.go rename to api/builtins/InventoryTransformer.go diff --git a/api/builtins/labeltransformer.go b/api/builtins/LabelTransformer.go similarity index 100% rename from api/builtins/labeltransformer.go rename to api/builtins/LabelTransformer.go diff --git a/api/builtins/legacyordertransformer.go b/api/builtins/LegacyOrderTransformer.go similarity index 100% rename from api/builtins/legacyordertransformer.go rename to api/builtins/LegacyOrderTransformer.go diff --git a/api/builtins/namespacetransformer.go b/api/builtins/NamespaceTransformer.go similarity index 100% rename from api/builtins/namespacetransformer.go rename to api/builtins/NamespaceTransformer.go diff --git a/api/builtins/patchjson6902transformer.go b/api/builtins/PatchJson6902Transformer.go similarity index 100% rename from api/builtins/patchjson6902transformer.go rename to api/builtins/PatchJson6902Transformer.go diff --git a/api/builtins/patchstrategicmergetransformer.go b/api/builtins/PatchStrategicMergeTransformer.go similarity index 100% rename from api/builtins/patchstrategicmergetransformer.go rename to api/builtins/PatchStrategicMergeTransformer.go diff --git a/api/builtins/patchtransformer.go b/api/builtins/PatchTransformer.go similarity index 100% rename from api/builtins/patchtransformer.go rename to api/builtins/PatchTransformer.go diff --git a/api/builtins/prefixsuffixtransformer.go b/api/builtins/PrefixSuffixTransformer.go similarity index 100% rename from api/builtins/prefixsuffixtransformer.go rename to api/builtins/PrefixSuffixTransformer.go diff --git a/api/builtins/replicacounttransformer.go b/api/builtins/ReplicaCountTransformer.go similarity index 100% rename from api/builtins/replicacounttransformer.go rename to api/builtins/ReplicaCountTransformer.go diff --git a/api/builtins/secretgenerator.go b/api/builtins/SecretGenerator.go similarity index 100% rename from api/builtins/secretgenerator.go rename to api/builtins/SecretGenerator.go diff --git a/pluginator/go.mod b/pluginator/go.mod index 907644375..a35240b71 100644 --- a/pluginator/go.mod +++ b/pluginator/go.mod @@ -3,3 +3,5 @@ module sigs.k8s.io/kustomize/pluginator/v2 go 1.13 require sigs.k8s.io/kustomize/api v0.2.0 + +replace sigs.k8s.io/kustomize/api v0.2.0 => ../api diff --git a/pluginator/go.sum b/pluginator/go.sum index aa39e98f2..a76c46a43 100644 --- a/pluginator/go.sum +++ b/pluginator/go.sum @@ -25,6 +25,7 @@ github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRF github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= +github.com/bombsimon/wsl v1.2.5/go.mod h1:43lEF/i0kpXbLCeDXL9LMT8c92HyBywXb0AsgMHYngM= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= @@ -85,6 +86,7 @@ github.com/go-toolsmith/pkgload v1.0.0/go.mod h1:5eFArkbO80v7Z0kdngIxsRXRMTaX4Il github.com/go-toolsmith/strparse v1.0.0/go.mod h1:YI2nUKP9YGZnL/L1/DLFBfixrcjslWct4wyljWhSRy8= github.com/go-toolsmith/typep v1.0.0/go.mod h1:JSQCQMUPdRlMZFswiq3TGpNp1GMktqkR2Ns5AIQkATU= github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8= +github.com/gofrs/flock v0.0.0-20190320160742-5135e617513b/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= @@ -105,9 +107,12 @@ github.com/golangci/go-misc v0.0.0-20180628070357-927a3d87b613/go.mod h1:SyvUF2N github.com/golangci/goconst v0.0.0-20180610141641-041c5f2b40f3/go.mod h1:JXrF4TWy4tXYn62/9x8Wm/K/dm06p8tCKwFRDPZG/1o= github.com/golangci/gocyclo v0.0.0-20180528134321-2becd97e67ee/go.mod h1:ozx7R9SIwqmqf5pRP90DhR2Oay2UIjGuKheCBCNwAYU= github.com/golangci/gofmt v0.0.0-20181222123516-0b8337e80d98/go.mod h1:9qCChq59u/eW8im404Q2WWTrnBUQKjpNYKMbU4M7EFU= +github.com/golangci/gofmt v0.0.0-20190930125516-244bba706f1a/go.mod h1:9qCChq59u/eW8im404Q2WWTrnBUQKjpNYKMbU4M7EFU= github.com/golangci/golangci-lint v1.19.1/go.mod h1:2CEc4Fxx3vxDv7g8DyXkHCBF73AOzAymcJAprs2vCps= +github.com/golangci/golangci-lint v1.21.0/go.mod h1:phxpHK52q7SE+5KpPnti4oZTdFCEsn/tKN+nFvCKXfk= github.com/golangci/ineffassign v0.0.0-20190609212857-42439a7714cc/go.mod h1:e5tpTHCfVze+7EpLEozzMB3eafxo2KT5veNg1k6byQU= github.com/golangci/lint-1 v0.0.0-20190420132249-ee948d087217/go.mod h1:66R6K6P6VWk9I95jvqGxkqJxVWGFy9XlDwLwVz1RCFg= +github.com/golangci/lint-1 v0.0.0-20191013205115-297bf364a8e0/go.mod h1:66R6K6P6VWk9I95jvqGxkqJxVWGFy9XlDwLwVz1RCFg= github.com/golangci/maligned v0.0.0-20180506175553-b1d89398deca/go.mod h1:tvlJhZqDe4LMs4ZHD0oMUlt9G2LWuDGoisJTBzLMV9o= github.com/golangci/misspell v0.0.0-20180809174111-950f5d19e770/go.mod h1:dEbvlSfYbMQDtrpRMQU675gSDLDNa8sCPPChZ7PhiVA= github.com/golangci/prealloc v0.0.0-20180630174525-215b22d4de21/go.mod h1:tf5+bzsHdTM0bsB7+8mt0GUMvjCgwLpTapNZHU8AajI= @@ -169,7 +174,9 @@ github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/matoous/godox v0.0.0-20190910121045-032ad8106c86/go.mod h1:1BELzlh859Sh1c6+90blK8lbYy0kwQf1bYlBhBysy1s= +github.com/matoous/godox v0.0.0-20190911065817-5d6d842e92eb/go.mod h1:1BELzlh859Sh1c6+90blK8lbYy0kwQf1bYlBhBysy1s= github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= +github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/goveralls v0.0.2/go.mod h1:8d1ZMHsd7fW6IRPKQh46F2WRpyib5/X4FOpevwGNQEw= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= @@ -216,6 +223,7 @@ github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= github.com/russross/blackfriday v2.0.0+incompatible/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= github.com/securego/gosec v0.0.0-20190912120752-140048b2a218/go.mod h1:q6oYAujd2qyeU4cJqIri4LBIgdHXGvxWHZ1E29HNFRE= +github.com/securego/gosec v0.0.0-20191002120514-e680875ea14d/go.mod h1:w5+eXa0mYznDkHaMCXA4XYffjlH+cy1oyKbfzJXa2Do= github.com/shirou/gopsutil v0.0.0-20190901111213-e4ec7b275ada/go.mod h1:WWnYX4lzhCH5h/3YBfyVA3VbLYjlMZZAQcW9ojMexNc= github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4/go.mod h1:qsXQc7+bwAM3Q1u/4XEfrquwF8Lw7D7y5cD8CuHnfIc= github.com/shurcooL/go v0.0.0-20180423040247-9e1955d9fb6e/go.mod h1:TDJrrUr11Vxrven61rcy3hJMUqaf/CLWYhHNPmT14Lk= @@ -245,11 +253,14 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/timakin/bodyclose v0.0.0-20190721030226-87058b9bfcec/go.mod h1:Qimiffbc6q9tBWlVV6x0P9sat/ao1xEkREYPPj9hphk= +github.com/timakin/bodyclose v0.0.0-20190930140734-f7f2e9bca95e/go.mod h1:Qimiffbc6q9tBWlVV6x0P9sat/ao1xEkREYPPj9hphk= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= github.com/ultraware/funlen v0.0.2/go.mod h1:Dp4UiAus7Wdb9KUZsYWZEWiRzGuM2kXM1lPbfaF6xhA= github.com/ultraware/whitespace v0.0.3/go.mod h1:aVMh/gQve5Maj9hQ/hg+F75lr/X5A89uZnzAmWSineA= +github.com/ultraware/whitespace v0.0.4/go.mod h1:aVMh/gQve5Maj9hQ/hg+F75lr/X5A89uZnzAmWSineA= +github.com/uudashr/gocognit v0.0.0-20190926065955-1655d0de0517/go.mod h1:j44Ayx2KW4+oB6SWMv8KsmHzZrOInQav7D3cQMJ5JUM= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= github.com/valyala/fasthttp v1.2.0/go.mod h1:4vX61m6KN+xDduDNwXrhIAVZaZaZiQ1luJk8LWSxF3s= github.com/valyala/quicktemplate v1.2.0/go.mod h1:EH+4AkTd43SvgIbQHYu59/cJyxDoOVRUAfrukLPuGJ4= @@ -266,6 +277,7 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= @@ -329,6 +341,8 @@ golang.org/x/tools v0.0.0-20190719005602-e377ae9d6386/go.mod h1:jcCCGcm9btYwXyDq golang.org/x/tools v0.0.0-20190910044552-dd2b5c81c578/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190911230505-6bfd74cf029c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190912215617-3720d1ec3678/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20190930201159-7c411dea38b0/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191010075000-0337d82405ff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -373,6 +387,7 @@ sigs.k8s.io/kustomize/api v0.1.1/go.mod h1:FyfJD1q1QMjC/TvK78b6cCtZB+mbpnGIo9YOv sigs.k8s.io/kustomize/api v0.1.2 h1:4zcI8UOsQv31nPn4S1qKq+PSpFdlxQ1YbMvB1lWSrO8= sigs.k8s.io/kustomize/api v0.2.0 h1:e++6JpysnnlUbHmFrv6jvfF5rFlgQ103bS1DO7r5bWA= sigs.k8s.io/kustomize/api v0.2.0/go.mod h1:zVtMg179jW1gr74jo9fc2Ac9dLYLTZZThc3DDb9lDW4= +sigs.k8s.io/kustomize/pluginator/v2 v2.0.0/go.mod h1:zrXhTv8BAKt0egmZX/8AtMOSFUSWM9YuoHvvqz8/eHE= sigs.k8s.io/kustomize/pseudo/k8s v0.0.0-20191108212413-1f86a0ca5d6c/go.mod h1:bl/gVJgYYhJZCZdYU2BfnaKYAlqFkgbJEkpl302jEss= sigs.k8s.io/kustomize/pseudo/k8s v0.1.0/go.mod h1:bl/gVJgYYhJZCZdYU2BfnaKYAlqFkgbJEkpl302jEss= sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI= diff --git a/pluginator/main.go b/pluginator/main.go index cb407fbf4..4981e7b80 100644 --- a/pluginator/main.go +++ b/pluginator/main.go @@ -119,15 +119,13 @@ func NewWriter(r string) *writer { return &writer{root: r, f: f} } -// Assmue that this command is running with a $PWD of +// Assume that this command is running with a $PWD of // $HOME/kustomize/plugin/builtin/secretgenerator // (for example). Then we want to write to // $HOME/kustomize/api/builtins func makeOutputFileName(root string) string { return filepath.Join( - "..", "..", "..", - "api", packageForGeneratedCode, - strings.ToLower(root)+".go") + "..", "..", "..", "api", packageForGeneratedCode, root+".go") } func (w *writer) close() {