feat: fixed intelligent tiering settings

modules/storage/s3_bucket_2023/main.tf

@@ -1,6 +1,5 @@
 resource "aws_s3_bucket" "this" {
-  bucket        = var.bucket_name
-  force_destroy = var.bucket_force_destroy
+  bucket = var.bucket_name
 }
 
 resource "aws_s3_bucket_public_access_block" "block_public_access" {
@@ -47,41 +46,41 @@ resource "aws_s3_bucket_lifecycle_configuration" "lifecycle" {
   bucket = aws_s3_bucket.this.id
   rule {
     id = "CurrentVersion"
-
+    filter {}
     expiration {
       days = var.current_version_expiration_days
     }
 
     status = "Enabled"
 
-    transition {
-      days          = 15
-      storage_class = "INTELLIGENT_TIERING"
+    dynamic "transition" {
+      for_each = var.enable_intelligent_tiering ? [1] : []
+      content {
+        days          = var.current-version-transition-days
+        storage_class = "INTELLIGENT_TIERING"
+      }
     }
-
-    filter {}
   }
 
   rule {
     id = "NonCurrentVersion"
-
+    filter {}
     noncurrent_version_expiration {
       noncurrent_days = var.noncurrent_version_expiration_days
     }
 
     noncurrent_version_transition {
-      noncurrent_days = 15
-      storage_class   = "INTELLIGENT_TIERING"
+      noncurrent_days = var.noncurrent-version-transition-days
+      storage_class   = var.enable_intelligent_tiering ? "INTELLIGENT_TIERING" : var.noncurrent-version-archive-tier
     }
 
-    filter {}
-
     status = var.enable_versioning ? "Enabled" : "Disabled"
   }
 }
 
 
 resource "aws_s3_bucket_intelligent_tiering_configuration" "intel_tiering_config" {
+  count  = var.enable_intelligent_tiering ? 1 : 0
   bucket = aws_s3_bucket.this.id
   name   = "IntelligentTieringArchiveConfigurations"
 
@@ -110,7 +109,7 @@ resource "aws_s3_bucket_server_side_encryption_configuration" "encryption" {
       kms_master_key_id = var.encryption_key_arn
       sse_algorithm     = length(var.encryption_key_arn) > 0 ? "aws:kms" : "AES256"
     }
-    bucket_key_enabled = length(var.encryption_key_arn) > 0 ? true : false
+    bucket_key_enabled = var.encryption-enable-bucket-key
   }
 }