Skip to content

Commit 53b7e60

Browse files
committed
feat: Additional improvements
1 parent 45fcbf1 commit 53b7e60

File tree

4 files changed

+19
-17
lines changed

4 files changed

+19
-17
lines changed

scripts/download-oas.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ fi
3333
# Move oas to root level
3434
mkdir ${ROOT_DIR}/oas
3535
cd ${work_dir}
36-
git clone ${OAS_REPO}
36+
git clone ${OAS_REPO} --quiet
3737

3838
for service_dir in ${work_dir}/${OAS_REPO_NAME}/services/*; do
3939
max_version_dir=""

scripts/generate-sdk/generate-sdk.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,21 +74,21 @@ fi
7474
# Generate SDK for the specified language
7575
case "${LANGUAGE}" in
7676
go)
77-
echo -e "\nGenerating the Go SDK...\n"
77+
echo -e "\n>> Generating the Go SDK...\n"
7878

7979
source ${LANGUAGE_GENERATORS_FOLDER_PATH}/${LANGUAGE}.sh
8080
# Usage: generate_go_sdk GENERATOR_PATH GIT_HOST GIT_USER_ID [GIT_REPO_ID] [SDK_REPO_URL]
8181
generate_go_sdk ${jar_path} ${GIT_HOST} ${GIT_USER_ID} ${GIT_REPO_ID} ${SDK_REPO_URL}
8282
;;
8383
python)
84-
echo -e "\nGenerating the Python SDK...\n"
84+
echo -e "\n>> Generating the Python SDK...\n"
8585

8686
source ${LANGUAGE_GENERATORS_FOLDER_PATH}/${LANGUAGE}.sh
8787
# Usage: generate_python_sdk GENERATOR_PATH GIT_HOST GIT_USER_ID [GIT_REPO_ID] [SDK_REPO_URL]
8888
generate_python_sdk ${jar_path} ${GIT_HOST} ${GIT_USER_ID} ${GIT_REPO_ID} ${SDK_REPO_URL}
8989
;;
9090
*)
91-
echo "SDK language not supported."
91+
echo "! SDK language not supported."
9292
exit 1
9393
;;
9494
esac

scripts/generate-sdk/languages/go.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,5 +215,4 @@ generate_go_sdk() {
215215
cd ${SDK_REPO_LOCAL_PATH}
216216
goimports -w ${SERVICES_FOLDER}/
217217
make sync-tidy
218-
219218
}

scripts/sdk-create-pr.sh

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ rm -rf ${work_dir}/sdk_to_push/.git
6060

6161
# Initialize git repo
6262
cd ${work_dir}/git_repo
63-
git clone ${REPO_URL_SSH} ./
63+
git clone ${REPO_URL_SSH} ./ --quiet
6464
git config user.name "${COMMIT_NAME}"
6565
git config user.email "${COMMIT_EMAIL}"
6666

@@ -89,13 +89,12 @@ for service_path in ${work_dir}/sdk_to_push/services/*; do
8989
fi
9090

9191
git add services/${service}/
92-
if [ "${LANGUAGE}" == "go" ] && [ ! -d "${work_dir}/sdk_backup/services/${service}/" ]; then # Check if it is a newly added SDK module
93-
# go work use -r adds a use directive to the go.work file for dir, if it exists, and removes the use directory if the argument directory doesn’t exist
94-
# the -r flag examines subdirectories of dir recursively
95-
# this prevents errors if there is more than one new module in the SDK generation
96-
go work use -r .
97-
git add go.work
98-
fi
92+
93+
# go work use -r adds a use directive to the go.work file for dir, if it exists, and removes the use directory if the argument directory doesn’t exist
94+
# The -r flag examines subdirectories of dir recursively
95+
# This prevents errors if there is more than one new module in the SDK generation
96+
go work use -r services
97+
git add go.work
9998

10099
if [[ "$branch" != "main" ]]; then
101100
echo ">> Creating PR for $service"
@@ -108,16 +107,20 @@ for service_path in ${work_dir}/sdk_to_push/services/*; do
108107

109108
# If lint or test fails for a service, we skip it and continue to the next one
110109
make lint skip-non-generated-files=true service=$service || {
111-
echo "! Linting failed for $service"
110+
echo "! Linting failed for $service. THE UPDATE OF THIS SERVICE WILL BE SKIPPED."
112111
continue
113112
}
113+
114+
echo ">> Adding $service to go.work..."
115+
go work use -r services/$service
114116
make test skip-non-generated-files=true service=$service || {
115-
echo "! Testing failed for $service"
117+
echo "! Testing failed for $service. THE UPDATE OF THIS SERVICE WILL BE SKIPPED."
116118
continue
117119
}
118120

119-
git commit -m "Generate $service: $COMMIT_INFO"
120-
git push origin "$branch"
121+
echo ">> Actually pushing changes to main for $service service..."
122+
# git commit -m "Generate $service: $COMMIT_INFO"
123+
# git push origin "$branch"
121124
fi
122125
fi
123126
done

0 commit comments

Comments
 (0)