s3 lifecycle updates

addons/logging-alb/main.tf

@@ -168,13 +168,12 @@ module "s3_bucket_for_logs" {
       ]
       expiration = {
         days = var.s3_expiration_days
-        # Always resets to false anyhow showing terraform changes constantly
-        expired_object_delete_marker = false
       }
       noncurrent_version_expiration = {
         newer_noncurrent_versions = var.s3_newer_noncurrent_versions
         days                      = var.s3_noncurrent_version_expiration_days
       }
+      filter = []
     }
   ]
 }
@@ -226,13 +225,12 @@ module "athena-s3-bucket" {
       ]
       expiration = {
         days = var.s3_expiration_days
-        # Always resets to false anyhow showing terraform changes constantly
-        expired_object_delete_marker = false
       }
       noncurrent_version_expiration = {
         newer_noncurrent_versions = var.s3_newer_noncurrent_versions
         days                      = var.s3_noncurrent_version_expiration_days
       }
+      filter = []
     }
   ]
 }

addons/logging-destination-firehose/main.tf

@@ -20,6 +20,7 @@ resource "aws_s3_bucket_lifecycle_configuration" "osquery-results" {
     expiration {
       days = var.osquery_results_s3_bucket.expires_days
     }
+    filter {}
   }
 }
 
@@ -59,6 +60,7 @@ resource "aws_s3_bucket_lifecycle_configuration" "osquery-status" {
     expiration {
       days = var.osquery_status_s3_bucket.expires_days
     }
+    filter {}
   }
 }
 

addons/osquery-carve/main.tf

@@ -17,6 +17,7 @@ resource "aws_s3_bucket_lifecycle_configuration" "main" {
     expiration {
       days = var.osquery_carve_s3_bucket.expires_days
     }
+    filter {}
   }
 }
 

byo-vpc/byo-db/byo-ecs/main.tf

@@ -319,6 +319,7 @@ resource "aws_s3_bucket_lifecycle_configuration" "software_installers" {
       noncurrent_days = 30
     }
     status = "Enabled"
+    filter {}
   }
 }
 

example/main.tf

@@ -52,7 +52,7 @@ locals {
 }
 
 module "fleet" {
-  source          = "github.com/fleetdm/fleet-terraform?depth=1&ref=tf-mod-root-v1.16.2"
+  source          = "github.com/fleetdm/fleet-terraform?depth=1&ref=tf-mod-root-v1.16.3"
   certificate_arn = module.acm.acm_certificate_arn
 
   vpc = {
@@ -143,15 +143,15 @@ module "migrations" {
 
 # Enable if using s3 for carves
 # module "osquery-carve" {
-#   source = "github.com/fleetdm/fleet-terraform/addons/osquery-carve?depth=1&ref=tf-mod-addon-osquery-carve-v1.1.0"
+#   source = "github.com/fleetdm/fleet-terraform/addons/osquery-carve?depth=1&ref=tf-mod-addon-osquery-carve-v1.1.1"
 #   osquery_carve_s3_bucket = {
 #     name = local.osquery_carve_bucket_name
 #   }
 # }
 
 # Uncomment if using firehose logging destination
 # module "firehose-logging" {
-#   source = "github.com/fleetdm/fleet-terraform/addons/logging-destination-firehose?depth=1&ref=tf-mod-addon-logging-destination-firehose-v1.1.1"
+#   source = "github.com/fleetdm/fleet-terraform/addons/logging-destination-firehose?depth=1&ref=tf-mod-addon-logging-destination-firehose-v1.2.1"
 #   osquery_results_s3_bucket = {
 #     name = local.osquery_results_bucket_name
 #   }