formatting (#1692)

[review]

aws/database-tools/blazer.tf

@@ -45,7 +45,7 @@ resource "aws_ecs_task_definition" "blazer" {
       "logConfiguration" : {
         "logDriver" : "awslogs",
         "options" : {
-          "awslogs-group" : "${var.cloudwatch_enabled ? aws_cloudwatch_log_group.blazer[0].name : "none"}",
+          "awslogs-group" : "${var.cloudwatch_enabled ? "blazer" : "none"}",
           "awslogs-region" : "${var.region}",
           "awslogs-stream-prefix" : "blazer"
         }

aws/database-tools/cloudwatch_logs.tf

@@ -1,5 +1,7 @@
-resource "aws_cloudwatch_log_group" "blazer" {
-  count             = var.cloudwatch_enabled ? 1 : 0
-  name              = aws_ecs_cluster.blazer.name
-  retention_in_days = 1827 # 5 years
-}
+removed {
+  from = aws_cloudwatch_log_group.blazer
+
+  lifecycle {
+    destroy = false
+  }
+}

aws/eks/cloudwatch_log.tf

@@ -2,6 +2,11 @@
 # AWS EKS Cloudwatch groups
 ###
 
+import {
+  to = aws_cloudwatch_log_group.blazer[0]
+  id = "blazer"
+}
+
 resource "aws_cloudwatch_log_group" "notification-canada-ca-eks-cluster-logs" {
   count             = var.cloudwatch_enabled ? 1 : 0
   name              = "/aws/eks/${var.eks_cluster_name}/cluster"
@@ -20,6 +25,12 @@ resource "aws_cloudwatch_log_group" "notification-canada-ca-eks-prometheus-logs"
   retention_in_days = var.log_retention_period_days
 }
 
+resource "aws_cloudwatch_log_group" "blazer" {
+  count             = var.cloudwatch_enabled ? 1 : 0
+  name              = "blazer"
+  retention_in_days = 1827 # 5 years
+}
+
 
 ###
 # AWS EKS Cloudwatch log metric filters

aws/eks/sentinel.tf

@@ -43,6 +43,7 @@ resource "aws_cloudwatch_log_subscription_filter" "admin_api_request" {
 
 resource "aws_cloudwatch_log_subscription_filter" "blazer_logging" {
   count           = var.cloudwatch_enabled ? 1 : 0
+  depends_on      = [aws_cloudwatch_log_group.blazer]
   name            = "Blazer logging"
   log_group_name  = "blazer"
   filter_pattern  = "Audit "

aws/system_status/lambda.tf

@@ -25,7 +25,7 @@ module "system_status" {
     system_status_admin_url        = var.system_status_admin_url
     system_status_api_url          = var.system_status_api_url
     system_status_bucket_name      = "notification-canada-ca-${var.env}-system-status"
-    sqlalchemy_database_reader_uri = "postgresql://app_db_user:${var.app_db_user_password}@${var.database_read_only_proxy_endpoint}/NotificationCanadaCa${var.env}"
+    sqlalchemy_database_reader_uri = "postgresql://app_db_user:${var.app_db_user_password}@${var.database_read_only_proxy_endpoint}/${var.rds_database_name}"
   }
 }