kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-05-17 18:25:26 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Edit commentaries and ensure pluginator logic does not create diff

Browse Source
This commit is contained in:
Kurnianto Trilaksono
2023-09-17 00:23:32 +07:00
parent 8f283499e9
commit a90c19d577
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile-plugins.mk
View File

@@ -89,7 +89,7 @@ $(pGen)/%.go: $(MYGOBIN)/pluginator $(MYGOBIN)/goimports
$(MYGOBIN)/goimports -w $*.go \ $(MYGOBIN)/goimports -w $*.go \
) )
# Target is for debugging. # Generate builtin plugins
.PHONY: generate-kustomize-builtin-plugins .PHONY: generate-kustomize-builtin-plugins
generate-kustomize-builtin-plugins: $(builtplugins) generate-kustomize-builtin-plugins: $(builtplugins)
for plugin in $(abspath $(wildcard $(pSrc)/*)); do \ for plugin in $(abspath $(wildcard $(pSrc)/*)); do \
@@ -101,7 +101,7 @@ generate-kustomize-builtin-plugins: $(builtplugins)
cd ../../../; \ cd ../../../; \
make no-diff \ make no-diff \
# Check for diff, if diff is found, throw error code 1 (subject to change based on discussion) # Check for diff, if diff is found, throw error code 1
.PHONY: no-diff .PHONY: no-diff
no-diff: $(builtplugins) no-diff: $(builtplugins)
for file in $(abspath $(builtinplugins)); do \ for file in $(abspath $(builtinplugins)); do \

5
cmd/pluginator/internal/builtinplugin/builtinplugin.go
View File

@@ -62,7 +62,6 @@ func ConvertToBuiltInPlugin() (retErr error) {
w.write( w.write(
fmt.Sprintf( fmt.Sprintf(
"// pluginator %s\n", provenance.GetProvenance().Short())) "// pluginator %s\n", provenance.GetProvenance().Short()))
w.write("\n")
w.write("package " + packageForGeneratedCode) w.write("package " + packageForGeneratedCode)
pType := unknown pType := unknown
@@ -73,6 +72,8 @@ func ConvertToBuiltInPlugin() (retErr error) {
continue continue
} }
if strings.HasPrefix(l, "var "+konfig.PluginSymbol+" plugin") { if strings.HasPrefix(l, "var "+konfig.PluginSymbol+" plugin") {
// Hack to skip leading new line
scanner.Scan()
continue continue
} }
if strings.Contains(l, " Transform(") { if strings.Contains(l, " Transform(") {
@@ -93,7 +94,7 @@ func ConvertToBuiltInPlugin() (retErr error) {
} }
w.write("") w.write("")
w.write("func New" + root + "Plugin() resmap." + pType.String() + "Plugin {") w.write("func New" + root + "Plugin() resmap." + pType.String() + "Plugin {")
w.write(" return &" + root + "Plugin{}") w.write(" return &" + root + "Plugin{}")
w.write("}") w.write("}")
return nil return nil