Skip to content
This repository has been archived by the owner on Sep 24, 2021. It is now read-only.

Commit

Permalink
Merge pull request #82 from ericzhang08/add-goimports-verification
Browse files Browse the repository at this point in the history
Add a goimports verification
  • Loading branch information
k8s-ci-robot authored Jul 12, 2019
2 parents 13632bd + 858ed81 commit a477868
Show file tree
Hide file tree
Showing 4 changed files with 90 additions and 0 deletions.
1 change: 1 addition & 0 deletions hack/update-all.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,4 @@ REPO_PATH=$(get_root_path)

"${REPO_PATH}"/hack/update-deps.sh
"${REPO_PATH}"/hack/update-gofmt.sh
"${REPO_PATH}"/hack/update-goimports.sh
27 changes: 27 additions & 0 deletions hack/update-goimports.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
#!/usr/bin/env bash
# Copyright 2019 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.

# script to run gofmt over our code (not vendor)
set -o errexit
set -o nounset
set -o pipefail

# shellcheck source=/dev/null
source "$(dirname "$0")/utils.sh"
# cd to the root path
cd_root_path

# update go imports
goimports -w ./
6 changes: 6 additions & 0 deletions hack/verify-all.sh
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,12 @@ if [[ "${VERIFY_GOFMT:-true}" == "true" ]]; then
cd "${REPO_PATH}"
fi

if [[ "${VERIFY_GOIMPORTS:-true}" == "true" ]]; then
echo "[*] Verifying goimports..."
hack/verify-goimports.sh || res=1
cd "${REPO_PATH}"
fi

if [[ "${VERIFY_GOLINT:-true}" == "true" ]]; then
echo "[*] Verifying golint..."
hack/verify-golint.sh || res=1
Expand Down
56 changes: 56 additions & 0 deletions hack/verify-goimports.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
#!/usr/bin/env bash
# Copyright 2019 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

# shellcheck source=/dev/null
source "$(dirname "$0")/utils.sh"
# cd to the root path
cd_root_path

# create a temporary directory
TMP_DIR=$(mktemp -d)

# cleanup
exitHandler() (
echo "Cleaning up..."
rm -rf "${TMP_DIR}"
)
trap exitHandler EXIT

# pull goimports
export GO111MODULE=on
URL="https://github.com/golang/tools.git"
git clone --quiet --depth=1 "${URL}" "${TMP_DIR}"
pushd "${TMP_DIR}" > /dev/null
popd > /dev/null

# build goimports
BIN_PATH="${TMP_DIR}/cmd/goimports"
pushd "${BIN_PATH}" > /dev/null
echo "Building goimports..."
go build > /dev/null
popd > /dev/null

# check for goimports diffs
diff=$(git ls-files | grep "\.go" | grep -v "\/vendor" | xargs "${BIN_PATH}/goimports" -d 2>&1)
if [[ -n "${diff}" ]]; then
echo "${diff}"
echo
echo "Check failed. Please run hack/update-goimports.sh"
exit 1
fi

0 comments on commit a477868

Please sign in to comment.