8000 Pass client version to client generator · mbohlool/client-python@a7c3b63 · GitHub
[go: up one dir, main page]
Skip to content

Commit a7c3b63

Browse files
mbohloolmbohlool
committed
Pass client version to client generator
1 parent 21f65ee commit a7c3b63

File tree

3 files changed

+20
-4
lines changed

3 files changed

+20
-4
lines changed

‎scripts/constants.py

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15+
import sys
16+
1517
# Kubernetes branch to get the OpenAPI spec from.
1618
KUBERNETES_BRANCH = "release-1.5"
1719

@@ -25,3 +27,16 @@
2527

2628
# Name of the release package
2729
PACKAGE_NAME = "kubernetes"
30+
31+
# If called directly, return the constant value given
32+
# its name. Useful in bash scripts.
33+
if __name__ == '__main__':
34+
if len(sys.argv) != 2:
35+
print("Usage: python constant.py CONSTANT_NAME")
36+
sys.exit(1)
37+
38+
if sys.argv[1] in globals():
39+
print globals()[sys.argv[1]]
40+
else:
41+
print "Cannot find constant %s" % sys.argv[1]
42+
sys.exit(1)

‎scripts/pom.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<gitRepoId>client-python</gitRepoId>
2424
<configOptions>
2525
<packageName>${generator.package.name}</packageName>
26-
<packageVersion>1.0.0-alpha.2</packageVersion>
26+
<packageVersion>${generator.client.version}</packageVersion>
2727
<sortParamsByRequiredFlag>true</sortParamsByRequiredFlag>
2828
</configOptions>
2929
<output>${generator.output.path}</output>
@@ -49,5 +49,6 @@
4949
<generator.output.path>.</generator.output.path>
5050
<generator.spec.path>swagger.json</generator.spec.path>
5151
<generator.package.name>swagger_client</generator.package.name>
52+
<generator.client.version>unversioned</generator.client.version>
5253
</properties>
5354
</project>

‎scripts/update-client.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,12 @@ rm -rf "${CLIENT_ROOT}/docs"
4848
rm -rf "${CLIENT_ROOT}/test"
4949

5050
echo "--- Generating client ..."
51-
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}
51+
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)
5252

5353
echo "--- Patching generated code..."
5454
find "${CLIENT_ROOT}/test" -type f -name \*.py -exec sed -i 's/\bclient/kubernetes.client/g' {} +
55-
find "kubernetes/" -type f -name \*.md -exec sed -i 's/\bclient/kubernetes.client/g' {} +
56-
find "kubernetes/" -type f -name \*.md -exec sed -i 's/kubernetes.client-python/client-python/g' {} +
55+
find "${CLIENT_ROOT}/" -type f -name \*.md -exec sed -i 's/\bclient/kubernetes.client/g' {} +
56+
find "${CLIENT_ROOT}/" -type f -name \*.md -exec sed -i 's/kubernetes.client-python/client-python/g' {} +
5757
rm "${CLIENT_ROOT}/LICENSE"
5858
echo "---Done."
5959

0 commit comments

Comments
 (0)
0