From 1ce96ca62a49ca136b0079b104a7c6b6c87f4504 Mon Sep 17 00:00:00 2001 From: RoseSecurity Date: Tue, 11 Mar 2025 11:23:01 -0400 Subject: [PATCH 01/12] fix: adjust deprecated lookup function MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit lookup(map, key) was useful in older Terraform versions when maps were sometimes nullable. Direct indexing (map["key"]) is now preferred because it is more readable, Terraform explicitly fails if the key doesn’t exist, and it aligns with standard programming practices --- src/main.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main.tf b/src/main.tf index 62628c6..7a70f84 100644 --- a/src/main.tf +++ b/src/main.tf @@ -12,8 +12,8 @@ locals { lookup(v, "name_prefix", "/aws/"), module.log_group_prefix.id, module.log_group_prefix.delimiter, - lookup(v, "name_suffix") - ) : lookup(v, "name") + v["name_suffix"] + ) : v["name"] filter_pattern : lookup(v, "filter_pattern", "") } } From d1ffaee9af80ca11ec98eac3a84e276cde7c8a7d Mon Sep 17 00:00:00 2001 From: RoseSecurity Date: Tue, 18 Mar 2025 09:46:47 -0400 Subject: [PATCH 02/12] fix: update credential module location --- src/provider-datadog.tf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/provider-datadog.tf b/src/provider-datadog.tf index 6fa8b89..b5f7f46 100644 --- a/src/provider-datadog.tf +++ b/src/provider-datadog.tf @@ -1,5 +1,7 @@ module "datadog_configuration" { - source = "../datadog-configuration/modules/datadog_keys" + source = "github.com/cloudposse-terraform-components/aws-datadog-credentials/modules/datadog_keys" + version = "v1.535.0" + enabled = true context = module.this.context global_environment_name = var.datadog_configuration_environment From c733c627a87d09a734a670c474624dc4e8d74146 Mon Sep 17 00:00:00 2001 From: RoseSecurity Date: Tue, 18 Mar 2025 10:14:40 -0400 Subject: [PATCH 03/12] fix: adjust datadog_configuration to use git repo --- src/provider-datadog.tf | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/provider-datadog.tf b/src/provider-datadog.tf index b5f7f46..01e9533 100644 --- a/src/provider-datadog.tf +++ b/src/provider-datadog.tf @@ -1,6 +1,5 @@ module "datadog_configuration" { - source = "github.com/cloudposse-terraform-components/aws-datadog-credentials/modules/datadog_keys" - version = "v1.535.0" + source = "git::https://github.com/cloudposse-terraform-components/aws-datadog-credentials.git//modules/datadog_keys?ref=v1.535.0" enabled = true context = module.this.context From e3fafbc95f892b7371b9bade4e64d3f9a91fe027 Mon Sep 17 00:00:00 2001 From: RoseSecurity Date: Tue, 18 Mar 2025 10:19:04 -0400 Subject: [PATCH 04/12] fix: adjust component creds module path --- src/provider-datadog.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/provider-datadog.tf b/src/provider-datadog.tf index 01e9533..96fa150 100644 --- a/src/provider-datadog.tf +++ b/src/provider-datadog.tf @@ -1,5 +1,5 @@ module "datadog_configuration" { - source = "git::https://github.com/cloudposse-terraform-components/aws-datadog-credentials.git//modules/datadog_keys?ref=v1.535.0" + source = "git::https://github.com/cloudposse-terraform-components/aws-datadog-credentials.git//src/modules/datadog_keys?ref=v1.535.0" enabled = true context = module.this.context From b8c346284faa950e9461df5987611c0346e42f14 Mon Sep 17 00:00:00 2001 From: RoseSecurity Date: Mon, 5 May 2025 10:20:29 -0400 Subject: [PATCH 05/12] fix: revert datadog config provider --- src/provider-datadog.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/provider-datadog.tf b/src/provider-datadog.tf index 96fa150..fc89d8d 100644 --- a/src/provider-datadog.tf +++ b/src/provider-datadog.tf @@ -1,5 +1,5 @@ module "datadog_configuration" { - source = "git::https://github.com/cloudposse-terraform-components/aws-datadog-credentials.git//src/modules/datadog_keys?ref=v1.535.0" + source = "../datadog-configuration/modules/datadog_keys" enabled = true context = module.this.context From 3deaca9a6e0a22d993068d79ef609cd28c726b8d Mon Sep 17 00:00:00 2001 From: Igor Rodionov Date: Tue, 3 Jun 2025 21:30:36 +0200 Subject: [PATCH 06/12] Use repo component reference --- src/provider-datadog.tf | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/provider-datadog.tf b/src/provider-datadog.tf index fc89d8d..17dba83 100644 --- a/src/provider-datadog.tf +++ b/src/provider-datadog.tf @@ -1,6 +1,10 @@ module "datadog_configuration" { +<<<<<<< Updated upstream source = "../datadog-configuration/modules/datadog_keys" +======= + source = "github.com/cloudposse-terraform-components/aws-datadog-credentials?ref=v1.535.1" +>>>>>>> Stashed changes enabled = true context = module.this.context global_environment_name = var.datadog_configuration_environment From b99db208f4009525904aa1688b8c2e9d0292c35a Mon Sep 17 00:00:00 2001 From: Igor Rodionov Date: Tue, 3 Jun 2025 21:30:44 +0200 Subject: [PATCH 07/12] Use repo component reference --- src/provider-datadog.tf | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/provider-datadog.tf b/src/provider-datadog.tf index 17dba83..019e8d8 100644 --- a/src/provider-datadog.tf +++ b/src/provider-datadog.tf @@ -1,10 +1,5 @@ module "datadog_configuration" { -<<<<<<< Updated upstream - source = "../datadog-configuration/modules/datadog_keys" - -======= source = "github.com/cloudposse-terraform-components/aws-datadog-credentials?ref=v1.535.1" ->>>>>>> Stashed changes enabled = true context = module.this.context global_environment_name = var.datadog_configuration_environment From 80d1f5da14a973eeff1d528d192285ed67136b8b Mon Sep 17 00:00:00 2001 From: Igor Rodionov Date: Tue, 3 Jun 2025 21:33:28 +0200 Subject: [PATCH 08/12] Use repo component reference --- src/provider-datadog.tf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/provider-datadog.tf b/src/provider-datadog.tf index 019e8d8..52a6717 100644 --- a/src/provider-datadog.tf +++ b/src/provider-datadog.tf @@ -1,5 +1,7 @@ module "datadog_configuration" { source = "github.com/cloudposse-terraform-components/aws-datadog-credentials?ref=v1.535.1" + version = "1.535.1" + enabled = true context = module.this.context global_environment_name = var.datadog_configuration_environment From 2b9d69b96ffb3d47719954a3c19824393cd615b0 Mon Sep 17 00:00:00 2001 From: Igor Rodionov Date: Tue, 3 Jun 2025 22:35:21 +0300 Subject: [PATCH 09/12] Update provider-datadog.tf --- src/provider-datadog.tf | 1 - 1 file changed, 1 deletion(-) diff --git a/src/provider-datadog.tf b/src/provider-datadog.tf index 52a6717..6776083 100644 --- a/src/provider-datadog.tf +++ b/src/provider-datadog.tf @@ -1,7 +1,6 @@ module "datadog_configuration" { source = "github.com/cloudposse-terraform-components/aws-datadog-credentials?ref=v1.535.1" version = "1.535.1" - enabled = true context = module.this.context global_environment_name = var.datadog_configuration_environment From e176d9b4f81341de5dd662fe275d633ee884dcff Mon Sep 17 00:00:00 2001 From: Igor Rodionov Date: Tue, 3 Jun 2025 21:37:41 +0200 Subject: [PATCH 10/12] Use repo component reference --- src/provider-datadog.tf | 1 - 1 file changed, 1 deletion(-) diff --git a/src/provider-datadog.tf b/src/provider-datadog.tf index 6776083..019e8d8 100644 --- a/src/provider-datadog.tf +++ b/src/provider-datadog.tf @@ -1,6 +1,5 @@ module "datadog_configuration" { source = "github.com/cloudposse-terraform-components/aws-datadog-credentials?ref=v1.535.1" - version = "1.535.1" enabled = true context = module.this.context global_environment_name = var.datadog_configuration_environment From 87137499a2163c28df1bb681f748190a69ca2213 Mon Sep 17 00:00:00 2001 From: Igor Rodionov Date: Tue, 3 Jun 2025 22:53:55 +0300 Subject: [PATCH 11/12] Update provider-datadog.tf --- src/provider-datadog.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/provider-datadog.tf b/src/provider-datadog.tf index 019e8d8..16cfdbc 100644 --- a/src/provider-datadog.tf +++ b/src/provider-datadog.tf @@ -1,5 +1,5 @@ module "datadog_configuration" { - source = "github.com/cloudposse-terraform-components/aws-datadog-credentials?ref=v1.535.1" + source = "github.com/cloudposse-terraform-components/aws-datadog-credentials?tags=v1.535.1" enabled = true context = module.this.context global_environment_name = var.datadog_configuration_environment From 616d99fa618976c3f57e86fdefc6659255a1542f Mon Sep 17 00:00:00 2001 From: Igor Rodionov Date: Tue, 3 Jun 2025 23:04:01 +0300 Subject: [PATCH 12/12] Update provider-datadog.tf --- src/provider-datadog.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/provider-datadog.tf b/src/provider-datadog.tf index 16cfdbc..c48b917 100644 --- a/src/provider-datadog.tf +++ b/src/provider-datadog.tf @@ -1,5 +1,5 @@ module "datadog_configuration" { - source = "github.com/cloudposse-terraform-components/aws-datadog-credentials?tags=v1.535.1" + source = "github.com/cloudposse-terraform-components/aws-datadog-credentials?ref=tags/v1.535.1" enabled = true context = module.this.context global_environment_name = var.datadog_configuration_environment