diff --git a/hack/.shellcheck_failures b/hack/.shellcheck_failures index d32b80e685d..f9f444ce8eb 100644 --- a/hack/.shellcheck_failures +++ b/hack/.shellcheck_failures @@ -18,7 +18,6 @@ ./cluster/test-e2e.sh ./cluster/validate-cluster.sh ./hack/lib/init.sh -./hack/lib/swagger.sh ./hack/lib/test.sh ./hack/lib/version.sh ./hack/test-integration.sh diff --git a/hack/lib/swagger.sh b/hack/lib/swagger.sh index 6865ad35b48..f8c4ba33ccb 100644 --- a/hack/lib/swagger.sh +++ b/hack/lib/swagger.sh @@ -20,9 +20,6 @@ set -o errexit set -o nounset set -o pipefail -# The root of the build/dist directory -KUBE_ROOT="$(cd "$(dirname "${BASH_SOURCE}")/../.." && pwd -P)" - # Generates types_swagger_doc_generated file for the given group version. # $1: Name of the group version # $2: Path to the directory where types.go for that group version exists. This @@ -30,13 +27,15 @@ KUBE_ROOT="$(cd "$(dirname "${BASH_SOURCE}")/../.." && pwd -P)" kube::swagger::gen_types_swagger_doc() { local group_version=$1 local gv_dir=$2 - local TMPFILE="${TMPDIR:-/tmp}/types_swagger_doc_generated.$(date +%s).go" + local TMPFILE + TMPFILE="${TMPDIR:-/tmp}/types_swagger_doc_generated.$(date +%s).go" echo "Generating swagger type docs for ${group_version} at ${gv_dir}" - echo -e "$(cat hack/boilerplate/boilerplate.generatego.txt)\n" > "${TMPFILE}" - echo "package ${group_version##*/}" >> "${TMPFILE}" - cat >> "${TMPFILE}" < "${TMPFILE}" go run cmd/genswaggertypedocs/swagger_type_docs.go -s \ "${gv_dir}/types.go" \ @@ -59,5 +59,5 @@ EOF echo "// AUTO-GENERATED FUNCTIONS END HERE" >> "${TMPFILE}" gofmt -w -s "${TMPFILE}" - mv "${TMPFILE}" ""${gv_dir}"/types_swagger_doc_generated.go" + mv "${TMPFILE}" "${gv_dir}/types_swagger_doc_generated.go" }