Merge pull request #127 from kbst/customenvnames

Extend configuration inheritance implementation

aws/cluster/configuration.tf

@@ -1,12 +1,13 @@
-locals {
-  # apps config and merged ops config
-  workspaces = {
-    apps = var.configuration["apps"]
-    ops  = merge(var.configuration["apps"], var.configuration["ops"])
-  }
+module "configuration" {
+  source = "../../common/configuration"
+
+  configuration = var.configuration
+  base_key      = var.base_key
+}
 
+locals {
   # current workspace config
-  cfg = local.workspaces[terraform.workspace]
+  cfg = module.configuration.merged[terraform.workspace]
 
   name_prefix = local.cfg["name_prefix"]
 

aws/cluster/variables.tf

@@ -8,3 +8,9 @@ variable "manifest_path" {
   description = "Path to Kustomize overlay to build."
   default     = null
 }
+
+variable "base_key" {
+  type        = string
+  description = "The key in the configuration map all other keys inherit from."
+  default     = "apps"
+}

azurerm/cluster/configuration.tf

@@ -1,12 +1,13 @@
-locals {
-  # apps config and merged ops config
-  workspaces = {
-    apps = var.configuration["apps"]
-    ops  = merge(var.configuration["apps"], var.configuration["ops"])
-  }
+module "configuration" {
+  source = "../../common/configuration"
+
+  configuration = var.configuration
+  base_key      = var.base_key
+}
 
+locals {
   # current workspace config
-  cfg = local.workspaces[terraform.workspace]
+  cfg = module.configuration.merged[terraform.workspace]
 
   name_prefix = local.cfg["name_prefix"]
 

azurerm/cluster/variables.tf

@@ -8,3 +8,9 @@ variable "manifest_path" {
   description = "Path to Kustomize overlay to build."
   default     = null
 }
+
+variable "base_key" {
+  type        = string
+  description = "The key in the configuration map all other keys inherit from."
+  default     = "apps"
+}

common/configuration/outputs.tf

@@ -0,0 +1,15 @@
+locals {
+  base = {
+    (var.base_key) = var.configuration[var.base_key]
+  }
+
+  overlays = {
+    for name, _ in var.configuration :
+    name => merge(var.configuration[var.base_key], var.configuration[name])
+    if name != var.base_key
+  }
+}
+
+output "merged" {
+  value = merge(local.base, local.overlays)
+}

common/configuration/variables.tf

@@ -0,0 +1,9 @@
+variable "configuration" {
+  type        = map(map(string))
+  description = "Map with per workspace cluster configuration."
+}
+
+variable "base_key" {
+  type        = string
+  description = "The key in the configuration map all other keys inherit from."
+}

common/configuration/versions.tf

@@ -0,0 +1,4 @@
+
+terraform {
+  required_version = ">= 0.12"
+}

google/cluster/configuration.tf

@@ -1,12 +1,13 @@
-locals {
-  # apps config and merged ops config
-  workspaces = {
-    apps = var.configuration["apps"]
-    ops  = merge(var.configuration["apps"], var.configuration["ops"])
-  }
+module "configuration" {
+  source = "../../common/configuration"
+
+  configuration = var.configuration
+  base_key      = var.base_key
+}
 
+locals {
   # current workspace config
-  cfg = local.workspaces[terraform.workspace]
+  cfg = module.configuration.merged[terraform.workspace]
 
   name_prefix = local.cfg["name_prefix"]
 

google/cluster/variables.tf

@@ -8,3 +8,9 @@ variable "manifest_path" {
   description = "Path to Kustomize overlay to build."
   default     = null
 }
+
+variable "base_key" {
+  type        = string
+  description = "The key in the configuration map all other keys inherit from."
+  default     = "apps"
+}

kind/cluster/configuration.tf

@@ -1,12 +1,13 @@
-locals {
-  # apps config and merged ops config
-  workspaces = {
-    apps = var.configuration["apps"]
-    ops  = merge(var.configuration["apps"], var.configuration["ops"])
-  }
+module "configuration" {
+  source = "../../common/configuration"
+
+  configuration = var.configuration
+  base_key      = var.base_key
+}
 
+locals {
   # current workspace config
-  cfg = local.workspaces[terraform.workspace]
+  cfg = module.configuration.merged[terraform.workspace]
 
   name_prefix = local.cfg["name_prefix"]
 

kind/cluster/variables.tf

@@ -8,3 +8,9 @@ variable "manifest_path" {
   description = "Path to Kustomize overlay to build."
   default     = null
 }
+
+variable "base_key" {
+  type        = string
+  description = "The key in the configuration map all other keys inherit from."
+  default     = "apps"
+}