Merge pull request #129 from kbst/bettervarname

pst · web-flow · commit 8c44d51c1be5 · 2020-08-25T14:07:37.000+02:00
Make clear base_key is configuration related
diff --git a/aws/cluster/configuration.tf b/aws/cluster/configuration.tf
@@ -2,7 +2,7 @@ module "configuration" {
   source = "../../common/configuration"
 
   configuration = var.configuration
-  base_key      = var.base_key
+  base_key      = var.configuration_base_key
 }
 
 locals {
diff --git a/aws/cluster/variables.tf b/aws/cluster/variables.tf
@@ -3,14 +3,14 @@ variable "configuration" {
   description = "Map with per workspace cluster configuration."
 }
 
-variable "manifest_path" {
+variable "configuration_base_key" {
   type        = string
-  description = "Path to Kustomize overlay to build."
-  default     = null
+  description = "The key in the configuration map all other keys inherit from."
+  default     = "apps"
 }
 
-variable "base_key" {
+variable "manifest_path" {
   type        = string
-  description = "The key in the configuration map all other keys inherit from."
-  default     = "apps"
+  description = "Path to Kustomize overlay to build."
+  default     = null
 }
diff --git a/azurerm/cluster/configuration.tf b/azurerm/cluster/configuration.tf
@@ -2,7 +2,7 @@ module "configuration" {
   source = "../../common/configuration"
 
   configuration = var.configuration
-  base_key      = var.base_key
+  base_key      = var.configuration_base_key
 }
 
 locals {
diff --git a/azurerm/cluster/variables.tf b/azurerm/cluster/variables.tf
@@ -3,14 +3,14 @@ variable "configuration" {
   description = "Map with per workspace cluster configuration."
 }
 
-variable "manifest_path" {
+variable "configuration_base_key" {
   type        = string
-  description = "Path to Kustomize overlay to build."
-  default     = null
+  description = "The key in the configuration map all other keys inherit from."
+  default     = "apps"
 }
 
-variable "base_key" {
+variable "manifest_path" {
   type        = string
-  description = "The key in the configuration map all other keys inherit from."
-  default     = "apps"
+  description = "Path to Kustomize overlay to build."
+  default     = null
 }
diff --git a/google/cluster/configuration.tf b/google/cluster/configuration.tf
@@ -2,7 +2,7 @@ module "configuration" {
   source = "../../common/configuration"
 
   configuration = var.configuration
-  base_key      = var.base_key
+  base_key      = var.configuration_base_key
 }
 
 locals {
diff --git a/google/cluster/variables.tf b/google/cluster/variables.tf
@@ -3,14 +3,14 @@ variable "configuration" {
   description = "Map with per workspace cluster configuration."
 }
 
-variable "manifest_path" {
+variable "configuration_base_key" {
   type        = string
-  description = "Path to Kustomize overlay to build."
-  default     = null
+  description = "The key in the configuration map all other keys inherit from."
+  default     = "apps"
 }
 
-variable "base_key" {
+variable "manifest_path" {
   type        = string
-  description = "The key in the configuration map all other keys inherit from."
-  default     = "apps"
+  description = "Path to Kustomize overlay to build."
+  default     = null
 }
diff --git a/kind/cluster/configuration.tf b/kind/cluster/configuration.tf
@@ -2,7 +2,7 @@ module "configuration" {
   source = "../../common/configuration"
 
   configuration = var.configuration
-  base_key      = var.base_key
+  base_key      = var.configuration_base_key
 }
 
 locals {
diff --git a/kind/cluster/variables.tf b/kind/cluster/variables.tf
@@ -3,14 +3,14 @@ variable "configuration" {
   description = "Map with per workspace cluster configuration."
 }
 
-variable "manifest_path" {
+variable "configuration_base_key" {
   type        = string
-  description = "Path to Kustomize overlay to build."
-  default     = null
+  description = "The key in the configuration map all other keys inherit from."
+  default     = "apps"
 }
 
-variable "base_key" {
+variable "manifest_path" {
   type        = string
-  description = "The key in the configuration map all other keys inherit from."
-  default     = "apps"
+  description = "Path to Kustomize overlay to build."
+  default     = null
 }

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ module "configuration" {`
`2`	`2`	`source = "../../common/configuration"`
`3`	`3`
`4`	`4`	`configuration = var.configuration`
`5`		`- base_key = var.base_key`
	`5`	`+ base_key = var.configuration_base_key`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`locals {`
Original file line number	Diff line number	Diff line change
`@@ -3,14 +3,14 @@ variable "configuration" {`
`3`	`3`	`description = "Map with per workspace cluster configuration."`
`4`	`4`	`}`
`5`	`5`
`6`		`-variable "manifest_path" {`
	`6`	`+variable "configuration_base_key" {`
`7`	`7`	`type = string`
`8`		`- description = "Path to Kustomize overlay to build."`
`9`		`- default = null`
	`8`	`+ description = "The key in the configuration map all other keys inherit from."`
	`9`	`+ default = "apps"`
`10`	`10`	`}`
`11`	`11`
`12`		`-variable "base_key" {`
	`12`	`+variable "manifest_path" {`
`13`	`13`	`type = string`
`14`		`- description = "The key in the configuration map all other keys inherit from."`
`15`		`- default = "apps"`
	`14`	`+ description = "Path to Kustomize overlay to build."`
	`15`	`+ default = null`
`16`	`16`	`}`