Merge pull request #1162 from chuckha/gomodule

migrate away from vendor

hack/verify-kep-metadata.sh

@@ -18,17 +18,15 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-export KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
-cd ${KUBE_ROOT}
+TOOL_VERSION=v0.1.0
 
-go install ./vendor/github.com/chuckha/kepview/cmd/kepval
-if ! which kepval >/dev/null 2>&1; then
-    echo "Can't find kepval - is your GOPATH 'bin' in your PATH?" >&2
-    echo "  GOPATH: ${GOPATH}" >&2
-    echo "  PATH:   ${PATH}" >&2
-    exit 1
-fi
+# cd to the root path
+ROOT=$(dirname "${BASH_SOURCE}")/..
+cd ${ROOT}
 
+GO111MODULE=on go get "github.com/chuckha/kepview/cmd/kepval@${TOOL_VERSION}"
+
+echo "Checking metadata validity..."
 # * ignore "0023-documentation-for-images.md" because it is not a real KEP
 # * ignore "YYYYMMDD-kep-template.md" because it is not a real KEP
 grep --recursive --files-with-matches --regexp '---' --include='*.md' keps | grep --invert-match "YYYYMMDD-kep-template.md" | grep --invert-match "0023-documentation-for-images.md" | xargs kepval

hack/verify-spelling.sh

@@ -18,20 +18,32 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-export KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
-
-# Install tools we need, but only from vendor/...
-cd ${KUBE_ROOT}
-go install ./vendor/github.com/client9/misspell/cmd/misspell
-if ! which misspell >/dev/null 2>&1; then
-    echo "Can't find misspell - is your GOPATH 'bin' in your PATH?" >&2
-    echo "  GOPATH: ${GOPATH}" >&2
-    echo "  PATH:   ${PATH}" >&2
-    exit 1
-fi
+TOOL_VERSION="v0.3.4"
+
+# cd to the root path
+ROOT=$(dirname "${BASH_SOURCE}")/..
+cd ${ROOT}
+
+# create a temporary directory
+TMP_DIR=$(mktemp -d)
 
-# Spell checking
-# All the skipping files are defined in hack/.spelling_failures
-skipping_file="${KUBE_ROOT}/hack/.spelling_failures"
-failing_packages=$(echo `cat ${skipping_file}` | sed "s| | -e |g")
-git ls-files | grep -v -e ${failing_packages} | xargs misspell -i "" -error -o stderr
+# cleanup
+exitHandler() (
+  echo "Cleaning up..."
+  rm -rf "${TMP_DIR}"
+)
+trap exitHandler EXIT
+
+GO111MODULE=on go get "github.com/client9/misspell/cmd/misspell@${TOOL_VERSION}"
+
+# check spelling
+RES=0
+echo "Checking spelling..."
+ERROR_LOG="${TMP_DIR}/errors.log"
+git ls-files | grep -v vendor | xargs misspell > "${ERROR_LOG}"
+if [[ -s "${ERROR_LOG}" ]]; then
+  sed 's/^/error: /' "${ERROR_LOG}" # add 'error' to each line to highlight in e2e status
+  echo "Found spelling errors!"
+  RES=1
+fi
+exit "${RES}"

hack/verify-toc.sh

@@ -18,17 +18,13 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-export KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
+TOOL_VERSION=4dc3d6f908138504b02a1766f1f8ea282d6bdd7c
 
-# Install tools we need, but only from vendor/...
-cd ${KUBE_ROOT}
-go install ./vendor/github.com/tallclair/mdtoc
-if ! which mdtoc >/dev/null 2>&1; then
-    echo "Can't find mdtoc - is your GOPATH 'bin' in your PATH?" >&2
-    echo "  GOPATH: ${GOPATH}" >&2
-    echo "  PATH:   ${PATH}" >&2
-    exit 1
-fi
+# cd to the root path
+ROOT=$(dirname "${BASH_SOURCE}")/..
+cd ${ROOT}
+GO111MODULE=on go get "github.com/tallclair/mdtoc@${TOOL_VERSION}"
 
+echo "Checking table of contents are up to date..."
 # Verify tables of contents are up-to-date
 grep --include='*.md' -rl keps -e '<!-- toc -->' | xargs mdtoc --inplace --dryrun