Skip to content

Commit def30a5

Browse files
committed
disable SIMPLIFY_ONEOF_ANYOF for Go, Python and Java
relates to STACKITSDK-478
1 parent 268f840 commit def30a5

3 files changed

Lines changed: 9 additions & 0 deletions

File tree

scripts/generate-sdk/languages/go.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,7 @@ generate_go_sdk() {
178178
--git-repo-id "${GIT_REPO_ID}/services/${service}" \
179179
--global-property apis,models,modelTests=true,modelDocs=false,apiDocs=false,supportingFiles,apiTests=false\
180180
--inline-schema-options "SKIP_SCHEMA_REUSE=true,RESOLVE_INLINE_ENUMS=true" \
181+
--openapi-normalizer "SIMPLIFY_ONEOF_ANYOF=false" \
181182
--http-user-agent "stackit-sdk-go/${service}" \
182183
--reserved-words-mappings type=types \
183184
--config "${ROOT_DIR}/languages/golang/openapi-generator-config.yml"
@@ -191,6 +192,12 @@ generate_go_sdk() {
191192
echo "Found ${service} \"wait\" package"
192193
cp -r "${sdk_services_backup_dir}/${service}/${version}api/wait" "${SERVICES_FOLDER}/${service}/${version}api/wait"
193194
fi
195+
196+
# If the service version has a handwritten.go file, move them inside the service folder
197+
if [ -f "${sdk_services_backup_dir}/${service}/${version}api/handwritten.go" ]; then
198+
echo "Found ${service} \"handwritten.go\" file"
199+
cp -r "${sdk_services_backup_dir}/${service}/${version}api/handwritten.go" "${SERVICES_FOLDER}/${service}/${version}api/handwritten.go"
200+
fi
194201
done
195202

196203
if ! grep -E "^$service$" "${ROOT_DIR}/languages/golang/compat-layer/allow-list.txt"; then

scripts/generate-sdk/languages/java.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@ generate_java_sdk() {
147147
--additional-properties="artifactId=${service},artifactDescription=${SERVICE_DESCRIPTION},invokerPackage=cloud.stackit.sdk.${service}.${version}api,modelPackage=cloud.stackit.sdk.${service}.${version}api.model,apiPackage=cloud.stackit.sdk.${service}.${version}api.api,serviceName=${service_pascal_case}" \
148148
--inline-schema-options "SKIP_SCHEMA_REUSE=true" \
149149
--http-user-agent stackit-sdk-java/"${service}" \
150+
--openapi-normalizer "SIMPLIFY_ONEOF_ANYOF=false" \
150151
--config "${ROOT_DIR}/languages/java/openapi-generator-config.yml"
151152

152153
# Rename DefaultApiServiceApi.java to {serviceName}Api.java

scripts/generate-sdk/languages/python.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ generate_python_sdk() {
124124
--git-host "${GIT_HOST}" \
125125
--git-user-id "${GIT_USER_ID}" \
126126
--git-repo-id "${GIT_REPO_ID}" \
127+
--openapi-normalizer "SIMPLIFY_ONEOF_ANYOF=false" \
127128
--global-property apis,models,modelTests=false,modelDocs=false,apiDocs=false,apiTests=false,supportingFiles \
128129
--additional-properties=pythonPackageName="stackit-${service},removeEnumValuePrefix=false,${extra_props_internal}" >/dev/null \
129130
--http-user-agent "stackit-sdk-python/${service}"

0 commit comments

Comments
 (0)