Make trigger_config non-nullable and simplify expressions

2022-11-15 17:03:56 +01:00
parent 5b0b1af2f6
commit de2bea16a4
3 changed files with 10 additions and 14 deletions
--- a/modules/cloud-function/variables.tf
+++ b/modules/cloud-function/variables.tf
@@ -163,9 +163,9 @@ variable "trigger_config" {
      retry_policy           = optional(string)
    }))
  })
-  default = null
+  default = { v1 = null, v2 = null }
  validation {
-    condition     = try(((var.trigger_config.v1 == null) != (var.trigger_config.v2 == null)), var.trigger_config == null)
+    condition     = !(var.trigger_config.v1 != null && var.trigger_config.v2 != null)
    error_message = "Provide configuration for only one generation - either v1 or v2"
  }
 }