github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 19:31:44 +00:00
Code Issues Projects Releases Wiki Activity

fix hack/lib/swagger.sh shellcheck failures

Browse Source
This commit is contained in:
Benjamin Elder 2019-06-23 17:30:50 -07:00
parent 4160909495
commit a101acc7eb
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hack/.shellcheck_failures
View File

@ -18,7 +18,6 @@
./cluster/test-e2e.sh ./cluster/test-e2e.sh
./cluster/validate-cluster.sh ./cluster/validate-cluster.sh
./hack/lib/init.sh ./hack/lib/init.sh
./hack/lib/swagger.sh
./hack/lib/test.sh ./hack/lib/test.sh
./hack/lib/version.sh ./hack/lib/version.sh
./hack/test-integration.sh ./hack/test-integration.sh

16
hack/lib/swagger.sh
View File

@ -20,9 +20,6 @@ set -o errexit
set -o nounset set -o nounset
set -o pipefail 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. # Generates types_swagger_doc_generated file for the given group version.
# $1: Name of the group version # $1: Name of the group version
# $2: Path to the directory where types.go for that group version exists. This # $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() { kube::swagger::gen_types_swagger_doc() {
local group_version=$1 local group_version=$1
local gv_dir=$2 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 "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}" echo -e "$(cat hack/boilerplate/boilerplate.generatego.txt)\n"
cat >> "${TMPFILE}" <<EOF echo "package ${group_version##*/}"
cat <<EOF
// This file contains a collection of methods that can be used from go-restful to // This file contains a collection of methods that can be used from go-restful to
// generate Swagger API documentation for its models. Please read this PR for more // generate Swagger API documentation for its models. Please read this PR for more
@ -50,6 +49,7 @@ kube::swagger::gen_types_swagger_doc() {
// AUTO-GENERATED FUNCTIONS START HERE. DO NOT EDIT. // AUTO-GENERATED FUNCTIONS START HERE. DO NOT EDIT.
EOF EOF
} > "${TMPFILE}"
go run cmd/genswaggertypedocs/swagger_type_docs.go -s \ go run cmd/genswaggertypedocs/swagger_type_docs.go -s \
"${gv_dir}/types.go" \ "${gv_dir}/types.go" \
@ -59,5 +59,5 @@ EOF
echo "// AUTO-GENERATED FUNCTIONS END HERE" >> "${TMPFILE}" echo "// AUTO-GENERATED FUNCTIONS END HERE" >> "${TMPFILE}"
gofmt -w -s "${TMPFILE}" gofmt -w -s "${TMPFILE}"
mv "${TMPFILE}" ""${gv_dir}"/types_swagger_doc_generated.go" mv "${TMPFILE}" "${gv_dir}/types_swagger_doc_generated.go"
} }