mirror of
https://github.com/fleetdm/fleet
synced 2026-05-24 01:18:42 +00:00
lifecycle_rule on aws_s3_bucket is deprecated on dogfood/firehose.tf (#10926)
`lifecycle_rule` on `aws_s3_bucket` is a deprecated argument. Highlighted on this job: https://github.com/fleetdm/fleet/actions/runs/4570054990/jobs/8066956394#step:4:56
This commit is contained in:
parent
4bfd886667
commit
2612ce7647
1 changed files with 13 additions and 8 deletions
|
|
@ -42,13 +42,6 @@ resource "aws_s3_bucket" "osquery-status" { #tfsec:ignore:aws-s3-encryption-cust
|
|||
bucket = var.osquery_status_s3_bucket
|
||||
acl = "private"
|
||||
|
||||
lifecycle_rule {
|
||||
enabled = true
|
||||
expiration {
|
||||
days = 1
|
||||
}
|
||||
}
|
||||
|
||||
server_side_encryption_configuration {
|
||||
rule {
|
||||
apply_server_side_encryption_by_default {
|
||||
|
|
@ -58,6 +51,18 @@ resource "aws_s3_bucket" "osquery-status" { #tfsec:ignore:aws-s3-encryption-cust
|
|||
}
|
||||
}
|
||||
|
||||
resource "aws_s3_bucket_lifecycle_configuration" "osquery-status" {
|
||||
bucket = aws_s3_bucket.osquery-status.id
|
||||
|
||||
rule {
|
||||
id = "rule-1"
|
||||
status = "Enabled"
|
||||
expiration {
|
||||
days = 1
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
resource "aws_s3_bucket_public_access_block" "osquery-status" {
|
||||
bucket = aws_s3_bucket.osquery-status.id
|
||||
block_public_acls = true
|
||||
|
|
@ -153,4 +158,4 @@ resource "aws_kinesis_firehose_delivery_stream" "osquery_status" {
|
|||
role_arn = aws_iam_role.firehose-status.arn
|
||||
bucket_arn = aws_s3_bucket.osquery-status.arn
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue