Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat: Moving s3_configuration {} from root block to http_endpoint_con… #49

Merged
merged 2 commits into from
Jun 22, 2023
Merged

Feat: Moving s3_configuration {} from root block to http_endpoint_con… #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5be28f1
Feat: Moving s3_configuration {} from root block to http_endpoint_con…
ryan-keswick Jun 21, 2023
3e81a5a
Fix: reflecting provider version bump
ryan-keswick Jun 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 9 additions & 10 deletions modules/kinesis-firehose-honeycomb/main.tf
View file
Open in desktop
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
View file
Open in desktop
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