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.

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

Do not require enable_dynamic_partitioning for dynamic_partition_append_delimiter_to_record #13

Merged
merged 2 commits into from
Mar 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ Supports all destinations and all Kinesis Firehose Features.
* [Upgrade](#upgrade)
* [Deprecations](#deprecations)
* [Version 3.1.0](#version-310)
* [Version 3.3.0](#version-330)
* [License](#license)

## Module versioning rule
Expand Down Expand Up @@ -912,6 +913,7 @@ No modules.

| Name | Description | Type | Default | Required |
|------|-------------|------|---------|:--------:|
| <a name="input_append_delimiter_to_record"></a> [append\_delimiter\_to\_record](#input\_append\_delimiter\_to\_record) | To configure your delivery stream to add a new line delimiter between records in objects that are delivered to Amazon S3. | `bool` | `false` | no |
| <a name="input_application_role_description"></a> [application\_role\_description](#input\_application\_role\_description) | Description of IAM Application role to use for Kinesis Firehose Stream Source | `string` | `null` | no |
| <a name="input_application_role_force_detach_policies"></a> [application\_role\_force\_detach\_policies](#input\_application\_role\_force\_detach\_policies) | Specifies to force detaching any policies the IAM Application role has before destroying it | `bool` | `true` | no |
| <a name="input_application_role_name"></a> [application\_role\_name](#input\_application\_role\_name) | Name of IAM Application role to use for Kinesis Firehose Stream Source | `string` | `null` | no |
Expand Down Expand Up @@ -1140,6 +1142,10 @@ No modules.
* Variable `kinesis_source_role_arn` is deprecated. Use `source_role_arn` instead.
* Variable `kinesis_source_use_existing_role` is deprecated. Use `source_use_existing_role` instead.

### Version 3.3.0

* Variable `dynamic_partition_append_delimiter_to_record` is deprecated. Use `append_delimiter_to_record` instead.

## License

Apache 2 Licensed. See [LICENSE](https://github.com/fdmsantos/terraform-aws-kinesis-firehose/tree/main/LICENSE) for full details.
2 changes: 1 addition & 1 deletion examples/s3/kinesis-to-s3-complete/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,6 @@ module "firehose" {
enable_dynamic_partitioning = true
dynamic_partitioning_retry_duration = 350
dynamic_partition_metadata_extractor_query = "{user_id:.user_id}"
dynamic_partition_append_delimiter_to_record = true
append_delimiter_to_record = true
dynamic_partition_enable_record_deaggregation = true
}
4 changes: 2 additions & 2 deletions locals.tf
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ locals {
is_search_destination = contains(["elasticsearch", "opensearch", "opensearchserverless"], local.destination) ? true : false

# Data Transformation
enable_processing = var.enable_lambda_transform || var.enable_dynamic_partitioning || var.enable_cloudwatch_logs_decompression
enable_processing = var.enable_lambda_transform || var.enable_dynamic_partitioning || var.enable_cloudwatch_logs_decompression || var.dynamic_partition_append_delimiter_to_record || var.append_delimiter_to_record
lambda_processor = var.enable_lambda_transform ? {
type = "Lambda"
parameters = [
Expand Down Expand Up @@ -68,7 +68,7 @@ locals {
},
]
} : null
append_delimiter_processor = var.enable_dynamic_partitioning && var.dynamic_partition_append_delimiter_to_record ? {
append_delimiter_processor = var.dynamic_partition_append_delimiter_to_record || var.append_delimiter_to_record ? {
type = "AppendDelimiterToRecord"
parameters = []
} : null
Expand Down
8 changes: 7 additions & 1 deletion variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -461,7 +461,7 @@ variable "dynamic_partitioning_retry_duration" {
}
}

variable "dynamic_partition_append_delimiter_to_record" {
variable "dynamic_partition_append_delimiter_to_record" { # TODO Variable Deprecated. Remove on Next Major Version
description = "To configure your delivery stream to add a new line delimiter between records in objects that are delivered to Amazon S3."
type = bool
default = false
Expand Down Expand Up @@ -721,6 +721,12 @@ variable "data_format_conversion_orc_stripe_size" {
}
}

variable "append_delimiter_to_record" {
description = "To configure your delivery stream to add a new line delimiter between records in objects that are delivered to Amazon S3."
type = bool
default = false
}

######
# Redshift Destination Variables
######
Expand Down
Loading