From e56d94632dd044a2aba241a0c75e08975a8d9047 Mon Sep 17 00:00:00 2001 From: Ryan Oaks Date: Thu, 23 Feb 2023 13:40:47 -0500 Subject: [PATCH] Fix DataFusion instance versions used in tests --- .../terraform/examples/data_fusion_instance_event.tf.erb | 1 - .../terraform/examples/data_fusion_instance_full.tf.erb | 1 - .../terraform/tests/resource_data_fusion_instance_test.go | 5 +++-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/mmv1/templates/terraform/examples/data_fusion_instance_event.tf.erb b/mmv1/templates/terraform/examples/data_fusion_instance_event.tf.erb index 7493bb8192bb..0d21f1b550d5 100644 --- a/mmv1/templates/terraform/examples/data_fusion_instance_event.tf.erb +++ b/mmv1/templates/terraform/examples/data_fusion_instance_event.tf.erb @@ -2,7 +2,6 @@ resource "google_data_fusion_instance" "<%= ctx[:primary_resource_id] %>" { name = "<%= ctx[:vars]["instance_name"] %>" region = "us-central1" type = "BASIC" - version = "6.7.0" event_publish_config { enabled = true diff --git a/mmv1/templates/terraform/examples/data_fusion_instance_full.tf.erb b/mmv1/templates/terraform/examples/data_fusion_instance_full.tf.erb index f0a902173c83..44daa5eb109e 100644 --- a/mmv1/templates/terraform/examples/data_fusion_instance_full.tf.erb +++ b/mmv1/templates/terraform/examples/data_fusion_instance_full.tf.erb @@ -7,7 +7,6 @@ resource "google_data_fusion_instance" "<%= ctx[:primary_resource_id] %>" { enable_stackdriver_logging = true enable_stackdriver_monitoring = true private_instance = true - version = "6.6.0" dataproc_service_account = data.google_app_engine_default_service_account.default.email labels = { diff --git a/mmv1/third_party/terraform/tests/resource_data_fusion_instance_test.go b/mmv1/third_party/terraform/tests/resource_data_fusion_instance_test.go index 04c5aa68131d..0f82a29fb088 100644 --- a/mmv1/third_party/terraform/tests/resource_data_fusion_instance_test.go +++ b/mmv1/third_party/terraform/tests/resource_data_fusion_instance_test.go @@ -42,7 +42,8 @@ resource "google_data_fusion_instance" "foobar" { name = "%s" region = "us-central1" type = "BASIC" - version = "6.1.1" + # See supported versions here https://cloud.google.com/data-fusion/docs/support/version-support-policy + version = "6.7.0" # Mark for testing to avoid service networking connection usage that is not cleaned up options = { prober_test_run = "true" @@ -64,7 +65,7 @@ resource "google_data_fusion_instance" "foobar" { label1 = "value1" label2 = "value2" } - version = "6.2.0" + version = "6.8.0" # Mark for testing to avoid service networking connection usage that is not cleaned up options = { prober_test_run = "true"