Skip to content

Commit 4cbb894

Browse files
chlinsstonezdj
andauthored
[CHERRY-PICK] Make openapi-generator-cli download URL configurable (#23186) (#23222)
Make openapi-generator-cli download URL configurable (#23186) Signed-off-by: chlins <chlins.zhang@gmail.com> Co-authored-by: stonezdj(Daojun Zhang) <stonezdj@gmail.com>
1 parent 79a297f commit 4cbb894

2 files changed

Lines changed: 11 additions & 3 deletions

File tree

Makefile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,10 @@ HTTPPROXY=
8383
BUILDREG=true
8484
BUILDTRIVYADP=true
8585
NPM_REGISTRY=https://registry.npmjs.org
86+
# Override when Maven Central returns 429 (rate limit), e.g. a mirror or cached URL:
87+
# make swagger_client OPENAPI_GENERATOR_CLI_URL=https://...
88+
# export OPENAPI_GENERATOR_CLI_URL=https://... ; make swagger_client
89+
OPENAPI_GENERATOR_CLI_URL ?= https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/4.3.1/openapi-generator-cli-4.3.1.jar
8690
BUILDTARGET=build
8791
GEN_TLS=
8892

@@ -550,7 +554,7 @@ restart: down prepare start
550554

551555
swagger_client:
552556
@echo "Generate swagger client"
553-
wget https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/4.3.1/openapi-generator-cli-4.3.1.jar -O openapi-generator-cli.jar
557+
wget "$(OPENAPI_GENERATOR_CLI_URL)" -O openapi-generator-cli.jar
554558
rm -rf harborclient
555559
mkdir -p harborclient/harbor_v2_swagger_client
556560
java -jar openapi-generator-cli.jar generate -i api/v2.0/swagger.yaml -g python -o harborclient/harbor_v2_swagger_client --package-name v2_swagger_client

tests/resources/APITest-Util.robot

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
1+
*** Variables ***
2+
${OPENAPI_GENERATOR_CLI_URL_DEFAULT} https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/4.3.1/openapi-generator-cli-4.3.1.jar
3+
14
*** Keywords ***
25
Make Swagger Client
36
${rc} ${output}= Run And Return Rc And Output pip uninstall setuptools -y
47
LogAll ${output}
58
${rc} ${output}= Run And Return Rc And Output pip install -U pip setuptools
69
LogAll ${output}
7-
${rc} ${output}= Run And Return Rc And Output make swagger_client
10+
${openapi_url}= Get Environment Variable OPENAPI_GENERATOR_CLI_URL ${OPENAPI_GENERATOR_CLI_URL_DEFAULT}
11+
${rc} ${output}= Run And Return Rc And Output OPENAPI_GENERATOR_CLI_URL=${openapi_url} make swagger_client
812
LogAll ${output}
913
[Return] ${rc}
1014

@@ -24,4 +28,4 @@ Harbor API Test
2428
${rc} ${output}= Run And Return Rc And Output SWAGGER_CLIENT_PATH=${current_dir}/harborclient HARBOR_HOST=${ip} DOCKER_USER=${DOCKER_USER} DOCKER_PWD=${DOCKER_PWD} ${param_str} python ${testcase_name}
2529
${prev_lvl} Set Log Level ${prev_lvl}
2630
Log ${output}
27-
Should Be Equal As Integers ${rc} 0
31+
Should Be Equal As Integers ${rc} 0

0 commit comments

Comments
 (0)