Bug Fix - Database Migration changed WF Retry logic

Author: Terraform Team Automation

examples/databasemigration/migration_oracle/migration_oracle.tf

@@ -111,7 +111,6 @@ provider "oci" {
   private_key_path = var.private_key_path
   auth             = "SecurityToken"
   region           = var.region
-
 }
 
 
@@ -150,6 +149,7 @@ resource "oci_database_migration_connection" "test_connection_autonomous_target"
   username = "ggfe"
   replication_password="replicationPassword"
   replication_username="replicationUsername"
+  subnet_id = var.subnet_id
 }
 
 resource "oci_database_migration_connection" "test_connection_pdb_source" {

examples/databasemigration/migration_oracle/migration_oracle_rds.tf

@@ -35,6 +35,7 @@ resource "oci_database_migration_connection" "test_connection_rds_target" {
   username = "ggfe"
   replication_password="replicationPassword"
   replication_username="replicationUsername"
+  subnet_id = var.subnet_id
 }
 
 resource "oci_database_migration_migration" "test_oracle_rds_migration" {
@@ -58,8 +59,6 @@ resource "oci_database_migration_migration" "test_oracle_rds_migration" {
     job_mode = "SCHEMA"
     export_directory_object {
       name = "name"
-      path = "/test/test/test/dumpdir"
-
     }
     data_pump_parameters {
       estimate = "BLOCKS"

internal/integrationtest/database_migration_migration_test.go

@@ -90,8 +90,8 @@ var (
 		"value":     acctest.Representation{RepType: acctest.Required, Create: `True`, Update: `5000`},
 	}
 	DatabaseMigrationMigrationAdvisorSettingsRepresentation = map[string]interface{}{
-		"is_ignore_errors": acctest.Representation{RepType: acctest.Optional, Create: `false`, Update: `true`},
-		"is_skip_advisor":  acctest.Representation{RepType: acctest.Optional, Create: `false`, Update: `true`},
+		"is_ignore_errors": acctest.Representation{RepType: acctest.Optional, Update: `true`},
+		"is_skip_advisor":  acctest.Representation{RepType: acctest.Optional, Update: `true`},
 	}
 	DatabaseMigrationMigrationDataTransferMediumDetailsRepresentation = map[string]interface{}{
 		"type":                  acctest.Representation{RepType: acctest.Required, Create: `OBJECT_STORAGE`, Update: `OBJECT_STORAGE`},

internal/service/database_migration/database_migration_connection_resource.go

@@ -399,10 +399,10 @@ func connectionWorkRequestShouldRetryFunc(timeout time.Duration) func(response o
 			return true
 		}
 
-		// Only stop if the time Finished is set
-		/*if workRequestResponse, ok := response.Response.(oci_database_migration.GetWorkRequestResponse); ok {
-			return workRequestResponse.TimeFinished == nil
-		}*/
+		// Only stop if status of work request response is succeeded
+		if workRequestResponse, ok := response.Response.(oci_database_migration.GetWorkRequestResponse); ok {
+			return workRequestResponse.Status != oci_database_migration.OperationStatusSucceeded
+		}
 		return false
 	}
 }

internal/service/database_migration/database_migration_migration_resource.go

@@ -1001,10 +1001,10 @@ func migrationWorkRequestShouldRetryFunc(timeout time.Duration) func(response oc
 			return true
 		}
 
-		// Only stop if the time Finished is set
-		/*	if workRequestResponse, ok := response.Response.(oci_database_migration.GetWorkRequestResponse); ok {
-			return workRequestResponse.TimeFinished == nil
-		}*/
+		// Only stop if status of work request response is succeeded
+		if workRequestResponse, ok := response.Response.(oci_database_migration.GetWorkRequestResponse); ok {
+			return workRequestResponse.Status != oci_database_migration.OperationStatusSucceeded
+		}
 
 		return false
 	}
@@ -2829,10 +2829,13 @@ func MySqlAdvisorSettingsToMap(obj *oci_database_migration.MySqlAdvisorSettings)
 
 	if obj.IsIgnoreErrors != nil {
 		result["is_ignore_errors"] = bool(*obj.IsIgnoreErrors)
+	} else {
+		result["is_ignore_errors"] = false
 	}
-
 	if obj.IsSkipAdvisor != nil {
 		result["is_skip_advisor"] = bool(*obj.IsSkipAdvisor)
+	} else {
+		result["is_skip_advisor"] = false
 	}
 
 	return result
@@ -3098,10 +3101,14 @@ func OracleAdvisorSettingsToMap(obj *oci_database_migration.OracleAdvisorSetting
 
 	if obj.IsIgnoreErrors != nil {
 		result["is_ignore_errors"] = bool(*obj.IsIgnoreErrors)
+	} else {
+		result["is_ignore_errors"] = false
 	}
 
 	if obj.IsSkipAdvisor != nil {
 		result["is_skip_advisor"] = bool(*obj.IsSkipAdvisor)
+	} else {
+		result["is_skip_advisor"] = false
 	}
 
 	return result