Add single quotes for empty federation prefixes (#153)

* test new vars

* test

* test

* changelog

* add in other places

Author: javsanbel2

CHANGELOG.md

@@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [4.6.2] - 2025-02-12
+### Added
+- Use single quotes when empty to instantiate empty prefix.
+
 ## [4.6.1] - 2025-02-11
 ### Added
 - Added variable `primary_metastore_database_prefix` to configure primary metastore database prefix.

templates.tf

@@ -63,6 +63,7 @@ data "template_file" "local_metastores_yaml" {
   vars = {
     prefix                 = var.local_metastores[count.index].prefix
     metastore_host         = var.local_metastores[count.index].host
+    name                   = lookup(var.local_metastores[count.index], "name", "")
     metastore_port         = lookup(var.local_metastores[count.index], "port", "9083")
     mapped_databases       = lookup(var.local_metastores[count.index], "mapped-databases", "")
     mapped_tables          = lookup(var.local_metastores[count.index], "mapped-tables", "")
@@ -81,6 +82,7 @@ data "template_file" "remote_metastores_yaml" {
   vars = {
     prefix                 = var.remote_metastores[count.index].prefix
     metastore_host         = aws_vpc_endpoint.remote_metastores[count.index].dns_entry[0].dns_name
+    name                   = lookup(var.remote_metastores[count.index], "name", "")
     metastore_port         = lookup(var.remote_metastores[count.index], "port", "9083")
     mapped_databases       = lookup(var.remote_metastores[count.index], "mapped-databases", "")
     mapped_tables          = lookup(var.remote_metastores[count.index], "mapped-tables", "")
@@ -99,6 +101,7 @@ data "template_file" "remote_region_metastores_yaml" {
   vars = {
     prefix                 = var.remote_region_metastores[count.index].prefix
     metastore_host         = aws_vpc_endpoint.remote_region_metastores[var.remote_region_metastores[count.index]["endpoint"]].dns_entry[0].dns_name
+    name                   = lookup(var.remote_region_metastores[count.index], "name", "")
     metastore_port         = lookup(var.remote_region_metastores[count.index], "port", "9083")
     mapped_databases       = lookup(var.remote_region_metastores[count.index], "mapped-databases", "")
     mapped_tables          = lookup(var.remote_region_metastores[count.index], "mapped-tables", "")
@@ -119,6 +122,7 @@ data "template_file" "ssh_metastores_yaml" {
     prefix                = lookup(var.ssh_metastores[count.index], "prefix")
     bastion_host          = lookup(var.ssh_metastores[count.index], "bastion-host")
     metastore_host        = lookup(var.ssh_metastores[count.index], "metastore-host")
+    name                  = lookup(var.ssh_metastores[count.index], "name", "")
     metastore_port        = lookup(var.ssh_metastores[count.index], "port")
     user                  = lookup(var.ssh_metastores[count.index], "user")
     timeout               = lookup(var.ssh_metastores[count.index], "timeout", "60000")
@@ -139,6 +143,7 @@ data "template_file" "glue_metastores_yaml" {
     prefix                 = lookup(var.glue_metastores[count.index], "prefix")
     glue_account_id        = lookup(var.glue_metastores[count.index], "glue-account-id")
     glue_endpoint          = lookup(var.glue_metastores[count.index], "glue-endpoint")
+    name                   = lookup(var.glue_metastores[count.index], "name", "")
     mapped_databases       = lookup(var.glue_metastores[count.index], "mapped-databases", "")
     mapped_tables          = lookup(var.glue_metastores[count.index], "mapped-tables", "")
     database_name_mapping  = lookup(var.glue_metastores[count.index], "database-name-mapping", "")

templates/waggle-dance-federation-glue.yml.tmpl

@@ -1,7 +1,7 @@
 %{if metastore_enabled~}
-  - name: ${prefix}
+  - name: ${ name == "" ? "prefix" : "name" }
     access-control-type: ${ writable_whitelist == "" ? "READ_ONLY" : "READ_AND_WRITE_ON_DATABASE_WHITELIST" }
-    database-prefix: ${prefix}_
+    database-prefix: '${ prefix == "" ? "" : "prefix_" }'
     glue-config:
       glue-account-id: ${glue_account_id}
       glue-endpoint: ${glue_endpoint}

templates/waggle-dance-federation-local.yml.tmpl

@@ -1,7 +1,7 @@
 %{if metastore_enabled~}
-  - name: ${prefix}
+  - name: ${ name == "" ? "prefix" : "name" }
     access-control-type: ${ writable_whitelist == "" ? "READ_ONLY" : "READ_AND_WRITE_ON_DATABASE_WHITELIST" }
-    database-prefix: ${prefix}_
+    database-prefix: '${ prefix == "" ? "" : "prefix_" }'
     remote-meta-store-uris: thrift://${metastore_host}:${metastore_port}
     latency: ${latency}
 %{if enable_path_conversion ~}

templates/waggle-dance-federation-remote.yml.tmpl

@@ -1,7 +1,7 @@
 %{if metastore_enabled~}
-  - name: ${prefix}
+  - name: ${ name == "" ? "prefix" : "name" }
     access-control-type: ${ writable_whitelist == "" ? "READ_ONLY" : "READ_AND_WRITE_ON_DATABASE_WHITELIST" }
-    database-prefix: ${prefix}_
+    database-prefix: '${ prefix == "" ? "" : "prefix_" }'
     remote-meta-store-uris: thrift://${metastore_host}:${metastore_port}
     latency: ${latency}
 %{if enable_path_conversion ~}

templates/waggle-dance-federation-ssh.yml.tmpl

@@ -1,7 +1,7 @@
 %{if metastore_enabled~}
-  - name: ${prefix}
+  - name: ${ name == "" ? "prefix" : "name" }
     access-control-type: ${ writable_whitelist == "" ? "READ_ONLY" : "READ_AND_WRITE_ON_DATABASE_WHITELIST" }
-    database-prefix: ${prefix}_
+    database-prefix: ${ prefix == "" ? '' : "prefix_" }
     remote-meta-store-uris: thrift://${metastore_host}:${metastore_port}
     latency: ${latency}
     metastore-tunnel:

templates/waggle-dance-federation.yml.tmpl

@@ -1,6 +1,6 @@
 primary-meta-store:
   access-control-type: ${primary_metastore_access_type}
-  database-prefix: ${primary_metastore_database_prefix}_
+  database-prefix: '${ primary_metastore_database_prefix == "" ? "" : "primary_metastore_database_prefix_" }'
   name: primary
 %{if primary_metastore_glue_account_id != "" ~}
   glue-config: