update output, settings

outputs.tf

@@ -12,6 +12,7 @@ output "s3_bucket_files_in" {
   value = {
     id  = module.files_in.s3_bucket_id
     arn = module.files_in.s3_bucket_arn
+    key_arn = module.files_in.kms_key_arn
   }
 }
 
@@ -20,6 +21,7 @@ output "s3_bucket_files_quarantine" {
   value = {
     id  = module.files_quarantine.s3_bucket_id
     arn = module.files_quarantine.s3_bucket_arn
+    key_arn = module.files_quarantine.kms_key_arn
   }
 }
 
@@ -28,12 +30,14 @@ output "s3_bucket_files_clean" {
   value = {
     id  = module.files_clean.s3_bucket_id
     arn = module.files_clean.s3_bucket_arn
+    key_arn = module.files_clean.kms_key_arn
   }
 }
 output "s3_bucket_files_out_clean" {
-  description = "files-out-clean (from replication) bucket ARN and id"
+  description = "files-out-clean bucket ARN and id"
   value = {
     id  = module.files_out_clean.s3_bucket_id
     arn = module.files_out_clean.s3_bucket_arn
+    key_arn = module.files_out_clean.kms_key_arn
   }
 }

settings.tf

@@ -1,4 +1,13 @@
 locals {
-  settings = var.settings
+  _settings = var.settings
   settings_default = yamldecode(file("${path.module}/settings.default.yml"))
+  settings = { for k in keys(var.settings_default): k => merge(
+    local.settings_default["default"],
+    local.settings_default[k],
+    local._settings[k],
+  ) if k!="default" }
+}
+
+output "settings" {
+  value = local.settings
 }

version.tf

@@ -1,4 +1,4 @@
 locals {
   _module_name = "aws-app-ditd-darhts-s3-transfer"
-  _module_version = "0.9.7"
+  _module_version = "0.9.8"
 }