Bug Fix - Added Resource discovery support for datascience model resource

Author: sagarp337

internal/integrationtest/datascience_model_test.go

@@ -37,12 +37,14 @@ var (
 	}
 
 	DatascienceDatascienceModelDataSourceRepresentation = map[string]interface{}{
-		"compartment_id": acctest.Representation{RepType: acctest.Required, Create: `${var.compartment_id}`},
-		"display_name":   acctest.Representation{RepType: acctest.Optional, Create: `displayName`, Update: `displayName2`},
-		"id":             acctest.Representation{RepType: acctest.Optional, Create: `${oci_datascience_model.test_model.id}`},
-		"project_id":     acctest.Representation{RepType: acctest.Optional, Create: `${oci_datascience_project.test_project.id}`},
-		"state":          acctest.Representation{RepType: acctest.Optional, Create: `ACTIVE`},
-		"filter":         acctest.RepresentationGroup{RepType: acctest.Required, Group: DatascienceModelDataSourceFilterRepresentation}}
+		"compartment_id":         acctest.Representation{RepType: acctest.Required, Create: `${var.compartment_id}`},
+		"display_name":           acctest.Representation{RepType: acctest.Optional, Create: `displayName`, Update: `displayName2`},
+		"id":                     acctest.Representation{RepType: acctest.Optional, Create: `${oci_datascience_model.test_model.id}`},
+		"model_version_set_name": acctest.Representation{RepType: acctest.Optional, Create: ``},
+		"project_id":             acctest.Representation{RepType: acctest.Optional, Create: `${oci_datascience_project.test_project.id}`},
+		"state":                  acctest.Representation{RepType: acctest.Optional, Create: `ACTIVE`},
+		"version_label":          acctest.Representation{RepType: acctest.Optional, Create: ``, Update: ``},
+		"filter":                 acctest.RepresentationGroup{RepType: acctest.Required, Group: DatascienceModelDataSourceFilterRepresentation}}
 	DatascienceModelDataSourceFilterRepresentation = map[string]interface{}{
 		"name":   acctest.Representation{RepType: acctest.Required, Create: `id`},
 		"values": acctest.Representation{RepType: acctest.Required, Create: []string{`${oci_datascience_model.test_model.id}`}},
@@ -76,6 +78,10 @@ var (
 
 	DatascienceModelResourceDependencies = acctest.GenerateResourceFromRepresentationMap("oci_datascience_project", "test_project", acctest.Required, acctest.Create, DatascienceProjectRepresentation) +
 		DefinedTagsDependencies
+
+	DatascienceModelResourceModelVersionSetDependencies = acctest.GenerateResourceFromRepresentationMap("oci_datascience_model_version_set", "test_model_version_set", acctest.Required, acctest.Create, DatascienceModelVersionSetRepresentation) +
+		acctest.GenerateResourceFromRepresentationMap("oci_datascience_project", "test_project", acctest.Required, acctest.Create, DatascienceProjectRepresentation) +
+		DefinedTagsDependencies
 )
 
 // issue-routing-tag: datascience/default
@@ -241,11 +247,12 @@ func TestDatascienceModelResource_basic(t *testing.T) {
 		{
 			Config: config +
 				acctest.GenerateDataSourceFromRepresentationMap("oci_datascience_models", "test_models", acctest.Optional, acctest.Update, DatascienceDatascienceModelDataSourceRepresentation) +
-				compartmentIdVariableStr + DatascienceModelResourceDependencies +
+				compartmentIdVariableStr + DatascienceModelResourceModelVersionSetDependencies +
 				acctest.GenerateResourceFromRepresentationMap("oci_datascience_model", "test_model", acctest.Optional, acctest.Update, DatascienceModelRepresentation),
 			Check: acctest.ComposeAggregateTestCheckFuncWrapper(
 				resource.TestCheckResourceAttr(datasourceName, "compartment_id", compartmentId),
 				resource.TestCheckResourceAttr(datasourceName, "display_name", "displayName2"),
+				resource.TestCheckResourceAttrSet(datasourceName, "id"),
 				resource.TestCheckResourceAttrSet(datasourceName, "project_id"),
 				resource.TestCheckResourceAttr(datasourceName, "state", "ACTIVE"),
 
@@ -398,4 +405,4 @@ func DatascienceModelSweepResponseFetchOperation(client *tf_client.OracleClients
 		},
 	})
 	return err
-}
+}

internal/service/datascience/datascience_export.go

@@ -95,6 +95,17 @@ var exportDatascienceJobRunHints = &tf_export.TerraformResourceHints{
 	},
 }
 
+var exportDatascienceModelVersionSetHints = &tf_export.TerraformResourceHints{
+	ResourceClass:          "oci_datascience_model_version_set",
+	DatasourceClass:        "oci_datascience_model_version_sets",
+	DatasourceItemsAttr:    "model_version_sets",
+	ResourceAbbreviation:   "model_version_set",
+	RequireResourceRefresh: true,
+	DiscoverableLifecycleStates: []string{
+		string(oci_datascience.ModelVersionSetLifecycleStateActive),
+	},
+}
+
 var exportDatasciencePipelineRunHints = &tf_export.TerraformResourceHints{
 	ResourceClass:          "oci_datascience_pipeline_run",
 	DatasourceClass:        "oci_datascience_pipeline_runs",
@@ -126,6 +137,7 @@ var datascienceResourceGraph = tf_export.TerraformResourceGraph{
 		{TerraformResourceHints: exportDatascienceJobHints},
 		{TerraformResourceHints: exportDatascienceJobRunHints},
 		{TerraformResourceHints: exportDatasciencePipelineRunHints},
+		{TerraformResourceHints: exportDatascienceModelVersionSetHints},
 		{TerraformResourceHints: exportDatasciencePipelineHints},
 	},
 	"oci_datascience_model": {