Skip to content

Commit b86c024

Browse files
authored
Feat: Moving s3_configuration {} from root block to http_endpoint_con… (#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
1 parent a3860c1 commit b86c024

File tree

2 files changed

+10
-11
lines changed

2 files changed

+10
-11
lines changed

modules/kinesis-firehose-honeycomb/main.tf

+9-10
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,6 @@ resource "aws_kinesis_firehose_delivery_stream" "http_stream" {
1515
name = var.name
1616
destination = "http_endpoint"
1717

18-
s3_configuration {
19-
role_arn = aws_iam_role.firehose_s3_role.arn
20-
bucket_arn = var.s3_failure_bucket_arn
21-
22-
buffer_size = var.s3_buffer_size
23-
buffer_interval = var.s3_buffer_interval
24-
compression_format = var.s3_compression_format
25-
}
26-
2718
http_endpoint_configuration {
2819
url = "${var.honeycomb_api_host}/1/kinesis_events/${var.honeycomb_dataset_name}"
2920
name = "honeycomb"
@@ -33,6 +24,15 @@ resource "aws_kinesis_firehose_delivery_stream" "http_stream" {
3324
buffering_size = var.http_buffering_size
3425
buffering_interval = var.http_buffering_interval
3526

27+
s3_configuration {
28+
role_arn = aws_iam_role.firehose_s3_role.arn
29+
bucket_arn = var.s3_failure_bucket_arn
30+
31+
buffering_size = var.s3_buffer_size
32+
buffering_interval = var.s3_buffer_interval
33+
compression_format = var.s3_compression_format
34+
}
35+
3636
request_configuration {
3737
content_encoding = "GZIP"
3838
}
@@ -56,7 +56,6 @@ resource "aws_kinesis_firehose_delivery_stream" "http_stream" {
5656
}
5757
}
5858
}
59-
6059
}
6160
}
6261

modules/s3-logfile/USAGE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
| Name | Version |
55
|------|---------|
66
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | ~> 1.0 |
7-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.9.0 |
7+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.0.0 |
88

99
## Providers
1010

0 commit comments

Comments
 (0)