Sandboxes now made a subdomain

Author: chrisbloe

infrastructure/modules/ses/main.tf

@@ -1,43 +1,39 @@
 resource "aws_ses_domain_identity" "ndr_ses" {
-  domain = "${terraform.workspace}.${var.domain}"
-  count  = var.enable ? 1 : 0
+  domain = var.is_sandbox ? "${terraform.workspace}.dev.${var.domain}" : "${terraform.workspace}.${var.domain}"
 }
 
 resource "aws_ses_domain_dkim" "ndr_dkim" {
   domain = aws_ses_domain_identity.ndr_ses[0].domain
 
-  count      = var.enable ? 1 : 0
   depends_on = [aws_ses_domain_identity.ndr_ses[0]]
 }
 
 resource "aws_route53_record" "ndr_ses_dkim_record" {
+  count = 3
+
   zone_id = var.zone_id
-  name    = "${aws_ses_domain_dkim.ndr_dkim[0].dkim_tokens[count.index]}._domainkey.${terraform.workspace}"
+  name    = var.is_sandbox ? "${aws_ses_domain_dkim.ndr_dkim[0].dkim_tokens[count.index]}._domainkey.${terraform.workspace}.dev" : "${aws_ses_domain_dkim.ndr_dkim[0].dkim_tokens[count.index]}._domainkey.${terraform.workspace}"
   type    = "CNAME"
   ttl     = 1800
   records = ["${aws_ses_domain_dkim.ndr_dkim[0].dkim_tokens[count.index]}.dkim.amazonses.com"]
 
-  count      = var.enable ? 3 : 0
   depends_on = [aws_ses_domain_dkim.ndr_dkim[0]]
 }
 
 resource "aws_ses_domain_identity_verification" "ndr_ses_domain_verification" {
   domain = aws_ses_domain_identity.ndr_ses[0].domain
 
-  count      = var.enable ? 1 : 0
   depends_on = [aws_route53_record.ndr_ses_dkim_record[0]]
 }
 
 resource "aws_ses_domain_mail_from" "reporting" {
-  count            = var.enable ? 1 : 0
   domain           = aws_ses_domain_identity.ndr_ses[0].domain
   mail_from_domain = "mail.${aws_ses_domain_identity.ndr_ses[0].domain}"
 
   behavior_on_mx_failure = "UseDefaultValue"
 }
 
 resource "aws_route53_record" "ses_mail_from_mx" {
-  count   = var.enable ? 1 : 0
   zone_id = var.zone_id
   name    = "mail.${aws_ses_domain_identity.ndr_ses[0].domain}"
   type    = "MX"
@@ -49,7 +45,6 @@ resource "aws_route53_record" "ses_mail_from_mx" {
 }
 
 resource "aws_route53_record" "ses_mail_from_spf" {
-  count   = var.enable ? 1 : 0
   zone_id = var.zone_id
   name    = "mail.${aws_ses_domain_identity.ndr_ses[0].domain}"
   type    = "TXT"
@@ -61,7 +56,6 @@ resource "aws_route53_record" "ses_mail_from_spf" {
 }
 
 resource "aws_route53_record" "dmarc" {
-  count   = var.enable ? 1 : 0
   zone_id = var.zone_id
   name    = "_dmarc.${aws_ses_domain_identity.ndr_ses[0].domain}"
   type    = "TXT"

infrastructure/modules/ses/moved-1.6.14.tf

@@ -0,0 +1,14 @@
+moved {
+  from = aws_ses_domain_identity.ndr_ses[0]
+  to   = aws_ses_domain_identity.ndr_ses
+}
+
+moved {
+  from = aws_ses_domain_dkim.ndr_dkim[0]
+  to   = aws_ses_domain_dkim.ndr_dkim
+}
+
+moved {
+  from = aws_ses_domain_identity_verification.ndr_ses_domain_verification[0]
+  to   = aws_ses_domain_identity_verification.ndr_ses_domain_verification
+}

infrastructure/modules/ses/variable.tf

@@ -8,7 +8,7 @@ variable "zone_id" {
   type        = string
 }
 
-variable "enable" {
-  description = "Whether to enable the creation of SES identity, DKIM, and DNS records."
+variable "is_sandbox" {
+  description = "Whether the workspace being created is a sandbox."
   type        = bool
 }

infrastructure/ses.tf

@@ -1,6 +1,6 @@
 module "ses" {
-  source  = "./modules/ses"
-  domain  = var.domain
-  zone_id = module.route53_fargate_ui.zone_id
-  enable  = !local.is_sandbox
+  source     = "./modules/ses"
+  domain     = var.domain
+  zone_id    = module.route53_fargate_ui.zone_id
+  is_sandbox = local.is_sandbox
 }