-
Notifications
You must be signed in to change notification settings - Fork 38.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix shellcheck in code-generator #73246
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -23,7 +23,7 @@ set -o pipefail | |
|
||
if [ "$#" -lt 5 ] || [ "${1}" == "--help" ]; then | ||
cat <<EOF | ||
Usage: $(basename $0) <generators> <output-package> <internal-apis-package> <extensiona-apis-package> <groups-versions> ... | ||
Usage: $(basename "$0") <generators> <output-package> <internal-apis-package> <extensiona-apis-package> <groups-versions> ... | ||
|
||
<generators> the generators comma separated to run (deepcopy,defaulter,conversion,client,lister,informer) or "all". | ||
<output-package> the output package name (e.g. github.com/example/project/pkg/generated). | ||
|
@@ -34,8 +34,8 @@ Usage: $(basename $0) <generators> <output-package> <internal-apis-package> <ext | |
... arbitrary flags passed to all generator binaries. | ||
|
||
Examples: | ||
$(basename $0) all github.com/example/project/pkg/client github.com/example/project/pkg/apis github.com/example/project/pkg/apis "foo:v1 bar:v1alpha1,v1beta1" | ||
$(basename $0) deepcopy,defaulter,conversion github.com/example/project/pkg/client github.com/example/project/pkg/apis github.com/example/project/apis "foo:v1 bar:v1alpha1,v1beta1" | ||
$(basename "$0") all github.com/example/project/pkg/client github.com/example/project/pkg/apis github.com/example/project/pkg/apis "foo:v1 bar:v1alpha1,v1beta1" | ||
$(basename "$0") deepcopy,defaulter,conversion github.com/example/project/pkg/client github.com/example/project/pkg/apis github.com/example/project/apis "foo:v1 bar:v1alpha1,v1beta1" | ||
EOF | ||
exit 0 | ||
fi | ||
|
@@ -47,15 +47,15 @@ EXT_APIS_PKG="$4" | |
GROUPS_WITH_VERSIONS="$5" | ||
shift 5 | ||
|
||
go install ${GOFLAGS:-} ./$(dirname "${0}")/cmd/{defaulter-gen,conversion-gen,client-gen,lister-gen,informer-gen,deepcopy-gen} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. why this? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. ref: #73246 (comment) , so we think it maybe the best answer to pass shellcheck here. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. makes sense |
||
go install ./"$(dirname "${0}")"/cmd/{defaulter-gen,conversion-gen,client-gen,lister-gen,informer-gen,deepcopy-gen} | ||
function codegen::join() { local IFS="$1"; shift; echo "$*"; } | ||
|
||
# enumerate group versions | ||
ALL_FQ_APIS=() # e.g. k8s.io/kubernetes/pkg/apis/apps k8s.io/api/apps/v1 | ||
INT_FQ_APIS=() # e.g. k8s.io/kubernetes/pkg/apis/apps | ||
EXT_FQ_APIS=() # e.g. k8s.io/api/apps/v1 | ||
for GVs in ${GROUPS_WITH_VERSIONS}; do | ||
IFS=: read G Vs <<<"${GVs}" | ||
IFS=: read -r G Vs <<<"${GVs}" | ||
|
||
if [ -n "${INT_APIS_PKG}" ]; then | ||
ALL_FQ_APIS+=("${INT_APIS_PKG}/${G}") | ||
|
@@ -71,39 +71,40 @@ done | |
|
||
if [ "${GENS}" = "all" ] || grep -qw "deepcopy" <<<"${GENS}"; then | ||
echo "Generating deepcopy funcs" | ||
${GOPATH}/bin/deepcopy-gen --input-dirs $(codegen::join , "${ALL_FQ_APIS[@]}") -O zz_generated.deepcopy --bounding-dirs ${INT_APIS_PKG},${EXT_APIS_PKG} "$@" | ||
"${GOPATH}/bin/deepcopy-gen" --input-dirs "$(codegen::join , "${ALL_FQ_APIS[@]}")" -O zz_generated.deepcopy --bounding-dirs "${INT_APIS_PKG},${EXT_APIS_PKG}" "$@" | ||
fi | ||
|
||
if [ "${GENS}" = "all" ] || grep -qw "defaulter" <<<"${GENS}"; then | ||
echo "Generating defaulters" | ||
${GOPATH}/bin/defaulter-gen --input-dirs $(codegen::join , "${EXT_FQ_APIS[@]}") -O zz_generated.defaults "$@" | ||
"${GOPATH}/bin/defaulter-gen" --input-dirs "$(codegen::join , "${EXT_FQ_APIS[@]}")" -O zz_generated.defaults "$@" | ||
fi | ||
|
||
if [ "${GENS}" = "all" ] || grep -qw "conversion" <<<"${GENS}"; then | ||
echo "Generating conversions" | ||
${GOPATH}/bin/conversion-gen --input-dirs $(codegen::join , "${ALL_FQ_APIS[@]}") -O zz_generated.conversion "$@" | ||
"${GOPATH}/bin/conversion-gen" --input-dirs "$(codegen::join , "${ALL_FQ_APIS[@]}")" -O zz_generated.conversion "$@" | ||
fi | ||
|
||
if [ "${GENS}" = "all" ] || grep -qw "client" <<<"${GENS}"; then | ||
echo "Generating clientset for ${GROUPS_WITH_VERSIONS} at ${OUTPUT_PKG}/${CLIENTSET_PKG_NAME:-clientset}" | ||
if [ -n "${INT_APIS_PKG}" ]; then | ||
${GOPATH}/bin/client-gen --clientset-name ${CLIENTSET_NAME_INTERNAL:-internalversion} --input-base "" --input $(codegen::join , $(printf '%s/ ' "${INT_FQ_APIS[@]}")) --output-package ${OUTPUT_PKG}/${CLIENTSET_PKG_NAME:-clientset} "$@" | ||
IFS=" " read -r -a APIS <<< "$(printf '%s/ ' "${INT_FQ_APIS[@]}")" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. what does this do? This need a comment, if at all necessary. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. ref: #73246 (comment) . |
||
"${GOPATH}/bin/client-gen" --clientset-name "${CLIENTSET_NAME_INTERNAL:-internalversion}" --input-base "" --input "$(codegen::join , "${APIS[@]}")" --output-package "${OUTPUT_PKG}/${CLIENTSET_PKG_NAME:-clientset}" "$@" | ||
fi | ||
${GOPATH}/bin/client-gen --clientset-name ${CLIENTSET_NAME_VERSIONED:-versioned} --input-base "" --input $(codegen::join , "${EXT_FQ_APIS[@]}") --output-package ${OUTPUT_PKG}/${CLIENTSET_PKG_NAME:-clientset} "$@" | ||
"${GOPATH}/bin/client-gen" --clientset-name "${CLIENTSET_NAME_VERSIONED:-versioned}" --input-base "" --input "$(codegen::join , "${EXT_FQ_APIS[@]}")" --output-package "${OUTPUT_PKG}/${CLIENTSET_PKG_NAME:-clientset}" "$@" | ||
fi | ||
|
||
if [ "${GENS}" = "all" ] || grep -qw "lister" <<<"${GENS}"; then | ||
echo "Generating listers for ${GROUPS_WITH_VERSIONS} at ${OUTPUT_PKG}/listers" | ||
${GOPATH}/bin/lister-gen --input-dirs $(codegen::join , "${ALL_FQ_APIS[@]}") --output-package ${OUTPUT_PKG}/listers "$@" | ||
"${GOPATH}/bin/lister-gen" --input-dirs "$(codegen::join , "${ALL_FQ_APIS[@]}")" --output-package "${OUTPUT_PKG}/listers" "$@" | ||
fi | ||
|
||
if [ "${GENS}" = "all" ] || grep -qw "informer" <<<"${GENS}"; then | ||
echo "Generating informers for ${GROUPS_WITH_VERSIONS} at ${OUTPUT_PKG}/informers" | ||
${GOPATH}/bin/informer-gen \ | ||
--input-dirs $(codegen::join , "${ALL_FQ_APIS[@]}") \ | ||
--versioned-clientset-package ${OUTPUT_PKG}/${CLIENTSET_PKG_NAME:-clientset}/${CLIENTSET_NAME_VERSIONED:-versioned} \ | ||
--internal-clientset-package ${OUTPUT_PKG}/${CLIENTSET_PKG_NAME:-clientset}/${CLIENTSET_NAME_INTERNAL:-internalversion} \ | ||
--listers-package ${OUTPUT_PKG}/listers \ | ||
--output-package ${OUTPUT_PKG}/informers \ | ||
"${GOPATH}/bin/informer-gen" \ | ||
--input-dirs "$(codegen::join , "${ALL_FQ_APIS[@]}")" \ | ||
--versioned-clientset-package "${OUTPUT_PKG}/${CLIENTSET_PKG_NAME:-clientset}/${CLIENTSET_NAME_VERSIONED:-versioned}" \ | ||
--internal-clientset-package "${OUTPUT_PKG}/${CLIENTSET_PKG_NAME:-clientset}/${CLIENTSET_NAME_INTERNAL:-internalversion}" \ | ||
--listers-package "${OUTPUT_PKG}/listers" \ | ||
--output-package "${OUTPUT_PKG}/informers" \ | ||
"$@" | ||
fi |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -18,8 +18,7 @@ set -o errexit | |
set -o nounset | ||
set -o pipefail | ||
|
||
SCRIPT_ROOT=$(dirname "${BASH_SOURCE}")/.. | ||
SCRIPT_BASE=${SCRIPT_ROOT}/../.. | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Is There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This env is not exported, and not used in this script. |
||
SCRIPT_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. | ||
|
||
DIFFROOT="${SCRIPT_ROOT}/_examples" | ||
TMP_DIFFROOT="${SCRIPT_ROOT}/_tmp/_examples" | ||
|
@@ -50,6 +49,6 @@ fi | |
|
||
# smoke test | ||
echo "Smoke testing _example by compiling..." | ||
go build ./${SCRIPT_ROOT}/_examples/crd/... | ||
go build ./${SCRIPT_ROOT}/_examples/apiserver/... | ||
go build ./${SCRIPT_ROOT}/_examples/MixedCase/... | ||
go build "./${SCRIPT_ROOT}/_examples/crd/..." | ||
go build "./${SCRIPT_ROOT}/_examples/apiserver/..." | ||
go build "./${SCRIPT_ROOT}/_examples/MixedCase/..." |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why this?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
it hits https://github.com/koalaman/shellcheck/wiki/SC2162
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ok, looks good