Cleanup go.mod only if option -c is passed

Signed-off-by: Benjamin Grandfond <benjamin.grandfond@docker.com>
docker · Apr 23, 2022 · a00f352 · a00f352
1 parent 267e36c
commit a00f352
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 22 deletions.
diff --git a/Makefile b/Makefile
@@ -52,15 +52,15 @@ plugins: ## build example CLI plugins
 .PHONY: vendor
 vendor: ## update vendor with go modules
 	rm -rf vendor
-	./scripts/vendor update
+	./scripts/vendor update -c
 
 .PHONY: validate-vendor
 validate-vendor: ## validate vendor
-	./scripts/vendor validate
+	./scripts/vendor validate -c
 
 .PHONY: mod-outdated
 mod-outdated: ## check outdated dependencies
-	./scripts/vendor outdated
+	./scripts/vendor outdated -c
 
 .PHONY: authors
 authors: ## generate AUTHORS file from git history

diff --git a/dockerfiles/Dockerfile.vendor b/dockerfiles/Dockerfile.vendor
@@ -14,7 +14,7 @@ RUN --mount=target=/context \
     --mount=target=/go/pkg/mod,type=cache <<EOT
 set -e
 rsync -a /context/. .
-./scripts/vendor update
+./scripts/vendor update -c
 mkdir /out
 cp -r vendor.mod vendor.sum vendor /out
 EOT
@@ -30,7 +30,7 @@ rsync -a /context/. .
 git add -A
 rm -rf vendor
 cp -rf /out/* .
-./scripts/vendor validate
+./scripts/vendor validate -c
 EOT
 
 FROM psampaz/go-mod-outdated:${MODOUTDATED_VERSION} AS go-mod-outdated
@@ -39,4 +39,4 @@ ARG UUID
 RUN --mount=target=.,rw \
     --mount=target=/go/pkg/mod,type=cache \
     --mount=from=go-mod-outdated,source=/home/go-mod-outdated,target=/usr/bin/go-mod-outdated \
-    ./scripts/vendor outdated
+    ./scripts/vendor outdated -c
diff --git a/scripts/docs/generate-man.sh b/scripts/docs/generate-man.sh
@@ -29,6 +29,8 @@ trap clean EXIT
   go build -mod=vendor -modfile=vendor.mod -tags manpages -o /tmp/gen-manpages ./man/generate.go
   # build go-md2man
   go build -mod=vendor -modfile=vendor.mod -o /tmp/go-md2man ./vendor/github.com/cpuguy83/go-md2man/v2
+  # clean vendor
+  ./scripts/vendor clean
 )
 
 mkdir -p man/man1

diff --git a/scripts/docs/generate-yaml.sh b/scripts/docs/generate-yaml.sh
@@ -27,6 +27,8 @@ trap clean EXIT
   ./scripts/vendor update
   # build docsgen
   go build -mod=vendor -modfile=vendor.mod -tags docsgen -o /tmp/docsgen ./docs/generate.go
+  # clean vendor
+  ./scripts/vendor clean
 )
 
 mkdir -p docs/yaml

diff --git a/scripts/vendor b/scripts/vendor
@@ -2,21 +2,14 @@
 
 set -eu
 
-TYP=$1
-
 usage() {
-  echo "usage: ./scripts/vendor <init|update|validate|outdated>"
+  echo "usage: ./scripts/vendor <init|update|validate|outdated|clean> [-c]"
+  echo
+  echo "options:"
+  echo "  c  remove dummy go.mod after command execution"
   exit 1
 }
 
-if [ -z "$TYP" ]; then
-  usage
-fi
-
-clean() {
-  rm go.mod
-}
-
 init() {
   # create dummy go.mod, see comment in vendor.mod
   cat > go.mod <<EOL
@@ -47,29 +40,49 @@ outdated() {
   (set -x ; go list -mod=vendor -mod=readonly -modfile=vendor.mod -u -m -json all | go-mod-outdated -update -direct)
 }
 
+clean() {
+  echo "Remove dummy go.mod file"
+  rm go.mod
+}
+
+command=(${1:-"usage"})
+if [ $# -gt 1 ]; then
+  shift # Remove command from the argument list
+fi
 
-case $TYP in
+case $command in
   "init")
     init
+    exit 0
     ;;
   "update")
     init
     update
-    clean
     ;;
   "validate")
     init
     update
-    clean
     validate
     ;;
   "outdated")
     init
     outdated
+    ;;
+  "clean")
     clean
+    exit 0
     ;;
   *)
-    echo >&2 "Unknown type $TYP"
-    exit 1
+    usage
     ;;
 esac
+
+while getopts ":c" opt; do
+  case $opt in
+    c)
+      clean
+      ;;
+    *)
+      ;;
+  esac
+done