Upstream flex template update (#4677) (#3246)

* Upstream flex template update

* Remove unused var

Signed-off-by: Modular Magician <[email protected]>

Author: modular-magician

.changelog/4677.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+dataflow: enabled updates for `google_dataflow_flex_template_job`
+```

google-beta/resource_dataflow_flex_template_job_test.go

@@ -158,7 +158,6 @@ data "google_storage_bucket_object" "flex_template" {
   name   = "latest/flex/Streaming_Data_Generator"
   bucket = "dataflow-templates"
 }
-
 resource "google_dataflow_flex_template_job" "job" {
   name = "%s"
   container_spec_gcs_path = "gs://${data.google_storage_bucket_object.flex_template.bucket}/${data.google_storage_bucket_object.flex_template.name}"
@@ -179,17 +178,14 @@ resource "google_service_account" "dataflow-sa" {
   account_id   = "%s"
   display_name = "DataFlow Service Account"
 }
-
 resource "google_project_iam_member" "dataflow-worker" {
   role   = "roles/dataflow.worker"
   member = "serviceAccount:${google_service_account.dataflow-sa.email}"
 }
-
 data "google_storage_bucket_object" "flex_template" {
   name   = "latest/flex/Streaming_Data_Generator"
   bucket = "dataflow-templates"
 }
-
 resource "google_dataflow_flex_template_job" "job" {
   name = "%s"
   container_spec_gcs_path = "gs://${data.google_storage_bucket_object.flex_template.bucket}/${data.google_storage_bucket_object.flex_template.name}"

google-beta/resource_dataflow_job.go

@@ -583,7 +583,6 @@ func resourceDataflowJobIterateMapHasChange(mapKey string, d *schema.ResourceDat
 func resourceDataflowJobIsVirtualUpdate(d *schema.ResourceData, resourceSchema map[string]*schema.Schema) bool {
 	// on_delete is the only virtual field
 	if d.HasChange("on_delete") {
-		// Check if other fields have changes, which would require an actual update request
 		for field := range resourceSchema {
 			if field == "on_delete" {
 				continue

google-beta/resource_dataproc_cluster_test.go

@@ -13,8 +13,9 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
 
-	dataproc "google.golang.org/api/dataproc/v1beta2"
 	"google.golang.org/api/googleapi"
+
+	dataproc "google.golang.org/api/dataproc/v1beta2"
 )
 
 func TestDataprocExtractInitTimeout(t *testing.T) {