Skip to content

Commit

Permalink
Feat: Moving s3_configuration {} from root block to http_endpoint_con… (
Browse files Browse the repository at this point in the history
#49)

## Which problem is this PR solving?

This is a breaking change and requires consumers to upgrade to 5.x.x AWS
terraform provider

- Closes #48

## Short description of the changes
hashicorp/terraform-provider-aws#31138


## How to verify that this has the expected result
Followed the changes specified
[here](hashicorp/terraform-provider-aws#31138)
and running in dev environment
  • Loading branch information
ryan-keswick authored Jun 22, 2023
1 parent a3860c1 commit b86c024
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 11 deletions.
19 changes: 9 additions & 10 deletions modules/kinesis-firehose-honeycomb/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,6 @@ resource "aws_kinesis_firehose_delivery_stream" "http_stream" {
name = var.name
destination = "http_endpoint"

s3_configuration {
role_arn = aws_iam_role.firehose_s3_role.arn
bucket_arn = var.s3_failure_bucket_arn

buffer_size = var.s3_buffer_size
buffer_interval = var.s3_buffer_interval
compression_format = var.s3_compression_format
}

http_endpoint_configuration {
url = "${var.honeycomb_api_host}/1/kinesis_events/${var.honeycomb_dataset_name}"
name = "honeycomb"
Expand All @@ -33,6 +24,15 @@ resource "aws_kinesis_firehose_delivery_stream" "http_stream" {
buffering_size = var.http_buffering_size
buffering_interval = var.http_buffering_interval

s3_configuration {
role_arn = aws_iam_role.firehose_s3_role.arn
bucket_arn = var.s3_failure_bucket_arn

buffering_size = var.s3_buffer_size
buffering_interval = var.s3_buffer_interval
compression_format = var.s3_compression_format
}

request_configuration {
content_encoding = "GZIP"
}
Expand All @@ -56,7 +56,6 @@ resource "aws_kinesis_firehose_delivery_stream" "http_stream" {
}
}
}

}
}

Expand Down
2 changes: 1 addition & 1 deletion modules/s3-logfile/USAGE.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | ~> 1.0 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.9.0 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.0.0 |

## Providers

Expand Down

0 comments on commit b86c024

Please sign in to comment.