Support for Spark 3.0 added in data flow

Author: rashik-bhasin

CHANGELOG.md

@@ -4,6 +4,7 @@
 - Support for Data Safe target database registration
 - Support for Elastic storage for ExaCC
 - Support for Migrate VCN status added to container engine
+- Support for Spark 3.0 added in data flow
 
 ## 4.30.0 (June 09, 2021)
 

oci/dataflow_application_test.go

@@ -287,6 +287,7 @@ func TestDataflowApplicationResource_basic(t *testing.T) {
 					resource.TestCheckResourceAttr(datasourceName, "applications.0.language", "SCALA"),
 					resource.TestCheckResourceAttrSet(datasourceName, "applications.0.owner_principal_id"),
 					resource.TestCheckResourceAttrSet(datasourceName, "applications.0.owner_user_name"),
+					resource.TestCheckResourceAttr(datasourceName, "applications.0.spark_version", "2.4.4"),
 					resource.TestCheckResourceAttrSet(datasourceName, "applications.0.state"),
 					resource.TestCheckResourceAttrSet(datasourceName, "applications.0.time_created"),
 					resource.TestCheckResourceAttrSet(datasourceName, "applications.0.time_updated"),

oci/dataflow_applications_data_source.go

@@ -35,6 +35,10 @@ func DataflowApplicationsDataSource() *schema.Resource {
 				Type:     schema.TypeString,
 				Optional: true,
 			},
+			"spark_version": {
+				Type:     schema.TypeString,
+				Optional: true,
+			},
 			"applications": {
 				Type:     schema.TypeList,
 				Computed: true,
@@ -85,6 +89,11 @@ func (s *DataflowApplicationsDataSourceCrud) Get() error {
 		request.OwnerPrincipalId = &tmp
 	}
 
+	if sparkVersion, ok := s.D.GetOkExists("spark_version"); ok {
+		tmp := sparkVersion.(string)
+		request.SparkVersion = &tmp
+	}
+
 	request.RequestMetadata.RetryPolicy = getRetryPolicy(false, "dataflow")
 
 	response, err := s.Client.ListApplications(context.Background(), request)
@@ -145,6 +154,10 @@ func (s *DataflowApplicationsDataSourceCrud) SetData() error {
 			application["owner_user_name"] = *r.OwnerUserName
 		}
 
+		if r.SparkVersion != nil {
+			application["spark_version"] = *r.SparkVersion
+		}
+
 		application["state"] = r.LifecycleState
 
 		if r.TimeCreated != nil {

website/docs/d/dataflow_applications.html.markdown

@@ -10,7 +10,7 @@ description: |-
 # Data Source: oci_dataflow_applications
 This data source provides the list of Applications in Oracle Cloud Infrastructure Data Flow service.
 
-Lists all applications in the specified compartment.
+Lists all applications in the specified compartment. Only one parameter other than compartmentId may also be included in a query. The query must include compartmentId. If the query does not include compartmentId, or includes compartmentId but two or more other parameters an error is returned.
 
 
 ## Example Usage
@@ -24,6 +24,7 @@ data "oci_dataflow_applications" "test_applications" {
 	display_name = var.application_display_name
 	display_name_starts_with = var.application_display_name_starts_with
 	owner_principal_id = oci_dataflow_owner_principal.test_owner_principal.id
+	spark_version = var.application_spark_version
 }
 ```
 
@@ -35,6 +36,7 @@ The following arguments are supported:
 * `display_name` - (Optional) The query parameter for the Spark application name. 
 * `display_name_starts_with` - (Optional) The displayName prefix. 
 * `owner_principal_id` - (Optional) The OCID of the user who created the resource. 
+* `spark_version` - (Optional) The Spark version utilized to run the application. 
 
 
 ## Attributes Reference

website/docs/d/dataflow_invoke_runs.html.markdown

@@ -10,7 +10,7 @@ description: |-
 # Data Source: oci_dataflow_invoke_runs
 This data source provides the list of Invoke Runs in Oracle Cloud Infrastructure Data Flow service.
 
-Lists all runs of an application in the specified compartment.
+Lists all runs of an application in the specified compartment.  Only one parameter other than compartmentId may also be included in a query. The query must include compartmentId. If the query does not include compartmentId, or includes compartmentId but two or more other parameters an error is returned.
 
 
 ## Example Usage

website/docs/r/dataflow_private_endpoint.html.markdown

@@ -10,7 +10,7 @@ description: |-
 # oci_dataflow_private_endpoint
 This resource provides the Private Endpoint resource in Oracle Cloud Infrastructure Data Flow service.
 
-Creates a private endpoint to be used by an application.
+Creates a private endpoint to be used by applications.
 
 
 ## Example Usage