From ad70acf018210ce4b7580d196e765d32c4beee59 Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Sat, 18 Apr 2020 20:44:06 -0400 Subject: [PATCH] add update/verify for go.mod/sum files in hack/tools Signed-off-by: Davanum Srinivas --- hack/update-hack-tools.sh | 43 ++++++++++++++++++++++++++++++++++++++ hack/verify-hack-tools.sh | 44 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 87 insertions(+) create mode 100755 hack/update-hack-tools.sh create mode 100755 hack/verify-hack-tools.sh diff --git a/hack/update-hack-tools.sh b/hack/update-hack-tools.sh new file mode 100755 index 00000000000..81f58af7f22 --- /dev/null +++ b/hack/update-hack-tools.sh @@ -0,0 +1,43 @@ +#!/usr/bin/env bash + +# Copyright 2020 The Kubernetes Authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +set -o errexit +set -o nounset +set -o pipefail + +KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. +source "${KUBE_ROOT}/hack/lib/init.sh" + +# Explicitly opt into go modules, even though we're inside a GOPATH directory +export GO111MODULE=on + +# Detect problematic GOPROXY settings that prevent lookup of dependencies +if [[ "${GOPROXY:-}" == "off" ]]; then + kube::log::error "Cannot run hack/update-hack-tools.sh with \$GOPROXY=off" + exit 1 +fi + +kube::golang::verify_go_version + +pushd "${KUBE_ROOT}/hack/tools" >/dev/null + echo "=== tidying go.mod/go.sum in hack/tools" + go mod edit -fmt + go mod tidy + go mod vendor + + LICENSE_ROOT="${PWD}" VENDOR_LICENSE_FILE="LICENSES" "${KUBE_ROOT}/hack/update-vendor-licenses.sh" + rm -rf vendor +popd >/dev/null diff --git a/hack/verify-hack-tools.sh b/hack/verify-hack-tools.sh new file mode 100755 index 00000000000..c70436023ff --- /dev/null +++ b/hack/verify-hack-tools.sh @@ -0,0 +1,44 @@ +#!/usr/bin/env bash + +# Copyright 2020 The Kubernetes Authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +set -o errexit +set -o nounset +set -o pipefail + +KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. +source "${KUBE_ROOT}/hack/lib/init.sh" + +_tmpdir="$(kube::realpath "$(mktemp -d -t verify-hack-tools.XXXXXX)")" +kube::util::trap_add "rm -rf ${_tmpdir}" EXIT + +_tmp_gopath="${_tmpdir}/go" +_tmp_kuberoot="${_tmp_gopath}/src/k8s.io/kubernetes" +_tmp_hack="${_tmp_gopath}/src/k8s.io/kubernetes/hack" +mkdir -p "${_tmp_hack}/.." +cp -a "${KUBE_ROOT}/hack" "${_tmp_hack}/.." + +pushd "${_tmp_kuberoot}" >/dev/null +./hack/update-hack-tools.sh +popd + +diff=$(diff -Naupr "${KUBE_ROOT}/hack" "${_tmp_kuberoot}/hack" || true) + +if [[ -n "${diff}" ]]; then + echo "${diff}" >&2 + echo >&2 + echo "Run ./hack/update-hack-tools.sh" >&2 + exit 1 +fi