Added - Support for ODSC - Nested Resource Principal Support

Author: Sriram Ananthakrishnan

examples/datascience/job/job.tf

@@ -64,6 +64,8 @@ resource "oci_datascience_job" "job" {
   artifact_content_length      = 1380
   artifact_content_disposition = "attachment; filename=job_artifact.py"
   delete_related_job_runs      = true
+  # optional parameter
+  # opc_parent_rpt_url = ""
 
   job_configuration_details {
     job_type                   = "DEFAULT"

examples/datascience/model_deployment/model_deployment.tf

@@ -211,6 +211,8 @@ variable "model_egress_id" {
 resource "oci_datascience_model_deployment" "tf_model_deployment" {
   # Required
   compartment_id = var.compartment_ocid
+  # optional parameter
+  # opc_parent_rpt_url = ""
   model_deployment_configuration_details {
     # Required
     deployment_type = var.model_deployment_model_deployment_configuration_details_deployment_type

examples/datascience/pipeline/pipeline.tf

@@ -160,6 +160,8 @@ resource "oci_datascience_pipeline" "test_pipeline" {
   compartment_id = var.compartment_ocid
   project_id     = oci_datascience_project.pipeline.id
   delete_related_pipeline_runs = true
+  # optional parameter
+  # opc_parent_rpt_url = ""
   step_details {
     #Required
     step_name = var.pipeline_step_details_step_name
@@ -228,7 +230,7 @@ resource "oci_datascience_pipeline" "test_pipeline" {
   }
   log_configuration_details {
 
-    #Optional
+    # Optional
     enable_auto_log_creation = var.pipeline_log_configuration_details_enable_auto_log_creation
     enable_logging           = var.pipeline_log_configuration_details_enable_logging
     log_group_id             = oci_logging_log_group.pipeline.id
@@ -320,7 +322,7 @@ resource "oci_datascience_pipeline_run" "test_pipeline_run" {
   #Optional
   log_configuration_override_details {
 
-    #Optional
+    # Optional
     enable_auto_log_creation = true
     enable_logging           = true
     log_group_id             = oci_logging_log_group.pipeline_run.id
@@ -340,38 +342,90 @@ resource "oci_datascience_pipeline_run" "test_pipeline_run" {
   }
 }
 
-resource "oci_datascience_pipeline_run" "test_pipeline_run_byoc" {
-  #Required
-  compartment_id = var.compartment_ocid
-  pipeline_id    = oci_datascience_pipeline.test_pipeline_byoc.id
-  delete_related_job_runs = true
-
-  display_name  = "DisplayNameContainer"
-  #Optional
-  log_configuration_override_details {
-
-    #Optional
-    enable_auto_log_creation = false
-    enable_logging           = false
-//    log_group_id             = oci_logging_log_group.pipeline_run.id
-    # log_id                   = oci_logging_log.test_log.id
-  }
-  project_id = oci_datascience_project.pipeline.id
-  step_override_details {
-    #Required
-    step_configuration_details {
 
-      #Optional
-      command_line_arguments     = "CommandLineArgumentsStepOverride"
-      environment_variables      = {"environmentVariablesStepOverride":"environmentVariablesStepOverride"}
-      maximum_runtime_in_minutes = 30
-    }
-    step_name = "stepName"
-    step_container_configuration_details {
-      container_type = "OCIR_CONTAINER"
-      image = "iad.ocir.io/ociodscdev/nested-rp-public-python-sdk-1:1.0"
-      cmd = ["hello_world.py"]
-      entrypoint = ["python3"]
-    }
-  }
-}
+## for 2 steps additional example
+# locals {
+#   steps = {
+#     "step1" = {
+#       step_name = var.ml_pipeline_step1_name
+#       step_type = "ML_JOB"
+
+#       #Optional
+#       depends_on = []
+#       is_artifact_uploaded = "false"
+#       job_id = var.job_id
+#       step_configuration_maximum_runtime_in_minutes = 30
+#     }
+#     # if step_type = "CUSTOM_SCRIPT" step artifact block has to be added
+#     # as shown above 
+#     "step2" = {
+#       step_name = var.ml_pipeline_step2_name
+#       step_type = "ML_JOB"
+
+#       #Optional
+#       depends_on = [var.ml_pipeline_step1_name]
+#       is_artifact_uploaded = "true"
+#       job_id =  var.job_id
+#       step_configuration_maximum_runtime_in_minutes = 30
+#     }
+#   }
+# }
+
+# resource "oci_datascience_pipeline" "test_pipeline" {
+#   #Required
+#   compartment_id = var.compartment_ocid
+#   project_id = var.project_ocid
+
+
+#   dynamic "step_details" {
+#     for_each = [for s in local.steps: {
+#       step_name = s.step_name
+#       step_type = s.step_type
+#       step_configuration_maximum_runtime_in_minutes = s.step_configuration_maximum_runtime_in_minutes
+#       depends_on = s.depends_on
+#       is_artifact_uploaded = s.is_artifact_uploaded
+#       job_id = s.job_id
+#     }]
+#     content {
+#       #Required
+#       step_name = step_details.value["step_name"]
+#       step_type = step_details.value["step_type"]
+
+#       #Optional
+#       depends_on = step_details.value["depends_on"] == [] ? null : step_details.value["depends_on"]
+#       is_artifact_uploaded = step_details.value["is_artifact_uploaded"]
+#       job_id = step_details.value["job_id"]
+#       step_configuration_details {
+#         maximum_runtime_in_minutes = step_details.value["step_configuration_maximum_runtime_in_minutes"]
+#       }
+#       step_infrastructure_configuration_details {
+
+#         #Optional
+#         block_storage_size_in_gbs = var.block_storage_size_in_gbs
+#         shape_name = var.shape_name
+#       }
+#     }
+#   }
+#   #Optional
+#   configuration_details {
+#     #Required
+#     type = "DEFAULT"
+#     maximum_runtime_in_minutes = 30
+#   }
+
+#   description = var.ml_pipeline_name
+#   display_name = var.ml_pipeline_name
+
+#   infrastructure_configuration_details {
+#     #Required
+#     block_storage_size_in_gbs = var.block_storage_size_in_gbs
+#     shape_name = var.shape_name
+#   }
+#   log_configuration_details {
+
+#     enable_auto_log_creation = "false"
+#     enable_logging           = "true"
+#     log_group_id = var.data_science_log_group_id
+#     log_id = var.data_science_job_log_id
+#   }
+# }

internal/integrationtest/datascience_job_run_test.go

@@ -84,8 +84,6 @@ var (
 	DatascienceJobRunResourceDependencies = acctest.GenerateDataSourceFromRepresentationMap("oci_core_shapes", "test_shapes", acctest.Required, acctest.Create, CoreCoreShapeDataSourceRepresentation) +
 		acctest.GenerateResourceFromRepresentationMap("oci_datascience_job", "test_job", acctest.Required, acctest.Create, mlJobWithArtifactNoLogging) +
 		acctest.GenerateResourceFromRepresentationMap("oci_datascience_project", "test_project", acctest.Required, acctest.Create, DatascienceDatascienceJobShapeDataSourceRepresentation) +
-		acctest.GenerateResourceFromRepresentationMap("oci_core_subnet", "test_subnet", acctest.Required, acctest.Create, CoreSubnetRepresentation) +
-		acctest.GenerateResourceFromRepresentationMap("oci_core_vcn", "test_vcn", acctest.Required, acctest.Create, CoreVcnRepresentation) +
 		DefinedTagsDependencies
 )
 
@@ -168,7 +166,7 @@ func TestDatascienceJobRunResource_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
 							}

internal/service/datascience/datascience_job_run_resource.go

@@ -219,6 +219,10 @@ func DatascienceJobRunResource() *schema.Resource {
 					},
 				},
 			},
+			"opc_parent_rpt_url": {
+				Type:     schema.TypeString,
+				Optional: true,
+			},
 
 			// Computed
 			"created_by": {
@@ -518,6 +522,11 @@ func (s *DatascienceJobRunResourceCrud) Create() error {
 		}
 	}
 
+	if opcParentRptUrl, ok := s.D.GetOkExists("opc_parent_rpt_url"); ok {
+		tmp := opcParentRptUrl.(string)
+		request.OpcParentRptUrl = &tmp
+	}
+
 	if projectId, ok := s.D.GetOkExists("project_id"); ok {
 		tmp := projectId.(string)
 		request.ProjectId = &tmp

internal/service/datascience/datascience_model_deployment_resource.go

@@ -490,6 +490,10 @@ func DatascienceModelDeploymentResource() *schema.Resource {
 				Computed: true,
 				Elem:     schema.TypeString,
 			},
+			"opc_parent_rpt_url": {
+				Type:     schema.TypeString,
+				Optional: true,
+			},
 			"state": {
 				Type:             schema.TypeString,
 				Optional:         true,
@@ -727,6 +731,11 @@ func (s *DatascienceModelDeploymentResourceCrud) Create() error {
 		}
 	}
 
+	if opcParentRptUrl, ok := s.D.GetOkExists("opc_parent_rpt_url"); ok {
+		tmp := opcParentRptUrl.(string)
+		request.OpcParentRptUrl = &tmp
+	}
+
 	if projectId, ok := s.D.GetOkExists("project_id"); ok {
 		tmp := projectId.(string)
 		request.ProjectId = &tmp

internal/service/datascience/datascience_pipeline_resource.go

@@ -71,7 +71,6 @@ func DatasciencePipelineResource() *schema.Resource {
 						"depends_on": {
 							Type:     schema.TypeList,
 							Optional: true,
-							Computed: true,
 							ForceNew: true,
 							Elem: &schema.Schema{
 								Type: schema.TypeString,
@@ -86,7 +85,6 @@ func DatasciencePipelineResource() *schema.Resource {
 							Type:     schema.TypeBool,
 							Optional: true,
 							Computed: true,
-							ForceNew: true,
 						},
 						"job_id": {
 							Type:     schema.TypeString,
@@ -329,8 +327,6 @@ func DatasciencePipelineResource() *schema.Resource {
 				Optional: true,
 				Computed: true,
 				ForceNew: true,
-				MaxItems: 1,
-				MinItems: 1,
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
 						"pipeline_step_artifact": {
@@ -348,7 +344,6 @@ func DatasciencePipelineResource() *schema.Resource {
 						"artifact_content_disposition": {
 							Type:     schema.TypeString,
 							Optional: true,
-							Computed: true,
 							ForceNew: true,
 						},
 						// Computed

internal/service/datascience/datascience_pipeline_run_resource.go

@@ -157,6 +157,10 @@ func DatasciencePipelineRunResource() *schema.Resource {
 					},
 				},
 			},
+			"opc_parent_rpt_url": {
+				Type:     schema.TypeString,
+				Optional: true,
+			},
 			"step_override_details": {
 				Type:     schema.TypeList,
 				Optional: true,
@@ -535,6 +539,12 @@ func (s *DatasciencePipelineRunResourceCrud) Create() error {
 		}
 	}
 
+	if opcParentRptUrl, ok := s.D.GetOkExists("opc_parent_rpt_url"); ok {
+		tmp := opcParentRptUrl.(string)
+		log.Printf("[INFO] Received opc_parent_rpt_url with value:%s", opcParentRptUrl)
+		request.OpcParentRptUrl = &tmp
+	}
+
 	if pipelineId, ok := s.D.GetOkExists("pipeline_id"); ok {
 		tmp := pipelineId.(string)
 		request.PipelineId = &tmp

website/docs/d/datascience_pipeline.html.markdown

@@ -59,6 +59,7 @@ The following attributes are exported:
 	* `log_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the log.
 * `project_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the project to associate the pipeline with.
 * `state` - The current state of the pipeline.
+* `delete_related_pipeline_runs` - If set to true will delete pipeline runs which are in a terminal state.
 * `step_details` - Array of step details for each step.
 	* `depends_on` - The list of step names this current step depends on for execution.
 	* `description` - A short description of the step.

website/docs/d/datascience_pipeline_run.html.markdown

@@ -60,6 +60,7 @@ The following attributes are exported:
 * `pipeline_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the pipeline for which pipeline run is created.
 * `project_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the project to associate the pipeline run with.
 * `state` - The current state of the pipeline run.
+* `delete_related_job_runs` - If set to true will delete related job runs. 
 * `step_override_details` - Array of step override details. Only Step Configuration is allowed to be overridden.
 	* `step_configuration_details` - The configuration details of a step.
 		* `command_line_arguments` - The command line arguments to set for step.