From b2e06093d89912beb54c5b9e0835097f1bbf229c Mon Sep 17 00:00:00 2001
From: Peter Rifel <pgrifel@gmail.com>
Date: Mon, 26 Oct 2020 14:17:44 -0400
Subject: [PATCH] Make hack/update and hack/verify scripts more consistent

---
 Makefile                                      | 21 +++++++++++--------
 hack/.shellcheck_failures                     |  2 +-
 ...apimachinery.sh => update-apimachinery.sh} |  0
 hack/{verify-generate.sh => verify-crds.sh}   |  2 +-
 4 files changed, 14 insertions(+), 11 deletions(-)
 rename hack/{make-apimachinery.sh => update-apimachinery.sh} (100%)
 rename hack/{verify-generate.sh => verify-crds.sh} (93%)

diff --git a/Makefile b/Makefile
index 718ab9292b..11550efd52 100644
--- a/Makefile
+++ b/Makefile
@@ -453,26 +453,26 @@ verify-staticcheck: ${BINDATA_TARGETS}
 
 .PHONY: verify-shellcheck
 verify-shellcheck:
-	${KOPS_ROOT}/hack/verify-shellcheck.sh
+	hack/verify-shellcheck.sh
 
 .PHONY: verify-terraform
 verify-terraform:
-	./hack/verify-terraform.sh
+	hack/verify-terraform.sh
 
 .PHONY: verify-bindata
 verify-bindata:
-	./hack/verify-bindata.sh
+	hack/verify-bindata.sh
 
 .PHONY: verify-hashes
 verify-hashes:
-	./hack/verify-hashes.sh
+	hack/verify-hashes.sh
 
 # ci target is for developers, it aims to cover all the CI jobs
 # verify-gendocs will call kops target
 # verify-package has to be after verify-gendocs, because with .gitignore for federation bindata
 # it bombs in travis. verify-gendocs generates the bindata file.
 .PHONY: ci
-ci: govet verify-gofmt verify-generate verify-gomod verify-goimports verify-boilerplate verify-bazel verify-misspelling verify-shellcheck verify-staticcheck verify-terraform verify-bindata nodeup examples test | verify-gendocs verify-packages verify-apimachinery
+ci: govet verify-gofmt verify-crds verify-gomod verify-goimports verify-boilerplate verify-bazel verify-misspelling verify-shellcheck verify-staticcheck verify-terraform verify-bindata nodeup examples test | verify-gendocs verify-packages verify-apimachinery
 	echo "Done!"
 
 # travis-ci is the target that travis-ci calls
@@ -480,7 +480,7 @@ ci: govet verify-gofmt verify-generate verify-gomod verify-goimports verify-boil
 # verify-gofmt: uses bazel, covered by pull-kops-verify
 # govet needs to be after verify-goimports because it generates bindata.go
 .PHONY: travis-ci
-travis-ci: verify-generate verify-goimports govet verify-boilerplate verify-bazel verify-misspelling verify-shellcheck verify-bindata | verify-gendocs verify-packages verify-apimachinery
+travis-ci: verify-crds verify-goimports govet verify-boilerplate verify-bazel verify-misspelling verify-shellcheck verify-bindata | verify-gendocs verify-packages verify-apimachinery
 	echo "Done!"
 
 .PHONY: pr
@@ -523,7 +523,7 @@ apimachinery: apimachinery-codegen goimports
 
 .PHONY: apimachinery-codegen
 apimachinery-codegen:
-	sh -c hack/make-apimachinery.sh
+	hack/update-apimachinery.sh
 	${GOPATH}/bin/conversion-gen ${API_OPTIONS} --skip-unsafe=true --input-dirs k8s.io/kops/pkg/apis/kops/v1alpha2 --v=0  --output-file-base=zz_generated.conversion \
 		 --go-header-file "hack/boilerplate/boilerplate.go.txt"
 	${GOPATH}/bin/deepcopy-gen ${API_OPTIONS} --input-dirs k8s.io/kops/pkg/apis/kops --v=0  --output-file-base=zz_generated.deepcopy \
@@ -545,8 +545,11 @@ verify-apimachinery:
 	hack/verify-apimachinery.sh
 
 .PHONY: verify-generate
-verify-generate:
-	hack/verify-generate.sh
+verify-generate: verify-crds
+
+.PHONY: verify-crds
+verify-crds:
+	hack/verify-crds.sh
 
 # -----------------------------------------------------
 # bazel targets
diff --git a/hack/.shellcheck_failures b/hack/.shellcheck_failures
index 0cfe61171d..80d5080c9f 100644
--- a/hack/.shellcheck_failures
+++ b/hack/.shellcheck_failures
@@ -2,7 +2,7 @@
 ./addons/prometheus-operator/sync-repo.sh
 ./hack/common.sh
 ./hack/dev-build.sh
-./hack/make-apimachinery.sh
+./hack/update-apimachinery.sh
 ./hack/new-iam-user.sh
 ./hack/update-bazel.sh
 ./hack/update-header.sh
diff --git a/hack/make-apimachinery.sh b/hack/update-apimachinery.sh
similarity index 100%
rename from hack/make-apimachinery.sh
rename to hack/update-apimachinery.sh
diff --git a/hack/verify-generate.sh b/hack/verify-crds.sh
similarity index 93%
rename from hack/verify-generate.sh
rename to hack/verify-crds.sh
index e292aefcda..99b85c1350 100755
--- a/hack/verify-generate.sh
+++ b/hack/verify-crds.sh
@@ -26,7 +26,7 @@ make crds
 
 changed_files=$(git status --porcelain --untracked-files=no || true)
 if [ -n "${changed_files}" ]; then
-   echo "Detected that generation is needed; run 'make crds'"
+   echo "Detected that CRD generation is needed; run 'make crds'"
    echo "changed files:"
    printf "%s" "${changed_files}\n"
    echo "git diff:"