Merge pull request #101 from lgallard/fix/retention-days

fix: Improve validation and configuration for AWS Backup vault

Author: lgallard

.github/.release-please-config.json

@@ -28,7 +28,7 @@
   },
   "release-search-depth": 10,
   "include-component-in-tag": false,
-  "include-v-in-tag": true,
+  "include-v-in-tag": false,
   "date-formats": {
     "changelogDate": "(%B %d, %Y)"
   }

main.tf

@@ -16,6 +16,13 @@ resource "aws_backup_vault_lock_configuration" "ab_vault_lock_configuration" {
   min_retention_days  = var.min_retention_days
   max_retention_days  = var.max_retention_days
   changeable_for_days = var.changeable_for_days
+
+  lifecycle {
+    precondition {
+      condition     = local.check_retention_days
+      error_message = "When vault locking is enabled (locked = true), min_retention_days and max_retention_days must be provided and min_retention_days must be less than or equal to max_retention_days."
+    }
+  }
 }
 
 # AWS Backup plan
@@ -133,4 +140,13 @@ locals {
       )
     ])
   ])
+
+  # Check retention days - handling null values properly
+  check_retention_days = var.locked ? (
+    var.min_retention_days == null ? false : (
+      var.max_retention_days == null ? false : (
+        var.min_retention_days <= var.max_retention_days
+      )
+    )
+  ) : true
 }

variables.tf

@@ -42,11 +42,6 @@ variable "locked" {
   description = "Change to true to add a lock configuration for the backup vault"
   type        = bool
   default     = false
-
-  validation {
-    condition     = !var.locked || (var.min_retention_days != null && var.max_retention_days != null && var.min_retention_days <= var.max_retention_days)
-    error_message = "When vault locking is enabled (locked = true), min_retention_days and max_retention_days must be provided and min_retention_days must be less than or equal to max_retention_days."
-  }
 }
 
 variable "changeable_for_days" {
@@ -66,8 +61,8 @@ variable "max_retention_days" {
   default     = null
 
   validation {
-    condition     = var.max_retention_days == null ? true : var.max_retention_days >= 1 && var.max_retention_days <= 36500
-    error_message = "The max_retention_days must be between 1 and 36500 days."
+    condition     = var.max_retention_days == null ? true : var.max_retention_days >= 1
+    error_message = "The max_retention_days must be greater than or equal to 1."
   }
 }