Skip to content

Commit abe1d45

Browse files
committed
update gen-sdk.sh to generate sdk using docker container
1 parent b92cbdc commit abe1d45

File tree

1 file changed

+23
-13
lines changed

1 file changed

+23
-13
lines changed

hack/python-sdk/gen-sdk.sh

+23-13
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ set -x
2323

2424
repo_root="$(dirname "${BASH_SOURCE}")/../.."
2525

26-
SWAGGER_JAR_URL="https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/4.3.1/openapi-generator-cli-4.3.1.jar"
27-
SWAGGER_CODEGEN_JAR="${repo_root}/hack/python-sdk/openapi-generator-cli.jar"
26+
#SWAGGER_JAR_URL="https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/4.3.1/openapi-generator-cli-4.3.1.jar"
27+
#SWAGGER_CODEGEN_JAR="${repo_root}/hack/python-sdk/openapi-generator-cli.jar"
2828
SWAGGER_CODEGEN_CONF="${repo_root}/hack/python-sdk/swagger_config.json"
2929
SDK_OUTPUT_PATH="${repo_root}/sdk/python"
3030
VERSION=0.1.4
@@ -37,17 +37,19 @@ fi
3737
echo "Generating OpenAPI specification ..."
3838
echo "./hack/update-codegen.sh already help us generate openapi specs ..."
3939

40-
if [[ ! -f "$SWAGGER_CODEGEN_JAR" ]]; then
41-
echo "Downloading the swagger-codegen JAR package ..."
42-
wget -O "${SWAGGER_CODEGEN_JAR}" ${SWAGGER_JAR_URL}
43-
fi
40+
#if [[ ! -f "$SWAGGER_CODEGEN_JAR" ]]; then
41+
# echo "Downloading the swagger-codegen JAR package ..."
42+
# wget -O "${SWAGGER_CODEGEN_JAR}" ${SWAGGER_JAR_URL}
43+
#fi
4444

45-
if [ -z `which java` ]; then
46-
apt-get update -y
47-
# TODO: update this fallback (remove it) when openjdk-11 completely deprecated
48-
echo "Installing OpenJDK 11 with fallback to OpenJDK 17"
49-
apt-get install -y openjdk-11-jdk || apt-get install -y openjdk-17-jdk
50-
fi
45+
46+
# Currently removed
47+
#if [ -z `which java` ]; then
48+
# apt-get update -y
49+
# # TODO: update this fallback (remove it) when openjdk-11 completely deprecated
50+
# echo "Installing OpenJDK 11 with fallback to OpenJDK 17"
51+
# apt-get install -y openjdk-11-jdk || apt-get install -y openjdk-17-jdk
52+
#fi
5153

5254
echo "Generating swagger file ..."
5355
go run "${repo_root}"/hack/swagger/main.go ${VERSION} >"${SWAGGER_CODEGEN_FILE}"
@@ -56,7 +58,15 @@ echo "Removing previously generated files ..."
5658
rm -rf "${SDK_OUTPUT_PATH}"/docs/V1*.md "${SDK_OUTPUT_PATH}"/jobset/models "${SDK_OUTPUT_PATH}"/test/test_*.py
5759

5860
echo "Generating Python SDK for JobSet..."
59-
java -jar "${SWAGGER_CODEGEN_JAR}" generate -i ${SWAGGER_CODEGEN_FILE} -g python -o "${SDK_OUTPUT_PATH}" -c "${SWAGGER_CODEGEN_CONF}"
61+
#java -jar "${SWAGGER_CODEGEN_JAR}" generate -i ${SWAGGER_CODEGEN_FILE} -g python -o "${SDK_OUTPUT_PATH}" -c "${SWAGGER_CODEGEN_CONF}"
62+
# Install the skds using docker
63+
docker run --rm \
64+
# Hooking up the whole repo onto the local folder
65+
-v "${repo_root}":/local openapitools/openapi-generator-cli generate \
66+
-i /local/ ${SWAGGER_CODEGEN_FILE} \
67+
-g python \
68+
-o /local/"${SDK_OUTPUT_PATH}" \
69+
-c ${SWAGGER_CODEGEN_FILE}
6070

6171
echo "Running post-generation script ..."
6272
"${repo_root}"/hack/python-sdk/post_gen.py

0 commit comments

Comments
 (0)