Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Email Notifications [mimics PR branch] #141

Open
wants to merge 99 commits into
base: main
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
99 commits
Select commit Hold shift + click to select a range
ab8e5a4
Bring over WIP from template-infra branch
rocketnova Aug 7, 2024
9ab6473
Enable notifications
rocketnova Aug 7, 2024
e772c1e
Restrict access
rocketnova Aug 8, 2024
18ee918
Conditionally return values based on verification method
rocketnova Aug 8, 2024
d62b062
Deal with pinpoint_email_channel role_arn
rocketnova Aug 8, 2024
391b603
Separate a verified sender identity from a pinpoint app
rocketnova Aug 8, 2024
9a607bb
Refactor outputs and variables
rocketnova Aug 8, 2024
0c417ad
Add code for aws_sesv2_email_identity_policy
rocketnova Aug 8, 2024
179b385
Drop workspace prefix for notifications config
rocketnova Aug 8, 2024
79f1bb9
Connect notifications and email-identity modules with app-config and …
rocketnova Aug 9, 2024
c07cb33
Rework idp to remove dependency on data output which would otherwise …
rocketnova Aug 9, 2024
11eee11
Add test email to satisfy tests
rocketnova Aug 9, 2024
a3e203b
Fix IAM role name collision
rocketnova Aug 12, 2024
c649240
Grant Github Actions auth for notifications: ses & mobiletargeting
rocketnova Aug 12, 2024
5dbcda6
Remove deprecated pinpoint identity role
rocketnova Aug 12, 2024
f0a9759
Move email identity into resources subdir
rocketnova Aug 12, 2024
7330a31
Refactor to support re-using existing email identities
rocketnova Aug 12, 2024
d7b5e35
Fix depends_on syntax
rocketnova Aug 12, 2024
3a80dbf
Simplify
rocketnova Aug 14, 2024
f6a57ed
Simplify and use domain name
rocketnova Aug 14, 2024
06bae3a
Auto-add dns records for domain verification
rocketnova Aug 14, 2024
9a53c2c
Merge branch 'main' into rocket/notifications
coilysiren Oct 4, 2024
1e24692
diff reduction
coilysiren Oct 4, 2024
64268b1
spacing and docs
coilysiren Oct 4, 2024
46dd4cd
use jsonencode
coilysiren Oct 4, 2024
0e4eb4c
module path
coilysiren Oct 4, 2024
a3834ee
prefix
coilysiren Oct 4, 2024
2b7bda9
try to fix verification records
coilysiren Oct 5, 2024
d2c2bf3
try using count
coilysiren Oct 7, 2024
33e654d
use route53 config from truss
coilysiren Oct 7, 2024
e3bbbdd
fix vars
coilysiren Oct 7, 2024
044b13c
trigger ci
coilysiren Oct 7, 2024
c38a5ec
fix regex
coilysiren Oct 11, 2024
bb99fa7
use 'mail' subdomain
coilysiren Oct 11, 2024
939f6fd
try subdomain again
coilysiren Oct 11, 2024
ca0a0d4
try subdomain again again
coilysiren Oct 11, 2024
a9e50da
revert to the original stuff
coilysiren Oct 11, 2024
bda7066
strip last
coilysiren Oct 11, 2024
09b6f08
fix incorrect var
coilysiren Oct 11, 2024
bd3f474
add back TLD
coilysiren Oct 12, 2024
11b8712
mail dot
coilysiren Oct 12, 2024
c45728a
mail_from_domain
coilysiren Oct 12, 2024
9c967c9
outbound subdomain
coilysiren Oct 12, 2024
f52cdf5
try again
coilysiren Oct 12, 2024
ab4da73
use trussworks patterns
coilysiren Oct 12, 2024
60edf04
update vars
coilysiren Oct 12, 2024
359f8ef
pass in seperate domain names
coilysiren Oct 12, 2024
c487417
workon mail from domain
coilysiren Oct 12, 2024
802536f
update vars
coilysiren Oct 12, 2024
5580c74
typo
coilysiren Oct 12, 2024
a7df4f9
route53 is on the wrong domain
coilysiren Oct 12, 2024
57bd7c7
small TXT change
coilysiren Oct 12, 2024
e688f90
move folders, remove some complexity around PR envs
coilysiren Oct 19, 2024
bea59b1
use existing zone
coilysiren Oct 19, 2024
3ab84b2
fix validation errors
coilysiren Oct 19, 2024
6de293c
dont double up on notes services
coilysiren Oct 19, 2024
5e212a0
fix conditional
coilysiren Oct 19, 2024
27fda90
Merge branch 'main' into kai/notifications
coilysiren Oct 25, 2024
6557098
more files means less merge conflicts
coilysiren Oct 25, 2024
23e653b
move module around
coilysiren Oct 25, 2024
e667aee
setup notifications client
coilysiren Oct 26, 2024
d5aedaa
add vars to service
coilysiren Oct 26, 2024
cc8e679
swap to real versions
coilysiren Oct 26, 2024
4fdb991
update output
coilysiren Oct 26, 2024
1f00ad9
remove errant module
coilysiren Oct 26, 2024
5add212
Revert "remove errant module"
coilysiren Oct 26, 2024
7f2ebe4
remove correct stuff
coilysiren Oct 26, 2024
f36741a
Merge remote-tracking branch 'origin' into kai/notifications-2
coilysiren Nov 1, 2024
2366ca9
Merge remote-tracking branch 'origin' into kai/notifications
coilysiren Nov 1, 2024
d8ecbfe
Revert "swap to real versions"
coilysiren Nov 1, 2024
3df9175
name based on PR apps
coilysiren Nov 1, 2024
7ba2cdb
Merge branch 'kai/notifications' into kai/notifications-2
coilysiren Nov 1, 2024
67710e8
Revert "Revert "swap to real versions""
coilysiren Nov 1, 2024
42f781d
string concat
coilysiren Nov 1, 2024
bd6e835
auto code review
coilysiren Nov 1, 2024
75e7bc4
typo
coilysiren Nov 1, 2024
31ff496
narrow env var scope
coilysiren Nov 8, 2024
d421603
domain_identity_arn
coilysiren Nov 8, 2024
52643a5
cleanup some vars
coilysiren Nov 8, 2024
f2d43bf
validation + test
coilysiren Nov 8, 2024
a6d6d83
Revert "validation + test"
coilysiren Nov 8, 2024
d8b89e2
use domain name as name
coilysiren Nov 8, 2024
8a10e95
remove some name
coilysiren Nov 8, 2024
7081ed2
comment
coilysiren Nov 8, 2024
d1218bb
move stuff around
coilysiren Nov 8, 2024
592a188
pull from correct var hopefully
coilysiren Nov 8, 2024
09a192d
use default email config, instead of explicit one
coilysiren Nov 8, 2024
9794f45
various renames
coilysiren Nov 14, 2024
1fa2229
revert idp stuff
coilysiren Nov 14, 2024
5910294
delete app first
coilysiren Nov 14, 2024
31eb7b2
delete it please, thanks
coilysiren Nov 14, 2024
fcfa6f4
update some var refs
coilysiren Nov 14, 2024
b8cd1fe
put everything back
coilysiren Nov 14, 2024
103f386
update vars
coilysiren Nov 14, 2024
fe2678d
reorg
coilysiren Nov 14, 2024
e1c6c2f
a var name
coilysiren Nov 14, 2024
8a8a6e9
fix domain vars
coilysiren Nov 15, 2024
9cf59a2
sender email cleanup
coilysiren Nov 15, 2024
dfee3b4
errant )
coilysiren Nov 16, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix vars
  • Loading branch information
coilysiren committed Oct 7, 2024
commit e3bbbdd5b0f9612945ccc3c4b11dde419a6a2c1f
18 changes: 9 additions & 9 deletions infra/modules/email-identity/main.tf
Original file line number Diff line number Diff line change
@@ -86,18 +86,18 @@ resource "aws_route53_record" "dkim" {
allow_overwrite = true
ttl = 60
type = "CNAME"
zone_id = aws_route53_zone.zone.zone_id
zone_id = aws_route53_zone.zone[0].zone_id
name = "${aws_sesv2_email_identity.sender.dkim_signing_attributes[0].tokens[count.index]}._domainkey"
records = ["${aws_sesv2_email_identity.sender.dkim_signing_attributes[0].tokens[count.index]}.dkim.amazonses.com"]

depends_on = [aws_sesv2_email_identity.sender]
}

resource "aws_sesv2_email_identity_mail_from_attributes" "main" {
email_identity = aws_sesv2_email_identity.main.email_identity
resource "aws_sesv2_email_identity_mail_from_attributes" "sender" {
email_identity = aws_sesv2_email_identity.sender.email_identity
mail_from_domain = local.stripped_mail_from_domain

depends_on = [aws_sesv2_email_identity.main]
depends_on = [aws_sesv2_email_identity.sender]
}

resource "aws_route53_record" "spf_mail_from" {
@@ -106,8 +106,8 @@ resource "aws_route53_record" "spf_mail_from" {
allow_overwrite = true
ttl = "600"
type = "TXT"
zone_id = aws_route53_zone.zone.zone_id
name = aws_sesv2_email_identity_mail_from_attributes.main.mail_from_domain
zone_id = aws_route53_zone.zone[0].zone_id
name = aws_sesv2_email_identity_mail_from_attributes.sender.mail_from_domain
records = ["v=spf1 include:amazonses.com -all"]
}

@@ -117,8 +117,8 @@ resource "aws_route53_record" "mx_send_mail_from" {
allow_overwrite = true
type = "MX"
ttl = "600"
zone_id = aws_route53_zone.zone.zone_id
name = aws_sesv2_email_identity_mail_from_attributes.main.mail_from_domain
zone_id = aws_route53_zone.zone[0].zone_id
name = aws_sesv2_email_identity_mail_from_attributes.sender.mail_from_domain
records = ["10 feedback-smtp.${data.aws_region.current.name}.amazonses.com"]
}

@@ -129,6 +129,6 @@ resource "aws_route53_record" "mx_receive" {
type = "MX"
ttl = "600"
name = var.sender_email_domain_name
zone_id = aws_route53_zone.zone.zone_id
zone_id = aws_route53_zone.zone[0].zone_id
records = ["10 inbound-smtp.${data.aws_region.current.name}.amazonaws.com"]
}