cleanup

Author: marcoacierno

infrastructure/applications/.terraform.lock.hcl

@@ -22,9 +22,10 @@ module "pycon_backend" {
   iam_role_arn = module.cluster.iam_role_arn
   database_settings = module.database.database_settings
   vpc_id = module.vpc.vpc_id
+  public_1a_subnet_id = module.vpc.public_1a_subnet_id
+  configuration_set_name = module.emails.configuration_set_name
 
   providers = {
-    aws    = aws
     aws.us = aws.us
   }
 }
@@ -36,22 +37,12 @@ module "pycon_frontend" {
   server_ip = module.cluster.server_ip
   cf_domain_name = module.cluster.cf_domain_name
   cf_hosted_zone_id = module.cluster.cf_hosted_zone_id
-
-  providers = {
-    aws    = aws
-    aws.us = aws.us
-  }
 }
 
 module "clamav" {
   source       = "./clamav"
   cluster_id = module.cluster.cluster_id
   logs_group_name = module.cluster.logs_group_name
-
-  providers = {
-    aws    = aws
-    aws.us = aws.us
-  }
 }
 
 # Other resources
@@ -66,7 +57,6 @@ module "emails" {
   source = "./emails"
 
   providers = {
-    aws    = aws
     aws.us = aws.us
   }
 }
@@ -77,7 +67,6 @@ module "cluster" {
   public_1a_subnet_id = module.vpc.public_1a_subnet_id
 
   providers = {
-    aws    = aws
     aws.us = aws.us
   }
 }

infrastructure/applications/applications.tf

@@ -0,0 +1,8 @@
+terraform {
+  required_providers {
+    aws = {
+      source                = "hashicorp/aws"
+      configuration_aliases = [aws.us]
+    }
+  }
+}

infrastructure/applications/cluster/providers.tf

@@ -2,7 +2,7 @@ terraform {
   required_providers {
     aws = {
       source                = "hashicorp/aws"
-      version               = "5.70.0"
+      version               = "5.82.2"
       configuration_aliases = [aws.us]
     }
   }

infrastructure/applications/cluster/vpc.tf

@@ -7,6 +7,7 @@ resource "aws_sesv2_configuration_set" "main" {
 
   tracking_options {
     custom_redirect_domain = local.email_tracking_domain
+    https_policy          = "OPTIONAL"
   }
 }
 
@@ -33,3 +34,7 @@ resource "aws_sesv2_configuration_set_event_destination" "backend" {
     ]
   }
 }
+
+output "configuration_set_name" {
+  value = aws_sesv2_configuration_set.main.configuration_set_name
+}

infrastructure/applications/config.tf

@@ -6,38 +6,8 @@ locals {
   cdn_url           = local.is_prod ? "cdn.pycon.it" : "${terraform.workspace}-cdn.pycon.it"
 }
 
-data "aws_vpc" "default" {
-  filter {
-    name   = "tag:Name"
-    values = ["pythonit-vpc"]
-  }
-}
-
-data "aws_subnets" "private" {
-  filter {
-    name   = "vpc-id"
-    values = [data.aws_vpc.default.id]
-  }
-
-  tags = {
-    Type = "private"
-  }
-}
-
-data "aws_security_group" "rds" {
-  name = "pythonit-rds-security-group"
-}
-
-data "aws_security_group" "lambda" {
-  name = "pythonit-lambda-security-group"
-}
-
 data "aws_acm_certificate" "cert" {
   domain   = "pycon.it"
   statuses = ["ISSUED"]
   provider = aws.us
 }
-
-data "aws_sesv2_configuration_set" "main" {
-  configuration_set_name = "pythonit-${terraform.workspace}"
-}

infrastructure/applications/emails/main.tf

@@ -11,3 +11,5 @@ variable "logs_group_name" {}
 variable "iam_role_arn" {}
 variable "database_settings" {}
 variable "vpc_id" {}
+variable "public_1a_subnet_id" {}
+variable "configuration_set_name" {}

infrastructure/applications/pycon_backend/main.tf

@@ -171,7 +171,7 @@ locals {
     {
       name = "ECS_NETWORK_CONFIG",
       value = jsonencode({
-        subnets = [data.aws_subnet.public_1a.id],
+        subnets = [var.public_1a_subnet_id],
         security_groups = [
           var.security_group_id
         ],
@@ -183,7 +183,7 @@ locals {
     },
     {
       name = "AWS_SES_CONFIGURATION_SET"
-      value = data.aws_sesv2_configuration_set.main.configuration_set_name
+      value = var.configuration_set_name
     },
     {
       name = "SNS_WEBHOOK_SECRET",
@@ -209,34 +209,6 @@ resource "aws_iam_role" "ecs_service" {
   })
 }
 
-data "aws_subnet" "private_1a" {
-  vpc_id = data.aws_vpc.default.id
-
-  filter {
-    name   = "tag:Type"
-    values = ["private"]
-  }
-
-  filter {
-    name   = "tag:AZ"
-    values = ["eu-central-1a"]
-  }
-}
-
-data "aws_subnet" "public_1a" {
-  vpc_id = data.aws_vpc.default.id
-
-  filter {
-    name   = "tag:Type"
-    values = ["public"]
-  }
-
-  filter {
-    name   = "tag:AZ"
-    values = ["eu-central-1a"]
-  }
-}
-
 resource "aws_ecs_task_definition" "worker" {
   family = "pythonit-${terraform.workspace}-worker"