Skip to content

Commit 513b733

Browse files
authored
fix(create-pr): Removed files were not recognised (#206)
Additionally added a warning message for skipped services to all generate methods Signed-off-by: Alexander Dahmen <alexander.dahmen@inovex.de>
1 parent b96c419 commit 513b733

File tree

4 files changed

+23
-1
lines changed

4 files changed

+23
-1
lines changed

scripts/generate-sdk/languages/go.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,8 @@ generate_go_sdk() {
106106
go work use .
107107
fi
108108

109+
warning=""
110+
109111
# Generate SDK for each service
110112
for service_json in ${ROOT_DIR}/oas/*.json; do
111113
service="${service_json##*/}"
@@ -132,6 +134,7 @@ generate_go_sdk() {
132134

133135
if grep -E "^$service$" ${ROOT_DIR}/blacklist.txt; then
134136
echo "Skipping blacklisted service ${service}"
137+
warning+="Skipping blacklisted service ${service}\n"
135138
continue
136139
fi
137140

@@ -238,4 +241,8 @@ generate_go_sdk() {
238241
cd ${SDK_REPO_LOCAL_PATH}
239242
goimports -w ${SERVICES_FOLDER}/
240243
make sync-tidy
244+
245+
if [[ -n "$warning" ]]; then
246+
echo -e "\nSome of the services were skipped during creation!\n$warning"
247+
fi
241248
}

scripts/generate-sdk/languages/java.sh

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,8 @@ generate_java_sdk() {
7474
# Remove old contents of services dir (services/)
7575
rm -rf "${SERVICES_FOLDER}"
7676

77+
warning=""
78+
7779
# Generate SDK for each service
7880
for service_json in "${ROOT_DIR}"/oas/*.json; do
7981
service="${service_json##*/}"
@@ -94,11 +96,13 @@ generate_java_sdk() {
9496

9597
if ! [[ ${INCLUDE_SERVICES[*]} =~ ${service} ]]; then
9698
echo "Skipping not included service ${service}"
99+
warning+="Skipping not included service ${service}\n"
97100
continue
98101
fi
99102

100103
if grep -E "^$service$" "${ROOT_DIR}/blacklist.txt"; then
101104
echo "Skipping blacklisted service ${service}"
105+
warning+="Skipping blacklisted service ${service}\n"
102106
continue
103107
fi
104108

@@ -172,6 +176,10 @@ generate_java_sdk() {
172176

173177
cd "${SDK_REPO_LOCAL_PATH}"
174178
make fmt
179+
180+
if [[ -n "$warning" ]]; then
181+
echo -e "\nSome of the services were skipped during creation!\n$warning"
182+
fi
175183
}
176184

177185
to_pascal_case() {

scripts/generate-sdk/languages/python.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,8 @@ generate_python_sdk() {
7878
# Remove old contents of services dir (services/)
7979
rm -rf ${SERVICES_FOLDER}
8080

81+
warning=""
82+
8183
# Generate SDK for each service
8284
for service_json in ${ROOT_DIR}/oas/*.json; do
8385
service="${service_json##*/}"
@@ -92,6 +94,7 @@ generate_python_sdk() {
9294

9395
if grep -E "^$service$" ${ROOT_DIR}/blacklist.txt; then
9496
echo "Skipping blacklisted service ${service}"
97+
warning+="Skipping blacklisted service ${service}\n"
9598
continue
9699
fi
97100

@@ -174,4 +177,8 @@ generate_python_sdk() {
174177
black .
175178

176179
done
180+
181+
if [[ -n "$warning" ]]; then
182+
echo -e "\nSome of the services were skipped during creation!\n$warning"
183+
fi
177184
}

scripts/sdk-create-pr.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ for service_path in ${work_dir}/sdk_to_push/services/*; do
7474
# Replace old SDK with new one
7575
# Removal of pulled data is necessary because the old version may have files
7676
# that were deleted in the new version
77-
rm -rf "./services/${service}/*"
77+
rm -rf "./services/${service}"
7878
cp -a "${work_dir}/sdk_to_push/services/${service}/." "./services/${service}"
7979

8080
# Check for changes in the specific folder compared to main

0 commit comments

Comments
 (0)