scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-04 04:08:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #76890 from xichengliudui/fixshellcheckfailures-31

Browse Source 
fix shellcheck failures on and verify-test-featuregates.sh
This commit is contained in:
Kubernetes Prow Robot
2019-04-23 00:46:26 -07:00
committed by GitHub
parent ccf9556ddc 5c8ec1ce9c
commit fd0a140673
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
hack/.shellcheck_failures
View File

@@ -42,7 +42,6 @@
./hack/verify-codegen.sh ./hack/verify-codegen.sh
./hack/verify-golint.sh ./hack/verify-golint.sh
./hack/verify-no-vendor-cycles.sh ./hack/verify-no-vendor-cycles.sh
./hack/verify-test-featuregates.sh
./test/cmd/apply.sh ./test/cmd/apply.sh
./test/cmd/apps.sh ./test/cmd/apps.sh
./test/cmd/authorization.sh ./test/cmd/authorization.sh

2
hack/verify-openapi-spec.sh
View File

@@ -32,7 +32,7 @@ _tmp="${KUBE_ROOT}/_tmp"
mkdir -p "${_tmp}" mkdir -p "${_tmp}"
cp -a "${SPECROOT}" "${TMP_SPECROOT}" cp -a "${SPECROOT}" "${TMP_SPECROOT}"
trap 'cp -a "${TMP_SPECROOT}" "${SPECROOT}"/..; rm -rf "${_tmp}"' EXIT SIGINT trap 'cp -a ${TMP_SPECROOT} ${SPECROOT}/..; rm -rf ${_tmp}' EXIT SIGINT
rm "${SPECROOT}"/* rm "${SPECROOT}"/*
cp "${TMP_SPECROOT}/BUILD" "${SPECROOT}/BUILD" cp "${TMP_SPECROOT}/BUILD" "${SPECROOT}/BUILD"
cp "${TMP_SPECROOT}/README.md" "${SPECROOT}/README.md" cp "${TMP_SPECROOT}/README.md" "${SPECROOT}/README.md"

6
hack/verify-test-featuregates.sh
View File

@@ -18,7 +18,7 @@ set -o errexit
set -o nounset set -o nounset
set -o pipefail set -o pipefail
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/.. KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
source "${KUBE_ROOT}/hack/lib/init.sh" source "${KUBE_ROOT}/hack/lib/init.sh"
cd "${KUBE_ROOT}" cd "${KUBE_ROOT}"
@@ -26,7 +26,7 @@ cd "${KUBE_ROOT}"
rc=0 rc=0
# find test files accessing the mutable global feature gate or interface # find test files accessing the mutable global feature gate or interface
direct_sets=$(grep -n --include *_test.go -R 'MutableFeatureGate' . 2>/dev/null) || true direct_sets=$(grep -n --include './*_test.go' -R 'MutableFeatureGate' . 2>/dev/null) || true
if [[ -n "${direct_sets}" ]]; then if [[ -n "${direct_sets}" ]]; then
echo "Test files may not access mutable global feature gates directly:" >&2 echo "Test files may not access mutable global feature gates directly:" >&2
echo "${direct_sets}" >&2 echo "${direct_sets}" >&2
@@ -38,7 +38,7 @@ if [[ -n "${direct_sets}" ]]; then
fi fi
# find test files calling SetFeatureGateDuringTest and not calling the result # find test files calling SetFeatureGateDuringTest and not calling the result
missing_defers=$(grep -n --include *_test.go -R 'SetFeatureGateDuringTest' . 2>/dev/null | egrep -v "defer .*\\)\\(\\)$") || true missing_defers=$(grep -n --include './*_test.go' -R 'SetFeatureGateDuringTest' . 2>/dev/null | grep -E -v "defer .*\\)\\(\\)$") || true
if [[ -n "${missing_defers}" ]]; then if [[ -n "${missing_defers}" ]]; then
echo "Invalid invocations of utilfeaturetesting.SetFeatureGateDuringTest():" >&2 echo "Invalid invocations of utilfeaturetesting.SetFeatureGateDuringTest():" >&2
echo "${missing_defers}" >&2 echo "${missing_defers}" >&2