Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions regional-whitelist.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Transitional file to force generation of the new regional api for selected services
# It will be removed when all services have been migrated to the new regional api
objectstorage
7 changes: 6 additions & 1 deletion scripts/generate-sdk/languages/go.sh
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,11 @@ generate_go_sdk() {
GO_POST_PROCESS_FILE="gofmt -w" \
mkdir -p ${SERVICES_FOLDER}/${service}/
cp ${ROOT_DIR}/scripts/generate-sdk/.openapi-generator-ignore-go ${SERVICES_FOLDER}/${service}/.openapi-generator-ignore
regional_api=
if grep -E "^$service$" ${ROOT_DIR}/regional-whitelist.txt; then
echo "Generating new regional api"
regional_api="regional_api"
fi

# Run the generator for Go
java -Dlog.level=${GENERATOR_LOG_LEVEL} -jar ${jar_path} generate \
Expand All @@ -149,7 +154,7 @@ generate_go_sdk() {
--git-user-id ${GIT_USER_ID} \
--git-repo-id ${GIT_REPO_ID} \
--global-property apis,models,modelTests=true,modelDocs=false,apiDocs=false,supportingFiles \
--additional-properties=isGoSubmodule=true,enumClassPrefix=true
--additional-properties=isGoSubmodule=true,enumClassPrefix=true,$regional_api
# Remove unnecessary files
rm ${SERVICES_FOLDER}/${service}/.openapi-generator-ignore
rm ${SERVICES_FOLDER}/${service}/.openapi-generator/FILES
Expand Down
5 changes: 5 additions & 0 deletions templates/go/client.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,15 @@ func NewAPIClient(opts ...config.ConfigurationOption) (*APIClient, error) {
}
}

{{#regional_api}}
// using new regional api, so no region is set here
{{/regional_api}}
{{^regional_api}}
err := config.ConfigureRegion(cfg)
if err != nil {
return nil, fmt.Errorf("configuring region: %w", err)
}
{{/regional_api}}

if cfg.HTTPClient == nil {
cfg.HTTPClient = &http.Client{}
Expand Down
Loading