Bug Fix: fix dbHome deletion and CEI polling workrequest.

Author: Terraform Team Automation

internal/integrationtest/database_cloud_exadata_infrastructure_test.go

@@ -304,7 +304,7 @@ func TestDatabaseCloudExadataInfrastructureResource_basic(t *testing.T) {
 				resource.TestCheckResourceAttr(datasourceName, "cloud_exadata_infrastructures.0.compartment_id", compartmentId),
 				resource.TestCheckResourceAttr(datasourceName, "cloud_exadata_infrastructures.0.compute_count", "2"),
 				resource.TestCheckResourceAttr(datasourceName, "cloud_exadata_infrastructures.0.customer_contacts.#", "1"),
-				resource.TestCheckResourceAttr(datasourceName, "cloud_exadata_infrastructures.0.defined_file_system_configurations.#", "7"),
+				resource.TestCheckResourceAttr(datasourceName, "cloud_exadata_infrastructures.0.defined_file_system_configurations.#", "9"),
 				//resource.TestCheckResourceAttrSet(datasourceName, "cloud_exadata_infrastructures.0.db_server_version"),
 				resource.TestCheckResourceAttr(datasourceName, "cloud_exadata_infrastructures.0.customer_contacts.0.email", "test2@oracle.com"),
 				resource.TestCheckResourceAttr(datasourceName, "cloud_exadata_infrastructures.0.display_name", "displayName2"),
@@ -348,7 +348,7 @@ func TestDatabaseCloudExadataInfrastructureResource_basic(t *testing.T) {
 				resource.TestCheckResourceAttr(singularDatasourceName, "compartment_id", compartmentId),
 				resource.TestCheckResourceAttr(singularDatasourceName, "compute_count", "2"),
 				resource.TestCheckResourceAttr(singularDatasourceName, "customer_contacts.#", "1"),
-				resource.TestCheckResourceAttr(singularDatasourceName, "defined_file_system_configurations.#", "7"),
+				resource.TestCheckResourceAttr(singularDatasourceName, "defined_file_system_configurations.#", "9"),
 				//resource.TestCheckResourceAttrSet(singularDatasourceName, "db_server_version"),
 				resource.TestCheckResourceAttr(singularDatasourceName, "customer_contacts.0.email", "test2@oracle.com"),
 				resource.TestCheckResourceAttr(singularDatasourceName, "display_name", "displayName2"),

internal/service/database/database_cloud_exadata_infrastructure_resource.go

@@ -340,6 +340,7 @@ func createDatabaseCloudExadataInfrastructure(d *schema.ResourceData, m interfac
 	sync := &DatabaseCloudExadataInfrastructureResourceCrud{}
 	sync.D = d
 	sync.Client = m.(*client.OracleClients).DatabaseClient()
+	sync.WorkRequestClient = m.(*client.OracleClients).WorkRequestClient
 
 	return tfresource.CreateResource(d, sync)
 }
@@ -504,6 +505,20 @@ func (s *DatabaseCloudExadataInfrastructureResourceCrud) Create() error {
 		return err
 	}
 
+	workId := response.OpcWorkRequestId
+	if workId != nil {
+		var identifier *string
+		var err error
+		identifier = response.Id
+		if identifier != nil {
+			s.D.SetId(*identifier)
+		}
+		_, err = tfresource.WaitForWorkRequestWithErrorHandling(s.WorkRequestClient, workId, "cloudExadataInfrastructure", oci_work_requests.WorkRequestResourceActionTypeCreated, s.D.Timeout(schema.TimeoutCreate), s.DisableNotFoundRetries)
+		if err != nil {
+			return err
+		}
+	}
+
 	s.Res = &response.CloudExadataInfrastructure
 	return nil
 }
@@ -607,6 +622,7 @@ func (s *DatabaseCloudExadataInfrastructureResourceCrud) Update() error {
 	retentionPolicyFunc := func() bool {
 		return s.Res.LifecycleState == oci_database.CloudExadataInfrastructureLifecycleStateAvailable
 	}
+	// Cannot poll by workrequest because we do not set affected resources during update. We only set them during scale.
 	if err := tfresource.WaitForResourceCondition(s, retentionPolicyFunc, s.D.Timeout(schema.TimeoutUpdate)); err != nil {
 		return err
 	}
@@ -988,13 +1004,17 @@ func (s *DatabaseCloudExadataInfrastructureResourceCrud) addStorageMVM() error {
 
 	addStorageRequest.RequestMetadata.RetryPolicy = tfresource.GetRetryPolicy(s.DisableNotFoundRetries, "database")
 
-	_, err := s.Client.AddStorageCapacityCloudExadataInfrastructure(context.Background(), addStorageRequest)
+	response, err := s.Client.AddStorageCapacityCloudExadataInfrastructure(context.Background(), addStorageRequest)
 	if err != nil {
 		return err
 	}
 
-	if waitErr := tfresource.WaitForUpdatedState(s.D, s); waitErr != nil {
-		return waitErr
+	workId := response.OpcWorkRequestId
+	if workId != nil {
+		_, err = tfresource.WaitForWorkRequestWithErrorHandling(s.WorkRequestClient, workId, "cloudExadataInfrastructure", oci_work_requests.WorkRequestResourceActionTypeUpdated, s.D.Timeout(schema.TimeoutUpdate), s.DisableNotFoundRetries)
+		if err != nil {
+			return err
+		}
 	}
 
 	return nil

internal/service/database/database_db_home_resource.go

@@ -783,11 +783,6 @@ func (s *DatabaseDbHomeResourceCrud) Delete() error {
 	deleteDbHomeRetryDurationFn := tfresource.GetDbHomeRetryDurationFunction(s.D.Timeout(schema.TimeoutDelete))
 	request.RequestMetadata.RetryPolicy = tfresource.GetRetryPolicy(s.DisableNotFoundRetries, "database", deleteDbHomeRetryDurationFn)
 
-	dbErr := s.deleteNestedDB()
-	if dbErr != nil {
-		log.Printf("[WARN] Could not delete nested database in DbHome. Will proceed to delete dbHome: %v", dbErr)
-	}
-
 	_, err := s.Client.DeleteDbHome(context.Background(), request)
 	if err != nil {
 		return err