Merge pull request #123 from trahim/remove-device-configuration-condi…

…tion-never-false Removing device configuration config where challenge_required_on_new_…
lgallard · Aug 8, 2024 · f0eee45 · f0eee45
2 parents 00fd5ab + 2034424
commit f0eee45
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/main.tf b/main.tf
@@ -260,12 +260,10 @@ locals {
 
   # device_configuration
   # If no device_configuration list is provided, build a device_configuration using the default values
-  device_configuration_default = {
+  device_configuration = [{
     challenge_required_on_new_device      = lookup(var.device_configuration, "challenge_required_on_new_device", null) == null ? var.device_configuration_challenge_required_on_new_device : lookup(var.device_configuration, "challenge_required_on_new_device")
     device_only_remembered_on_user_prompt = lookup(var.device_configuration, "device_only_remembered_on_user_prompt", null) == null ? var.device_configuration_device_only_remembered_on_user_prompt : lookup(var.device_configuration, "device_only_remembered_on_user_prompt")
-  }
-
-  device_configuration = lookup(local.device_configuration_default, "challenge_required_on_new_device") == false && lookup(local.device_configuration_default, "device_only_remembered_on_user_prompt") == false ? [] : [local.device_configuration_default]
+  }]
 
   # email_configuration
   # If no email_configuration is provided, build an email_configuration using the default values

diff --git a/variables.tf b/variables.tf
@@ -122,13 +122,13 @@ variable "device_configuration" {
 variable "device_configuration_challenge_required_on_new_device" {
   description = "Indicates whether a challenge is required on a new device. Only applicable to a new device"
   type        = bool
-  default     = false
+  default     = null
 }
 
 variable "device_configuration_device_only_remembered_on_user_prompt" {
   description = "If true, a device is only remembered on user prompt"
   type        = bool
-  default     = false
+  default     = null
 }
 
 # email_configuration