Skip to content

(DUX) [ICD-CLI] Bug: Terraform CLI create DB with non-existing region #6312

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dhananjayksharma wants to merge 1 commit into
base: master
Choose a base branch
from
Open

(DUX) [ICD-CLI] Bug: Terraform CLI create DB with non-existing region #6312

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 30 additions & 0 deletions ibm/provider/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,18 @@ import (
"github.com/IBM-Cloud/terraform-provider-ibm/ibm/validate"
)

var regionLocationMap = map[string]struct{}{
"au-syd": {},
"ca-tor": {},
"eu-de": {},
"eu-gb": {},
"jp-tok": {},
"jp-osa": {},
"us-east": {},
"us-south": {},
"br-sao": {},
}

// Provider returns a *schema.Provider.
func Provider() *schema.Provider {
provider := schema.Provider{
Expand Down Expand Up @@ -2415,6 +2427,11 @@ func providerConfigure(d *schema.ResourceData) (interface{}, error) {
if err != nil {
return nil, err
}

if isRegionValid(region) == false {
return nil, fmt.Errorf("[ERROR] Provider region %q is not supported. Valid provider region(s) are: %q", region, getRegionNames())
}

// Set environment variable to be used in DiffSupressFunction
if wskEnvVal.(string) == "" {
os.Setenv("FUNCTION_NAMESPACE", wskNameSpace)
Expand Down Expand Up @@ -2444,3 +2461,16 @@ func providerConfigure(d *schema.ResourceData) (interface{}, error) {

return config.ClientSession()
}

func isRegionValid(region string) bool {
_, exists := regionLocationMap[region]
return exists
}

func getRegionNames() []string {
regions := make([]string, 0, len(regionLocationMap))
for region := range regionLocationMap {
regions = append(regions, region)
}
return regions
}