From d1a4321cc2ed372b7af23b35dc63ec827479b1e1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 3 Jun 2024 18:30:05 +0000 Subject: [PATCH 1/2] chore(deps): update all minor dependencies --- terragrunt/aft/main/OIDC_roles.tf | 2 +- terragrunt/aft/main/slack_notify.tf | 2 +- terragrunt/aft/notifications/aft-notifications.tf | 2 +- terragrunt/common/provider.tf | 2 +- terragrunt/log_archive/sre_bot/OIDC.tf | 2 +- terragrunt/org_account/aft/main.tf | 2 +- .../lambdas/billing_extract_tags/requirements_dev.txt | 2 +- terragrunt/org_account/billing_extract_tags/s3.tf | 2 +- terragrunt/org_account/main/sentinel_forwarders.tf | 4 ++-- terragrunt/org_account/roles/OIDC.tf | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/terragrunt/aft/main/OIDC_roles.tf b/terragrunt/aft/main/OIDC_roles.tf index 7a9b41a5..0cbc8720 100644 --- a/terragrunt/aft/main/OIDC_roles.tf +++ b/terragrunt/aft/main/OIDC_roles.tf @@ -3,7 +3,7 @@ locals { } module "gh_oidc_roles" { - source = "github.com/cds-snc/terraform-modules//gh_oidc_role?ref=v9.0.3" + source = "github.com/cds-snc/terraform-modules//gh_oidc_role?ref=v9.4.5" oidc_exists = true roles = [ diff --git a/terragrunt/aft/main/slack_notify.tf b/terragrunt/aft/main/slack_notify.tf index efa4d887..77381a60 100644 --- a/terragrunt/aft/main/slack_notify.tf +++ b/terragrunt/aft/main/slack_notify.tf @@ -1,5 +1,5 @@ module "aft_slack_notification" { - source = "github.com/cds-snc/terraform-modules//notify_slack?ref=v9.3.9" + source = "github.com/cds-snc/terraform-modules//notify_slack?ref=v9.4.5" billing_tag_value = var.billing_code function_name = "aft_slack_notification" project_name = "Account Factory for Terraform" diff --git a/terragrunt/aft/notifications/aft-notifications.tf b/terragrunt/aft/notifications/aft-notifications.tf index d27b4bd8..4faa2e60 100644 --- a/terragrunt/aft/notifications/aft-notifications.tf +++ b/terragrunt/aft/notifications/aft-notifications.tf @@ -1,5 +1,5 @@ module "aft_failure_notifications" { - source = "github.com/cds-snc/terraform-modules//notify_slack?ref=v9.3.9" + source = "github.com/cds-snc/terraform-modules//notify_slack?ref=v9.4.5" function_name = "slack_notifier_aft" project_name = "AFT" diff --git a/terragrunt/common/provider.tf b/terragrunt/common/provider.tf index 532b5c96..ed030899 100644 --- a/terragrunt/common/provider.tf +++ b/terragrunt/common/provider.tf @@ -2,7 +2,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = ">= 4.40.0, <= 5.11" + version = "<= 5.51" } } } diff --git a/terragrunt/log_archive/sre_bot/OIDC.tf b/terragrunt/log_archive/sre_bot/OIDC.tf index 972d2e04..4c6c20da 100644 --- a/terragrunt/log_archive/sre_bot/OIDC.tf +++ b/terragrunt/log_archive/sre_bot/OIDC.tf @@ -1,5 +1,5 @@ module "OIDC_Roles" { - source = "github.com/cds-snc/terraform-modules//gh_oidc_role?ref=v5.0.0" + source = "github.com/cds-snc/terraform-modules//gh_oidc_role?ref=v5.1.11" oidc_exists = true roles = [ diff --git a/terragrunt/org_account/aft/main.tf b/terragrunt/org_account/aft/main.tf index 31ff4a76..882a044c 100644 --- a/terragrunt/org_account/aft/main.tf +++ b/terragrunt/org_account/aft/main.tf @@ -1,5 +1,5 @@ module "account_factory_for_terraform" { - source = "github.com/aws-ia/terraform-aws-control_tower_account_factory?ref=1.11.1" + source = "github.com/aws-ia/terraform-aws-control_tower_account_factory?ref=1.12.2" terraform_version = "1.7.2" diff --git a/terragrunt/org_account/billing_extract_tags/lambdas/billing_extract_tags/requirements_dev.txt b/terragrunt/org_account/billing_extract_tags/lambdas/billing_extract_tags/requirements_dev.txt index a4dfb8c2..a0586074 100644 --- a/terragrunt/org_account/billing_extract_tags/lambdas/billing_extract_tags/requirements_dev.txt +++ b/terragrunt/org_account/billing_extract_tags/lambdas/billing_extract_tags/requirements_dev.txt @@ -1,4 +1,4 @@ boto3==1.34.113 -black==24.3.0 +black==24.4.2 flake8==7.0.0 pytest==8.2.1 \ No newline at end of file diff --git a/terragrunt/org_account/billing_extract_tags/s3.tf b/terragrunt/org_account/billing_extract_tags/s3.tf index ceeec561..7ab2cb06 100644 --- a/terragrunt/org_account/billing_extract_tags/s3.tf +++ b/terragrunt/org_account/billing_extract_tags/s3.tf @@ -1,5 +1,5 @@ module "billing_extract_tags" { - source = "github.com/cds-snc/terraform-modules//S3?ref=v9.2.5" + source = "github.com/cds-snc/terraform-modules//S3?ref=v9.4.5" bucket_name = "5bf89a78-1503-4e02-9621-3ac658f558fb" acl = null diff --git a/terragrunt/org_account/main/sentinel_forwarders.tf b/terragrunt/org_account/main/sentinel_forwarders.tf index bdfe80f5..130bd60b 100644 --- a/terragrunt/org_account/main/sentinel_forwarders.tf +++ b/terragrunt/org_account/main/sentinel_forwarders.tf @@ -4,7 +4,7 @@ module "guardduty_forwarder" { aws = aws.log_archive } - source = "github.com/cds-snc/terraform-modules//sentinel_forwarder?ref=v9.3.8" + source = "github.com/cds-snc/terraform-modules//sentinel_forwarder?ref=v9.4.5" function_name = "sentinel-guard-duty-forwarder" billing_tag_value = var.billing_code @@ -32,7 +32,7 @@ module "securityhub_forwarder" { aws = aws.log_archive } - source = "github.com/cds-snc/terraform-modules//sentinel_forwarder?ref=v9.3.8" + source = "github.com/cds-snc/terraform-modules//sentinel_forwarder?ref=v9.4.5" function_name = "sentinel-securityhub-forwarder" billing_tag_value = var.billing_code diff --git a/terragrunt/org_account/roles/OIDC.tf b/terragrunt/org_account/roles/OIDC.tf index 63e95db8..9e07c0d4 100644 --- a/terragrunt/org_account/roles/OIDC.tf +++ b/terragrunt/org_account/roles/OIDC.tf @@ -1,6 +1,6 @@ module "OIDC_Roles" { - source = "github.com/cds-snc/terraform-modules//gh_oidc_role?ref=v5.0.0" + source = "github.com/cds-snc/terraform-modules//gh_oidc_role?ref=v5.1.11" oidc_exists = true roles = [{ From e95b8c4aba3522f5c89cdfb9cbdefa21da2a9734 Mon Sep 17 00:00:00 2001 From: Pat Heard Date: Mon, 3 Jun 2024 14:35:40 -0400 Subject: [PATCH 2/2] chore: rollback the ControlTower module upgrade This will be done in a separate PR rather than as part of Renovate. --- terragrunt/org_account/aft/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terragrunt/org_account/aft/main.tf b/terragrunt/org_account/aft/main.tf index 882a044c..31ff4a76 100644 --- a/terragrunt/org_account/aft/main.tf +++ b/terragrunt/org_account/aft/main.tf @@ -1,5 +1,5 @@ module "account_factory_for_terraform" { - source = "github.com/aws-ia/terraform-aws-control_tower_account_factory?ref=1.12.2" + source = "github.com/aws-ia/terraform-aws-control_tower_account_factory?ref=1.11.1" terraform_version = "1.7.2"