File tree Expand file tree Collapse file tree 5 files changed +28
-3
lines changed Expand file tree Collapse file tree 5 files changed +28
-3
lines changed Original file line number Diff line number Diff line change 11ROOT_DIR ?= $(shell git rev-parse --show-toplevel)
22SCRIPTS_BASE ?= $(ROOT_DIR ) /scripts
3+ API_VERSION ?= $(shell cat api_version|grep -v '^\#'|head -n 1)
4+ SDK_BRANCH ?= main
35
46# SETUP AND TOOL INITIALIZATION TASKS
57project-help :
@@ -10,7 +12,8 @@ project-tools:
1012
1113# GENERATE
1214download-oas :
13- @$(SCRIPTS_BASE ) /download-oas.sh " $( OAS_REPO_NAME) " " $( OAS_REPO) " " $( ALLOW_ALPHA) "
15+ @$(SCRIPTS_BASE ) /download-oas.sh " $( OAS_REPO_NAME) " " $( OAS_REPO) " " $( ALLOW_ALPHA) " " $( API_VERSION) "
16+
1417generate-sdk :
15- @$(SCRIPTS_BASE ) /generate-sdk/generate-sdk.sh " $( GIT_HOST) " " $( GIT_USER_ID) " " $( GIT_REPO_ID) " " $( SDK_REPO_URL) " " $( LANGUAGE) "
18+ @$(SCRIPTS_BASE ) /generate-sdk/generate-sdk.sh " $( GIT_HOST) " " $( GIT_USER_ID) " " $( GIT_REPO_ID) " " $( SDK_REPO_URL) " " $( LANGUAGE) " " $( SDK_BRANCH ) "
1619
Original file line number Diff line number Diff line change 1+ # 2e3768b7b65237391fc587eddd559451f2b183a6
2+ # comments are allowed!
3+ main
Original file line number Diff line number Diff line change @@ -6,6 +6,7 @@ ROOT_DIR=$(git rev-parse --show-toplevel)
66OAS_REPO_NAME=$1
77OAS_REPO=$2
88ALLOW_ALPHA=$3
9+ OAS_API_VERSION=$4
910
1011if [[ -z ${OAS_REPO_NAME} ]]; then
1112 echo " Repo name is empty, default public OAS repo name will be used."
@@ -17,6 +18,11 @@ if [[ ! ${OAS_REPO} || -d ${OAS_REPO} ]]; then
1718 OAS_REPO=" https://github.com/stackitcloud/${OAS_REPO_NAME} .git"
1819fi
1920
21+ if [[ -z ${OAS_API_VERSION} ]]; then
22+ echo " No API version passed, main branch will be used"
23+ OAS_API_VERSION=" main"
24+ fi
25+
2026# Create temp directory to clone OAS repo
2127work_dir=$( mktemp -d)
2228if [[ ! ${work_dir} || -d {work_dir} ]]; then
@@ -35,6 +41,11 @@ mkdir ${ROOT_DIR}/oas
3541cd ${work_dir}
3642git clone ${OAS_REPO} --quiet
3743
44+ echo " Using api version ${OAS_API_VERSION} "
45+ cd ${OAS_REPO_NAME}
46+ git checkout --quiet ${OAS_API_VERSION}
47+ cd -
48+
3849for service_dir in ${work_dir} /${OAS_REPO_NAME} /services/* ; do
3950 max_version_dir=" "
4051 max_version=-1
Original file line number Diff line number Diff line change @@ -9,6 +9,7 @@ GIT_USER_ID=$2
99GIT_REPO_ID=$3
1010SDK_REPO_URL=$4
1111LANGUAGE=$5
12+ SDK_BRANCH=$6
1213
1314# Global variables
1415ROOT_DIR=$( git rev-parse --show-toplevel)
@@ -32,6 +33,11 @@ if [[ -z ${LANGUAGE} ]]; then
3233 LANGUAGE=" go"
3334fi
3435
36+ if [[ -z ${SDK_BRANCH} ]]; then
37+ echo " SDK_BRANCH not specified, main branch will be used."
38+ SDK_BRANCH=main
39+ fi
40+
3541# Check dependencies
3642if type -p java > /dev/null; then
3743 :
7884
7985 source ${LANGUAGE_GENERATORS_FOLDER_PATH} /${LANGUAGE} .sh
8086 # Usage: generate_go_sdk GENERATOR_PATH GIT_HOST GIT_USER_ID [GIT_REPO_ID] [SDK_REPO_URL]
81- generate_go_sdk ${jar_path} ${GIT_HOST} ${GIT_USER_ID} ${GIT_REPO_ID} ${SDK_REPO_URL}
87+ generate_go_sdk " ${jar_path} " " ${GIT_HOST} " " ${GIT_USER_ID} " " ${GIT_REPO_ID} " " ${SDK_REPO_URL} " " ${SDK_BRANCH} "
8288 ;;
8389python)
8490 echo -e " \n>> Generating the Python SDK..."
Original file line number Diff line number Diff line change @@ -27,6 +27,7 @@ generate_go_sdk() {
2727 # Optional parameters
2828 local GIT_REPO_ID=$4
2929 local SDK_REPO_URL=$5
30+ local SDK_BRANCH=$6
3031
3132 # Check required parameters
3233 if [[ -z ${GIT_HOST} ]]; then
@@ -75,6 +76,7 @@ generate_go_sdk() {
7576
7677 # Install SDK project tools
7778 cd ${SDK_REPO_LOCAL_PATH}
79+ git checkout ${SDK_BRANCH}
7880 make project-tools
7981
8082 # Backup of the current state of the SDK services dir (services/)
You can’t perform that action at this time.
0 commit comments