re-enable Dataproc Metastore Federation tests (GoogleCloudPlatform#10445

) Co-authored-by: Sarah French <15078782+SarahFrench@users.noreply.github.com>
abd-goog · Sep 23, 2024 · f8f326f · f8f326f
1 parent 38dc6d9
commit f8f326f
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 11 deletions.
diff --git a/mmv1/products/metastore/Federation.yaml b/mmv1/products/metastore/Federation.yaml
@@ -51,7 +51,6 @@ import_format:
 examples:
   - !ruby/object:Provider::Terraform::Examples
     name: 'dataproc_metastore_federation_basic'
-    skip_test: true  # https://github.com/hashicorp/terraform-provider-google/issues/13710
     primary_resource_id: 'default'
     primary_resource_name:
       'fmt.Sprintf("tf-test-metastore-fed%s", context["random_suffix"])'
@@ -60,7 +59,6 @@ examples:
       service_id: 'metastore-service'
   - !ruby/object:Provider::Terraform::Examples
     name: 'dataproc_metastore_federation_bigquery'
-    skip_test: true  # https://github.com/hashicorp/terraform-provider-google/issues/13710
     primary_resource_id: 'default'
     primary_resource_name:
       'fmt.Sprintf("tf-test-metastore-fed%s", context["random_suffix"])'

diff --git a/mmv1/products/metastore/Service.yaml b/mmv1/products/metastore/Service.yaml
@@ -83,7 +83,6 @@ examples:
   - !ruby/object:Provider::Terraform::Examples
     name: 'dataproc_metastore_service_endpoint'
     skip_docs: true
-    skip_test: true  # https://github.com/hashicorp/terraform-provider-google/issues/13710
     primary_resource_id: 'endpoint'
     vars:
       metastore_service_name: 'metastore-endpoint'

diff --git a/mmv1/templates/terraform/examples/dataproc_metastore_federation_basic.tf.erb b/mmv1/templates/terraform/examples/dataproc_metastore_federation_basic.tf.erb
@@ -1,6 +1,6 @@
 resource "google_dataproc_metastore_federation" "<%= ctx[:primary_resource_id] %>" {
   location      = "us-central1"
-  federation_id = "<%= ctx[:vars]['metastore_federation_name'] %>"
+  federation_id = "<%= ctx[:vars]['federation_id'] %>"
   version       = "3.1.2"
 
   backend_metastores {
@@ -11,7 +11,7 @@ resource "google_dataproc_metastore_federation" "<%= ctx[:primary_resource_id] %
 }
 
 resource "google_dataproc_metastore_service" "<%= ctx[:primary_resource_id] %>" {
-  service_id = "<%= ctx[:vars]['metastore_federation_name'] %>"
+  service_id = "<%= ctx[:vars]['service_id'] %>"
   location   = "us-central1"
   tier       = "DEVELOPER"
 

diff --git a/mmv1/templates/terraform/examples/dataproc_metastore_federation_bigquery.tf.erb b/mmv1/templates/terraform/examples/dataproc_metastore_federation_bigquery.tf.erb
@@ -1,6 +1,6 @@
 resource "google_dataproc_metastore_federation" "<%= ctx[:primary_resource_id] %>" {
   location      = "us-central1"
-  federation_id = "<%= ctx[:vars]['metastore_federation_name'] %>"
+  federation_id = "<%= ctx[:vars]['federation_id'] %>"
   version       = "3.1.2"
 
   backend_metastores {
@@ -17,7 +17,7 @@ resource "google_dataproc_metastore_federation" "<%= ctx[:primary_resource_id] %
 }
 
 resource "google_dataproc_metastore_service" "<%= ctx[:primary_resource_id] %>" {
-  service_id = "<%= ctx[:vars]['metastore_federation_name'] %>"
+  service_id = "<%= ctx[:vars]['service_id'] %>"
   location   = "us-central1"
   tier       = "DEVELOPER"
 

diff --git a/mmv1/templates/terraform/examples/dataproc_metastore_service_private_service_connect.tf.erb b/mmv1/templates/terraform/examples/dataproc_metastore_service_private_service_connect.tf.erb
@@ -14,6 +14,7 @@ resource "google_compute_subnetwork" "subnet" {
 resource "google_dataproc_metastore_service" "<%= ctx[:primary_resource_id] %>" {
   service_id = "<%= ctx[:vars]['metastore_service_name'] %>"
   location   = "us-central1"
+  tier       = "DEVELOPER"
 
   hive_metastore_config {
     version = "3.1.2"

diff --git a/mmv1/templates/terraform/examples/go/dataproc_metastore_federation_basic.tf.tmpl b/mmv1/templates/terraform/examples/go/dataproc_metastore_federation_basic.tf.tmpl
@@ -1,6 +1,6 @@
 resource "google_dataproc_metastore_federation" "{{$.PrimaryResourceId}}" {
   location      = "us-central1"
-  federation_id = "{{index $.Vars "metastore_federation_name"}}"
+  federation_id = "{{index $.Vars "federation_id"}}"
   version       = "3.1.2"
 
   backend_metastores {
@@ -11,7 +11,7 @@ resource "google_dataproc_metastore_federation" "{{$.PrimaryResourceId}}" {
 }
 
 resource "google_dataproc_metastore_service" "{{$.PrimaryResourceId}}" {
-  service_id = "{{index $.Vars "metastore_federation_name"}}"
+  service_id = "{{index $.Vars "service_id"}}"
   location   = "us-central1"
   tier       = "DEVELOPER"
 

diff --git a/mmv1/templates/terraform/examples/go/dataproc_metastore_federation_bigquery.tf.tmpl b/mmv1/templates/terraform/examples/go/dataproc_metastore_federation_bigquery.tf.tmpl
@@ -1,6 +1,6 @@
 resource "google_dataproc_metastore_federation" "{{$.PrimaryResourceId}}" {
   location      = "us-central1"
-  federation_id = "{{index $.Vars "metastore_federation_name"}}"
+  federation_id = "{{index $.Vars "federation_id"}}"
   version       = "3.1.2"
 
   backend_metastores {
@@ -17,7 +17,7 @@ resource "google_dataproc_metastore_federation" "{{$.PrimaryResourceId}}" {
 }
 
 resource "google_dataproc_metastore_service" "{{$.PrimaryResourceId}}" {
-  service_id = "{{index $.Vars "metastore_federation_name"}}"
+  service_id = "{{index $.Vars "service_id"}}"
   location   = "us-central1"
   tier       = "DEVELOPER"
 

diff --git a/...emplates/terraform/examples/go/dataproc_metastore_service_private_service_connect.tf.tmpl b/...emplates/terraform/examples/go/dataproc_metastore_service_private_service_connect.tf.tmpl
@@ -14,6 +14,7 @@ resource "google_compute_subnetwork" "subnet" {
 resource "google_dataproc_metastore_service" "{{$.PrimaryResourceId}}" {
   service_id = "{{index $.Vars "metastore_service_name"}}"
   location   = "us-central1"
+  tier       = "DEVELOPER"
 
   hive_metastore_config {
     version = "3.1.2"