From 532abf77e783a1013416f01e841549386411be11 Mon Sep 17 00:00:00 2001 From: Kurnianto Trilaksono Date: Sun, 27 Aug 2023 23:16:55 +0700 Subject: [PATCH] refactor: fix generate-kustimize-builtin-plugins, add diff checker on generate-kustomize-builtin-plugins, add go work sync on presubmit check, add generate-kustomize-builtin-plugins on presubmit check --- 0 | 1 + Makefile | 12 +++++++++++- Makefile-plugins.mk | 20 +++++++++++++++++++- 3 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 0 diff --git a/0 b/0 new file mode 100644 index 000000000..6d34a2e5e --- /dev/null +++ b/0 @@ -0,0 +1 @@ + 1607 diff --git a/Makefile b/Makefile index e50ebf445..e3a399bc4 100644 --- a/Makefile +++ b/Makefile @@ -112,7 +112,9 @@ prow-presubmit-check: \ test-go-mod \ build-non-plugin-all \ test-examples-kustomize-against-HEAD \ - test-examples-kustomize-against-latest-release + test-examples-kustomize-against-latest-release \ + workspace-sync \ + generate-kustomize-builtin-plugins .PHONY: license license: $(MYGOBIN)/addlicense @@ -181,7 +183,15 @@ test-examples-kustomize-against-HEAD: $(MYGOBIN)/kustomize $(MYGOBIN)/mdrip test-examples-kustomize-against-latest-release: $(MYGOBIN)/mdrip ./hack/testExamplesAgainstKustomize.sh v5@$(LATEST_RELEASE) +.PHONY: generate-kustomize-builtin-plugins +generate-kustomize-builtin-plugins: + $(MAKE) -f Makefile-plugin.mk +# Pushes dependencies in the go.work file back to go.mod files of each workspace module. +.PHONY: workspace-sync +workspace sync: + go work sync + # --- Cleanup targets --- .PHONY: clean clean: clean-kustomize-external-go-plugin uninstall-tools diff --git a/Makefile-plugins.mk b/Makefile-plugins.mk index 6cc49b388..172c70873 100644 --- a/Makefile-plugins.mk +++ b/Makefile-plugins.mk @@ -91,7 +91,25 @@ $(pGen)/%.go: $(MYGOBIN)/pluginator $(MYGOBIN)/goimports # Target is for debugging. .PHONY: generate-kustomize-builtin-plugins -generate-kustomize-builtin-plugins: $(builtinplugins) +generate-kustomize-builtin-plugins: $(builtplugins) + for plugin in $(abspath $(wildcard $(pSrc)/*)); do \ + echo "generating $${plugin} ..."; \ + set -e; \ + cd $${plugin}; \ + go generate pluginator .; \ + done; \ + cd ../../../; \ + make no-diff \ + +.PHONY: no-diff +no-diff: $(builtplugins) + for file in $(abspath $(builtinplugins)); do \ + echo "Checking for diff... $${file}" ; \ + set -e ; \ + if [ "`git diff $${file} | wc -c`" -gt 0 ]; then\ + echo "Error(1): diff found on $${file}"; exit 1; \ + fi \ + done .PHONY: build-kustomize-external-go-plugin build-kustomize-external-go-plugin: