Added - Support for refresh DR Plans

Author: dyajaman

examples/disaster_recovery/dr_plan/dr_plan.tf

@@ -49,6 +49,8 @@ resource "oci_disaster_recovery_dr_plan" "test_dr_plan" {
   display_name           = var.dr_plan_display_name
   dr_protection_group_id = data.oci_disaster_recovery_dr_protection_groups.test_dr_protection_groups.dr_protection_group_collection.0.items.0.id
   type                   = var.dr_plan_type
+  refresh_trigger        = 0
+  verify_trigger         = 0
 
   lifecycle {
     ignore_changes = [defined_tags]

internal/integrationtest/disaster_recovery_dr_plan_test.go

@@ -88,6 +88,8 @@ func (s *DisasterRecoveryDrPlanDataSourceCrud) SetData() error {
 		s.D.Set("life_cycle_details", *s.Res.LifeCycleDetails)
 	}
 
+	s.D.Set("lifecycle_sub_state", s.Res.LifecycleSubState)
+
 	if s.Res.PeerDrProtectionGroupId != nil {
 		s.D.Set("peer_dr_protection_group_id", *s.Res.PeerDrProtectionGroupId)
 	}
@@ -102,6 +104,10 @@ func (s *DisasterRecoveryDrPlanDataSourceCrud) SetData() error {
 	}
 	s.D.Set("plan_groups", planGroups)
 
+	if s.Res.SourcePlanId != nil {
+		s.D.Set("source_plan_id", *s.Res.SourcePlanId)
+	}
+
 	s.D.Set("state", s.Res.LifecycleState)
 
 	if s.Res.SystemTags != nil {

internal/service/disaster_recovery/disaster_recovery_dr_plan_data_source.go

@@ -61,6 +61,20 @@ func DisasterRecoveryDrPlanResource() *schema.Resource {
 				Computed: true,
 				Elem:     schema.TypeString,
 			},
+			"source_plan_id": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+				ForceNew: true,
+			},
+			"refresh_trigger": {
+				Type:     schema.TypeInt,
+				Optional: true,
+			},
+			"verify_trigger": {
+				Type:     schema.TypeInt,
+				Optional: true,
+			},
 
 			// Computed
 			"compartment_id": {
@@ -71,6 +85,10 @@ func DisasterRecoveryDrPlanResource() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"lifecycle_sub_state": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"peer_dr_protection_group_id": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -101,6 +119,10 @@ func DisasterRecoveryDrPlanResource() *schema.Resource {
 							Type:     schema.TypeBool,
 							Computed: true,
 						},
+						"refresh_status": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
 						"steps": {
 							Type:     schema.TypeList,
 							Computed: true,
@@ -135,6 +157,10 @@ func DisasterRecoveryDrPlanResource() *schema.Resource {
 										Type:     schema.TypeString,
 										Computed: true,
 									},
+									"refresh_status": {
+										Type:     schema.TypeString,
+										Computed: true,
+									},
 									"timeout": {
 										Type:     schema.TypeInt,
 										Computed: true,
@@ -265,7 +291,30 @@ func updateDisasterRecoveryDrPlan(d *schema.ResourceData, m interface{}) error {
 	sync.D = d
 	sync.Client = m.(*client.OracleClients).DisasterRecoveryClient()
 
-	return tfresource.UpdateResource(d, sync)
+	if _, ok := sync.D.GetOkExists("refresh_trigger"); ok && sync.D.HasChange("refresh_trigger") {
+		oldRaw, newRaw := sync.D.GetChange("refresh_trigger")
+		oldValue := oldRaw.(int)
+		newValue := newRaw.(int)
+		if oldValue < newValue {
+			return sync.RefreshDrPlan()
+		} else {
+			sync.D.Set("refresh_trigger", oldRaw)
+			return fmt.Errorf("new value of trigger should be greater than the old value")
+		}
+
+	} else if _, ok := sync.D.GetOkExists("verify_trigger"); ok && sync.D.HasChange("verify_trigger") {
+		oldRaw, newRaw := sync.D.GetChange("verify_trigger")
+		oldValue := oldRaw.(int)
+		newValue := newRaw.(int)
+		if oldValue < newValue {
+			return sync.VerifyDrPlan()
+		} else {
+			sync.D.Set("verify_trigger", oldRaw)
+			return fmt.Errorf("new value of trigger should be greater than the old value")
+		}
+	} else {
+		return tfresource.UpdateResource(d, sync)
+	}
 }
 
 func deleteDisasterRecoveryDrPlan(d *schema.ResourceData, m interface{}) error {
@@ -338,6 +387,11 @@ func (s *DisasterRecoveryDrPlanResourceCrud) Create() error {
 		request.FreeformTags = tfresource.ObjectMapToStringMap(freeformTags.(map[string]interface{}))
 	}
 
+	if sourcePlanId, ok := s.D.GetOkExists("source_plan_id"); ok {
+		tmp := sourcePlanId.(string)
+		request.SourcePlanId = &tmp
+	}
+
 	if type_, ok := s.D.GetOkExists("type"); ok {
 		request.Type = oci_disaster_recovery.DrPlanTypeEnum(type_.(string))
 	}
@@ -588,6 +642,8 @@ func (s *DisasterRecoveryDrPlanResourceCrud) SetData() error {
 		s.D.Set("life_cycle_details", *s.Res.LifeCycleDetails)
 	}
 
+	s.D.Set("lifecycle_sub_state", s.Res.LifecycleSubState)
+
 	if s.Res.PeerDrProtectionGroupId != nil {
 		s.D.Set("peer_dr_protection_group_id", *s.Res.PeerDrProtectionGroupId)
 	}
@@ -602,6 +658,10 @@ func (s *DisasterRecoveryDrPlanResourceCrud) SetData() error {
 	}
 	s.D.Set("plan_groups", planGroups)
 
+	if s.Res.SourcePlanId != nil {
+		s.D.Set("source_plan_id", *s.Res.SourcePlanId)
+	}
+
 	s.D.Set("state", s.Res.LifecycleState)
 
 	if s.Res.SystemTags != nil {
@@ -621,6 +681,67 @@ func (s *DisasterRecoveryDrPlanResourceCrud) SetData() error {
 	return nil
 }
 
+func (s *DisasterRecoveryDrPlanResourceCrud) RefreshDrPlan() error {
+	request := oci_disaster_recovery.RefreshDrPlanRequest{}
+	err := s.populateTopLevelPolymorphicRefreshDrPlanRequest(&request)
+	if err != nil {
+		return err
+	}
+
+	request.RequestMetadata.RetryPolicy = tfresource.GetRetryPolicy(s.DisableNotFoundRetries, "disaster_recovery")
+
+	response, err := s.Client.RefreshDrPlan(context.Background(), request)
+	if err != nil {
+		return err
+	}
+
+	if waitErr := tfresource.WaitForUpdatedState(s.D, s); waitErr != nil {
+		return waitErr
+	}
+
+	val := s.D.Get("refresh_trigger")
+	if val != nil {
+		err := s.D.Set("refresh_trigger", val)
+		if err != nil {
+			return err
+		}
+	}
+
+	workId := response.OpcWorkRequestId
+	return s.getDrPlanFromWorkRequest(workId, tfresource.GetRetryPolicy(s.DisableNotFoundRetries, "disaster_recovery"), oci_disaster_recovery.ActionTypeUpdated, s.D.Timeout(schema.TimeoutUpdate))
+}
+
+func (s *DisasterRecoveryDrPlanResourceCrud) VerifyDrPlan() error {
+	request := oci_disaster_recovery.VerifyDrPlanRequest{}
+
+	err := s.populateTopLevelPolymorphicVerifyDrPlanRequest(&request)
+	if err != nil {
+		return err
+	}
+
+	request.RequestMetadata.RetryPolicy = tfresource.GetRetryPolicy(s.DisableNotFoundRetries, "disaster_recovery")
+
+	response, err := s.Client.VerifyDrPlan(context.Background(), request)
+	if err != nil {
+		return err
+	}
+
+	if waitErr := tfresource.WaitForUpdatedState(s.D, s); waitErr != nil {
+		return waitErr
+	}
+
+	val := s.D.Get("verify_trigger")
+	if val != nil {
+		err := s.D.Set("verify_trigger", val)
+		if err != nil {
+			return err
+		}
+	}
+
+	workId := response.OpcWorkRequestId
+	return s.getDrPlanFromWorkRequest(workId, tfresource.GetRetryPolicy(s.DisableNotFoundRetries, "disaster_recovery"), oci_disaster_recovery.ActionTypeUpdated, s.D.Timeout(schema.TimeoutUpdate))
+}
+
 func (s *DisasterRecoveryDrPlanResourceCrud) mapToDrPlanGroup(fieldKeyFormat string) (oci_disaster_recovery.DrPlanGroup, error) {
 	result := oci_disaster_recovery.DrPlanGroup{}
 
@@ -757,6 +878,8 @@ func DrPlanGroupToMap(obj oci_disaster_recovery.DrPlanGroup) map[string]interfac
 		result["is_pause_enabled"] = bool(*obj.IsPauseEnabled)
 	}
 
+	result["refresh_status"] = string(obj.RefreshStatus)
+
 	steps := []interface{}{}
 	for _, item := range obj.Steps {
 		steps = append(steps, DrPlanStepToMap(item))
@@ -834,6 +957,8 @@ func DrPlanStepToMap(obj oci_disaster_recovery.DrPlanStep) map[string]interface{
 		result["member_id"] = string(*obj.MemberId)
 	}
 
+	result["refresh_status"] = string(obj.RefreshStatus)
+
 	if obj.Timeout != nil {
 		result["timeout"] = int(*obj.Timeout)
 	}
@@ -880,6 +1005,8 @@ func DrPlanSummaryToMap(obj oci_disaster_recovery.DrPlanSummary) map[string]inte
 		result["life_cycle_details"] = string(*obj.LifeCycleDetails)
 	}
 
+	result["lifecycle_sub_state"] = string(obj.LifecycleSubState)
+
 	if obj.PeerDrProtectionGroupId != nil {
 		result["peer_dr_protection_group_id"] = string(*obj.PeerDrProtectionGroupId)
 	}
@@ -1173,3 +1300,65 @@ func UpdateObjectStorageScriptLocationDetailsToMap(obj *oci_disaster_recovery.Up
 
 	return result
 }
+
+func (s *DisasterRecoveryDrPlanResourceCrud) populateTopLevelPolymorphicRefreshDrPlanRequest(request *oci_disaster_recovery.RefreshDrPlanRequest) error {
+	//typeRaw, ok := s.D.GetOkExists("type")
+	//var type_ string
+	//if ok {
+	//	type_ = typeRaw.(string)
+	//} else {
+	//	type_ = "" // default value
+	//}
+
+	details := oci_disaster_recovery.RefreshDrPlanDefaultDetails{}
+	tmp := s.D.Id()
+	request.DrPlanId = &tmp
+	request.RefreshDrPlanDetails = details
+
+	//switch strings.ToLower(type_) {
+	//case strings.ToLower("DEFAULT"):
+	//	details := oci_disaster_recovery.RefreshDrPlanDefaultDetails{}
+	//
+	//	tmp := s.D.Id()
+	//	request.DrPlanId = &tmp
+	//
+	//	request.RefreshDrPlanDetails = details
+
+	//default:
+	//	return fmt.Errorf("unknown type '%v' was specified", type_)
+	//}
+
+	return nil
+}
+
+func (s *DisasterRecoveryDrPlanResourceCrud) populateTopLevelPolymorphicVerifyDrPlanRequest(request *oci_disaster_recovery.VerifyDrPlanRequest) error {
+	//typeRaw, ok := s.D.GetOkExists("type")
+	//var type_ string
+	//if ok {
+	//	type_ = typeRaw.(string)
+	//} else {
+	//	type_ = "" // default value
+	//}
+
+	details := oci_disaster_recovery.VerifyDrPlanDefaultDetails{}
+
+	tmp := s.D.Id()
+	request.DrPlanId = &tmp
+
+	request.VerifyDrPlanDetails = details
+
+	//switch strings.ToLower(type_) {
+	//case strings.ToLower("DEFAULT"):
+	//	details := oci_disaster_recovery.VerifyDrPlanDefaultDetails{}
+	//
+	//	tmp := s.D.Id()
+	//	request.DrPlanId = &tmp
+	//
+	//	request.VerifyDrPlanDetails = details
+	//
+	//default:
+	//	return fmt.Errorf("unknown type '%v' was specified", type_)
+	//}
+
+	return nil
+}

internal/service/disaster_recovery/disaster_recovery_dr_plan_resource.go

@@ -34,6 +34,10 @@ func DisasterRecoveryDrPlansDataSource() *schema.Resource {
 				Type:     schema.TypeString,
 				Required: true,
 			},
+			"lifecycle_sub_state": {
+				Type:     schema.TypeString,
+				Optional: true,
+			},
 			"state": {
 				Type:     schema.TypeString,
 				Optional: true,
@@ -96,6 +100,10 @@ func (s *DisasterRecoveryDrPlansDataSourceCrud) Get() error {
 		request.DrProtectionGroupId = &tmp
 	}
 
+	if lifecycleSubState, ok := s.D.GetOkExists("lifecycle_sub_state"); ok {
+		request.LifecycleSubState = oci_disaster_recovery.ListDrPlansLifecycleSubStateEnum(lifecycleSubState.(string))
+	}
+
 	if state, ok := s.D.GetOkExists("state"); ok {
 		request.LifecycleState = oci_disaster_recovery.ListDrPlansLifecycleStateEnum(state.(string))
 	}

internal/service/disaster_recovery/disaster_recovery_dr_plans_data_source.go

@@ -39,19 +39,22 @@ The following attributes are exported:
 * `freeform_tags` - Simple key-value pair that is applied without any predefined name, type or scope. Exists for cross-compatibility only.  Example: `{"Department": "Finance"}` 
 * `id` - The OCID of the DR plan.  Example: `ocid1.drplan.oc1..uniqueID` 
 * `life_cycle_details` - A message describing the DR plan's current state in more detail. 
+* `lifecycle_sub_state` - The current state of the DR plan. 
 * `peer_dr_protection_group_id` - The OCID of the peer DR protection group associated with this plan's DR protection group.  Example: `ocid1.drprotectiongroup.oc1..uniqueID` 
 * `peer_region` - The region of the peer DR protection group associated with this plan's DR protection group.  Example: `us-ashburn-1` 
 * `plan_groups` - The list of groups in this DR plan. 
 	* `display_name` - The display name of the group.  Example: `DATABASE_SWITCHOVER` 
 	* `id` - The unique id of the group. Must not be modified by user.  Example: `sgid1.group..uniqueID` 
 	* `is_pause_enabled` - A flag indicating whether this group should be enabled for execution. This flag is only applicable to the `USER_DEFINED_PAUSE` group. The flag should be null for the remaining group types.  Example: `true` 
+	* `refresh_status` - The DR plan group refresh status.  Example: `GROUP_MODIFIED` 
 	* `steps` - The list of steps in the group. 
 		* `display_name` - The display name of the group.  Example: `DATABASE_SWITCHOVER` 
 		* `error_mode` - The error mode for this step. 
 		* `group_id` - The unique id of the group to which this step belongs. Must not be modified by user.  Example: `sgid1.group..uniqueID` 
 		* `id` - The unique id of the step. Must not be modified by the user.  Example: `sgid1.step..uniqueID` 
 		* `is_enabled` - A flag indicating whether this step should be enabled for execution.  Example: `true` 
 		* `member_id` - The OCID of the member associated with this step.  Example: `ocid1.database.oc1..uniqueID` 
+		* `refresh_status` - The DR plan step refresh status.  Example: `STEP_ADDED` 
 		* `timeout` - The timeout in seconds for executing this step.  Example: `600` 
 		* `type` - The plan step type. 
 		* `user_defined_step` - The details for a user-defined step in a DR plan.
@@ -86,6 +89,7 @@ The following attributes are exported:
 
 				**INVOKE_FUNCTION** - A step which invokes an Oracle Cloud Infrastructure function. See https://docs.oracle.com/en-us/iaas/Content/Functions/home.htm. 
 	* `type` - The group type.  Example: `BUILT_IN` 
+* `source_plan_id` - If this is a cloned DR plan, the OCID of the source DR plan that was used to clone this DR plan. If this DR plan was not cloned, then the value for this will be `null`.  Example: `ocid1.drplan.oc1..uniqueID` 
 * `state` - The current state of the DR plan. 
 * `system_tags` - Usage of system tag keys. These predefined keys are scoped to namespaces.  Example: `{"orcl-cloud.free-tier-retained": "true"}` 
 * `time_created` - The date and time the DR plan was created. An RFC3339 formatted datetime string.  Example: `2019-03-29T09:36:42Z`