Added - Support for FAaaS Self-service refresh scheduling

Author: Terraform Team Automation

examples/fusionapps/FusionEnvironmentRefreshActivity/fusion_environment_refresh_activity.tf

@@ -8,7 +8,7 @@ variable "private_key_path" {}
 variable "region" {}
 
 variable "fusion_environment_refresh_activity_display_name" {
-  default = "displayName"
+  default = "Manual_Execute_Refresh_2022-12-02T03:48:18.932Z"
 }
 
 variable "fusion_environment_refresh_activity_state" {

internal/integrationtest/fusion_apps_fusion_environment_refresh_activity_test.go

@@ -13,9 +13,7 @@ import (
 
 	"github.com/oracle/terraform-provider-oci/httpreplay"
 	"github.com/oracle/terraform-provider-oci/internal/acctest"
-
 	"github.com/oracle/terraform-provider-oci/internal/resourcediscovery"
-
 	"github.com/oracle/terraform-provider-oci/internal/utils"
 )
 
@@ -25,20 +23,11 @@ var (
 
 	FusionAppsFusionAppsFusionEnvironmentRefreshActivitySingularDataSourceRepresentation = map[string]interface{}{
 		"fusion_environment_id": acctest.Representation{RepType: acctest.Required, Create: `${oci_fusion_apps_fusion_environment.test_fusion_environment.id}`},
-		"refresh_activity_id":   acctest.Representation{RepType: acctest.Required, Create: `{}`},
+		"refresh_activity_id":   acctest.Representation{RepType: acctest.Required, Create: `${oci_fusion_apps_fusion_environment_refresh_activity.test_fusion_environment_refresh_activity.id}`},
 	}
 
 	FusionAppsFusionAppsFusionEnvironmentRefreshActivityDataSourceRepresentation = map[string]interface{}{
-		"fusion_environment_id": acctest.Representation{RepType: acctest.Required, Create: `${oci_fusion_apps_fusion_environment.test_fusion_environment.id}`},
-		"display_name":          acctest.Representation{RepType: acctest.Optional, Create: `displayName`},
-		"state":                 acctest.Representation{RepType: acctest.Optional, Create: `ACTIVE`},
-		"time_expected_finish_less_than_or_equal_to":    acctest.Representation{RepType: acctest.Optional, Create: `timeExpectedFinishLessThanOrEqualTo`},
-		"time_scheduled_start_greater_than_or_equal_to": acctest.Representation{RepType: acctest.Optional, Create: `timeScheduledStartGreaterThanOrEqualTo`},
-		"filter": acctest.RepresentationGroup{RepType: acctest.Required, Group: FusionAppsFusionEnvironmentRefreshActivityDataSourceFilterRepresentation}}
-	FusionAppsFusionEnvironmentRefreshActivityDataSourceFilterRepresentation = map[string]interface{}{
-		"name":   acctest.Representation{RepType: acctest.Required, Create: `id`},
-		"values": acctest.Representation{RepType: acctest.Required, Create: []string{`${oci_fusion_apps_fusion_environment_refresh_activity.test_fusion_environment_refresh_activity.id}`}},
-	}
+		"fusion_environment_id": acctest.Representation{RepType: acctest.Required, Create: `${oci_fusion_apps_fusion_environment.test_fusion_environment.id}`}}
 
 	FusionAppsFusionEnvironmentRefreshActivityRepresentation = map[string]interface{}{
 		"fusion_environment_id":        acctest.Representation{RepType: acctest.Required, Create: `${oci_fusion_apps_fusion_environment.test_fusion_environment.id}`},
@@ -79,7 +68,7 @@ func TestFusionAppsFusionEnvironmentRefreshActivityResource_basic(t *testing.T)
 
 				func(s *terraform.State) (err error) {
 					resId, err = acctest.FromInstanceState(s, resourceName, "id")
-					if isEnableExportCompartment, _ := strconv.ParseBool(utils.GetEnvSettingWithDefault("enable_export_compartment", "true")); isEnableExportCompartment {
+					if isEnableExportCompartment, _ := strconv.ParseBool(utils.GetEnvSettingWithDefault("enable_export_compartment", "false")); isEnableExportCompartment {
 						if errExport := resourcediscovery.TestExportCompartmentWithResourceName(&resId, &compartmentId, resourceName); errExport != nil {
 							return errExport
 						}
@@ -96,11 +85,7 @@ func TestFusionAppsFusionEnvironmentRefreshActivityResource_basic(t *testing.T)
 				compartmentIdVariableStr + FusionAppsFusionEnvironmentRefreshActivityResourceDependencies +
 				acctest.GenerateResourceFromRepresentationMap("oci_fusion_apps_fusion_environment_refresh_activity", "test_fusion_environment_refresh_activity", acctest.Optional, acctest.Update, FusionAppsFusionEnvironmentRefreshActivityRepresentation),
 			Check: acctest.ComposeAggregateTestCheckFuncWrapper(
-				resource.TestCheckResourceAttr(datasourceName, "display_name", "displayName"),
 				resource.TestCheckResourceAttrSet(datasourceName, "fusion_environment_id"),
-				resource.TestCheckResourceAttr(datasourceName, "state", "ACTIVE"),
-				resource.TestCheckResourceAttrSet(datasourceName, "time_expected_finish_less_than_or_equal_to"),
-				resource.TestCheckResourceAttrSet(datasourceName, "time_scheduled_start_greater_than_or_equal_to"),
 
 				resource.TestCheckResourceAttr(datasourceName, "refresh_activity_collection.#", "1"),
 				resource.TestCheckResourceAttr(datasourceName, "refresh_activity_collection.0.items.#", "1"),
@@ -117,14 +102,21 @@ func TestFusionAppsFusionEnvironmentRefreshActivityResource_basic(t *testing.T)
 
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "display_name"),
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "id"),
+				// if there's no refresh issue, this field will be null, so commented out this line
+				// resource.TestCheckResourceAttr(singularDatasourceName, "refresh_issue_details_list.#", "1"),
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "service_availability"),
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "state"),
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "time_accepted"),
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "time_expected_finish"),
-				resource.TestCheckResourceAttrSet(singularDatasourceName, "time_finished"),
-				resource.TestCheckResourceAttrSet(singularDatasourceName, "time_of_restoration_point"),
-				resource.TestCheckResourceAttrSet(singularDatasourceName, "time_scheduled_start"),
-				resource.TestCheckResourceAttrSet(singularDatasourceName, "time_updated"),
+				// Refresh resource is a scheduled activity, the create API is to create the activity.
+				// This field will only be set when the actual refresh finished, commented out
+				// resource.TestCheckResourceAttrSet(singularDatasourceName, "time_finished"),
+
+				// This field will only be set when the actual refresh finished, commented out
+				// resource.TestCheckResourceAttrSet(singularDatasourceName, "time_of_restoration_point"),
+
+				// This field will only be set when the actual refresh finished, commented out
+				// resource.TestCheckResourceAttrSet(singularDatasourceName, "time_updated"),
 			),
 		},
 	})

internal/service/fusion_apps/fusion_apps_export.go

@@ -56,7 +56,10 @@ var exportFusionAppsFusionEnvironmentRefreshActivityHints = &tf_export.Terraform
 	ResourceAbbreviation:   "fusion_environment_refresh_activity",
 	RequireResourceRefresh: true,
 	DiscoverableLifecycleStates: []string{
-		string(oci_fusion_apps.DataMaskingActivityLifecycleStateSucceeded),
+		string(oci_fusion_apps.RefreshActivityLifecycleStateAccepted),
+		string(oci_fusion_apps.RefreshActivityLifecycleStateInProgress),
+		string(oci_fusion_apps.RefreshActivityLifecycleStateNeedsAttention),
+		string(oci_fusion_apps.RefreshActivityLifecycleStateSucceeded),
 	},
 }
 
@@ -100,7 +103,7 @@ var exportFusionAppsFusionEnvironmentDataMaskingActivityHints = &tf_export.Terra
 	ResourceAbbreviation:   "fusion_environment_data_masking_activity",
 	RequireResourceRefresh: true,
 	DiscoverableLifecycleStates: []string{
-		string(oci_fusion_apps.RefreshActivityLifecycleStateSucceeded),
+		string(oci_fusion_apps.DataMaskingActivityLifecycleStateSucceeded),
 	},
 }
 

internal/service/fusion_apps/fusion_apps_fusion_environment_refresh_activity_data_source.go

@@ -52,9 +52,12 @@ func (s *FusionAppsFusionEnvironmentRefreshActivityDataSourceCrud) Get() error {
 		request.FusionEnvironmentId = &tmp
 	}
 
+	// the refresh_activity_id is a composite id
 	if refreshActivityId, ok := s.D.GetOkExists("refresh_activity_id"); ok {
-		tmp := refreshActivityId.(string)
-		request.RefreshActivityId = &tmp
+		_, refreshActivityIdString, err := parseFusionEnvironmentRefreshActivityCompositeId(refreshActivityId.(string))
+		if err == nil {
+			request.RefreshActivityId = &refreshActivityIdString
+		}
 	}
 
 	request.RequestMetadata.RetryPolicy = tfresource.GetRetryPolicy(false, "fusion_apps")
@@ -81,6 +84,12 @@ func (s *FusionAppsFusionEnvironmentRefreshActivityDataSourceCrud) SetData() err
 
 	s.D.Set("lifecycle_details", s.Res.LifecycleDetails)
 
+	refreshIssueDetailsList := []interface{}{}
+	for _, item := range s.Res.RefreshIssueDetailsList {
+		refreshIssueDetailsList = append(refreshIssueDetailsList, RefreshIssueDetailsToMap(item))
+	}
+	s.D.Set("refresh_issue_details_list", refreshIssueDetailsList)
+
 	s.D.Set("service_availability", s.Res.ServiceAvailability)
 
 	if s.Res.SourceFusionEnvironmentId != nil {
@@ -105,10 +114,6 @@ func (s *FusionAppsFusionEnvironmentRefreshActivityDataSourceCrud) SetData() err
 		s.D.Set("time_of_restoration_point", s.Res.TimeOfRestorationPoint.String())
 	}
 
-	if s.Res.TimeScheduledStart != nil {
-		s.D.Set("time_scheduled_start", s.Res.TimeScheduledStart.String())
-	}
-
 	if s.Res.TimeUpdated != nil {
 		s.D.Set("time_updated", s.Res.TimeUpdated.String())
 	}

internal/service/fusion_apps/fusion_apps_fusion_environment_refresh_activity_resource.go

@@ -27,10 +27,12 @@ func FusionAppsFusionEnvironmentRefreshActivityResource() *schema.Resource {
 		Importer: &schema.ResourceImporter{
 			State: schema.ImportStatePassthrough,
 		},
-		Timeouts: tfresource.DefaultTimeout,
-		Create:   createFusionAppsFusionEnvironmentRefreshActivity,
-		Read:     readFusionAppsFusionEnvironmentRefreshActivity,
-		Delete:   deleteFusionAppsFusionEnvironmentRefreshActivity,
+		Timeouts: &schema.ResourceTimeout{
+			Create: tfresource.GetTimeoutDuration("12h"),
+		},
+		Create: createFusionAppsFusionEnvironmentRefreshActivity,
+		Read:   readFusionAppsFusionEnvironmentRefreshActivity,
+		Delete: deleteFusionAppsFusionEnvironmentRefreshActivity,
 		Schema: map[string]*schema.Schema{
 			// Required
 			"fusion_environment_id": {
@@ -44,9 +46,11 @@ func FusionAppsFusionEnvironmentRefreshActivityResource() *schema.Resource {
 				ForceNew: true,
 			},
 
-			// Optional
-
 			// Computed
+			"refresh_activity_id": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"display_name": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -55,6 +59,23 @@ func FusionAppsFusionEnvironmentRefreshActivityResource() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"refresh_issue_details_list": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						// Required
+
+						// Optional
+
+						// Computed
+						"refresh_issues": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+					},
+				},
+			},
 			"service_availability": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -79,10 +100,6 @@ func FusionAppsFusionEnvironmentRefreshActivityResource() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
-			"time_scheduled_start": {
-				Type:     schema.TypeString,
-				Computed: true,
-			},
 			"time_updated": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -119,7 +136,7 @@ type FusionAppsFusionEnvironmentRefreshActivityResourceCrud struct {
 }
 
 func (s *FusionAppsFusionEnvironmentRefreshActivityResourceCrud) ID() string {
-	return GetFusionEnvironmentRefreshActivityCompositeId(s.D.Get("fusion_environment_id").(string), s.D.Get("refresh_activity_id").(string))
+	return GetFusionEnvironmentRefreshActivityCompositeId(s.D.Get("fusion_environment_id").(string), *(s.Res).Id)
 }
 
 func (s *FusionAppsFusionEnvironmentRefreshActivityResourceCrud) CreatedPending() []string {
@@ -130,6 +147,7 @@ func (s *FusionAppsFusionEnvironmentRefreshActivityResourceCrud) CreatedPending(
 
 func (s *FusionAppsFusionEnvironmentRefreshActivityResourceCrud) CreatedTarget() []string {
 	return []string{
+		string(oci_fusion_apps.RefreshActivityLifecycleStateNeedsAttention),
 		string(oci_fusion_apps.RefreshActivityLifecycleStateSucceeded),
 	}
 }
@@ -169,14 +187,16 @@ func (s *FusionAppsFusionEnvironmentRefreshActivityResourceCrud) Create() error
 func (s *FusionAppsFusionEnvironmentRefreshActivityResourceCrud) getFusionEnvironmentRefreshActivityFromWorkRequest(workId *string, retryPolicy *oci_common.RetryPolicy,
 	actionTypeEnum oci_fusion_apps.WorkRequestResourceActionTypeEnum, timeout time.Duration) error {
 
-	// Wait until it finishes
-	fusionEnvironmentRefreshActivityId, err := fusionEnvironmentRefreshActivityWaitForWorkRequest(workId, "fusion_apps",
+	// We don't wait for the actual refresh complete,
+	// the work request will track the actual refresh instead of the refresh resource creation
+	// As long as the work request is returned, that means the refresh resource is created
+	fusionEnvironmentRefreshActivityId, err := fusionEnvironmentRefreshActivityWaitForWorkRequest(workId, "refreshactivity",
 		actionTypeEnum, timeout, s.DisableNotFoundRetries, s.Client)
 
 	if err != nil {
 		return err
 	}
-	s.D.SetId(*fusionEnvironmentRefreshActivityId)
+	s.D.Set("refresh_activity_id", fusionEnvironmentRefreshActivityId)
 
 	return s.Get()
 }
@@ -196,9 +216,10 @@ func fusionEnvironmentRefreshActivityWorkRequestShouldRetryFunc(timeout time.Dur
 			return true
 		}
 
-		// Only stop if the time Finished is set
+		// This work request will track the actual refresh, for creation,
+		//when the work request is accepted then the refresh creation is succeeded
 		if workRequestResponse, ok := response.Response.(oci_fusion_apps.GetWorkRequestResponse); ok {
-			return workRequestResponse.TimeFinished == nil
+			return workRequestResponse.TimeAccepted == nil
 		}
 		return false
 	}
@@ -212,11 +233,14 @@ func fusionEnvironmentRefreshActivityWaitForWorkRequest(wId *string, entityType
 	response := oci_fusion_apps.GetWorkRequestResponse{}
 	stateConf := &resource.StateChangeConf{
 		Pending: []string{
-			string(oci_fusion_apps.WorkRequestStatusInProgress),
-			string(oci_fusion_apps.WorkRequestStatusAccepted),
 			string(oci_fusion_apps.WorkRequestStatusCanceling),
 		},
+		// We don't wait for the actual refresh complete,
+		// the work request will track the actual refresh instead of the refresh resource creation
+		// As long as the work request is returned, that means the refresh resource is created
 		Target: []string{
+			string(oci_fusion_apps.WorkRequestStatusInProgress),
+			string(oci_fusion_apps.WorkRequestStatusAccepted),
 			string(oci_fusion_apps.WorkRequestStatusSucceeded),
 			string(oci_fusion_apps.WorkRequestStatusFailed),
 			string(oci_fusion_apps.WorkRequestStatusCanceled),
@@ -243,10 +267,8 @@ func fusionEnvironmentRefreshActivityWaitForWorkRequest(wId *string, entityType
 	// The work request response contains an array of objects that finished the operation
 	for _, res := range response.Resources {
 		if strings.Contains(strings.ToLower(*res.EntityType), entityType) {
-			if res.ActionType == action {
-				identifier = res.Identifier
-				break
-			}
+			identifier = res.Identifier
+			break
 		}
 	}
 
@@ -329,6 +351,12 @@ func (s *FusionAppsFusionEnvironmentRefreshActivityResourceCrud) SetData() error
 
 	s.D.Set("lifecycle_details", s.Res.LifecycleDetails)
 
+	refreshIssueDetailsList := []interface{}{}
+	for _, item := range s.Res.RefreshIssueDetailsList {
+		refreshIssueDetailsList = append(refreshIssueDetailsList, RefreshIssueDetailsToMap(item))
+	}
+	s.D.Set("refresh_issue_details_list", refreshIssueDetailsList)
+
 	s.D.Set("service_availability", s.Res.ServiceAvailability)
 
 	if s.Res.SourceFusionEnvironmentId != nil {
@@ -353,10 +381,6 @@ func (s *FusionAppsFusionEnvironmentRefreshActivityResourceCrud) SetData() error
 		s.D.Set("time_of_restoration_point", s.Res.TimeOfRestorationPoint.String())
 	}
 
-	if s.Res.TimeScheduledStart != nil {
-		s.D.Set("time_scheduled_start", s.Res.TimeScheduledStart.String())
-	}
-
 	if s.Res.TimeUpdated != nil {
 		s.D.Set("time_updated", s.Res.TimeUpdated.String())
 	}
@@ -397,6 +421,12 @@ func RefreshActivitySummaryToMap(obj oci_fusion_apps.RefreshActivitySummary) map
 
 	result["lifecycle_details"] = string(obj.LifecycleDetails)
 
+	refreshIssueDetailsList := []interface{}{}
+	for _, item := range obj.RefreshIssueDetailsList {
+		refreshIssueDetailsList = append(refreshIssueDetailsList, RefreshIssueDetailsToMap(item))
+	}
+	result["refresh_issue_details_list"] = refreshIssueDetailsList
+
 	result["service_availability"] = string(obj.ServiceAvailability)
 
 	if obj.SourceFusionEnvironmentId != nil {
@@ -421,13 +451,19 @@ func RefreshActivitySummaryToMap(obj oci_fusion_apps.RefreshActivitySummary) map
 		result["time_of_restoration_point"] = obj.TimeOfRestorationPoint.String()
 	}
 
-	if obj.TimeScheduledStart != nil {
-		result["time_scheduled_start"] = obj.TimeScheduledStart.String()
-	}
-
 	if obj.TimeUpdated != nil {
 		result["time_updated"] = obj.TimeUpdated.String()
 	}
 
 	return result
 }
+
+func RefreshIssueDetailsToMap(obj oci_fusion_apps.RefreshIssueDetails) map[string]interface{} {
+	result := map[string]interface{}{}
+
+	if obj.RefreshIssues != nil {
+		result["refresh_issues"] = string(*obj.RefreshIssues)
+	}
+
+	return result
+}

website/docs/d/fusion_apps_fusion_environment_refresh_activities.html.markdown

@@ -52,6 +52,8 @@ The following attributes are exported:
 * `display_name` - A friendly name for the refresh activity. Can be changed later.
 * `id` - The unique identifier (OCID) of the refresh activity. Can't be changed after creation.
 * `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.
+* `refresh_issue_details_list` - Details of refresh investigation information, each item represents a different issue.
+	* `refresh_issues` - Detail reasons of refresh failure or validation failure that needs to be shown to customer.
 * `service_availability` - Service availability / impact during refresh activity execution up down
 * `source_fusion_environment_id` - The OCID of the Fusion environment that is the source environment for the refresh.
 * `state` - The current state of the refreshActivity.

website/docs/d/fusion_apps_fusion_environment_refresh_activity.html.markdown

@@ -37,6 +37,8 @@ The following attributes are exported:
 * `display_name` - A friendly name for the refresh activity. Can be changed later.
 * `id` - The unique identifier (OCID) of the refresh activity. Can't be changed after creation.
 * `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.
+* `refresh_issue_details_list` - Details of refresh investigation information, each item represents a different issue.
+	* `refresh_issues` - Detail reasons of refresh failure or validation failure that needs to be shown to customer.
 * `service_availability` - Service availability / impact during refresh activity execution up down
 * `source_fusion_environment_id` - The OCID of the Fusion environment that is the source environment for the refresh.
 * `state` - The current state of the refreshActivity.

website/docs/r/fusion_apps_fusion_environment_refresh_activity.html.markdown

@@ -28,7 +28,7 @@ resource "oci_fusion_apps_fusion_environment_refresh_activity" "test_fusion_envi
 The following arguments are supported:
 
 * `fusion_environment_id` - (Required) unique FusionEnvironment identifier
-* `source_fusion_environment_id` - (Required) The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the source environment 
+* `source_fusion_environment_id` - (Required) The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the source environment
 
 
 ** IMPORTANT **
@@ -41,6 +41,8 @@ The following attributes are exported:
 * `display_name` - A friendly name for the refresh activity. Can be changed later.
 * `id` - The unique identifier (OCID) of the refresh activity. Can't be changed after creation.
 * `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.
+* `refresh_issue_details_list` - Details of refresh investigation information, each item represents a different issue.
+	* `refresh_issues` - Detail reasons of refresh failure or validation failure that needs to be shown to customer.
 * `service_availability` - Service availability / impact during refresh activity execution up down
 * `source_fusion_environment_id` - The OCID of the Fusion environment that is the source environment for the refresh.
 * `state` - The current state of the refreshActivity.