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

Commit

Permalink
hack: include a verify-whitespace script and fix whitespace issues
Browse files Browse the repository at this point in the history
  • Loading branch information
neolit123 committed Jun 24, 2019
1 parent 2e852e2 commit daafa3a
Show file tree
Hide file tree
Showing 8 changed files with 78 additions and 6 deletions.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -198,4 +198,4 @@
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.
limitations under the License.
2 changes: 1 addition & 1 deletion OWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ approvers:

reviewers:
- cluster-api-maintainers
- cluster-api-provider-docker-maintainers
- cluster-api-provider-docker-maintainers
2 changes: 1 addition & 1 deletion SECURITY_CONTACTS
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
detiber
justinsb
luxas
timothysc
timothysc
2 changes: 1 addition & 1 deletion code-of-conduct.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Kubernetes Community Code of Conduct

Please refer to our [Kubernetes Community Code of Conduct](https://git.k8s.io/community/code-of-conduct.md)
Please refer to our [Kubernetes Community Code of Conduct](https://git.k8s.io/community/code-of-conduct.md)
24 changes: 24 additions & 0 deletions hack/utils.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
#!/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.

# get_root_path returns the root path of the project source tree
get_root_path() {
echo "$(git rev-parse --show-toplevel)"
}

# cd_root_path cds to the root path of the project source tree
cd_root_path() {
cd "$(get_root_path)" || exit
}
48 changes: 48 additions & 0 deletions hack/verify-whitespace.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
#!/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 nounset
set -o pipefail

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

echo "Verifying trailing whitespace..."
TRAILING="$(grep -rnI '[[:blank:]]$' . | grep -v -e .git)"

ERR="0"
if [[ ! -z "$TRAILING" ]]; then
echo "Found trailing whitespace in the follow files:"
echo "${TRAILING}"
ERR="1"
fi

echo -e "Verifying new lines at end of files..."
FILES="$(git ls-files | grep -I -v -e vendor)"
while read -r LINE; do
grep -qI . "${LINE}" || continue # skip binary files
c="$(tail -c 1 "${LINE}")"
if [[ "$c" != "" ]]; then
echo "${LINE}: no newline at the end of file"
ERR=1
fi
done <<< "${FILES}"

if [[ "$ERR" == "1" ]]; then
echo "Found whitespace errors!"
exit 1
fi
2 changes: 1 addition & 1 deletion scripts/publish-manager.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ TAG=${TAG:-latest}
IMAGE="gcr.io/${REGISTRY}/capd-manager:${TAG}"

docker build --file Dockerfile -t "${IMAGE}" .
gcloud docker -- push "${IMAGE}"
gcloud docker -- push "${IMAGE}"
2 changes: 1 addition & 1 deletion third_party/forked/loadbalancer/README.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Forked from Kind v0.3.0 release branch to expose some generic functionality.
Forked from Kind v0.3.0 release branch to expose some generic functionality.

0 comments on commit daafa3a

Please sign in to comment.