Added - Support for OCM - Add Disaster Recovery Feature

Author: Terraform Team Automation

examples/oracle_content_experience/main.tf

@@ -55,6 +55,12 @@ resource "oci_oce_oce_instance" "test_oce_instance" {
   instance_license_type = "BYOL"
   upgrade_schedule      = "UPGRADE_IMMEDIATELY"
   waf_primary_domain    = "oracle.com"
+  
+  timeouts {
+    create = "2h"
+    update = "60m"
+    delete = "1h"
+  }
 }
 
 data "oci_oce_oce_instances" "test_oce_instances" {

internal/integrationtest/oce_oce_instance_test.go

@@ -56,9 +56,10 @@ var (
 		"object_storage_namespace": acctest.Representation{RepType: acctest.Required, Create: `${data.oci_objectstorage_namespace.test_namespace.namespace}`},
 		"tenancy_id":               acctest.Representation{RepType: acctest.Required, Create: `${data.oci_identity_tenancy.test_tenancy.id}`},
 		"tenancy_name":             acctest.Representation{RepType: acctest.Required, Create: `${data.oci_identity_tenancy.test_tenancy.name}`},
-		"add_on_features":          acctest.Representation{RepType: acctest.Optional, Create: []string{`ENABLE_SAUCE`}, Update: []string{`ENABLE_SA`}},
+		"add_on_features":          acctest.Representation{RepType: acctest.Optional, Create: []string{`ENABLE_ADVANCED_HOSTING`, `CROSS_REGION_DR`}, Update: []string{`ENABLE_ADVANCED_HOSTING`, `CROSS_REGION_DR`}},
 		"defined_tags":             acctest.Representation{RepType: acctest.Optional, Create: `${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "value")}`, Update: `${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "updatedValue")}`},
 		"description":              acctest.Representation{RepType: acctest.Optional, Create: `description`, Update: `description2`},
+		"dr_region":                acctest.Representation{RepType: acctest.Optional, Create: `us-phoenix-1`, Update: `us-phoenix-1`},
 		"freeform_tags":            acctest.Representation{RepType: acctest.Optional, Create: map[string]string{"bar-key": "value"}, Update: map[string]string{"Department": "Accounting"}},
 		"instance_access_type":     acctest.Representation{RepType: acctest.Optional, Create: `PUBLIC`},
 		"instance_license_type":    acctest.Representation{RepType: acctest.Optional, Create: `PREMIUM`},
@@ -134,10 +135,11 @@ func TestOceOceInstanceResource_basic(t *testing.T) {
 			Config: config + compartmentIdVariableStr + adminEmailVariableStr + idcsAccessTokenVariableStr + OceOceInstanceResourceDependencies +
 				acctest.GenerateResourceFromRepresentationMap("oci_oce_oce_instance", "test_oce_instance", acctest.Optional, acctest.Create, OceOceInstanceRepresentation),
 			Check: acctest.ComposeAggregateTestCheckFuncWrapper(
-				resource.TestCheckResourceAttr(resourceName, "add_on_features.#", "1"),
+				resource.TestCheckResourceAttr(resourceName, "add_on_features.#", "2"),
 				resource.TestCheckResourceAttrSet(resourceName, "admin_email"),
 				resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId),
 				resource.TestCheckResourceAttr(resourceName, "description", "description"),
+				resource.TestCheckResourceAttr(resourceName, "dr_region", "us-phoenix-1"),
 				resource.TestCheckResourceAttr(resourceName, "freeform_tags.%", "1"),
 				resource.TestCheckResourceAttrSet(resourceName, "guid"),
 				resource.TestCheckResourceAttrSet(resourceName, "id"),
@@ -172,10 +174,11 @@ func TestOceOceInstanceResource_basic(t *testing.T) {
 						"compartment_id": acctest.Representation{RepType: acctest.Required, Create: `${var.compartment_id_for_update}`},
 					})),
 			Check: acctest.ComposeAggregateTestCheckFuncWrapper(
-				resource.TestCheckResourceAttr(resourceName, "add_on_features.#", "1"),
+				resource.TestCheckResourceAttr(resourceName, "add_on_features.#", "2"),
 				resource.TestCheckResourceAttrSet(resourceName, "admin_email"),
 				resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentIdU),
 				resource.TestCheckResourceAttr(resourceName, "description", "description"),
+				resource.TestCheckResourceAttr(resourceName, "dr_region", "us-phoenix-1"),
 				resource.TestCheckResourceAttr(resourceName, "freeform_tags.%", "1"),
 				resource.TestCheckResourceAttrSet(resourceName, "guid"),
 				resource.TestCheckResourceAttrSet(resourceName, "id"),
@@ -205,10 +208,11 @@ func TestOceOceInstanceResource_basic(t *testing.T) {
 			Config: config + compartmentIdVariableStr + adminEmailVariableStr + idcsAccessTokenVariableStr + OceOceInstanceResourceDependencies +
 				acctest.GenerateResourceFromRepresentationMap("oci_oce_oce_instance", "test_oce_instance", acctest.Optional, acctest.Update, OceOceInstanceRepresentation),
 			Check: acctest.ComposeAggregateTestCheckFuncWrapper(
-				resource.TestCheckResourceAttr(resourceName, "add_on_features.#", "1"),
+				resource.TestCheckResourceAttr(resourceName, "add_on_features.#", "2"),
 				resource.TestCheckResourceAttrSet(resourceName, "admin_email"),
 				resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId),
 				resource.TestCheckResourceAttr(resourceName, "description", "description2"),
+				resource.TestCheckResourceAttr(resourceName, "dr_region", "us-phoenix-1"),
 				resource.TestCheckResourceAttr(resourceName, "freeform_tags.%", "1"),
 				resource.TestCheckResourceAttrSet(resourceName, "guid"),
 				resource.TestCheckResourceAttrSet(resourceName, "id"),
@@ -244,10 +248,11 @@ func TestOceOceInstanceResource_basic(t *testing.T) {
 				resource.TestCheckResourceAttrSet(datasourceName, "tenancy_id"),
 
 				resource.TestCheckResourceAttr(datasourceName, "oce_instances.#", "1"),
-				resource.TestCheckResourceAttr(datasourceName, "oce_instances.0.add_on_features.#", "1"),
+				resource.TestCheckResourceAttr(datasourceName, "oce_instances.0.add_on_features.#", "2"),
 				resource.TestCheckResourceAttrSet(datasourceName, "oce_instances.0.admin_email"),
 				resource.TestCheckResourceAttr(datasourceName, "oce_instances.0.compartment_id", compartmentId),
 				resource.TestCheckResourceAttr(datasourceName, "oce_instances.0.description", "description2"),
+				resource.TestCheckResourceAttr(datasourceName, "oce_instances.0.dr_region", ""),
 				resource.TestCheckResourceAttr(datasourceName, "oce_instances.0.freeform_tags.%", "1"),
 				resource.TestCheckResourceAttrSet(datasourceName, "oce_instances.0.guid"),
 				resource.TestCheckResourceAttrSet(datasourceName, "oce_instances.0.id"),
@@ -274,7 +279,7 @@ func TestOceOceInstanceResource_basic(t *testing.T) {
 			Check: acctest.ComposeAggregateTestCheckFuncWrapper(
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "oce_instance_id"),
 
-				resource.TestCheckResourceAttr(singularDatasourceName, "add_on_features.#", "1"),
+				resource.TestCheckResourceAttr(singularDatasourceName, "add_on_features.#", "2"),
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "admin_email"),
 				resource.TestCheckResourceAttr(singularDatasourceName, "compartment_id", compartmentId),
 				resource.TestCheckResourceAttr(singularDatasourceName, "description", "description2"),
@@ -301,6 +306,7 @@ func TestOceOceInstanceResource_basic(t *testing.T) {
 			ImportStateVerify: true,
 			ImportStateVerifyIgnore: []string{
 				"idcs_access_token",
+				"dr_region",
 			},
 			ResourceName: resourceName,
 		},

internal/service/oce/oce_oce_instance_data_source.go

@@ -84,6 +84,10 @@ func (s *OceOceInstanceDataSourceCrud) SetData() error {
 		s.D.Set("description", *s.Res.Description)
 	}
 
+	if s.Res.DrRegion != nil {
+		s.D.Set("dr_region", *s.Res.DrRegion)
+	}
+
 	s.D.Set("freeform_tags", s.Res.FreeformTags)
 
 	if s.Res.Guid != nil {

internal/service/oce/oce_oce_instance_resource.go

@@ -26,9 +26,9 @@ func OceOceInstanceResource() *schema.Resource {
 			State: schema.ImportStatePassthrough,
 		},
 		Timeouts: &schema.ResourceTimeout{
-			Create: tfresource.GetTimeoutDuration("30m"),
-			Update: tfresource.GetTimeoutDuration("20m"),
-			Delete: tfresource.GetTimeoutDuration("20m"),
+			Create: tfresource.GetTimeoutDuration("2h"),
+			Update: tfresource.GetTimeoutDuration("60m"),
+			Delete: tfresource.GetTimeoutDuration("1h"),
 		},
 		Create: createOceOceInstance,
 		Read:   readOceOceInstance,
@@ -93,6 +93,11 @@ func OceOceInstanceResource() *schema.Resource {
 				Optional: true,
 				Computed: true,
 			},
+			"dr_region": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
 			"freeform_tags": {
 				Type:     schema.TypeMap,
 				Optional: true,
@@ -277,6 +282,11 @@ func (s *OceOceInstanceResourceCrud) Create() error {
 		request.Description = &tmp
 	}
 
+	if drRegion, ok := s.D.GetOkExists("dr_region"); ok {
+		tmp := drRegion.(string)
+		request.DrRegion = &tmp
+	}
+
 	if freeformTags, ok := s.D.GetOkExists("freeform_tags"); ok {
 		request.FreeformTags = tfresource.ObjectMapToStringMap(freeformTags.(map[string]interface{}))
 	}
@@ -513,6 +523,11 @@ func (s *OceOceInstanceResourceCrud) Update() error {
 		request.Description = &tmp
 	}
 
+	if drRegion, ok := s.D.GetOkExists("dr_region"); ok {
+		tmp := drRegion.(string)
+		request.DrRegion = &tmp
+	}
+
 	if freeformTags, ok := s.D.GetOkExists("freeform_tags"); ok {
 		request.FreeformTags = tfresource.ObjectMapToStringMap(freeformTags.(map[string]interface{}))
 	}
@@ -525,6 +540,10 @@ func (s *OceOceInstanceResourceCrud) Update() error {
 		request.InstanceUsageType = oci_oce.UpdateOceInstanceDetailsInstanceUsageTypeEnum(instanceUsageType.(string))
 	}
 
+	if lifecycleDetails, ok := s.D.GetOkExists("lifecycle_details"); ok {
+		request.LifecycleDetails = oci_oce.LifecycleDetailsEnum(lifecycleDetails.(string))
+	}
+
 	tmp := s.D.Id()
 	request.OceInstanceId = &tmp
 
@@ -583,6 +602,10 @@ func (s *OceOceInstanceResourceCrud) SetData() error {
 		s.D.Set("description", *s.Res.Description)
 	}
 
+	if s.Res.DrRegion != nil {
+		s.D.Set("dr_region", *s.Res.DrRegion)
+	}
+
 	s.D.Set("freeform_tags", s.Res.FreeformTags)
 
 	if s.Res.Guid != nil {

internal/service/oce/oce_oce_instances_data_source.go

@@ -133,6 +133,10 @@ func (s *OceOceInstancesDataSourceCrud) SetData() error {
 			oceInstance["description"] = *r.Description
 		}
 
+		if r.DrRegion != nil {
+			oceInstance["dr_region"] = *r.DrRegion
+		}
+
 		oceInstance["freeform_tags"] = r.FreeformTags
 
 		if r.Guid != nil {

website/docs/d/oce_oce_instance.html.markdown

@@ -37,6 +37,7 @@ The following attributes are exported:
 * `compartment_id` - Compartment Identifier
 * `defined_tags` - Usage of predefined tag keys. These predefined keys are scoped to namespaces. Example: `{"foo-namespace.bar-key": "value"}` 
 * `description` - OceInstance description, can be updated
+* `dr_region` - disaster recovery paired ragion name
 * `freeform_tags` - Simple key-value pair that is applied without any predefined name, type or scope. Exists for cross-compatibility only. Example: `{"bar-key": "value"}` 
 * `guid` - Unique GUID identifier that is immutable on creation
 * `id` - Unique identifier that is immutable on creation

website/docs/d/oce_oce_instances.html.markdown

@@ -52,6 +52,7 @@ The following attributes are exported:
 * `compartment_id` - Compartment Identifier
 * `defined_tags` - Usage of predefined tag keys. These predefined keys are scoped to namespaces. Example: `{"foo-namespace.bar-key": "value"}` 
 * `description` - OceInstance description, can be updated
+* `dr_region` - disaster recovery paired ragion name
 * `freeform_tags` - Simple key-value pair that is applied without any predefined name, type or scope. Exists for cross-compatibility only. Example: `{"bar-key": "value"}` 
 * `guid` - Unique GUID identifier that is immutable on creation
 * `id` - Unique identifier that is immutable on creation

website/docs/r/oce_oce_instance.html.markdown

@@ -30,6 +30,7 @@ resource "oci_oce_oce_instance" "test_oce_instance" {
 	add_on_features = var.oce_instance_add_on_features
 	defined_tags = {"foo-namespace.bar-key"= "value"}
 	description = var.oce_instance_description
+	dr_region = var.oce_instance_dr_region
 	freeform_tags = {"bar-key"= "value"}
 	instance_access_type = var.oce_instance_instance_access_type
 	instance_license_type = var.oce_instance_instance_license_type
@@ -48,6 +49,7 @@ The following arguments are supported:
 * `compartment_id` - (Required) (Updatable) Compartment Identifier
 * `defined_tags` - (Optional) (Updatable) Usage of predefined tag keys. These predefined keys are scoped to namespaces. Example: `{"foo-namespace.bar-key": "value"}` 
 * `description` - (Optional) (Updatable) OceInstance description
+* `dr_region` - (Optional) (Updatable) disaster recovery paired ragion name
 * `freeform_tags` - (Optional) (Updatable) Simple key-value pair that is applied without any predefined name, type or scope. Exists for cross-compatibility only. Example: `{"bar-key": "value"}` 
 * `idcs_access_token` - (Required) Identity Cloud Service access token identifying a stripe and service administrator user
 * `instance_access_type` - (Optional) Flag indicating whether the instance access is private or public
@@ -73,6 +75,7 @@ The following attributes are exported:
 * `compartment_id` - Compartment Identifier
 * `defined_tags` - Usage of predefined tag keys. These predefined keys are scoped to namespaces. Example: `{"foo-namespace.bar-key": "value"}` 
 * `description` - OceInstance description, can be updated
+* `dr_region` - disaster recovery paired ragion name
 * `freeform_tags` - Simple key-value pair that is applied without any predefined name, type or scope. Exists for cross-compatibility only. Example: `{"bar-key": "value"}` 
 * `guid` - Unique GUID identifier that is immutable on creation
 * `id` - Unique identifier that is immutable on creation