Merge pull request #10 from geekcell/fix/upgrade-terraform-1-6

fix: Upgrade this module to work with Terraform 1.6

Author: ckappen

modules/metrics_firehose/README.md

@@ -34,16 +34,15 @@ No outputs.
 
 ## Resources
 
-- resource.aws_cloudwatch_log_group.main (modules/metrics_firehose/main.tf#312)
-- resource.aws_cloudwatch_log_stream.http_endpoint (modules/metrics_firehose/main.tf#319)
-- resource.aws_cloudwatch_log_stream.s3_backup (modules/metrics_firehose/main.tf#324)
+- resource.aws_cloudwatch_log_group.main (modules/metrics_firehose/main.tf#320)
+- resource.aws_cloudwatch_log_stream.http_endpoint (modules/metrics_firehose/main.tf#327)
+- resource.aws_cloudwatch_log_stream.s3_backup (modules/metrics_firehose/main.tf#332)
 - resource.aws_cloudwatch_metric_stream.main (modules/metrics_firehose/main.tf#107)
 - resource.aws_kinesis_firehose_delivery_stream.main (modules/metrics_firehose/main.tf#261)
-- resource.aws_s3_bucket.main (modules/metrics_firehose/main.tf#332)
-- resource.aws_s3_bucket_acl.main (modules/metrics_firehose/main.tf#338)
-- resource.aws_s3_bucket_lifecycle_configuration.main (modules/metrics_firehose/main.tf#362)
-- resource.aws_s3_bucket_policy.main (modules/metrics_firehose/main.tf#375)
-- resource.aws_s3_bucket_public_access_block.main (modules/metrics_firehose/main.tf#343)
-- resource.aws_s3_bucket_versioning.main (modules/metrics_firehose/main.tf#352)
-- data source.aws_iam_policy_document.main (modules/metrics_firehose/main.tf#382)
+- resource.aws_s3_bucket.main (modules/metrics_firehose/main.tf#340)
+- resource.aws_s3_bucket_lifecycle_configuration.main (modules/metrics_firehose/main.tf#365)
+- resource.aws_s3_bucket_policy.main (modules/metrics_firehose/main.tf#378)
+- resource.aws_s3_bucket_public_access_block.main (modules/metrics_firehose/main.tf#346)
+- resource.aws_s3_bucket_versioning.main (modules/metrics_firehose/main.tf#355)
+- data source.aws_iam_policy_document.main (modules/metrics_firehose/main.tf#385)
 <!-- END_TF_DOCS -->

modules/metrics_firehose/main.tf

@@ -262,10 +262,10 @@ resource "aws_kinesis_firehose_delivery_stream" "main" {
   name        = "${var.prefix}-datadog-metric-stream"
   destination = "http_endpoint"
 
-  s3_configuration {
+  extended_s3_configuration {
     bucket_arn          = aws_s3_bucket.main.arn
-    buffer_size         = 4
-    buffer_interval     = 60
+    buffering_size      = 4
+    buffering_interval  = 60
     compression_format  = "GZIP"
     role_arn            = module.firehose_role.arn
     error_output_prefix = "datadog-stream"
@@ -287,15 +287,23 @@ resource "aws_kinesis_firehose_delivery_stream" "main" {
     s3_backup_mode     = "FailedDataOnly"
     role_arn           = module.firehose_role.arn
 
-    request_configuration {
-      content_encoding = "GZIP"
-    }
-
     cloudwatch_logging_options {
       enabled         = true
       log_group_name  = aws_cloudwatch_log_group.main.name
       log_stream_name = aws_cloudwatch_log_stream.http_endpoint.name
     }
+
+    request_configuration {
+      content_encoding = "GZIP"
+    }
+
+    s3_configuration {
+      role_arn           = module.firehose_role.arn
+      bucket_arn         = aws_s3_bucket.main.arn
+      buffering_size     = 10
+      buffering_interval = 400
+      compression_format = "GZIP"
+    }
   }
 
   server_side_encryption {
@@ -335,11 +343,6 @@ resource "aws_s3_bucket" "main" {
   tags = var.tags
 }
 
-resource "aws_s3_bucket_acl" "main" {
-  bucket = aws_s3_bucket.main.id
-  acl    = "private"
-}
-
 resource "aws_s3_bucket_public_access_block" "main" {
   bucket = aws_s3_bucket.main.id