added support for region override in resource principal

Author: Maxrovr

internal/provider/provider.go

@@ -424,7 +424,15 @@ func getConfigProviders(d *schema.ResourceData, auth string) ([]oci_common.Confi
 		}
 		configProviders = append(configProviders, securityTokenBasedAuthConfigProvider)
 	case strings.ToLower(globalvar.ResourcePrincipal):
-		resourcePrincipalAuthConfigProvider, err := oci_common_auth.ResourcePrincipalConfigurationProvider()
+		var err error
+		var resourcePrincipalAuthConfigProvider oci_common_auth.ConfigurationProviderWithClaimAccess
+		region, ok := d.GetOk(globalvar.RegionAttrName)
+		if !ok {
+			log.Printf("did not get %s from Terraform configuration (ResourcePrincipal), falling back to environment variable", globalvar.RegionAttrName)
+			resourcePrincipalAuthConfigProvider, err = oci_common_auth.ResourcePrincipalConfigurationProvider()
+		} else {
+			resourcePrincipalAuthConfigProvider, err = oci_common_auth.ResourcePrincipalConfigurationProviderForRegion(oci_common.StringToRegion(region.(string)))
+		}
 		if err != nil {
 			return nil, err
 		}

internal/provider/provider_test.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"crypto/tls"
 	"io/ioutil"
+	"log"
 	"net/http"
 	"os"
 	"reflect"
@@ -677,6 +678,38 @@ func TestUnitResourcePrincipal_basic(t *testing.T) {
 	assert.NoError(t, err)
 }
 
+func TestUnitResourcePrincipal_regionOverride(t *testing.T) {
+	httpreplay.SetScenario("TestUnitResourcePrincipal_regionOverride")
+	defer httpreplay.SaveScenario()
+
+	r := &schema.Resource{
+		Schema: SchemaMap(),
+	}
+	d := r.Data(nil)
+	d.Set("auth", globalvar.ResourcePrincipal)
+	d.Set(globalvar.RegionAttrName, "test-region")
+
+	os.Setenv("OCI_RESOURCE_PRINCIPAL_VERSION", "2.2")
+	os.Setenv("OCI_RESOURCE_PRINCIPAL_RPST", "$ST")
+	os.Setenv("OCI_RESOURCE_PRINCIPAL_PRIVATE_PEM", "")
+	os.Setenv("OCI_RESOURCE_PRINCIPAL_PRIVATE_PEM_PASSPHRASE", "")
+	os.Setenv("OCI_RESOURCE_PRINCIPAL_REGION", "us-ashburn-1")
+
+	clients := &tf_client.OracleClients{
+		SdkClientMap:  make(map[string]interface{}, len(tf_client.OracleClientRegistrationsVar.RegisteredClients)),
+		Configuration: make(map[string]string),
+	}
+	sdkConfigProvider, err := GetSdkConfigProvider(d, clients)
+	if err != nil {
+		log.Println(err)
+	}
+
+	// Assert that the region is being overridden
+	region, _ := sdkConfigProvider.Region()
+	assert.Equal(t, region, "test-region")
+
+}
+
 type mockResourceData struct {
 	state string
 }