kubernetes-client/gen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: unbound variable USE_SINGLE_PARAMETER (#261)

Browse Source 
openapi/openapi-generator/client-generator.sh: line 86: USE_SINGLE_PARAMETER: unbound variable

use default from pom if empty

introduced in #257
This commit is contained in:
Carlos Sanchez
2023-12-27 18:52:52 +01:00
committed by GitHub
parent dde176ff81
commit 255cc279b7
2 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
openapi/openapi-generator/client-generator.sh
View File

@@ -101,7 +101,7 @@ kubeclient::generator::generate_client() {
-e LIBRARY="${LIBRARY}" \ -e LIBRARY="${LIBRARY}" \
-e USERNAME="${USERNAME}" \ -e USERNAME="${USERNAME}" \
-e REPOSITORY="${REPOSITORY}" \ -e REPOSITORY="${REPOSITORY}" \
-e USE_SINGLE_PARAMETER="${USE_SINGLE_PARAMETER}" \ -e USE_SINGLE_PARAMETER="${USE_SINGLE_PARAMETER:-}" \
-v "${output_dir}:/output_dir" \ -v "${output_dir}:/output_dir" \
"${image_name}" "/output_dir" "${image_name}" "/output_dir"

22
openapi/openapi-generator/generate_client_in_container.sh
View File

@@ -36,7 +36,6 @@ set -o pipefail
: "${CLIENT_LANGUAGE?Must set CLIENT_LANGUAGE env var}" : "${CLIENT_LANGUAGE?Must set CLIENT_LANGUAGE env var}"
: "${PACKAGE_NAME?Must set PACKAGE_NAME env var}" : "${PACKAGE_NAME?Must set PACKAGE_NAME env var}"
: "${OPENAPI_GENERATOR_COMMIT?Must set OPENAPI_GENERATOR_COMMIT env var}" : "${OPENAPI_GENERATOR_COMMIT?Must set OPENAPI_GENERATOR_COMMIT env var}"
: "${USE_SINGLE_PARAMETER?Must set USE_SINGLE_PARAMETER env var}"
output_dir=$1 output_dir=$1
pushd "${output_dir}" > /dev/null pushd "${output_dir}" > /dev/null
@@ -89,14 +88,21 @@ for i in ${CLEANUP_DIRS}; do
done done
echo "--- Generating client ..." echo "--- Generating client ..."
mvn -f "${SCRIPT_ROOT}/generation_params.xml" clean generate-sources \
-Dgenerator.spec.path="${output_dir}/swagger.json" \ mvn_args=(
-Dgenerator.output.path="${output_dir}" \ -Dgenerator.spec.path="${output_dir}/swagger.json"
-D=generator.client.version="${CLIENT_VERSION}" \ -Dgenerator.output.path="${output_dir}"
-D=generator.package.name="${PACKAGE_NAME}" \ -D=generator.client.version="${CLIENT_VERSION}"
-D=openapi-generator-version="${PLUGIN_VERSION}" \ -D=generator.package.name="${PACKAGE_NAME}"
-D=use-single-parameter="${USE_SINGLE_PARAMETER}" \ -D=openapi-generator-version="${PLUGIN_VERSION}"
-Duser.home=/root -Duser.home=/root
)
if [ -n "${USE_SINGLE_PARAMETER:-}" ]; then
mvn_args+=("-D=use-single-parameter=${USE_SINGLE_PARAMETER}")
fi
mvn -f "${SCRIPT_ROOT}/generation_params.xml" clean generate-sources "${mvn_args[@]}"
mkdir -p "${output_dir}/.openapi-generator" mkdir -p "${output_dir}/.openapi-generator"
echo "Requested Commit/Tag : ${OPENAPI_GENERATOR_COMMIT}" > "${output_dir}/.openapi-generator/COMMIT" echo "Requested Commit/Tag : ${OPENAPI_GENERATOR_COMMIT}" > "${output_dir}/.openapi-generator/COMMIT"