Skip to content

Commit

Permalink
fix: update changelog
Browse files Browse the repository at this point in the history
  • Loading branch information
guyrenny committed Oct 13, 2024
1 parent e6ee7ee commit b019058
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 5 deletions.
8 changes: 7 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,19 @@
# Changelog

## v2.1.1
#### **S3-archive**
### 🧰 Bug fixes 🧰
- Add `logs_bucket_force_destroy` and `metrics_bucket_force_destroy` variables to allow force destroy the bucekts.

## v2.1.0
#### **firehose-metrics**
### 💡 Enhancements
- Added an option to include metrics from source accounts linked to the monitoring account in the Firehose CloudWatch metric stream.
- Introduced the `include_linked_accounts_metrics` variable to control the inclusion of linked account metrics for Firehose.
- Updated example configurations to demonstrate usage of the `include_linked_accounts_metrics` variable in Firehose metric streams.

## v2.0.1
#### **ecs-ec2**
### 🧰 Bug fixes 🧰
- Fixed ecs-ec2 module, adjusted cdot image command to `--config env:OTEL_CONFIG`
- Removed latest flag from ecs-ec2 module example.
Expand All @@ -15,7 +22,6 @@
### 💡 Enhancements
- Added pprof extension to default ecs-ec2 otel configurations.


## v2.0.0
### 🛑 Breaking changes 🛑
- Remove deprecated modules: cloudwatch-logs, S3 and kinesis
Expand Down
7 changes: 5 additions & 2 deletions modules/provisioning/s3-archive/main.tf
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
locals {
is_logs_bucket_name_empty = var.logs_bucket_name != null
is_metrics_bucket_name_empty = var.metrics_bucket_name != null
is_same_bucket_name = var.logs_bucket_name == var.metrics_bucket_name
is_valid_region = data.aws_region.current.name == var.aws_region
coralogix_role_region = lookup(var.aws_role_region, var.aws_region)

logs_validations = local.is_valid_region || var.bypass_valid_region != ""
metrics_validations = local.is_valid_region || var.bypass_valid_region != ""
logs_validations = local.is_logs_bucket_name_empty && !local.is_same_bucket_name && (local.is_valid_region || var.bypass_valid_region != "")
metrics_validations = local.is_metrics_bucket_name_empty && !local.is_same_bucket_name && (local.is_valid_region || var.bypass_valid_region != "")
kms_logs_validation = local.logs_validations && var.logs_kms_arn != "" && contains(split(":", var.logs_kms_arn), var.aws_region)
kms_metrics_validation = local.metrics_validations && var.metrics_kms_arn != "" && contains(split(":", var.metrics_kms_arn), var.aws_region)
coralogix_log_role_arn = var.custom_coralogix_arn != "" ? "arn:aws:iam::${var.custom_coralogix_arn}:role/coralogix-archive-${local.coralogix_role_region}" : var.bypass_valid_region != "" ? "arn:aws:iam::${var.coralogix_arn_mapping[""]}:role/coralogix-archive-${local.coralogix_role_region}" : "arn:aws:iam::${var.coralogix_arn_mapping[var.aws_region]}:role/coralogix-archive-${local.coralogix_role_region}"
Expand Down
4 changes: 2 additions & 2 deletions modules/provisioning/s3-archive/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@ variable "coralogix_arn_mapping" {
variable "logs_bucket_name" {
type = string
description = "The name of the S3 bucket to create for the logs archive (Leave empty if not needed)"
default = ""
default = null
}

variable "metrics_bucket_name" {
type = string
description = "The name of the S3 bucket to create for the metrics archive (Leave empty if not needed)"
default = ""
default = null
}

variable "logs_kms_arn" {
Expand Down

0 comments on commit b019058

Please sign in to comment.