github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 06:27:05 +00:00
Code Issues Projects Releases Wiki Activity

fix shellcheck failures of hack/lib/logging.sh hack/lib/protoc.sh

Browse Source
This commit is contained in:
SataQiu 2019-04-04 15:56:35 +08:00
parent c2877f862a
commit 4231fa0980
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hack/.shellcheck_failures
View File

@ -33,8 +33,6 @@
./hack/jenkins/upload-to-gcs.sh ./hack/jenkins/upload-to-gcs.sh
./hack/jenkins/verify-dockerized.sh ./hack/jenkins/verify-dockerized.sh
./hack/lib/init.sh ./hack/lib/init.sh
./hack/lib/logging.sh
./hack/lib/protoc.sh
./hack/lib/swagger.sh ./hack/lib/swagger.sh
./hack/lib/test.sh ./hack/lib/test.sh
./hack/lib/version.sh ./hack/lib/version.sh

4
hack/lib/logging.sh
View File

@ -20,7 +20,7 @@ KUBE_VERBOSE="${KUBE_VERBOSE:-5}"
# Handler for when we exit automatically on an error. # Handler for when we exit automatically on an error.
# Borrowed from https://gist.github.com/ahendrix/7030300 # Borrowed from https://gist.github.com/ahendrix/7030300
kube::log::errexit() { kube::log::errexit() {
local err="${PIPESTATUS[@]}" local err="${PIPESTATUS[*]}"
# If the shell we are in doesn't have errexit set (common in subshells) then # If the shell we are in doesn't have errexit set (common in subshells) then
# don't dump stacks. # don't dump stacks.
@ -60,7 +60,7 @@ kube::log::stack() {
if [[ ${#FUNCNAME[@]} -gt ${stack_skip} ]]; then if [[ ${#FUNCNAME[@]} -gt ${stack_skip} ]]; then
echo "Call stack:" >&2 echo "Call stack:" >&2
local i local i
for ((i=1 ; i <= ${#FUNCNAME[@]} - ${stack_skip} ; i++)) for ((i=1 ; i <= ${#FUNCNAME[@]} - stack_skip ; i++))
do do
local frame_no=$((i - 1 + stack_skip)) local frame_no=$((i - 1 + stack_skip))
local source_file=${BASH_SOURCE[${frame_no}]} local source_file=${BASH_SOURCE[${frame_no}]}

16
hack/lib/protoc.sh
View File

@ -19,7 +19,7 @@ set -o nounset
set -o pipefail set -o pipefail
# The root of the build/dist directory # The root of the build/dist directory
KUBE_ROOT="$(cd "$(dirname "${BASH_SOURCE}")/../.." && pwd -P)" KUBE_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd -P)"
source "${KUBE_ROOT}/hack/lib/init.sh" source "${KUBE_ROOT}/hack/lib/init.sh"
# Generates $1/api.pb.go from the protobuf file $1/api.proto # Generates $1/api.pb.go from the protobuf file $1/api.proto
@ -35,8 +35,8 @@ function kube::protoc::generate_proto() {
kube::protoc::check_protoc kube::protoc::check_protoc
local package=${1} local package=${1}
kube::protoc::protoc ${package} kube::protoc::protoc "${package}"
kube::protoc::format ${package} kube::protoc::format "${package}"
} }
# Checks that the current protoc version is at least version 3.0.0-beta1 # Checks that the current protoc version is at least version 3.0.0-beta1
@ -62,7 +62,7 @@ function kube::protoc::protoc() {
PATH="${gogopath}:${PATH}" protoc \ PATH="${gogopath}:${PATH}" protoc \
--proto_path="${package}" \ --proto_path="${package}" \
--proto_path="${KUBE_ROOT}/vendor" \ --proto_path="${KUBE_ROOT}/vendor" \
--gogo_out=plugins=grpc:${package} ${package}/api.proto --gogo_out=plugins=grpc:"${package}" "${package}/api.proto"
} }
# Formats $1/api.pb.go, adds the boilerplate comments and run gofmt on it # Formats $1/api.pb.go, adds the boilerplate comments and run gofmt on it
@ -71,20 +71,20 @@ function kube::protoc::format() {
local package=${1} local package=${1}
# Update boilerplate for the generated file. # Update boilerplate for the generated file.
echo "$(cat hack/boilerplate/boilerplate.generatego.txt ${package}/api.pb.go)" > ${package}/api.pb.go cat hack/boilerplate/boilerplate.generatego.txt "${package}/api.pb.go" > tmpfile && mv tmpfile "${package}/api.pb.go"
# Run gofmt to clean up the generated code. # Run gofmt to clean up the generated code.
kube::golang::verify_go_version kube::golang::verify_go_version
gofmt -l -s -w ${package}/api.pb.go gofmt -l -s -w "${package}/api.pb.go"
} }
# Compares the contents of $1 and $2 # Compares the contents of $1 and $2
# Echo's $3 in case of error and exits 1 # Echo's $3 in case of error and exits 1
function kube::protoc::diff() { function kube::protoc::diff() {
local ret=0 local ret=0
diff -I "gzipped FileDescriptorProto" -I "0x" -Naupr ${1} ${2} || ret=$? diff -I "gzipped FileDescriptorProto" -I "0x" -Naupr "${1}" "${2}" || ret=$?
if [[ ${ret} -ne 0 ]]; then if [[ ${ret} -ne 0 ]]; then
echo ${3} echo "${3}"
exit 1 exit 1
fi fi
} }