Merge pull request #30 from aodn/support_dot_env

Support dot env
aodn · Dec 19, 2023 · e8be96d · e8be96d
2 parents 9b46d10 + 2806110
commit e8be96d
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 17 deletions.
diff --git a/deploy/container/default.env b/deploy/container/default.env
@@ -0,0 +1,10 @@
+ALLOWED_CIDR_NETS=0.0.0.0/0
+ALLOWED_HOSTS=*
+DB_HOST=
+DB_NAME=
+DB_SECRET_NAME=
+DB_SECRET_REGION=
+DB_USER=
+DJANGO_SECRET_KEY=changeme
+S3_STORAGE_BUCKET_NAME=
+S3_STORAGE_BUCKET_REGION=
diff --git a/deploy/container/env_vars.yaml b/deploy/container/env_vars.yaml
diff --git a/deploy/iam_statements/development.yaml → deploy/iam_statements/development.yaml.tftpl b/deploy/iam_statements/development.yaml → deploy/iam_statements/development.yaml.tftpl
diff --git a/deploy/iam_statements/production.yaml → deploy/iam_statements/production.yaml.tftpl b/deploy/iam_statements/production.yaml → deploy/iam_statements/production.yaml.tftpl
diff --git a/deploy/iam_statements/staging.yaml → deploy/iam_statements/staging.yaml.tftpl b/deploy/iam_statements/staging.yaml → deploy/iam_statements/staging.yaml.tftpl
diff --git a/deploy/tg/ecs/terragrunt.hcl b/deploy/tg/ecs/terragrunt.hcl
@@ -34,22 +34,22 @@ locals {
   global = include.global.locals
 
   # container/task environment variables
-  default_env_vars = yamldecode(file("../../container/env_vars.yaml"))
+  default_env_vars = { for tuple in regexall("(.*?)=(.*)", file("../../container/default.env")) : tuple[0] => tuple[1] }
 
   # get any overrides from the environment (e.g. GitHub deployment variables)
   override_env_vars = {
     for k, v in local.default_env_vars :
-    k => can(get_env(upper(k))) ? get_env(upper(k)) : v
+    k => can(get_env(k)) ? get_env(k) : v
   }
 
-  # remove null values from the override map
+  # remove empty values from the override map
   env_vars = {
-    for k, v in local.override_env_vars : k => v if v != null && v != ""
+    for k, v in local.override_env_vars : k => v if v != ""
   }
 
   default_hostname = join("-", [get_env("APP_NAME"), local.global.environment])
 
-  iam_statements = try(yamldecode(templatefile("../..//iam_statements/${local.global.environment}.yaml",
+  iam_statements = try(yamldecode(templatefile("../..//iam_statements/${local.global.environment}.yaml.tftpl",
     {
       aws_account = local.global.aws_account
       aws_region  = local.global.aws_region