Rejigger flags around environment

main.tf

@@ -128,7 +128,7 @@ module "cloud-manager-agent" {
 
   namespace              = var.cma_namespace
   settings               = var.cma_settings
-  environment            = var.environment
+  environment            = var.cma_environment
   values                 = var.cma_values
 }
 

modules/cloud-manager-agent/main.tf

@@ -39,7 +39,7 @@ locals {
   settings         = var.settings != null ? var.settings : {}
   timeout          = var.timeout != null ? var.timeout : 120
   values           = var.values != null ? var.values : []
-  environment      = var.environment
+  environment      = var.environment != null ? var.environment : "production"
 }
 
 resource "helm_release" "cloud-manager-agent" {

modules/cloud-manager-agent/values.yaml.tftpl

@@ -2,4 +2,4 @@ appConfig:
   applicationAgentProperties:
     kubernetesExternalSecret:
       enabled: true
-      secretName: cloud-manager-agent-extra-%{environment}
+      secretName: cloud-manager-agent-extra-${environment}

modules/cloud-manager-agent/variables.tf

@@ -75,8 +75,8 @@ variable "environment" {
   description = "Whether this is for a test, staging, or production environment."
 
   validation {
-    condition     = var.stage == "test" || var.stage == "staging" || var.stage == "production"
-    error_message = "Got an unexpected value for environment (expecting test, staging, or production)"
+    condition     = var.environment == "test" || var.environment == "staging" || var.environment == "production"
+    error_message = "Got an unexpected value for environment (expecting test, staging, or production)."
   }
 }
 

variables.tf

@@ -870,7 +870,7 @@ variable "cma_environment" {
   description = "Whether this is for a test, staging, or production environment."
 
   validation {
-    condition     = var.stage == "test" || var.stage == "staging" || var.stage == "production"
-    error_message = "Got an unexpected value for environment (expecting test, staging, or production)"
+    condition     = var.cma_environment == "test" || var.cma_environment == "staging" || var.cma_environment == "production"
+    error_message = "Got an unexpected value for environment (expecting test, staging, or production)."
   }
 }