Add ability to import Dataflow jobs (#6386) (#12316)

* Add ability to import dataflow jobs * Update vcr tests to include dataflow job resource state import * Remove status state ignore * Remove manual passed importID * Add properties to ImportStateVerifyIgnore * add trailing comma to `ImportStateVerifyIgnore` prop * Ignore state attribute too Signed-off-by: Modular Magician <magic-modules@google.com> Signed-off-by: Modular Magician <magic-modules@google.com>
hashicorp · Aug 16, 2022 · f65a2f9 · f65a2f9
1 parent 8f34996
commit f65a2f9
Show file tree

Hide file tree

Showing 4 changed files with 83 additions and 1 deletion.
diff --git a/.changelog/6386.txt b/.changelog/6386.txt
@@ -0,0 +1,3 @@
+```release-note:enhancement
+Add ability to import Dataflow jobs
+```
diff --git a/google/resource_dataflow_job.go b/google/resource_dataflow_job.go
@@ -59,6 +59,9 @@ func resourceDataflowJob() *schema.Resource {
 		CustomizeDiff: customdiff.All(
 			resourceDataflowJobTypeCustomizeDiff,
 		),
+		Importer: &schema.ResourceImporter{
+			State: schema.ImportStatePassthrough,
+		},
 		Schema: map[string]*schema.Schema{
 			"name": {
 				Type:     schema.TypeString,

diff --git a/google/resource_dataflow_job_test.go b/google/resource_dataflow_job_test.go
@@ -41,6 +41,12 @@ func TestAccDataflowJob_basic(t *testing.T) {
 					testAccDataflowJobExists(t, "google_dataflow_job.big_data"),
 				),
 			},
+			{
+				ResourceName:            "google_dataflow_job.big_data",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"on_delete", "parameters", "skip_wait_on_job_termination", "zone", "state"},
+			},
 		},
 	})
 }
@@ -67,6 +73,12 @@ func TestAccDataflowJobSkipWait_basic(t *testing.T) {
 					testAccDataflowJobExists(t, "google_dataflow_job.big_data"),
 				),
 			},
+			{
+				ResourceName:            "google_dataflow_job.big_data",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"on_delete", "parameters", "skip_wait_on_job_termination", "zone", "state"},
+			},
 		},
 	})
 }
@@ -92,6 +104,12 @@ func TestAccDataflowJob_withRegion(t *testing.T) {
 					testAccRegionalDataflowJobExists(t, "google_dataflow_job.big_data", "us-central1"),
 				),
 			},
+			{
+				ResourceName:            "google_dataflow_job.big_data",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"on_delete", "parameters", "skip_wait_on_job_termination", "region", "state"},
+			},
 		},
 	})
 }
@@ -119,6 +137,12 @@ func TestAccDataflowJob_withServiceAccount(t *testing.T) {
 					testAccDataflowJobHasServiceAccount(t, "google_dataflow_job.big_data", accountId),
 				),
 			},
+			{
+				ResourceName:            "google_dataflow_job.big_data",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"on_delete", "parameters", "skip_wait_on_job_termination", "state"},
+			},
 		},
 	})
 }
@@ -146,6 +170,12 @@ func TestAccDataflowJob_withNetwork(t *testing.T) {
 					testAccDataflowJobHasNetwork(t, "google_dataflow_job.big_data", network),
 				),
 			},
+			{
+				ResourceName:            "google_dataflow_job.big_data",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"on_delete", "parameters", "skip_wait_on_job_termination", "state"},
+			},
 		},
 	})
 }
@@ -174,6 +204,12 @@ func TestAccDataflowJob_withSubnetwork(t *testing.T) {
 					testAccDataflowJobHasSubnetwork(t, "google_dataflow_job.big_data", subnetwork),
 				),
 			},
+			{
+				ResourceName:            "google_dataflow_job.big_data",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"on_delete", "parameters", "skip_wait_on_job_termination", "subnetwork", "state"},
+			},
 		},
 	})
 }
@@ -202,6 +238,12 @@ func TestAccDataflowJob_withLabels(t *testing.T) {
 					testAccDataflowJobHasLabels(t, "google_dataflow_job.with_labels", key),
 				),
 			},
+			{
+				ResourceName:            "google_dataflow_job.with_labels",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"on_delete", "parameters", "skip_wait_on_job_termination", "state"},
+			},
 		},
 	})
 }
@@ -227,6 +269,12 @@ func TestAccDataflowJob_withIpConfig(t *testing.T) {
 					testAccDataflowJobExists(t, "google_dataflow_job.big_data"),
 				),
 			},
+			{
+				ResourceName:            "google_dataflow_job.big_data",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"on_delete", "parameters", "skip_wait_on_job_termination", "ip_configuration", "state"},
+			},
 		},
 	})
 }
@@ -255,6 +303,12 @@ func TestAccDataflowJob_withKmsKey(t *testing.T) {
 					testAccDataflowJobExists(t, "google_dataflow_job.big_data"),
 				),
 			},
+			{
+				ResourceName:            "google_dataflow_job.big_data",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"on_delete", "parameters", "skip_wait_on_job_termination", "zone", "state"},
+			},
 		},
 	})
 }
@@ -281,6 +335,12 @@ func TestAccDataflowJobWithAdditionalExperiments(t *testing.T) {
 					testAccDataflowJobHasExperiments(t, "google_dataflow_job.with_additional_experiments", additionalExperiments),
 				),
 			},
+			{
+				ResourceName:            "google_dataflow_job.with_additional_experiments",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"on_delete", "parameters", "skip_wait_on_job_termination", "state"},
+			},
 		},
 	})
 }
@@ -309,6 +369,12 @@ func TestAccDataflowJob_streamUpdate(t *testing.T) {
 					testAccDataflowJobHasTempLocation(t, "google_dataflow_job.pubsub_stream", "gs://tf-test-bucket2-"+suffix),
 				),
 			},
+			{
+				ResourceName:            "google_dataflow_job.pubsub_stream",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"on_delete", "parameters", "skip_wait_on_job_termination", "transform_name_mapping", "state"},
+			},
 		},
 	})
 }
@@ -342,6 +408,12 @@ func TestAccDataflowJob_virtualUpdate(t *testing.T) {
 					resource.TestCheckResourceAttr("google_dataflow_job.pubsub_stream", "on_delete", "cancel"),
 				),
 			},
+			{
+				ResourceName:            "google_dataflow_job.pubsub_stream",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"on_delete", "parameters", "skip_wait_on_job_termination", "state"},
+			},
 		},
 	})
 }

diff --git a/website/docs/r/dataflow_job.html.markdown b/website/docs/r/dataflow_job.html.markdown
@@ -129,4 +129,8 @@ The following arguments are supported:
 
 ## Import
 
-This resource does not support import.
+Dataflow jobs can be imported using the job `id` e.g.
+
+```
+$ terraform import google_dataflow_job.example 2022-07-31_06_25_42-11926927532632678660
+```