Skip to content

Commit e364044

Browse files
kohashimalexng-canuck
authored andcommitted
Set Region to InstancePrincipalConfigurationProvider to correctly support
multipl OCI providers
1 parent 84a261b commit e364044

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

provider/provider.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,11 @@ func ProviderConfig(d *schema.ResourceData) (clients interface{}, err error) {
304304
return nil, err
305305
}
306306
case strings.ToLower(authInstancePrincipalSetting):
307-
cfg, err := oci_common_auth.InstancePrincipalConfigurationProvider()
307+
region, ok := d.GetOkExists("region")
308+
if !ok {
309+
return nil, fmt.Errorf("can not get region from Terraform configuration (InstancePrincipal)")
310+
}
311+
cfg, err := oci_common_auth.InstancePrincipalConfigurationProviderForRegion(oci_common.StringToRegion(region.(string)))
308312
if err != nil {
309313
return nil, err
310314
}

provider/provider_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,7 @@ func providerConfigTest(t *testing.T, disableRetries bool, skipRequiredField boo
277277
d.Set("private_key", testPrivateKey)
278278
//d.Set("private_key_path", "")
279279
d.Set("private_key_password", "password")
280+
d.Set("region", "us-phoenix-1")
280281

281282
if disableRetries {
282283
d.Set("disable_auto_retries", disableRetries)

0 commit comments

Comments
 (0)