Added - Changes on test and resource files for DMS Validation and Migration error cause and resolution. Reviewer comments addressed.

Author: Terraform Team Automation

examples/databasemigration/job/issue_action.tf

@@ -0,0 +1,5 @@
+variable "job_ocid" {}
+
+data "oci_database_migration_job" "test_job" {
+  job_id = var.job_ocid
+}

internal/integrationtest/database_migration_job_test.go

@@ -6,13 +6,11 @@ package integrationtest
 import (
 	"context"
 	"fmt"
-	"strconv"
 	"testing"
 	"time"
 
 	"github.com/oracle/terraform-provider-oci/internal/acctest"
 	tf_client "github.com/oracle/terraform-provider-oci/internal/client"
-	"github.com/oracle/terraform-provider-oci/internal/resourcediscovery"
 	"github.com/oracle/terraform-provider-oci/internal/tfresource"
 	"github.com/oracle/terraform-provider-oci/internal/utils"
 
@@ -26,169 +24,42 @@ import (
 )
 
 var (
-	DatabaseMigrationJobRequiredOnlyResource = DatabaseMigrationJobResourceDependencies +
-		acctest.GenerateResourceFromRepresentationMap("oci_database_migration_job", "test_job", acctest.Required, acctest.Create, jobRepresentation)
-
-	DatabaseMigrationJobResourceConfig = //DatabaseMigrationJobResourceDependencies +
-	acctest.GenerateResourceFromRepresentationMap("oci_database_migration_job", "test_job", acctest.Optional, acctest.Update, jobRepresentation2)
-
 	DatabaseMigrationjobSingularDataSourceRepresentation = map[string]interface{}{
-		"job_id": acctest.Representation{RepType: acctest.Required, Create: `${oci_database_migration_job.test_job.id}`},
-	}
-
-	DatabaseMigrationjobDataSourceRepresentation = map[string]interface{}{
-		"migration_id": acctest.Representation{RepType: acctest.Required, Create: `${oci_database_migration_migration.test_migration.id}`},
-		"display_name": acctest.Representation{RepType: acctest.Optional, Create: `TF_displayName`, Update: `TF_displayName2`},
-		"state":        acctest.Representation{RepType: acctest.Optional, Create: `Succeeded`},
-		"filter":       acctest.RepresentationGroup{RepType: acctest.Required, Group: jobDataSourceFilterRepresentation}}
-	jobDataSourceFilterRepresentation = map[string]interface{}{
-		"name":   acctest.Representation{RepType: acctest.Required, Create: `TF_id`},
-		"values": acctest.Representation{RepType: acctest.Required, Create: []string{`${oci_database_migration_job.test_job.id}`}},
+		"job_id": acctest.Representation{RepType: acctest.Required, Create: `${var.oci_job_id}`},
 	}
 
 	jobRepresentation = map[string]interface{}{
-		"job_id":       acctest.Representation{RepType: acctest.Required, Create: `${oci_database_migration_job.test_job.id}`},
-		"display_name": acctest.Representation{RepType: acctest.Optional, Create: `TF_displayName`, Update: `TF_displayName2`},
+		"job_id": acctest.Representation{RepType: acctest.Required, Create: `${var.oci_job_id}`},
 	}
-
-	jobRepresentation2 = map[string]interface{}{
-		"job_id":       acctest.Representation{RepType: acctest.Required, Create: `${oci_database_migration_job.test_job.id}`},
-		"display_name": acctest.Representation{RepType: acctest.Optional, Create: `TF_displayName`, Update: `TF_displayName2`},
-	}
-
-	DatabaseMigrationJobResourceDependencies = acctest.GenerateResourceFromRepresentationMap("oci_apigateway_deployment", "test_deployment", acctest.Required, acctest.Create, ApigatewayDeploymentRepresentation) +
-		acctest.GenerateResourceFromRepresentationMap("oci_apigateway_gateway", "test_gateway", acctest.Required, acctest.Create, ApigatewayRepresentation) +
-		acctest.GenerateResourceFromRepresentationMap("oci_core_subnet", "test_subnet", acctest.Required, acctest.Create, CoreSubnetRepresentation) +
-		acctest.GenerateResourceFromRepresentationMap("oci_core_vcn", "test_vcn", acctest.Required, acctest.Create, CoreVcnRepresentation) +
-		acctest.GenerateResourceFromRepresentationMap("oci_database_migration_connection", "test_connection", acctest.Required, acctest.Create, connectionRepresentationCon) +
-		acctest.GenerateResourceFromRepresentationMap("oci_database_migration_job", "test_job", acctest.Required, acctest.Create, jobRepresentation) +
-		acctest.GenerateResourceFromRepresentationMap("oci_database_migration_migration", "test_migration", acctest.Required, acctest.Create, migrationRepresentation) +
-		acctest.GenerateResourceFromRepresentationMap("oci_functions_application", "test_application", acctest.Required, acctest.Create, FunctionsApplicationRepresentation) +
-		acctest.GenerateResourceFromRepresentationMap("oci_functions_function", "test_function", acctest.Required, acctest.Create, FunctionsFunctionRepresentation) +
-		DefinedTagsDependencies +
-		KeyResourceDependencyConfig +
-		acctest.GenerateResourceFromRepresentationMap("oci_kms_vault", "test_vault", acctest.Required, acctest.Create, KmsVaultRepresentation) +
-		acctest.GenerateResourceFromRepresentationMap("oci_objectstorage_bucket", "test_bucket", acctest.Required, acctest.Create, ObjectStorageBucketRepresentation) +
-		acctest.GenerateDataSourceFromRepresentationMap("oci_objectstorage_namespace", "test_namespace", acctest.Required, acctest.Create, ObjectStorageObjectStorageNamespaceSingularDataSourceRepresentation)
 )
 
 // issue-routing-tag: database_migration/default
 func TestDatabaseMigrationJobResource_basic(t *testing.T) {
-	t.Skip("Skip this job creation is an independent operation after validating the migration")
 	httpreplay.SetScenario("TestDatabaseMigrationJobResource_basic")
 	defer httpreplay.SaveScenario()
 
 	config := acctest.ProviderTestConfig()
 
-	compartmentId := utils.GetEnvSettingWithBlankDefault("compartment_ocid")
-	compartmentIdVariableStr := fmt.Sprintf("variable \"compartment_id\" { default = \"%s\" }\n", compartmentId)
+	jobId := utils.GetEnvSettingWithBlankDefault("job_ocid")
+	jobIdVariableStr := fmt.Sprintf("variable \"oci_job_id\" { default = \"%s\" }\n", jobId)
 
-	resourceName := "oci_database_migration_job.test_job"
-	datasourceName := "data.oci_database_migration_jobs.test_jobs"
 	singularDatasourceName := "data.oci_database_migration_job.test_job"
 
-	var resId, resId2 string
-	// Save TF content to Create resource with optional properties. This has to be exactly the same as the config part in the "Create with optionals" step in the test.
-	acctest.SaveConfigContent(config+compartmentIdVariableStr+
-		acctest.GenerateResourceFromRepresentationMap("oci_database_migration_job", "test_job", acctest.Optional, acctest.Create, jobRepresentation), "databasemigration", "job", t)
-
 	acctest.ResourceTest(t, testAccCheckDatabaseMigrationJobDestroy, []resource.TestStep{
-		// verify Create
-		{
-			Config: config + compartmentIdVariableStr +
-				acctest.GenerateResourceFromRepresentationMap("oci_database_migration_job", "test_job", acctest.Required, acctest.Create, jobRepresentation),
-			Check: acctest.ComposeAggregateTestCheckFuncWrapper(
-				resource.TestCheckResourceAttrSet(resourceName, "job_id"),
-
-				func(s *terraform.State) (err error) {
-					resId, err = acctest.FromInstanceState(s, resourceName, "job_id")
-					return err
-				},
-			),
-		},
-
-		// delete before next Create
-		{
-			Config: config + compartmentIdVariableStr,
-		},
-		// verify Create with optionals
-		{
-			Config: config + compartmentIdVariableStr +
-				acctest.GenerateResourceFromRepresentationMap("oci_database_migration_job", "test_job", acctest.Optional, acctest.Create, jobRepresentation2),
-			Check: acctest.ComposeAggregateTestCheckFuncWrapper(
-				resource.TestCheckResourceAttr(resourceName, "display_name", "TF_displayName"),
-				resource.TestCheckResourceAttrSet(resourceName, "job_id"),
-				resource.TestCheckResourceAttrSet(resourceName, "migration_id"),
-				resource.TestCheckResourceAttrSet(resourceName, "state"),
-				resource.TestCheckResourceAttrSet(resourceName, "time_created"),
-				resource.TestCheckResourceAttrSet(resourceName, "type"),
-				func(s *terraform.State) (err error) {
-					resId, err = acctest.FromInstanceState(s, resourceName, "job_id")
-					if isEnableExportCompartment, _ := strconv.ParseBool(utils.GetEnvSettingWithDefault("enable_export_compartment", "true")); isEnableExportCompartment {
-						if errExport := resourcediscovery.TestExportCompartmentWithResourceName(&resId, &compartmentId, resourceName); errExport != nil {
-							return errExport
-						}
-					}
-					return err
-				},
-			),
-		},
-
-		// verify updates to updatable parameters
-		{
-			Config: config + compartmentIdVariableStr +
-				acctest.GenerateResourceFromRepresentationMap("oci_database_migration_job", "test_job", acctest.Optional, acctest.Update, jobRepresentation2),
-			Check: acctest.ComposeAggregateTestCheckFuncWrapper(
-				resource.TestCheckResourceAttr(resourceName, "display_name", "TF_displayName2"),
-				resource.TestCheckResourceAttrSet(resourceName, "job_id"),
-				resource.TestCheckResourceAttrSet(resourceName, "migration_id"),
-				resource.TestCheckResourceAttrSet(resourceName, "state"),
-				resource.TestCheckResourceAttrSet(resourceName, "time_created"),
-				resource.TestCheckResourceAttrSet(resourceName, "type"),
-				func(s *terraform.State) (err error) {
-					resId2, err = acctest.FromInstanceState(s, resourceName, "job_id")
-					if resId != resId2 {
-						return fmt.Errorf("Resource recreated when it was supposed to be updated.")
-					}
-					return err
-				},
-			),
-		},
-		// verify datasource
-		{
-			Config: config +
-				acctest.GenerateDataSourceFromRepresentationMap("oci_database_migration_jobs", "test_jobs", acctest.Optional, acctest.Update, DatabaseMigrationjobDataSourceRepresentation) +
-				compartmentIdVariableStr + //DatabaseMigrationJobResourceDependencies +
-				acctest.GenerateResourceFromRepresentationMap("oci_database_migration_job", "test_job", acctest.Optional, acctest.Update, jobRepresentation2),
-			Check: acctest.ComposeAggregateTestCheckFuncWrapper(
-				resource.TestCheckResourceAttr(datasourceName, "display_name", "TF_displayName2"),
-				resource.TestCheckResourceAttr(datasourceName, "state", "Succeeded"),
-				resource.TestCheckResourceAttr(datasourceName, "job_collection.#", "1"),
-				resource.TestCheckResourceAttr(datasourceName, "job_collection.0.items.#", "0"),
-			),
-		},
 		// verify singular datasource
 		{
-			Config: config +
-				acctest.GenerateDataSourceFromRepresentationMap("oci_database_migration_job", "test_job", acctest.Required, acctest.Create, DatabaseMigrationjobSingularDataSourceRepresentation) +
-				compartmentIdVariableStr + DatabaseMigrationJobResourceConfig,
+			Config: config + jobIdVariableStr +
+				acctest.GenerateDataSourceFromRepresentationMap("oci_database_migration_job", "test_job", acctest.Required, acctest.Create, DatabaseMigrationjobSingularDataSourceRepresentation),
 			Check: acctest.ComposeAggregateTestCheckFuncWrapper(
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "job_id"),
-				resource.TestCheckResourceAttr(singularDatasourceName, "display_name", "TF_displayName2"),
-				resource.TestCheckResourceAttrSet(singularDatasourceName, "state"),
-				resource.TestCheckResourceAttrSet(singularDatasourceName, "time_created"),
-				resource.TestCheckResourceAttrSet(singularDatasourceName, "time_updated"),
-				resource.TestCheckResourceAttrSet(singularDatasourceName, "type"),
+				resource.TestCheckResourceAttr(singularDatasourceName, "progress.0.phases.0.status", "COMPLETED"),
+				resource.TestCheckResourceAttr(singularDatasourceName, "progress.0.phases.0.issue", ""),
+				resource.TestCheckResourceAttr(singularDatasourceName, "progress.0.phases.0.action", ""),
+				resource.TestCheckResourceAttr(singularDatasourceName, "progress.0.phases.1.status", "FAILED"),
+				resource.TestCheckResourceAttrSet(singularDatasourceName, "progress.0.phases.1.issue"),
+				resource.TestCheckResourceAttrSet(singularDatasourceName, "progress.0.phases.1.action"),
 			),
 		},
-		// verify resource import
-		{
-			Config:                  config + DatabaseMigrationJobRequiredOnlyResource,
-			ImportState:             true,
-			ImportStateVerify:       false,
-			ImportStateVerifyIgnore: []string{},
-			ResourceName:            resourceName,
-		},
 	})
 }
 
@@ -209,7 +80,8 @@ func testAccCheckDatabaseMigrationJobDestroy(s *terraform.State) error {
 
 			if err == nil {
 				deletedLifecycleStates := map[string]bool{
-					string(oci_database_migration.JobLifecycleStatesTerminated): true,
+					// Because of the nature of this test, the Job is expected to finish in a Failed State
+					string(oci_database_migration.JobLifecycleStatesFailed): true,
 				}
 				if _, ok := deletedLifecycleStates[string(response.LifecycleState)]; !ok {
 					//resource lifecycle state is not in expected deleted lifecycle states.

internal/service/database_migration/database_migration_connection_data_source.go

@@ -110,6 +110,8 @@ func (s *DatabaseMigrationConnectionDataSourceCrud) SetData() error {
 		s.D.Set("lifecycle_details", *s.Res.LifecycleDetails)
 	}
 
+	s.D.Set("nsg_ids", s.Res.NsgIds)
+
 	if s.Res.PrivateEndpoint != nil {
 		s.D.Set("private_endpoint", []interface{}{PrivateEndpointDetailsToMap(s.Res.PrivateEndpoint)})
 	} else {

internal/service/database_migration/database_migration_connection_resource.go

@@ -162,6 +162,15 @@ func DatabaseMigrationConnectionResource() *schema.Resource {
 				Computed: true,
 				Elem:     schema.TypeString,
 			},
+			"nsg_ids": {
+				Type:     schema.TypeSet,
+				Optional: true,
+				Computed: true,
+				Set:      tfresource.LiteralTypeHashCodeForSets,
+				Elem: &schema.Schema{
+					Type: schema.TypeString,
+				},
+			},
 			"private_endpoint": {
 				Type:     schema.TypeList,
 				Optional: true,
@@ -397,6 +406,20 @@ func (s *DatabaseMigrationConnectionResourceCrud) Create() error {
 		request.FreeformTags = tfresource.ObjectMapToStringMap(freeformTags.(map[string]interface{}))
 	}
 
+	if nsgIds, ok := s.D.GetOkExists("nsg_ids"); ok {
+		set := nsgIds.(*schema.Set)
+		interfaces := set.List()
+		tmp := make([]string, len(interfaces))
+		for i := range interfaces {
+			if interfaces[i] != nil {
+				tmp[i] = interfaces[i].(string)
+			}
+		}
+		if len(tmp) != 0 || s.D.HasChange("nsg_ids") {
+			request.NsgIds = tmp
+		}
+	}
+
 	if privateEndpoint, ok := s.D.GetOkExists("private_endpoint"); ok {
 		if tmpList := privateEndpoint.([]interface{}); len(tmpList) > 0 {
 			fieldKeyFormat := fmt.Sprintf("%s.%d.%%s", "private_endpoint", 0)
@@ -648,6 +671,20 @@ func (s *DatabaseMigrationConnectionResourceCrud) Update() error {
 		request.FreeformTags = tfresource.ObjectMapToStringMap(freeformTags.(map[string]interface{}))
 	}
 
+	if nsgIds, ok := s.D.GetOkExists("nsg_ids"); ok {
+		set := nsgIds.(*schema.Set)
+		interfaces := set.List()
+		tmp := make([]string, len(interfaces))
+		for i := range interfaces {
+			if interfaces[i] != nil {
+				tmp[i] = interfaces[i].(string)
+			}
+		}
+		if len(tmp) != 0 || s.D.HasChange("nsg_ids") {
+			request.NsgIds = tmp
+		}
+	}
+
 	if privateEndpoint, ok := s.D.GetOkExists("private_endpoint"); ok {
 		if tmpList := privateEndpoint.([]interface{}); len(tmpList) > 0 {
 			fieldKeyFormat := fmt.Sprintf("%s.%d.%%s", "private_endpoint", 0)
@@ -768,6 +805,12 @@ func (s *DatabaseMigrationConnectionResourceCrud) SetData() error {
 		s.D.Set("lifecycle_details", *s.Res.LifecycleDetails)
 	}
 
+	nsgIds := []interface{}{}
+	for _, item := range s.Res.NsgIds {
+		nsgIds = append(nsgIds, item)
+	}
+	s.D.Set("nsg_ids", schema.NewSet(tfresource.LiteralTypeHashCodeForSets, nsgIds))
+
 	if s.Res.PrivateEndpoint != nil {
 		s.D.Set("private_endpoint", []interface{}{PrivateEndpointDetailsToMap(s.Res.PrivateEndpoint)})
 	} else {
@@ -834,6 +877,11 @@ func ConnectionSummaryToMapMig(obj oci_database_migration.ConnectionSummary) map
 		result["lifecycle_details"] = string(*obj.LifecycleDetails)
 	}
 
+	nsgIds := []interface{}{}
+	for _, item := range obj.NsgIds {
+		nsgIds = append(nsgIds, item)
+	}
+
 	result["state"] = string(obj.LifecycleState)
 
 	if obj.SystemTags != nil {

internal/service/database_migration/database_migration_job_resource.go

@@ -89,6 +89,10 @@ func DatabaseMigrationJobResource() *schema.Resource {
 									// Optional
 
 									// Computed
+									"action": {
+										Type:     schema.TypeString,
+										Computed: true,
+									},
 									"duration_in_ms": {
 										Type:     schema.TypeInt,
 										Computed: true,
@@ -118,6 +122,10 @@ func DatabaseMigrationJobResource() *schema.Resource {
 										Type:     schema.TypeBool,
 										Computed: true,
 									},
+									"issue": {
+										Type:     schema.TypeString,
+										Computed: true,
+									},
 									"log_location": {
 										Type:     schema.TypeList,
 										Computed: true,
@@ -535,6 +543,10 @@ func PhaseExtractEntryToMap(obj oci_database_migration.PhaseExtractEntry) map[st
 func PhaseStatusToMap(obj oci_database_migration.PhaseStatus) map[string]interface{} {
 	result := map[string]interface{}{}
 
+	if obj.Action != nil {
+		result["action"] = string(*obj.Action)
+	}
+
 	if obj.DurationInMs != nil {
 		result["duration_in_ms"] = int(*obj.DurationInMs)
 	}
@@ -549,6 +561,10 @@ func PhaseStatusToMap(obj oci_database_migration.PhaseStatus) map[string]interfa
 		result["is_advisor_report_available"] = bool(*obj.IsAdvisorReportAvailable)
 	}
 
+	if obj.Issue != nil {
+		result["issue"] = string(*obj.Issue)
+	}
+
 	if obj.LogLocation != nil {
 		result["log_location"] = []interface{}{LogLocationBucketDetailsToMap(obj.LogLocation)}
 	}

internal/service/database_migration/database_migration_migration_resource.go

@@ -242,13 +242,14 @@ func DatabaseMigrationMigrationResource() *schema.Resource {
 										Type:     schema.TypeString,
 										Required: true,
 									},
+
+									// Optional
 									"path": {
 										Type:     schema.TypeString,
-										Required: true,
+										Optional: true,
+										Computed: true,
 									},
 
-									// Optional
-
 									// Computed
 								},
 							},
@@ -266,13 +267,14 @@ func DatabaseMigrationMigrationResource() *schema.Resource {
 										Type:     schema.TypeString,
 										Required: true,
 									},
+
+									// Optional
 									"path": {
 										Type:     schema.TypeString,
-										Required: true,
+										Optional: true,
+										Computed: true,
 									},
 
-									// Optional
-
 									// Computed
 								},
 							},

website/docs/d/database_migration_connection.html.markdown

@@ -49,6 +49,7 @@ 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: `{"bar-key": "value"}` 
 * `id` - The OCID of the resource 
 * `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. 
+* `nsg_ids` - An array of Network Security Group OCIDs used to define network access for Connections. 
 * `private_endpoint` - Oracle Cloud Infrastructure Private Endpoint configuration details. 
 	* `compartment_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the compartment to contain the private endpoint. 
 	* `id` - [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of a previously created Private Endpoint.