Added support for realm specific service endpoints

Author: ravinitp

examples/apm/apm_domains/main.tf

@@ -71,4 +71,4 @@ data "oci_apm_data_keys" "test_data_keys" {
 
   #Optional
   data_key_type = var.data_key_data_key_type
-}
+}

examples/object_storage/bucket_with_replication/main.tf

@@ -129,4 +129,3 @@ resource "oci_objectstorage_replication_policy" "bucket_rp" {
   destination_region_name = var.region
   destination_bucket_name = oci_objectstorage_bucket.bucket2.name
 }
-

internal/client/provider_clients.go

@@ -5,6 +5,9 @@ package client
 
 import (
 	"fmt"
+	"github.com/oracle/oci-go-sdk/v65/common"
+	"github.com/oracle/terraform-provider-oci/internal/tfresource"
+	"strconv"
 	"strings"
 
 	oci_identity_domains "github.com/oracle/oci-go-sdk/v65/identitydomains"
@@ -160,3 +163,17 @@ func CreateSDKClients(clients *OracleClients, configProvider oci_common.Configur
 
 	return
 }
+func setCustomConfiguration(oClient interface {
+	SetCustomClientConfiguration(config common.CustomClientConfiguration)
+}) error {
+	if tfresource.RealmSpecificServiceEndpointTemplateEnabled != "" {
+		value, err := strconv.ParseBool(tfresource.RealmSpecificServiceEndpointTemplateEnabled)
+		if err != nil {
+			return err
+		}
+		oClient.SetCustomClientConfiguration(oci_common.CustomClientConfiguration{
+			RealmSpecificServiceEndpointTemplateEnabled: oci_common.Bool(value),
+		})
+	}
+	return nil
+}

internal/globalvar/constants.go

@@ -27,21 +27,22 @@ const (
 	AcceptLocalCerts                      = "accept_local_certs"
 	JobOCID                               = "job-ocid"
 
-	AuthAttrName                 = "auth"
-	TenancyOcidAttrName          = "tenancy_ocid"
-	BoatTenancyOcidAttrName      = "boat_tenancy_ocid"
-	UserOcidAttrName             = "user_ocid"
-	FingerprintAttrName          = "fingerprint"
-	PrivateKeyAttrName           = "private_key"
-	PrivateKeyPathAttrName       = "private_key_path"
-	PrivateKeyPasswordAttrName   = "private_key_password"
-	RegionAttrName               = "region"
-	DisableAutoRetriesAttrName   = "disable_auto_retries"
-	RetryDurationSecondsAttrName = "retry_duration_seconds"
-	OboTokenAttrName             = "obo_token"
-	OboTokenPath                 = "obo_token_path"
-	ConfigFileProfileAttrName    = "config_file_profile"
-	DefinedTagsToIgnore          = "ignore_defined_tags"
+	AuthAttrName                                = "auth"
+	TenancyOcidAttrName                         = "tenancy_ocid"
+	BoatTenancyOcidAttrName                     = "boat_tenancy_ocid"
+	UserOcidAttrName                            = "user_ocid"
+	FingerprintAttrName                         = "fingerprint"
+	PrivateKeyAttrName                          = "private_key"
+	PrivateKeyPathAttrName                      = "private_key_path"
+	PrivateKeyPasswordAttrName                  = "private_key_password"
+	RegionAttrName                              = "region"
+	DisableAutoRetriesAttrName                  = "disable_auto_retries"
+	RetryDurationSecondsAttrName                = "retry_duration_seconds"
+	OboTokenAttrName                            = "obo_token"
+	OboTokenPath                                = "obo_token_path"
+	ConfigFileProfileAttrName                   = "config_file_profile"
+	DefinedTagsToIgnore                         = "ignore_defined_tags"
+	RealmSpecificServiceEndpointTemplateEnabled = "realm_specific_service_endpoint_template_enabled"
 
 	DefaultConfigFileName    = "config"
 	DefaultConfigDirName     = ".oci"

internal/provider/provider.go

@@ -104,8 +104,9 @@ func init() {
 			"Automatic retries were introduced to solve some eventual consistency problems but it also introduced performance issues on destroy operations.",
 		globalvar.RetryDurationSecondsAttrName: "(Optional) The minimum duration (in seconds) to retry a resource operation in response to an error.\n" +
 			"The actual retry duration may be longer due to jittering of retry operations. This value is ignored if the `disable_auto_retries` field is set to true.",
-		globalvar.ConfigFileProfileAttrName: "(Optional) The profile name to be used from config file, if not set it will be DEFAULT.",
-		globalvar.DefinedTagsToIgnore:       "(Optional) List of defined tags keys that Terraform should ignore when planning creates and updates to the associated remote object",
+		globalvar.ConfigFileProfileAttrName:                   "(Optional) The profile name to be used from config file, if not set it will be DEFAULT.",
+		globalvar.DefinedTagsToIgnore:                         "(Optional) List of defined tags keys that Terraform should ignore when planning creates and updates to the associated remote object",
+		globalvar.RealmSpecificServiceEndpointTemplateEnabled: "(Optional) flags to enable realm specific service endpoint.",
 	}
 }
 
@@ -199,6 +200,11 @@ func SchemaMap() map[string]*schema.Schema {
 			Description: descriptions[globalvar.DefinedTagsToIgnore],
 			MaxItems:    100,
 		},
+		globalvar.RealmSpecificServiceEndpointTemplateEnabled: {
+			Type:        schema.TypeBool,
+			Optional:    true,
+			Description: descriptions[globalvar.RealmSpecificServiceEndpointTemplateEnabled],
+		},
 	}
 }
 
@@ -227,6 +233,7 @@ func ResourcesMap() map[string]*schema.Resource {
 
 func ProviderConfig(d *schema.ResourceData) (interface{}, error) {
 	tf_resource.DefinedTagsToSuppress = IgnoreDefinedTags(d)
+	tf_resource.RealmSpecificServiceEndpointTemplateEnabled = realmSpecificServiceEndpointTemplateEnabled(d)
 	clients := &tf_client.OracleClients{
 		SdkClientMap:  make(map[string]interface{}, len(tf_client.OracleClientRegistrationsVar.RegisteredClients)),
 		Configuration: make(map[string]string),
@@ -502,6 +509,12 @@ func IgnoreDefinedTags(d schemaResourceData) []string {
 	}
 	return nil
 }
+func realmSpecificServiceEndpointTemplateEnabled(d schemaResourceData) string {
+	if flag, ok := d.GetOkExists(globalvar.RealmSpecificServiceEndpointTemplateEnabled); ok {
+		return strconv.FormatBool(flag.(bool))
+	}
+	return ""
+}
 
 func (p ResourceDataConfigProvider) KeyID() (string, error) {
 	tenancy, err := p.TenancyOCID()

internal/tfresource/crud_helpers.go

@@ -35,15 +35,17 @@ import (
 )
 
 var (
-	FifteenMinutes                = 15 * time.Minute
-	TwentyMinutes                 = 20 * time.Minute
-	ThirtyMinutes                 = 30 * time.Minute
-	OneHour                       = 60 * time.Minute
-	TwoHours                      = 120 * time.Minute
-	TwoAndHalfHours               = 150 * time.Minute
-	ThreeHours                    = 180 * time.Minute
-	TwelveHours                   = 12 * time.Hour
-	ZeroTime        time.Duration = 0
+	//string value can store true,false and empty. Empty value can identify that user has not set the flag.
+	RealmSpecificServiceEndpointTemplateEnabled               = ""
+	FifteenMinutes                                            = 15 * time.Minute
+	TwentyMinutes                                             = 20 * time.Minute
+	ThirtyMinutes                                             = 30 * time.Minute
+	OneHour                                                   = 60 * time.Minute
+	TwoHours                                                  = 120 * time.Minute
+	TwoAndHalfHours                                           = 150 * time.Minute
+	ThreeHours                                                = 180 * time.Minute
+	TwelveHours                                               = 12 * time.Hour
+	ZeroTime                                    time.Duration = 0
 
 	DefaultTimeout = &schema.ResourceTimeout{
 		Create: &TwentyMinutes,