Skip to content

Commit 564c310

Browse files
authored
fix: added whitelist (#128)
* fix: added whitelist * fix: remove testing code
1 parent 8f1c727 commit 564c310

File tree

3 files changed

+14
-1
lines changed

3 files changed

+14
-1
lines changed

regional-whitelist.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Transitional file to force generation of the new regional api for selected services
2+
# It will be removed when all services have been migrated to the new regional api
3+
objectstorage

scripts/generate-sdk/languages/go.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,11 @@ generate_go_sdk() {
136136
GO_POST_PROCESS_FILE="gofmt -w" \
137137
mkdir -p ${SERVICES_FOLDER}/${service}/
138138
cp ${ROOT_DIR}/scripts/generate-sdk/.openapi-generator-ignore-go ${SERVICES_FOLDER}/${service}/.openapi-generator-ignore
139+
regional_api=
140+
if grep -E "^$service$" ${ROOT_DIR}/regional-whitelist.txt; then
141+
echo "Generating new regional api"
142+
regional_api="regional_api"
143+
fi
139144

140145
# Run the generator for Go
141146
java -Dlog.level=${GENERATOR_LOG_LEVEL} -jar ${jar_path} generate \
@@ -149,7 +154,7 @@ generate_go_sdk() {
149154
--git-user-id ${GIT_USER_ID} \
150155
--git-repo-id ${GIT_REPO_ID} \
151156
--global-property apis,models,modelTests=true,modelDocs=false,apiDocs=false,supportingFiles \
152-
--additional-properties=isGoSubmodule=true,enumClassPrefix=true
157+
--additional-properties=isGoSubmodule=true,enumClassPrefix=true,$regional_api
153158
# Remove unnecessary files
154159
rm ${SERVICES_FOLDER}/${service}/.openapi-generator-ignore
155160
rm ${SERVICES_FOLDER}/${service}/.openapi-generator/FILES

templates/go/client.mustache

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,15 @@ func NewAPIClient(opts ...config.ConfigurationOption) (*APIClient, error) {
6060
}
6161
}
6262

63+
{{#regional_api}}
64+
// using new regional api, so no region is set here
65+
{{/regional_api}}
66+
{{^regional_api}}
6367
err := config.ConfigureRegion(cfg)
6468
if err != nil {
6569
return nil, fmt.Errorf("configuring region: %w", err)
6670
}
71+
{{/regional_api}}
6772

6873
if cfg.HTTPClient == nil {
6974
cfg.HTTPClient = &http.Client{}

0 commit comments

Comments
 (0)