From a7c3b634db09b011709fc75a0028e35841c99488 Mon Sep 17 00:00:00 2001 From: mbohlool Date: Mon, 12 Dec 2016 23:33:00 -0800 Subject: [PATCH] Pass client version to client generator --- scripts/constants.py | 15 +++++++++++++++ scripts/pom.xml | 3 ++- scripts/update-client.sh | 6 +++--- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/scripts/constants.py b/scripts/constants.py index 68ccee59b..aba4d4c89 100644 --- a/scripts/constants.py +++ b/scripts/constants.py @@ -12,6 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. +import sys + # Kubernetes branch to get the OpenAPI spec from. KUBERNETES_BRANCH = "release-1.5" @@ -25,3 +27,16 @@ CLIENT_VERSION = "1.0.0-alpha.2" # Name of the release package PACKAGE_NAME = "kubernetes" + +# If called directly, return the constant value given +# its name. Useful in bash scripts. +if __name__ == '__main__': + if len(sys.argv) != 2: + print("Usage: python constant.py CONSTANT_NAME") + sys.exit(1) + + if sys.argv[1] in globals(): + print globals()[sys.argv[1]] + else: + print "Cannot find constant %s" % sys.argv[1] + sys.exit(1) diff --git a/scripts/pom.xml b/scripts/pom.xml index 83a8772fa..9a1abd41d 100644 --- a/scripts/pom.xml +++ b/scripts/pom.xml @@ -23,7 +23,7 @@ client-python ${generator.package.name} - 1.0.0-alpha.2 + ${generator.client.version} true ${generator.output.path} @@ -49,5 +49,6 @@ . swagger.json swagger_client + unversioned diff --git a/scripts/update-client.sh b/scripts/update-client.sh index c991ed3b3..bbbd6d302 100755 --- a/scripts/update-client.sh +++ b/scripts/update-client.sh @@ -48,12 +48,12 @@ rm -rf "${CLIENT_ROOT}/docs" rm -rf "${CLIENT_ROOT}/test" echo "--- Generating client ..." -mvn -f "${SCRIPT_ROOT}/pom.xml" clean generate-sources -Dgenerator.spec.path="${SCRIPT_ROOT}/swagger.json" -Dgenerator.output.path="${CLIENT_ROOT}" -Dgenerator.package.name=${PACKAGE_NAME} +mvn -f "${SCRIPT_ROOT}/pom.xml" clean generate-sources -Dgenerator.spec.path="${SCRIPT_ROOT}/swagger.json" -Dgenerator.output.path="${CLIENT_ROOT}" -Dgenerator.package.name=${PACKAGE_NAME} -D=generator.client.version=$(python "${SCRIPT_ROOT}/constants.py" CLIENT_VERSION) echo "--- Patching generated code..." find "${CLIENT_ROOT}/test" -type f -name \*.py -exec sed -i 's/\bclient/kubernetes.client/g' {} + -find "kubernetes/" -type f -name \*.md -exec sed -i 's/\bclient/kubernetes.client/g' {} + -find "kubernetes/" -type f -name \*.md -exec sed -i 's/kubernetes.client-python/client-python/g' {} + +find "${CLIENT_ROOT}/" -type f -name \*.md -exec sed -i 's/\bclient/kubernetes.client/g' {} + +find "${CLIENT_ROOT}/" -type f -name \*.md -exec sed -i 's/kubernetes.client-python/client-python/g' {} + rm "${CLIENT_ROOT}/LICENSE" echo "---Done."