Added - Support for OIC Gen3 Disaster Recovery

Author: Xu Zhang

examples/integration/main.tf

@@ -19,12 +19,15 @@ variable "region" {
 variable "compartment_id" {
 }
 
+variable "compartment_id_for_update" {
+}
+
 variable "instance_type" {
   default = "STANDARDX"
 }
 
 variable "integration_instance_idcs_access_token" {
-  default = ""                  #
+  default = ""
 }
 
 variable "integration_instance_consumption_model" {
@@ -72,7 +75,7 @@ resource "oci_integration_integration_instance" "test_integration_instance" {
   shape                     = "DEVELOPMENT"
   display_name              = "instance-created-via-tf-${random_integer.seq.result}"
   is_byol                   = "false"
-  message_packs             = "10"
+  message_packs             = "1"
   domain_id                 = var.domain_id
 
   lifecycle {
@@ -180,4 +183,35 @@ resource "oci_integration_private_endpoint_outbound_connection" "integration_pri
   depends_on = [
     oci_integration_oracle_managed_custom_endpoint.integretion_custom_endpoint
   ]
+# resource "oci_integration_integration_instance" "test_integration_instance_idcs" {
+#   #Required
+#   compartment_id            = var.compartment_id
+#   display_name              = "instance4643_idcs"
+#   integration_instance_type = "STANDARDX"
+#   shape                     = "DEVELOPMENT"
+#   # shape                     = "PRODUCTION"
+#   is_byol                   = "false"
+#   message_packs             = "10"
+#   idcs_at                   = var.integration_instance_idcs_access_token
+# }
+
+resource "oci_integration_private_endpoint_outbound_connection" "integration_private_endpoint" {
+  integration_instance_id = oci_integration_integration_instance.test_integration_instance.id
+  nsg_ids = [var.nsg_id]
+  subnet_id = var.subnet_id
+}
+
+resource "oci_integration_integration_instance" "test_integration_instance_with_dr" {
+  #Required
+  compartment_id            = var.compartment_id
+  integration_instance_type = "STANDARDX"
+  shape                     = "DEVELOPMENT"
+  display_name              = "DR"
+  is_byol                   = "false"
+  message_packs             = "1"
+  domain_id                 = var.domain_id
+  is_disaster_recovery_enabled = "true"
+  lifecycle {
+    ignore_changes = ["system_tags"]
+  }
 }

internal/integrationtest/integration_integration_instance_test.go

@@ -96,6 +96,12 @@ func (s *IntegrationIntegrationInstanceDataSourceCrud) SetData() error {
 		s.D.Set("defined_tags", tfresource.DefinedTagsToMap(s.Res.DefinedTags))
 	}
 
+	if s.Res.DisasterRecoveryDetails != nil {
+		s.D.Set("disaster_recovery_details", []interface{}{DisasterRecoveryDetailsToMap(s.Res.DisasterRecoveryDetails)})
+	} else {
+		s.D.Set("disaster_recovery_details", nil)
+	}
+
 	if s.Res.DisplayName != nil {
 		s.D.Set("display_name", *s.Res.DisplayName)
 	}
@@ -122,6 +128,10 @@ func (s *IntegrationIntegrationInstanceDataSourceCrud) SetData() error {
 		s.D.Set("is_byol", *s.Res.IsByol)
 	}
 
+	if s.Res.IsDisasterRecoveryEnabled != nil {
+		s.D.Set("is_disaster_recovery_enabled", *s.Res.IsDisasterRecoveryEnabled)
+	}
+
 	if s.Res.IsFileServerEnabled != nil {
 		s.D.Set("is_file_server_enabled", *s.Res.IsFileServerEnabled)
 	}
@@ -130,6 +140,10 @@ func (s *IntegrationIntegrationInstanceDataSourceCrud) SetData() error {
 		s.D.Set("is_visual_builder_enabled", *s.Res.IsVisualBuilderEnabled)
 	}
 
+	if s.Res.LifecycleDetails != nil {
+		s.D.Set("lifecycle_details", *s.Res.LifecycleDetails)
+	}
+
 	if s.Res.MessagePacks != nil {
 		s.D.Set("message_packs", *s.Res.MessagePacks)
 	}

internal/service/integration/integration_integration_instance_data_source.go

@@ -181,6 +181,12 @@ func IntegrationIntegrationInstanceResource() *schema.Resource {
 				StateFunc: tfresource.GetMd5Hash,
 				Sensitive: true,
 			},
+			"is_disaster_recovery_enabled": {
+				Type:     schema.TypeBool,
+				Optional: true,
+				Computed: true,
+				ForceNew: true,
+			},
 			"is_file_server_enabled": {
 				Type:     schema.TypeBool,
 				Optional: true,
@@ -282,12 +288,16 @@ func IntegrationIntegrationInstanceResource() *schema.Resource {
 				Type:     schema.TypeInt,
 				Optional: true,
 			},
-
 			// "remove_oracle_managed_custom_endpoint_trigger": {
 			// 	Type:     schema.TypeInt,
 			// 	Optional: true,
 			// },
 
+			"failover_trigger": {
+				Type:     schema.TypeInt,
+				Optional: true,
+			},
+
 			// Computed
 			"attachments": {
 				Type:     schema.TypeList,
@@ -322,6 +332,56 @@ func IntegrationIntegrationInstanceResource() *schema.Resource {
 					},
 				},
 			},
+			"disaster_recovery_details": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						// Required
+
+						// Optional
+
+						// Computed
+						"cross_region_integration_instance_details": {
+							Type:     schema.TypeList,
+							Computed: true,
+							Elem: &schema.Resource{
+								Schema: map[string]*schema.Schema{
+									// Required
+
+									// Optional
+
+									// Computed
+									"id": {
+										Type:     schema.TypeString,
+										Computed: true,
+									},
+									"region": {
+										Type:     schema.TypeString,
+										Computed: true,
+									},
+									"role": {
+										Type:     schema.TypeString,
+										Computed: true,
+									},
+									"time_role_changed": {
+										Type:     schema.TypeString,
+										Computed: true,
+									},
+								},
+							},
+						},
+						"regional_instance_url": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"role": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+					},
+				},
+			},
 			"data_retention_period": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -367,6 +427,10 @@ func IntegrationIntegrationInstanceResource() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"lifecycle_details": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"private_endpoint_outbound_connection": {
 				Type:     schema.TypeList,
 				Computed: true,
@@ -445,6 +509,14 @@ func createIntegrationIntegrationInstance(d *schema.ResourceData, m interface{})
 			return err
 		}
 	}
+
+	if _, ok := sync.D.GetOkExists("failover_trigger"); ok {
+		err := sync.DisasterRecoveryFailover()
+		if err != nil {
+			return err
+		}
+	}
+
 	var powerOff = false
 	if configState, ok := sync.D.GetOkExists("state"); ok {
 		wantedState := oci_integration.IntegrationInstanceLifecycleStateEnum(strings.ToUpper(configState.(string)))
@@ -538,6 +610,22 @@ func updateIntegrationIntegrationInstance(d *schema.ResourceData, m interface{})
 		}
 	}
 
+	if _, ok := sync.D.GetOkExists("failover_trigger"); ok && sync.D.HasChange("failover_trigger") {
+		oldRaw, newRaw := sync.D.GetChange("failover_trigger")
+		oldValue := oldRaw.(int)
+		newValue := newRaw.(int)
+		if oldValue < newValue {
+			err := sync.DisasterRecoveryFailover()
+
+			if err != nil {
+				return err
+			}
+		} else {
+			sync.D.Set("failover_trigger", oldRaw)
+			return fmt.Errorf("new value of trigger should be greater than the old value")
+		}
+	}
+
 	if err := tfresource.UpdateResource(d, sync); err != nil {
 		return err
 	}
@@ -675,6 +763,11 @@ func (s *IntegrationIntegrationInstanceResourceCrud) Create() error {
 		request.IsByol = &tmp
 	}
 
+	if isDisasterRecoveryEnabled, ok := s.D.GetOkExists("is_disaster_recovery_enabled"); ok {
+		tmp := isDisasterRecoveryEnabled.(bool)
+		request.IsDisasterRecoveryEnabled = &tmp
+	}
+
 	if isFileServerEnabled, ok := s.D.GetOkExists("is_file_server_enabled"); ok {
 		tmp := isFileServerEnabled.(bool)
 		request.IsFileServerEnabled = &tmp
@@ -1025,6 +1118,12 @@ func (s *IntegrationIntegrationInstanceResourceCrud) SetData() error {
 		s.D.Set("defined_tags", tfresource.DefinedTagsToMap(s.Res.DefinedTags))
 	}
 
+	if s.Res.DisasterRecoveryDetails != nil {
+		s.D.Set("disaster_recovery_details", []interface{}{DisasterRecoveryDetailsToMap(s.Res.DisasterRecoveryDetails)})
+	} else {
+		s.D.Set("disaster_recovery_details", nil)
+	}
+
 	if s.Res.DisplayName != nil {
 		s.D.Set("display_name", *s.Res.DisplayName)
 	}
@@ -1051,6 +1150,10 @@ func (s *IntegrationIntegrationInstanceResourceCrud) SetData() error {
 		s.D.Set("is_byol", *s.Res.IsByol)
 	}
 
+	if s.Res.IsDisasterRecoveryEnabled != nil {
+		s.D.Set("is_disaster_recovery_enabled", *s.Res.IsDisasterRecoveryEnabled)
+	}
+
 	if s.Res.IsFileServerEnabled != nil {
 		s.D.Set("is_file_server_enabled", *s.Res.IsFileServerEnabled)
 	}
@@ -1059,6 +1162,10 @@ func (s *IntegrationIntegrationInstanceResourceCrud) SetData() error {
 		s.D.Set("is_visual_builder_enabled", *s.Res.IsVisualBuilderEnabled)
 	}
 
+	if s.Res.LifecycleDetails != nil {
+		s.D.Set("lifecycle_details", *s.Res.LifecycleDetails)
+	}
+
 	if s.Res.MessagePacks != nil {
 		s.D.Set("message_packs", *s.Res.MessagePacks)
 	}
@@ -1222,6 +1329,29 @@ func (s *IntegrationIntegrationInstanceResourceCrud) RemoveOracleManagedCustomEn
 	return nil
 }
 
+func (s *IntegrationIntegrationInstanceResourceCrud) DisasterRecoveryFailover() error {
+	request := oci_integration.DisasterRecoveryFailoverRequest{}
+
+	idTmp := s.D.Id()
+	request.IntegrationInstanceId = &idTmp
+
+	request.RequestMetadata.RetryPolicy = tfresource.GetRetryPolicy(s.DisableNotFoundRetries, "integration")
+
+	_, err := s.Client.DisasterRecoveryFailover(context.Background(), request)
+	if err != nil {
+		return err
+	}
+
+	if waitErr := tfresource.WaitForUpdatedState(s.D, s); waitErr != nil {
+		return waitErr
+	}
+
+	val := s.D.Get("failover_trigger")
+	s.D.Set("failover_trigger", val)
+
+	return nil
+}
+
 func AttachmentDetailsToMap(obj oci_integration.AttachmentDetails) map[string]interface{} {
 	result := map[string]interface{}{}
 
@@ -1327,7 +1457,41 @@ func CustomEndpointDetailsToMap(obj *oci_integration.CustomEndpointDetails) map[
 		result["hostname"] = string(*obj.Hostname)
 	}
 
-	result["managed_type"] = string(obj.ManagedType)
+	return result
+}
+
+func CrossRegionIntegrationInstanceDetailsToMap(obj *oci_integration.CrossRegionIntegrationInstanceDetails) map[string]interface{} {
+	result := map[string]interface{}{}
+
+	if obj.Id != nil {
+		result["id"] = string(*obj.Id)
+	}
+
+	if obj.Region != nil {
+		result["region"] = string(*obj.Region)
+	}
+
+	result["role"] = string(obj.Role)
+
+	if obj.TimeRoleChanged != nil {
+		result["time_role_changed"] = obj.TimeRoleChanged.String()
+	}
+
+	return result
+}
+
+func DisasterRecoveryDetailsToMap(obj *oci_integration.DisasterRecoveryDetails) map[string]interface{} {
+	result := map[string]interface{}{}
+
+	if obj.CrossRegionIntegrationInstanceDetails != nil {
+		result["cross_region_integration_instance_details"] = []interface{}{CrossRegionIntegrationInstanceDetailsToMap(obj.CrossRegionIntegrationInstanceDetails)}
+	}
+
+	if obj.RegionalInstanceUrl != nil {
+		result["regional_instance_url"] = string(*obj.RegionalInstanceUrl)
+	}
+
+	result["role"] = string(obj.Role)
 
 	return result
 }

internal/service/integration/integration_integration_instance_resource.go

@@ -154,6 +154,10 @@ func (s *IntegrationIntegrationInstancesDataSourceCrud) SetData() error {
 			integrationInstance["is_byol"] = *r.IsByol
 		}
 
+		if r.IsDisasterRecoveryEnabled != nil {
+			integrationInstance["is_disaster_recovery_enabled"] = *r.IsDisasterRecoveryEnabled
+		}
+
 		if r.IsFileServerEnabled != nil {
 			integrationInstance["is_file_server_enabled"] = *r.IsFileServerEnabled
 		}
@@ -162,6 +166,10 @@ func (s *IntegrationIntegrationInstancesDataSourceCrud) SetData() error {
 			integrationInstance["is_visual_builder_enabled"] = *r.IsVisualBuilderEnabled
 		}
 
+		if r.LifecycleDetails != nil {
+			integrationInstance["lifecycle_details"] = *r.LifecycleDetails
+		}
+
 		if r.MessagePacks != nil {
 			integrationInstance["message_packs"] = *r.MessagePacks
 		}