Merge branch 'main' into chore/gh_cli_release

stroeer · Sep 19, 2024 · 80b8483 · 80b8483
2 parents 02ce02c + 6b0cf02
commit 80b8483
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/container_definition.tf b/container_definition.tf
@@ -16,7 +16,7 @@ locals {
       logDriver = "awsfirelens",
       options = {
         Aws_Auth           = "On"
-        Aws_Region         = data.aws_region.current.name
+        Aws_Region         = null != var.firelens.aws_region ? var.firelens.aws_region : data.aws_region.current.name
         Host               = var.firelens.opensearch_host
         Logstash_Format    = "true"
         Logstash_Prefix    = "${var.service_name}-app"

diff --git a/envoy.tf b/envoy.tf
@@ -41,7 +41,7 @@ locals {
       logDriver = "awsfirelens",
       options = {
         Aws_Auth           = "On"
-        Aws_Region         = data.aws_region.current.name
+        Aws_Region         = null != var.firelens.aws_region ? var.firelens.aws_region : data.aws_region.current.name
         Host               = var.firelens.opensearch_host
         Logstash_Format    = "true"
         Logstash_Prefix    = "${var.service_name}-envoy"

diff --git a/variables.tf b/variables.tf
@@ -332,6 +332,7 @@ variable "firelens" {
     init_config_files            = optional(list(string), [])
     log_level                    = optional(string, "info")
     opensearch_host              = optional(string, "")
+    aws_region                   = optional(string)
   })
 }