diff --git a/build/terraform b/build/terraform index e053a9c5813c..6a45d4c38beb 160000 --- a/build/terraform +++ b/build/terraform @@ -1 +1 @@ -Subproject commit e053a9c5813c86e3f49a2b1f66e2992da96deedf +Subproject commit 6a45d4c38beb6883e844178353cf4be71943d97d diff --git a/build/terraform-beta b/build/terraform-beta index 5e77cae1b3f8..c742433d97a2 160000 --- a/build/terraform-beta +++ b/build/terraform-beta @@ -1 +1 @@ -Subproject commit 5e77cae1b3f87c2f3f3cc67b592a446abd83bc0b +Subproject commit c742433d97a27b13b65a53f055fb0390e3c05f13 diff --git a/third_party/terraform/resources/resource_dataflow_job.go b/third_party/terraform/resources/resource_dataflow_job.go index 1cf0a9eaee89..ff4996b34194 100644 --- a/third_party/terraform/resources/resource_dataflow_job.go +++ b/third_party/terraform/resources/resource_dataflow_job.go @@ -122,13 +122,6 @@ func resourceDataflowJob() *schema.Resource { Optional: true, ForceNew: true, }, - - "ip_configuration": { - Type: schema.TypeString, - Optional: true, - ForceNew: true, - ValidateFunc: validation.StringInSlice([]string{"WORKER_IP_PUBLIC", "WORKER_IP_PRIVATE", ""}, false), - }, }, } } @@ -161,7 +154,6 @@ func resourceDataflowJobCreate(d *schema.ResourceData, meta interface{}) error { Subnetwork: d.Get("subnetwork").(string), TempLocation: d.Get("temp_gcs_location").(string), MachineType: d.Get("machine_type").(string), - IpConfiguration: d.Get("ip_configuration").(string), AdditionalUserLabels: labels, Zone: zone, } diff --git a/third_party/terraform/tests/resource_dataflow_job_test.go b/third_party/terraform/tests/resource_dataflow_job_test.go index ae38eeb8d63e..37ffc05f1809 100644 --- a/third_party/terraform/tests/resource_dataflow_job_test.go +++ b/third_party/terraform/tests/resource_dataflow_job_test.go @@ -131,24 +131,6 @@ func TestAccDataflowJobCreateWithLabels(t *testing.T) { }) } -func TestAccDataflowJobCreateWithIpConfig(t *testing.T) { - t.Parallel() - resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckDataflowJobDestroy, - Steps: []resource.TestStep{ - { - Config: testAccDataflowJobWithIpConfig, - Check: resource.ComposeTestCheckFunc( - testAccDataflowJobExists( - "google_dataflow_job.big_data"), - ), - }, - }, - }) -} - func testAccCheckDataflowJobDestroy(s *terraform.State) error { for _, rs := range s.RootModule().Resources { if rs.Type != "google_dataflow_job" { @@ -537,33 +519,6 @@ resource "google_dataflow_job" "big_data" { on_delete = "cancel" }`, acctest.RandString(10), acctest.RandString(10), acctest.RandString(10), getTestProjectFromEnv()) -var testAccDataflowJobWithIpConfig = fmt.Sprintf(` -resource "google_storage_bucket" "temp" { - name = "dfjob-test-%s-temp" - - force_destroy = true -} - -resource "google_dataflow_job" "big_data" { - name = "dfjob-test-%s" - - template_gcs_path = "gs://dataflow-templates/wordcount/template_file" - temp_gcs_location = "${google_storage_bucket.temp.url}" - machine_type = "n1-standard-2" - - parameters = { - inputFile = "gs://dataflow-samples/shakespeare/kinglear.txt" - output = "${google_storage_bucket.temp.url}/output" - } - - ip_configuration = "WORKER_IP_PRIVATE" - - zone = "us-central1-f" - project = "%s" - - on_delete = "cancel" -}`, acctest.RandString(10), acctest.RandString(10), getTestProjectFromEnv()) - func testAccDataflowJobWithLabels(key string) string { return fmt.Sprintf(` resource "google_storage_bucket" "temp" { diff --git a/third_party/terraform/website/docs/r/dataflow_job.html.markdown b/third_party/terraform/website/docs/r/dataflow_job.html.markdown index 8b3901b4cf85..9cc2e1e102f2 100644 --- a/third_party/terraform/website/docs/r/dataflow_job.html.markdown +++ b/third_party/terraform/website/docs/r/dataflow_job.html.markdown @@ -54,7 +54,6 @@ The following arguments are supported: * `network` - (Optional) The network to which VMs will be assigned. If it is not provided, "default" will be used. * `subnetwork` - (Optional) The subnetwork to which VMs will be assigned. Should be of the form "regions/REGION/subnetworks/SUBNETWORK". * `machine_type` - (Optional) The machine type to use for the job. -* `ip_configuration` - (Optional) The configuration for VM IPs. Options are `"WORKER_IP_PUBLIC"` or `"WORKER_IP_PUBLIC"`. ## Attributes Reference