metadata_integration and auxiliary_versions

GoogleCloudPlatform · Jul 16, 2022 · d5e3b16 · d5e3b16
1 parent 1f1955d
commit d5e3b16
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 4 deletions.
diff --git a/mmv1/products/metastore/terraform.yaml b/mmv1/products/metastore/terraform.yaml
@@ -19,7 +19,7 @@ overrides: !ruby/object:Overrides::ResourceOverrides
     examples:
       - !ruby/object:Provider::Terraform::Examples
         name: "dataproc_metastore_service_basic"
-        primary_resource_name: "fmt.Sprintf(\"tf-test-metastore-srv%s\", context[\"random_suffix\"])"
+        primary_resource_name: 'fmt.Sprintf("tf-test-metastore-srv%s", context["random_suffix"])'
         primary_resource_id: "default"
         vars:
           metastore_service_name: "metastore-srv"
@@ -45,7 +45,21 @@ overrides: !ruby/object:Overrides::ResourceOverrides
         skip_docs: true
         primary_resource_id: "endpoint"
         vars:
-          metastore_service_name: "metastore-endpoint"          
+          metastore_service_name: "metastore-endpoint"
+      - !ruby/object:Provider::Terraform::Examples
+        name: "dataproc_metastore_service_aux"
+        min_version: beta
+        skip_docs: true
+        primary_resource_id: "aux"
+        vars:
+          metastore_service_name: "metastore-aux"
+      - !ruby/object:Provider::Terraform::Examples
+        name: "dataproc_metastore_service_metadata"
+        min_version: beta
+        skip_docs: true
+        primary_resource_id: "metadata"
+        vars:
+          metastore_service_name: "metastore-metadata"          
     properties:
       network: !ruby/object:Overrides::Terraform::PropertyOverride
         default_from_api: true
@@ -55,7 +69,7 @@ overrides: !ruby/object:Overrides::ResourceOverrides
         default_from_api: true
       hiveMetastoreConfig.configOverrides: !ruby/object:Overrides::Terraform::PropertyOverride
         default_from_api: true
-        diff_suppress_func: 'dataprocMetastoreServiceOverrideSuppress'
+        diff_suppress_func: "dataprocMetastoreServiceOverrideSuppress"
   Federation: !ruby/object:Overrides::Terraform::ResourceOverride
     autogen_async: true
     import_format: ["projects/{{project}}/locations/{{location}}/federations/{{federation_id}}"]
@@ -64,6 +78,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides
         name: "dataproc_metastore_federation_basic"
         primary_resource_id: "default"
         min_version: beta
-        primary_resource_name: "fmt.Sprintf(\"fed%s\", context[\"random_suffix\"])"
+        primary_resource_name: 'fmt.Sprintf("fed%s", context["random_suffix"])'
         vars:
           metastore_federation_name: "fed"
diff --git a/mmv1/templates/terraform/examples/dataproc_metastore_service_aux.tf.erb b/mmv1/templates/terraform/examples/dataproc_metastore_service_aux.tf.erb
@@ -0,0 +1,14 @@
+resource "google_dataproc_metastore_service" "<%= ctx[:primary_resource_id] %>" {
+  provider   = google-beta
+  service_id = "<%= ctx[:vars]['metastore_service_name'] %>"
+  location   = "us-central1"
+  tier       = "DEVELOPER"
+
+  hive_metastore_config {
+    version = "3.1.2"
+    auxiliary_versions {
+      key     = "aux-test"
+      version = "2.3.6"
+    }
+  }
+}
diff --git a/mmv1/templates/terraform/examples/dataproc_metastore_service_metadata.tf.erb b/mmv1/templates/terraform/examples/dataproc_metastore_service_metadata.tf.erb
@@ -0,0 +1,16 @@
+resource "google_dataproc_metastore_service" "<%= ctx[:primary_resource_id] %>" {
+  provider   = google-beta
+  service_id = "<%= ctx[:vars]['metastore_service_name'] %>"
+  location   = "us-central1"
+  tier       = "DEVELOPER"
+
+  metadata_integration {
+    data_catalog_config {
+      enabled = true
+    }
+  }
+
+  hive_metastore_config {
+    version = "3.1.2"
+  }
+}