Added - Support for Rollback Maintenance Cycle Feature

Author: Madhu Pankaj

internal/integrationtest/fleet_software_update_fsu_collection_test.go

@@ -638,6 +638,7 @@ func TestFleetSoftwareUpdateFsuCollectionResource_DB_23ai(t *testing.T) {
 				resource.TestCheckResourceAttr(singularDatasourceName, "compartment_id", compartmentId),
 				resource.TestCheckResourceAttr(singularDatasourceName, "display_name", "TF_TEST_Collection_Updated"),
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "id"),
+				resource.TestCheckResourceAttr(singularDatasourceName, "last_completed_fsu_cycle_id", ""),
 				resource.TestCheckResourceAttr(singularDatasourceName, "service_type", "EXACS"),
 				resource.TestCheckResourceAttr(singularDatasourceName, "source_major_version", "DB_23"),
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "state"),

internal/integrationtest/fleet_software_update_fsu_cycle_test.go

@@ -627,6 +627,7 @@ func TestFleetSoftwareUpdateFsuCycleResource_DB_ImageIdDetails(t *testing.T) {
 				resource.TestCheckResourceAttr(singularDatasourceName, "is_keep_placement", "true"),
 				resource.TestCheckResourceAttr(singularDatasourceName, "max_drain_timeout_in_seconds", "11"),
 				resource.TestCheckResourceAttr(singularDatasourceName, "next_action_to_execute.#", "1"),
+				resource.TestCheckResourceAttr(singularDatasourceName, "rollback_cycle_state", ""),
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "state"),
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "time_created"),
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "time_updated"),

internal/service/fleet_software_update/fleet_software_update_fsu_collection_data_source.go

@@ -102,6 +102,12 @@ func (s *FleetSoftwareUpdateFsuCollectionDataSourceCrud) SetData() error {
 
 		s.D.Set("freeform_tags", v.FreeformTags)
 
+		if v.LastCompletedFsuCycleId != nil {
+			s.D.Set("last_completed_fsu_cycle_id", *v.LastCompletedFsuCycleId)
+		} else {
+			s.D.Set("last_completed_fsu_cycle_id", nil)
+		}
+
 		if v.LifecycleDetails != nil {
 			s.D.Set("lifecycle_details", *v.LifecycleDetails)
 		}
@@ -160,6 +166,10 @@ func (s *FleetSoftwareUpdateFsuCollectionDataSourceCrud) SetData() error {
 
 		s.D.Set("freeform_tags", v.FreeformTags)
 
+		if v.LastCompletedFsuCycleId != nil {
+			s.D.Set("last_completed_fsu_cycle_id", *v.LastCompletedFsuCycleId)
+		}
+
 		if v.LifecycleDetails != nil {
 			s.D.Set("lifecycle_details", *v.LifecycleDetails)
 		}

internal/service/fleet_software_update/fleet_software_update_fsu_collection_resource.go

@@ -262,6 +262,10 @@ func FleetSoftwareUpdateFsuCollectionResource() *schema.Resource {
 					},
 				},
 			},
+			"last_completed_fsu_cycle_id": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"lifecycle_details": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -621,6 +625,10 @@ func (s *FleetSoftwareUpdateFsuCollectionResourceCrud) SetData() error {
 			s.D.Set("id", *v.Id)
 		}
 
+		if v.LastCompletedFsuCycleId != nil {
+			s.D.Set("last_completed_fsu_cycle_id", *v.LastCompletedFsuCycleId)
+		}
+
 		if v.LifecycleDetails != nil {
 			s.D.Set("lifecycle_details", *v.LifecycleDetails)
 		}
@@ -683,6 +691,10 @@ func (s *FleetSoftwareUpdateFsuCollectionResourceCrud) SetData() error {
 			s.D.Set("id", *v.Id)
 		}
 
+		if v.LastCompletedFsuCycleId != nil {
+			s.D.Set("last_completed_fsu_cycle_id", *v.LastCompletedFsuCycleId)
+		}
+
 		if v.LifecycleDetails != nil {
 			s.D.Set("lifecycle_details", *v.LifecycleDetails)
 		}

internal/service/fleet_software_update/fleet_software_update_fsu_cycle_data_source.go

@@ -146,6 +146,10 @@ func (s *FleetSoftwareUpdateFsuCycleDataSourceCrud) SetData() error {
 
 		s.D.Set("last_completed_action", v.LastCompletedAction)
 
+		if v.LastCompletedActionId != nil {
+			s.D.Set("last_completed_action_id", *v.LastCompletedActionId)
+		}
+
 		if v.LifecycleDetails != nil {
 			s.D.Set("lifecycle_details", *v.LifecycleDetails)
 		}
@@ -156,6 +160,8 @@ func (s *FleetSoftwareUpdateFsuCycleDataSourceCrud) SetData() error {
 		}
 		s.D.Set("next_action_to_execute", nextActionToExecute)
 
+		s.D.Set("rollback_cycle_state", v.RollbackCycleState)
+
 		if v.StageActionSchedule != nil {
 			stageActionScheduleArray := []interface{}{}
 			if stageActionScheduleMap := ScheduleDetailsToMap(&v.StageActionSchedule); stageActionScheduleMap != nil {

internal/service/fleet_software_update/fleet_software_update_fsu_cycle_resource.go

@@ -280,6 +280,10 @@ func FleetSoftwareUpdateFsuCycleResource() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"last_completed_action_id": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"lifecycle_details": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -305,6 +309,10 @@ func FleetSoftwareUpdateFsuCycleResource() *schema.Resource {
 					},
 				},
 			},
+			"rollback_cycle_state": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"state": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -698,6 +706,10 @@ func (s *FleetSoftwareUpdateFsuCycleResourceCrud) SetData() error {
 
 		s.D.Set("last_completed_action", v.LastCompletedAction)
 
+		if v.LastCompletedActionId != nil {
+			s.D.Set("last_completed_action_id", *v.LastCompletedActionId)
+		}
+
 		if v.LifecycleDetails != nil {
 			s.D.Set("lifecycle_details", *v.LifecycleDetails)
 		}
@@ -708,6 +720,8 @@ func (s *FleetSoftwareUpdateFsuCycleResourceCrud) SetData() error {
 		}
 		s.D.Set("next_action_to_execute", nextActionToExecute)
 
+		s.D.Set("rollback_cycle_state", v.RollbackCycleState)
+
 		if v.StageActionSchedule != nil {
 			stageActionScheduleArray := []interface{}{}
 			if stageActionScheduleMap := ScheduleDetailsToMap(&v.StageActionSchedule); stageActionScheduleMap != nil {
@@ -994,6 +1008,10 @@ func FsuCycleSummaryToMap(obj oci_fleet_software_update.FsuCycleSummary) map[str
 
 	result["last_completed_action"] = string(obj.LastCompletedAction)
 
+	if obj.LastCompletedActionId != nil {
+		result["last_completed_action_id"] = string(*obj.LastCompletedActionId)
+	}
+
 	if obj.LifecycleDetails != nil {
 		result["lifecycle_details"] = string(*obj.LifecycleDetails)
 	}
@@ -1004,6 +1022,8 @@ func FsuCycleSummaryToMap(obj oci_fleet_software_update.FsuCycleSummary) map[str
 	}
 	result["next_action_to_execute"] = nextActionToExecute
 
+	result["rollback_cycle_state"] = string(obj.RollbackCycleState)
+
 	result["state"] = string(obj.LifecycleState)
 
 	if obj.SystemTags != nil {

website/docs/d/fleet_software_update_fsu_collection.html.markdown

@@ -58,6 +58,7 @@ The following attributes are exported:
 	* `targets` - OCIDs of target resources to include. For EXACC service type Collections only VMClusters are allowed. For EXACS service type Collections only CloudVMClusters are allowed. 
 * `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"}` 
 * `id` - OCID identifier for the Exadata Fleet Update Collection. 
+* `last_completed_fsu_cycle_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of last completed FSU Cycle. 
 * `lifecycle_details` - A message describing the current state in more detail. For example, can be used to provide actionable information for a resource in Failed state. 
 * `service_type` - Exadata service type for the target resource members. 
 * `source_major_version` - Database Major Version of targets to be included in the Exadata Fleet Update Collection. https://docs.oracle.com/en-us/iaas/api/#/en/database/20160918/DbVersionSummary/ListDbVersions Only Database targets that match the version specified in this value would be added to the Exadata Fleet Update Collection. 

website/docs/d/fleet_software_update_fsu_collections.html.markdown

@@ -72,6 +72,7 @@ The following attributes are exported:
 	* `targets` - OCIDs of target resources to include. For EXACC service type Collections only VMClusters are allowed. For EXACS service type Collections only CloudVMClusters are allowed. 
 * `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"}` 
 * `id` - OCID identifier for the Exadata Fleet Update Collection. 
+* `last_completed_fsu_cycle_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of last completed FSU Cycle. 
 * `lifecycle_details` - A message describing the current state in more detail. For example, can be used to provide actionable information for a resource in Failed state. 
 * `service_type` - Exadata service type for the target resource members. 
 * `source_major_version` - Database Major Version of targets to be included in the Exadata Fleet Update Collection. https://docs.oracle.com/en-us/iaas/api/#/en/database/20160918/DbVersionSummary/ListDbVersions Only Database targets that match the version specified in this value would be added to the Exadata Fleet Update Collection. 

website/docs/d/fleet_software_update_fsu_cycle.html.markdown

@@ -61,11 +61,13 @@ The following attributes are exported:
 * `is_ignore_patches` - Ignore all patches between the source and target homes during patching. 
 * `is_keep_placement` - Ensure that services of administrator-managed Oracle RAC or Oracle RAC One databases are running on the same instances before and after the move operation. 
 * `last_completed_action` - The latest Action type that was completed in the Exadata Fleet Update Cycle. No value would indicate that the Cycle has not completed any Action yet. 
+* `last_completed_action_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the latest Action  in the Exadata Fleet Update Cycle. 
 * `lifecycle_details` - A message describing the current state in more detail. For example, can be used to provide actionable information for a resource in Failed state. 
 * `max_drain_timeout_in_seconds` - Service drain timeout specified in seconds. 
 * `next_action_to_execute` - In this array all the possible actions will be listed. The first element is the suggested Action. 
 	* `time_to_start` - The date and time the Exadata Fleet Update Action is expected to start. Null if no Action has been scheduled. [RFC 3339](https://tools.ietf.org/rfc/rfc3339), section 14.29. 
 	* `type` - Type of Exadata Fleet Update Action 
+* `rollback_cycle_state` - Current rollback cycle state if rollback maintenance cycle action has been attempted. No value would indicate that the Cycle has not run a rollback maintenance cycle action before. 
 * `stage_action_schedule` - Scheduling related details for the Exadata Fleet Update Action. The specified time should not conflict with existing Exadata Infrastructure maintenance windows. Null scheduleDetails would execute the Exadata Fleet Update Action as soon as possible. 
 	* `time_to_start` - The date and time the Exadata Fleet Update Action is expected to start. [RFC 3339](https://tools.ietf.org/rfc/rfc3339), section 14.29. 
 	* `type` - Type of scheduling strategy to use for Fleet Patching Update Action execution. 

website/docs/d/fleet_software_update_fsu_cycles.html.markdown

@@ -79,11 +79,13 @@ The following attributes are exported:
 * `is_ignore_patches` - Ignore all patches between the source and target homes during patching. 
 * `is_keep_placement` - Ensure that services of administrator-managed Oracle RAC or Oracle RAC One databases are running on the same instances before and after the move operation. 
 * `last_completed_action` - The latest Action type that was completed in the Exadata Fleet Update Cycle. No value would indicate that the Cycle has not completed any Action yet. 
+* `last_completed_action_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the latest Action  in the Exadata Fleet Update Cycle. 
 * `lifecycle_details` - A message describing the current state in more detail. For example, can be used to provide actionable information for a resource in Failed state. 
 * `max_drain_timeout_in_seconds` - Service drain timeout specified in seconds. 
 * `next_action_to_execute` - In this array all the possible actions will be listed. The first element is the suggested Action. 
 	* `time_to_start` - The date and time the Exadata Fleet Update Action is expected to start. Null if no Action has been scheduled. [RFC 3339](https://tools.ietf.org/rfc/rfc3339), section 14.29. 
 	* `type` - Type of Exadata Fleet Update Action 
+* `rollback_cycle_state` - Current rollback cycle state if rollback maintenance cycle action has been attempted. No value would indicate that the Cycle has not run a rollback maintenance cycle action before. 
 * `stage_action_schedule` - Scheduling related details for the Exadata Fleet Update Action. The specified time should not conflict with existing Exadata Infrastructure maintenance windows. Null scheduleDetails would execute the Exadata Fleet Update Action as soon as possible. 
 	* `time_to_start` - The date and time the Exadata Fleet Update Action is expected to start. [RFC 3339](https://tools.ietf.org/rfc/rfc3339), section 14.29. 
 	* `type` - Type of scheduling strategy to use for Fleet Patching Update Action execution.