From 719981af109bc612247b07c52e398ea4db9ae6c3 Mon Sep 17 00:00:00 2001
From: Raj Poluri <rpoluri@expediagroup.com>
Date: Thu, 27 Feb 2025 15:17:19 -0600
Subject: [PATCH] create system glue database

---
 glue.tf     | 7 +++++++
 s3-other.tf | 8 ++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/glue.tf b/glue.tf
index f9892ef..31b5c4d 100644
--- a/glue.tf
+++ b/glue.tf
@@ -13,3 +13,10 @@ resource "aws_glue_catalog_database" "apiary_glue_database" {
   name         = "${local.gluedb_prefix}${each.key}"
   description  = "Managed by Apiary terraform"
 }
+
+resource "aws_glue_catalog_database" "apiary_glue_database" {
+  count        = var.disable_glue_db_init ? 1 : 0
+  location_uri = "s3://${aws_s3_bucket.apiary_system.id}/"
+  name         = "${local.gluedb_prefix}${var.system_schema_name}"
+  description  = "Managed by Apiary terraform"
+}
diff --git a/s3-other.tf b/s3-other.tf
index fce8882..8d2c8a8 100644
--- a/s3-other.tf
+++ b/s3-other.tf
@@ -7,7 +7,7 @@
 resource "aws_s3_bucket" "apiary_inventory_bucket" {
   count  = var.s3_enable_inventory == true ? 1 : 0
   bucket = local.s3_inventory_bucket
-  tags   = merge(tomap({"Name"="${local.s3_inventory_bucket}"}), var.apiary_tags)
+  tags   = merge(tomap({ "Name" = "${local.s3_inventory_bucket}" }), var.apiary_tags)
   policy = <<EOF
 {
   "Version":"2012-10-17",
@@ -96,7 +96,7 @@ resource "aws_s3_bucket" "apiary_managed_logs_bucket" {
   count  = local.enable_apiary_s3_log_management ? 1 : 0
   bucket = local.apiary_s3_logs_bucket
   acl    = "log-delivery-write"
-  tags   = merge(tomap({"Name"=local.apiary_s3_logs_bucket}), var.apiary_tags, var.apiary_extra_tags_s3)
+  tags   = merge(tomap({ "Name" = local.apiary_s3_logs_bucket }), var.apiary_tags, var.apiary_extra_tags_s3)
   policy = <<EOF
 {
   "Version":"2012-10-17",
@@ -161,7 +161,7 @@ resource "aws_s3_bucket_notification" "apiary_managed_logs_bucket" {
 resource "aws_s3_bucket" "apiary_access_logs_hive" {
   count  = local.enable_apiary_s3_log_hive ? 1 : 0
   bucket = local.apiary_s3_hive_logs_bucket
-  tags   = merge(tomap({"Name"=local.apiary_s3_hive_logs_bucket}), var.apiary_tags)
+  tags   = merge(tomap({ "Name" = local.apiary_s3_hive_logs_bucket }), var.apiary_tags)
   policy = <<EOF
 {
   "Version":"2012-10-17",
@@ -211,7 +211,7 @@ resource "aws_s3_bucket_public_access_block" "apiary_access_logs_hive" {
 
 resource "aws_s3_bucket" "apiary_system" {
   bucket = local.apiary_system_bucket
-  tags   = merge(tomap({"Name"=local.apiary_system_bucket}), var.apiary_tags)
+  tags   = merge(tomap({ "Name" = local.apiary_system_bucket }), var.apiary_tags)
   policy = <<EOF
 {
   "Version":"2012-10-17",