Skip to content

Commit 0813567

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes#74349 from mattjmcnaughton/mattjmcnaughton/fix-shellcheck-in-hack
Fix shellcheck for hack/verify-generated-*
2 parents 86a3cae + b4d086f commit 0813567

9 files changed

+41
-48
lines changed

‎hack/.shellcheck_failures‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -86,14 +86,6 @@
8686
./hack/verify-cli-conventions.sh
8787
./hack/verify-codegen.sh
8888
./hack/verify-description.sh
89-
./hack/verify-generated-device-plugin.sh
90-
./hack/verify-generated-docs.sh
91-
./hack/verify-generated-files.sh
92-
./hack/verify-generated-kms.sh
93-
./hack/verify-generated-kubelet-plugin-registration.sh
94-
./hack/verify-generated-pod-resources.sh
95-
./hack/verify-generated-protobuf.sh
96-
./hack/verify-generated-runtime.sh
9789
./hack/verify-golint.sh
9890
./hack/verify-govet.sh
9991
./hack/verify-import-boss.sh

‎hack/verify-generated-device-plugin.sh‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ set -o errexit
1818
set -o nounset
1919
set -o pipefail
2020

21-
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
21+
KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
2222
ERROR="Device plugin api is out of date. Please run hack/update-generated-device-plugin.sh"
2323
DEVICE_PLUGIN_ALPHA="${KUBE_ROOT}/pkg/kubelet/apis/deviceplugin/v1alpha/"
2424
DEVICE_PLUGIN_V1BETA1="${KUBE_ROOT}/pkg/kubelet/apis/deviceplugin/v1beta1/"
@@ -27,19 +27,19 @@ source "${KUBE_ROOT}/hack/lib/protoc.sh"
2727
kube::golang::setup_env
2828

2929
function cleanup {
30-
rm -rf ${DEVICE_PLUGIN_ALPHA}/_tmp/
31-
rm -rf ${DEVICE_PLUGIN_V1BETA1}/_tmp/
30+
rm -rf "${DEVICE_PLUGIN_ALPHA}/_tmp/"
31+
rm -rf "${DEVICE_PLUGIN_V1BETA1}/_tmp/"
3232
}
3333

3434
trap cleanup EXIT
3535

36-
mkdir -p ${DEVICE_PLUGIN_ALPHA}/_tmp
37-
cp ${DEVICE_PLUGIN_ALPHA}/api.pb.go ${DEVICE_PLUGIN_ALPHA}/_tmp/
38-
mkdir -p ${DEVICE_PLUGIN_V1BETA1}/_tmp
39-
cp ${DEVICE_PLUGIN_V1BETA1}/api.pb.go ${DEVICE_PLUGIN_V1BETA1}/_tmp/
36+
mkdir -p "${DEVICE_PLUGIN_ALPHA}/_tmp"
37+
cp "${DEVICE_PLUGIN_ALPHA}/api.pb.go" "${DEVICE_PLUGIN_ALPHA}/_tmp/"
38+
mkdir -p "${DEVICE_PLUGIN_V1BETA1}/_tmp"
39+
cp "${DEVICE_PLUGIN_V1BETA1}/api.pb.go" "${DEVICE_PLUGIN_V1BETA1}/_tmp/"
4040

4141
KUBE_VERBOSE=3 "${KUBE_ROOT}/hack/update-generated-device-plugin.sh"
42-
kube::protoc::diff "${DEVICE_PLUGIN_ALPHA}/api.pb.go" "${DEVICE_PLUGIN_ALPHA}/_tmp/api.pb.go" ${ERROR}
42+
kube::protoc::diff "${DEVICE_PLUGIN_ALPHA}/api.pb.go" "${DEVICE_PLUGIN_ALPHA}/_tmp/api.pb.go" "${ERROR}"
4343
echo "Generated device plugin alpha api is up to date."
44-
kube::protoc::diff "${DEVICE_PLUGIN_V1BETA1}/api.pb.go" "${DEVICE_PLUGIN_V1BETA1}/_tmp/api.pb.go" ${ERROR}
44+
kube::protoc::diff "${DEVICE_PLUGIN_V1BETA1}/api.pb.go" "${DEVICE_PLUGIN_V1BETA1}/_tmp/api.pb.go" "${ERROR}"
4545
echo "Generated device plugin beta api is up to date."

‎hack/verify-generated-docs.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ set -o errexit
1818
set -o nounset
1919
set -o pipefail
2020

21-
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
21+
KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
2222
source "${KUBE_ROOT}/hack/lib/init.sh"
2323

2424
kube::golang::setup_env

‎hack/verify-generated-files.sh‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,13 @@ set -o errexit
1818
set -o nounset
1919
set -o pipefail
2020

21-
export KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
21+
KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
22+
export KUBE_ROOT
2223
source "${KUBE_ROOT}/hack/lib/init.sh"
2324

2425
kube::util::ensure_clean_working_dir
2526

26-
_tmpdir="$(kube::realpath $(mktemp -d -t verify-generated-files.XXXXXX))"
27+
_tmpdir="$(kube::realpath "$(mktemp -d -t verify-generated-files.XXXXXX)")"
2728
kube::util::trap_add "rm -rf ${_tmpdir}" EXIT
2829

2930
_tmp_gopath="${_tmpdir}/go"

‎hack/verify-generated-kms.sh‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,27 +18,27 @@ set -o errexit
1818
set -o nounset
1919
set -o pipefail
2020

21-
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
21+
KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
2222
KUBE_KMS_GRPC_ROOT="${KUBE_ROOT}/staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/v1beta1/"
2323
source "${KUBE_ROOT}/hack/lib/init.sh"
2424

2525
kube::golang::setup_env
2626

2727
function cleanup {
28-
rm -rf ${KUBE_KMS_GRPC_ROOT}/_tmp/
28+
rm -rf "${KUBE_KMS_GRPC_ROOT}/_tmp/"
2929
}
3030

3131
trap cleanup EXIT
3232

33-
mkdir -p ${KUBE_KMS_GRPC_ROOT}/_tmp
34-
cp ${KUBE_KMS_GRPC_ROOT}/service.pb.go ${KUBE_KMS_GRPC_ROOT}/_tmp/
33+
mkdir -p "${KUBE_KMS_GRPC_ROOT}/_tmp"
34+
cp "${KUBE_KMS_GRPC_ROOT}/service.pb.go" "${KUBE_KMS_GRPC_ROOT}/_tmp/"
3535

3636
ret=0
3737
KUBE_VERBOSE=3 "${KUBE_ROOT}/hack/update-generated-kms.sh"
38-
diff -I "gzipped FileDescriptorProto" -I "0x" -Naupr ${KUBE_KMS_GRPC_ROOT}/_tmp/service.pb.go ${KUBE_KMS_GRPC_ROOT}/service.pb.go || ret=$?
38+
diff -I "gzipped FileDescriptorProto" -I "0x" -Naupr "${KUBE_KMS_GRPC_ROOT}/_tmp/service.pb.go" "${KUBE_KMS_GRPC_ROOT}/service.pb.go" || ret=$?
3939
if [[ $ret -eq 0 ]]; then
4040
echo "Generated KMS gRPC is up to date."
41-
cp ${KUBE_KMS_GRPC_ROOT}/_tmp/service.pb.go ${KUBE_KMS_GRPC_ROOT}/
41+
cp "${KUBE_KMS_GRPC_ROOT}/_tmp/service.pb.go" "${KUBE_KMS_GRPC_ROOT}/"
4242
else
4343
echo "Generated KMS gRPC is out of date. Please run hack/update-generated-kms.sh"
4444
exit 1

‎hack/verify-generated-kubelet-plugin-registration.sh‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ set -o errexit
1818
set -o nounset
1919
set -o pipefail
2020

21-
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
21+
KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
2222
ERROR="Kubelet Plugin Registration api is out of date. Please run hack/update-generated-kubelet-plugin-registration.sh"
2323
KUBELET_PLUGIN_REGISTRATION_V1ALPHA="${KUBE_ROOT}/pkg/kubelet/apis/pluginregistration/v1alpha1/"
2424
KUBELET_PLUGIN_REGISTRATION_V1BETA="${KUBE_ROOT}/pkg/kubelet/apis/pluginregistration/v1beta1/"
@@ -27,24 +27,24 @@ source "${KUBE_ROOT}/hack/lib/protoc.sh"
2727
kube::golang::setup_env
2828

2929
function cleanup {
30-
rm -rf ${KUBELET_PLUGIN_REGISTRATION_V1ALPHA}/_tmp/
31-
rm -rf ${KUBELET_PLUGIN_REGISTRATION_V1BETA}/_tmp/
30+
rm -rf "${KUBELET_PLUGIN_REGISTRATION_V1ALPHA}/_tmp/"
31+
rm -rf "${KUBELET_PLUGIN_REGISTRATION_V1BETA}/_tmp/"
3232
}
3333

3434
trap cleanup EXIT
3535

36-
mkdir -p ${KUBELET_PLUGIN_REGISTRATION_V1ALPHA}/_tmp
37-
mkdir -p ${KUBELET_PLUGIN_REGISTRATION_V1BETA}/_tmp
36+
mkdir -p "${KUBELET_PLUGIN_REGISTRATION_V1ALPHA}/_tmp"
37+
mkdir -p "${KUBELET_PLUGIN_REGISTRATION_V1BETA}/_tmp"
3838

39-
cp ${KUBELET_PLUGIN_REGISTRATION_V1ALPHA}/api.pb.go ${KUBELET_PLUGIN_REGISTRATION_V1ALPHA}/_tmp/
40-
cp ${KUBELET_PLUGIN_REGISTRATION_V1BETA}/api.pb.go ${KUBELET_PLUGIN_REGISTRATION_V1BETA}/_tmp/
39+
cp "${KUBELET_PLUGIN_REGISTRATION_V1ALPHA}/api.pb.go" "${KUBELET_PLUGIN_REGISTRATION_V1ALPHA}/_tmp/"
40+
cp "${KUBELET_PLUGIN_REGISTRATION_V1BETA}/api.pb.go" "${KUBELET_PLUGIN_REGISTRATION_V1BETA}/_tmp/"
4141

4242
# Check V1Alpha
4343
KUBE_VERBOSE=3 "${KUBE_ROOT}/hack/update-generated-kubelet-plugin-registration.sh"
44-
kube::protoc::diff "${KUBELET_PLUGIN_REGISTRATION_V1ALPHA}/api.pb.go" "${KUBELET_PLUGIN_REGISTRATION_V1ALPHA}/_tmp/api.pb.go" ${ERROR}
44+
kube::protoc::diff "${KUBELET_PLUGIN_REGISTRATION_V1ALPHA}/api.pb.go" "${KUBELET_PLUGIN_REGISTRATION_V1ALPHA}/_tmp/api.pb.go" "${ERROR}"
4545
echo "Generated Kubelet Plugin Registration api is up to date."
4646

4747
# Check V1Beta
4848
KUBE_VERBOSE=3 "${KUBE_ROOT}/hack/update-generated-kubelet-plugin-registration.sh"
49-
kube::protoc::diff "${KUBELET_PLUGIN_REGISTRATION_V1BETA}/api.pb.go" "${KUBELET_PLUGIN_REGISTRATION_V1BETA}/_tmp/api.pb.go" ${ERROR}
49+
kube::protoc::diff "${KUBELET_PLUGIN_REGISTRATION_V1BETA}/api.pb.go" "${KUBELET_PLUGIN_REGISTRATION_V1BETA}/_tmp/api.pb.go" "${ERROR}"
5050
echo "Generated Kubelet Plugin Registration api is up to date."

‎hack/verify-generated-pod-resources.sh‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,27 +18,27 @@ set -o errexit
1818
set -o nounset
1919
set -o pipefail
2020

21-
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
21+
KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
2222
KUBE_REMOTE_RUNTIME_ROOT="${KUBE_ROOT}/pkg/kubelet/apis/podresources/v1alpha1"
2323
source "${KUBE_ROOT}/hack/lib/init.sh"
2424

2525
kube::golang::setup_env
2626

2727
function cleanup {
28-
rm -rf ${KUBE_REMOTE_RUNTIME_ROOT}/_tmp/
28+
rm -rf "${KUBE_REMOTE_RUNTIME_ROOT}/_tmp/"
2929
}
3030

3131
trap cleanup EXIT
3232

33-
mkdir -p ${KUBE_REMOTE_RUNTIME_ROOT}/_tmp
34-
cp ${KUBE_REMOTE_RUNTIME_ROOT}/api.pb.go ${KUBE_REMOTE_RUNTIME_ROOT}/_tmp/
33+
mkdir -p "${KUBE_REMOTE_RUNTIME_ROOT}/_tmp"
34+
cp "${KUBE_REMOTE_RUNTIME_ROOT}/api.pb.go" "${KUBE_REMOTE_RUNTIME_ROOT}/_tmp/"
3535

3636
ret=0
3737
KUBE_VERBOSE=3 "${KUBE_ROOT}/hack/update-generated-pod-resources.sh"
38-
diff -I "gzipped FileDescriptorProto" -I "0x" -Naupr ${KUBE_REMOTE_RUNTIME_ROOT}/_tmp/api.pb.go ${KUBE_REMOTE_RUNTIME_ROOT}/api.pb.go || ret=$?
38+
diff -I "gzipped FileDescriptorProto" -I "0x" -Naupr "${KUBE_REMOTE_RUNTIME_ROOT}/_tmp/api.pb.go" "${KUBE_REMOTE_RUNTIME_ROOT}/api.pb.go" || ret=$?
3939
if [[ $ret -eq 0 ]]; then
4040
echo "Generated pod resources api is up to date."
41-
cp ${KUBE_REMOTE_RUNTIME_ROOT}/_tmp/api.pb.go ${KUBE_REMOTE_RUNTIME_ROOT}/
41+
cp "${KUBE_REMOTE_RUNTIME_ROOT}/_tmp/api.pb.go" "${KUBE_REMOTE_RUNTIME_ROOT}/"
4242
else
4343
echo "Generated pod resources api is out of date. Please run hack/update-generated-pod-resources.sh"
4444
exit 1

‎hack/verify-generated-protobuf.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ set -o errexit
1818
set -o nounset
1919
set -o pipefail
2020

21-
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
21+
KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
2222
source "${KUBE_ROOT}/hack/lib/init.sh"
2323

2424
kube::golang::setup_env

‎hack/verify-generated-runtime.sh‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,27 +18,27 @@ set -o errexit
1818
set -o nounset
1919
set -o pipefail
2020

21-
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
21+
KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
2222
KUBE_REMOTE_RUNTIME_ROOT="${KUBE_ROOT}/pkg/kubelet/apis/cri/runtime/v1alpha2"
2323
source "${KUBE_ROOT}/hack/lib/init.sh"
2424

2525
kube::golang::setup_env
2626

2727
function cleanup {
28-
rm -rf ${KUBE_REMOTE_RUNTIME_ROOT}/_tmp/
28+
rm -rf "${KUBE_REMOTE_RUNTIME_ROOT}/_tmp/"
2929
}
3030

3131
trap cleanup EXIT
3232

33-
mkdir -p ${KUBE_REMOTE_RUNTIME_ROOT}/_tmp
34-
cp ${KUBE_REMOTE_RUNTIME_ROOT}/api.pb.go ${KUBE_REMOTE_RUNTIME_ROOT}/_tmp/
33+
mkdir -p "${KUBE_REMOTE_RUNTIME_ROOT}/_tmp"
34+
cp "${KUBE_REMOTE_RUNTIME_ROOT}/api.pb.go" "${KUBE_REMOTE_RUNTIME_ROOT}/_tmp/"
3535

3636
ret=0
3737
KUBE_VERBOSE=3 "${KUBE_ROOT}/hack/update-generated-runtime.sh"
38-
diff -I "gzipped FileDescriptorProto" -I "0x" -Naupr ${KUBE_REMOTE_RUNTIME_ROOT}/_tmp/api.pb.go ${KUBE_REMOTE_RUNTIME_ROOT}/api.pb.go || ret=$?
38+
diff -I "gzipped FileDescriptorProto" -I "0x" -Naupr "${KUBE_REMOTE_RUNTIME_ROOT}/_tmp/api.pb.go" "${KUBE_REMOTE_RUNTIME_ROOT}/api.pb.go" || ret=$?
3939
if [[ $ret -eq 0 ]]; then
4040
echo "Generated container runtime api is up to date."
41-
cp ${KUBE_REMOTE_RUNTIME_ROOT}/_tmp/api.pb.go ${KUBE_REMOTE_RUNTIME_ROOT}/
41+
cp "${KUBE_REMOTE_RUNTIME_ROOT}/_tmp/api.pb.go" "${KUBE_REMOTE_RUNTIME_ROOT}/"
4242
else
4343
echo "Generated container runtime api is out of date. Please run hack/update-generated-runtime.sh"
4444
exit 1

0 commit comments

Comments
 (0)