Skip to content

Commit 7ca05c1

Browse files
authored
Merge branch 'main' into fix/timeout-usage-in-rest-client
2 parents d5152b5 + a1a83b9 commit 7ca05c1

2 files changed

Lines changed: 30 additions & 7 deletions

File tree

scripts/download-oas.sh

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,6 @@ fi
3030

3131
git clone "${OAS_REPO}" "${ROOT_DIR}/oas" --quiet
3232

33-
# OPTIONAL: Lock to a specific commit
34-
if [[ "$OAS_REPO" == "https://github.com/stackitcloud/stackit-api-specifications.git" ]]; then
35-
cd "${ROOT_DIR}/oas"
36-
git checkout 335aa32af4d6c0d2a036b8567773da2f051f7efb
37-
fi
38-
3933
# NOTE: Everything below is needed for the "compatibility layer" logic.
4034
# It can be completely removed once the compatibility layer isn't needed anymore in the SDK.
4135

scripts/generate-sdk/languages/go.sh

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,14 +193,37 @@ generate_go_sdk() {
193193

194194
cp "${ROOT_DIR}/LICENSE.md" "${SERVICES_FOLDER}/${service}/LICENSE.md"
195195
if [ ! -f "${SERVICES_FOLDER}/${service}/go.mod" ]; then
196-
printf "module github.com/stackitcloud/stackit-sdk-go/services/${service}\n\n" > "${SERVICES_FOLDER}/${service}/go.mod"
196+
printf "module ${GIT_HOST}/${GIT_USER_ID}/${GIT_REPO_ID}/services/${service}\n\n" > "${SERVICES_FOLDER}/${service}/go.mod"
197197
printf "go ${SDK_GO_VERSION}\n\n" >> "${SERVICES_FOLDER}/${service}/go.mod"
198198
printf "require (\n\tgithub.com/stackitcloud/stackit-sdk-go/core v0.21.1\n)\n" >> "${SERVICES_FOLDER}/${service}/go.mod"
199199
fi
200200

201201
# generate package.go
202202
printf "package ${service}\n" > "${SERVICES_FOLDER}/${service}/package.go"
203+
204+
# If the service has a CHANGELOG file, move it inside the service folder
205+
if [ -f "${sdk_services_backup_dir}/${service}/CHANGELOG.md" ]; then
206+
echo "Found ${service} \"CHANGELOG\" file"
207+
cp -r "${sdk_services_backup_dir}/${service}/CHANGELOG.md" "${SERVICES_FOLDER}/${service}/CHANGELOG.md"
208+
fi
203209

210+
# If the service has a NOTICE file, move it inside the service folder
211+
if [ -f "${sdk_services_backup_dir}/${service}/NOTICE.txt" ]; then
212+
echo "Found ${service} \"NOTICE\" file"
213+
cp -r "${sdk_services_backup_dir}/${service}/NOTICE.txt" "${SERVICES_FOLDER}/${service}/NOTICE.txt"
214+
fi
215+
216+
# If the service has a VERSION file, move it inside the service folder
217+
if [ -f "${sdk_services_backup_dir}/${service}/VERSION" ]; then
218+
echo "Found ${service} \"VERSION\" file"
219+
cp -r "${sdk_services_backup_dir}/${service}/VERSION" "${SERVICES_FOLDER}/${service}/VERSION"
220+
fi
221+
222+
# If the service has oas_commit file, move it inside the service folder
223+
if [ -f "${sdk_services_backup_dir}/${service}/oas_commit" ]; then
224+
echo "Found ${service} \"oas_commit\" file"
225+
cp -r "${sdk_services_backup_dir}/${service}/oas_commit" "${SERVICES_FOLDER}/${service}/oas_commit"
226+
fi
204227

205228
cd "${SERVICES_FOLDER}/${service}"
206229
go work use .
@@ -298,6 +321,12 @@ generate_go_sdk() {
298321
echo "Found ${service} \"VERSION\" file"
299322
cp -r "${sdk_services_backup_dir}/${service}/VERSION" "${SERVICES_FOLDER}/${service}/VERSION"
300323
fi
324+
325+
# If the service has oas_commit file, move it inside the service folder
326+
if [ -f "${sdk_services_backup_dir}/${service}/oas_commit" ]; then
327+
echo "Found ${service} \"oas_commit\" file"
328+
cp -r "${sdk_services_backup_dir}/${service}/oas_commit" "${SERVICES_FOLDER}/${service}/oas_commit"
329+
fi
301330

302331
cd "${SERVICES_FOLDER}/${service}"
303332
go work use .

0 commit comments

Comments
 (0)