Update template-infra:base to version 0.15.2.post1.dev0+005e822

.template-infra/base.yml

@@ -1,6 +1,6 @@
 # Changes here will be overwritten by Copier
-_commit: v0.15.1-17-g9310f64
-_src_path: https://github.com/navapbc/template-infra
+_commit: v0.15.2-1-g005e822
+_src_path: ../template-infra
 base_code_repository_url: https://github.com/navapbc/platform-test-flask
 base_default_region: us-east-1
 base_owner: platform-admins

infra/modules/notifications-email-domain/resources/dns.tf

@@ -7,8 +7,6 @@ resource "aws_route53_record" "dkim" {
   zone_id         = var.hosted_zone_id
   name            = "${aws_sesv2_email_identity.sender_domain.dkim_signing_attributes[0].tokens[count.index]}._domainkey.${var.domain_name}"
   records         = ["${aws_sesv2_email_identity.sender_domain.dkim_signing_attributes[0].tokens[count.index]}.dkim.amazonses.com"]
-
-  depends_on = [aws_sesv2_email_identity.sender_domain]
 }
 
 resource "aws_route53_record" "spf_mail_from" {
@@ -24,7 +22,16 @@ resource "aws_route53_record" "mx_receive" {
   allow_overwrite = true
   type            = "MX"
   ttl             = "600"
+  zone_id         = var.hosted_zone_id
   name            = local.mail_from_domain
+  records         = ["10 feedback-smtp.${data.aws_region.current.name}.amazonses.com"]
+}
+
+resource "aws_route53_record" "dmarc" {
+  allow_overwrite = true
+  ttl             = "600"
+  type            = "TXT"
   zone_id         = var.hosted_zone_id
-  records         = ["10 feedback-smtp.${data.aws_region.current.name}.amazonaws.com"]
+  name            = local.dmarc_domain
+  records         = ["v=DMARC1; p=none;"]
 }

infra/modules/notifications-email-domain/resources/main.tf

@@ -4,6 +4,7 @@ data "aws_region" "current" {}
 
 locals {
   mail_from_domain = "mail.${var.domain_name}"
+  dmarc_domain     = "_dmarc.${var.domain_name}"
   dash_domain      = replace(var.domain_name, ".", "-")
 }
 
@@ -35,6 +36,4 @@ resource "aws_sesv2_configuration_set" "email" {
 resource "aws_sesv2_email_identity_mail_from_attributes" "sender_domain" {
   email_identity   = aws_sesv2_email_identity.sender_domain.email_identity
   mail_from_domain = local.mail_from_domain
-
-  depends_on = [aws_sesv2_email_identity.sender_domain]
 }