Revert "Update modules (#1524)"

This reverts commit 29698d5.
cds-snc · Sep 10, 2024 · 2dea7b8 · 2dea7b8
1 parent 29698d5
commit 2dea7b8
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 17 deletions.
diff --git a/aws/common/budget.tf b/aws/common/budget.tf
@@ -24,7 +24,7 @@ resource "aws_budgets_budget" "notify_global" {
 }
 
 module "budget_notifier" {
-  source                     = "github.com/cds-snc/terraform-modules//spend_notifier?ref=v9.6.4"
+  source                     = "github.com/cds-snc/terraform-modules//spend_notifier?ref=v9.2.6"
   daily_spend_notifier_hook  = var.budget_sre_bot_webhook
   weekly_spend_notifier_hook = var.budget_sre_bot_webhook
   billing_tag_value          = "notification-canada-ca-${var.env}"

diff --git a/aws/common/s3.tf b/aws/common/s3.tf
@@ -44,12 +44,11 @@ resource "aws_s3_bucket_public_access_block" "csv_bucket" {
 }
 
 module "csv_bucket_logs" {
-  source = "github.com/cds-snc/terraform-modules//S3_log_bucket?ref=v6.1.5"
+  source = "github.com/cds-snc/terraform-modules//S3_log_bucket?ref=v6.0.3"
 
   bucket_name       = "notification-canada-ca-${var.env}-csv-upload-logs"
   force_destroy     = var.force_destroy_s3
   billing_tag_value = "notification-canada-ca-${var.env}"
-  versioning_status = "Enabled"
 
   lifecycle_rule = { "lifecycle_rule" : { "enabled" : "true", "expiration" : { "days" : "90" } } }
 
@@ -219,12 +218,11 @@ resource "aws_s3_bucket_public_access_block" "scan_files_document_bucket" {
 }
 
 module "document_download_logs" {
-  source = "github.com/cds-snc/terraform-modules//S3_log_bucket?ref=v6.1.5"
+  source = "github.com/cds-snc/terraform-modules//S3_log_bucket?ref=v6.0.3"
 
   bucket_name       = "notification-canada-ca-${var.env}-document-download-logs"
   force_destroy     = var.force_destroy_s3
   billing_tag_value = "notification-canada-ca-${var.env}"
-  versioning_status = "Enabled"
 
   lifecycle_rule = { "lifecycle_rule" : { "enabled" : "true", "expiration" : { "days" : "90" } } }
 
@@ -353,12 +351,11 @@ resource "aws_s3_bucket_public_access_block" "athena_bucket" {
 }
 
 module "athena_logs_bucket" {
-  source = "github.com/cds-snc/terraform-modules//S3_log_bucket?ref=v6.1.5"
+  source = "github.com/cds-snc/terraform-modules//S3_log_bucket?ref=v6.0.3"
 
   bucket_name       = "notification-canada-ca-${var.env}-athena-logs"
   force_destroy     = var.force_destroy_s3
   billing_tag_value = "notification-canada-ca-${var.env}"
-  versioning_status = "Enabled"
 
   lifecycle_rule = { "lifecycle_rule" : { "enabled" : "true", "expiration" : { "days" : "90" } } }
 
@@ -368,15 +365,14 @@ module "athena_logs_bucket" {
 }
 
 module "cbs_logs_bucket" {
-  source = "github.com/cds-snc/terraform-modules//S3_log_bucket?ref=v6.1.5"
+  source = "github.com/cds-snc/terraform-modules//S3_log_bucket?ref=v6.0.3"
   count  = var.create_cbs_bucket ? 1 : 0
 
   bucket_name                    = var.cbs_satellite_bucket_name
   force_destroy                  = var.force_destroy_s3
   billing_tag_value              = "notification-canada-ca-${var.env}"
   attach_lb_log_delivery_policy  = true
   attach_elb_log_delivery_policy = true
-  versioning_status              = "Enabled"
 
   lifecycle_rule = { "lifecycle_rule" : { "enabled" : "true", "expiration" : { "days" : "90" } } }
 
@@ -386,7 +382,7 @@ module "cbs_logs_bucket" {
 }
 
 module "sns_sms_usage_report_bucket" {
-  source = "github.com/cds-snc/terraform-modules//S3?ref=v9.6.4"
+  source = "github.com/cds-snc/terraform-modules//S3?ref=v9.2.3"
 
   bucket_name       = "notification-canada-ca-${var.env}-sms-usage-logs"
   force_destroy     = var.force_destroy_s3
@@ -466,7 +462,7 @@ module "sns_sms_usage_report_bucket_us_west_2" {
     aws = aws.us-west-2
   }
 
-  source = "github.com/cds-snc/terraform-modules//S3?ref=v9.6.4"
+  source = "github.com/cds-snc/terraform-modules//S3?ref=v9.2.3"
 
   bucket_name       = "notification-canada-ca-${var.env}-sms-usage-west-2-logs"
   force_destroy     = var.force_destroy_s3
@@ -544,7 +540,7 @@ POLICY
 }
 
 module "sns_sms_usage_report_sanitized_bucket" {
-  source = "github.com/cds-snc/terraform-modules//S3?ref=v9.6.4"
+  source = "github.com/cds-snc/terraform-modules//S3?ref=v9.2.3"
 
   bucket_name       = "notification-canada-ca-${var.env}-sms-usage-logs-san"
   force_destroy     = var.force_destroy_s3
@@ -561,7 +557,7 @@ module "sns_sms_usage_report_sanitized_bucket_us_west_2" {
     aws = aws.us-west-2
   }
 
-  source = "github.com/cds-snc/terraform-modules//S3?ref=v9.6.4"
+  source = "github.com/cds-snc/terraform-modules//S3?ref=v9.2.3"
 
   bucket_name       = "notification-canada-ca-${var.env}-sms-usage-west-2-logs-san"
   force_destroy     = var.force_destroy_s3

diff --git a/aws/common/slack.tf b/aws/common/slack.tf
@@ -1,7 +1,7 @@
 # Doc: https://registry.terraform.io/modules/terraform-aws-modules/notify-slack/aws/
 module "notify_slack_warning" {
   source  = "terraform-aws-modules/notify-slack/aws"
-  version = "6.4.1"
+  version = "6.0.0"
 
   create_sns_topic = false
   sns_topic_name   = aws_sns_topic.notification-canada-ca-alert-warning.name
@@ -19,7 +19,7 @@ module "notify_slack_warning" {
 
 module "notify_slack_ok" {
   source  = "terraform-aws-modules/notify-slack/aws"
-  version = "6.4.1"
+  version = "6.0.0"
 
   create_sns_topic = false
   sns_topic_name   = aws_sns_topic.notification-canada-ca-alert-ok.name
@@ -37,7 +37,7 @@ module "notify_slack_ok" {
 
 module "notify_slack_critical" {
   source  = "terraform-aws-modules/notify-slack/aws"
-  version = "6.4.1"
+  version = "6.0.0"
 
   create_sns_topic = false
   sns_topic_name   = aws_sns_topic.notification-canada-ca-alert-critical.name
@@ -56,7 +56,7 @@ module "notify_slack_critical" {
 # Shared generic slack webhook & topic.
 module "notify_slack_general" {
   source  = "terraform-aws-modules/notify-slack/aws"
-  version = "6.4.1"
+  version = "6.0.0"
 
   create_sns_topic = false
   sns_topic_name   = aws_sns_topic.notification-canada-ca-alert-general.name