Merge pull request #177 from ederst/fix-broken-workspace-inheritance

Fix configuration module inheritance #176

Author: pst

common/configuration/outputs.tf

@@ -3,15 +3,17 @@ locals {
     (var.base_key) = var.configuration[var.base_key]
   }
 
+  base_config = local.base[var.base_key]
+
   overlays = {
     # include all envs but the base_key in overlays
     for env_key, env in var.configuration :
     env_key => {
-      # loop through all config keys in base_key environment
+      # loop through all config keys in base_key environment and current env
       # if current env has that key, use the value from current env
       # if not, use the value from the base_key environment
-      for key, value in var.configuration[var.base_key] :
-      key => lookup(env, key, null) != null ? env[key] : value
+      for key in setunion(keys(env), keys(local.base_config)) :
+      key => lookup(env, key, null) != null ? env[key] : local.base_config[key]
     }
     if env_key != var.base_key
   }