Merge pull request #81 from mdr-engineering/feature/ftd_MSOCI-1451_mailrelayToGC

Fixes remaining issues with mailrelay in test

base/mailrelay/ses.tf

@@ -5,12 +5,14 @@
 # add a new one (with a higher version number), and then update the output.
 
 # ses_user
-resource "aws_iam_access_key" "ses_access_key-v0" {
+resource "aws_iam_access_key" "ses_access_key-v2" {
   user     = aws_iam_user.ses_user.name
+  provider = aws.ses
 }
 
-resource "aws_iam_access_key" "ses_access_key-v1" {
+resource "aws_iam_access_key" "ses_access_key-v3" {
   user     = aws_iam_user.ses_user.name
+  provider = aws.ses
 }
 
 # This just muddies the output, but is good for troubleshooting, so I'm just
@@ -29,21 +31,23 @@ resource "aws_iam_access_key" "ses_access_key-v1" {
 #}
 
 output ses_user_smtp_username {
-  value = aws_iam_access_key.ses_access_key-v1.id
+  value = aws_iam_access_key.ses_access_key-v3.id
 }
 
 output ses_user_smtp_password { 
-  value = aws_iam_access_key.ses_access_key-v1.ses_smtp_password_v4
+  value = aws_iam_access_key.ses_access_key-v3.ses_smtp_password_v4
 }
 
 
 # dps_portal
-resource "aws_iam_access_key" "dps_portal_key-v0" {
+resource "aws_iam_access_key" "dps_portal_key-v2" {
   user     = aws_iam_user.dps_portal.name
+  provider = aws.ses
 }
 
-resource "aws_iam_access_key" "dps_portal_key-v1" {
+resource "aws_iam_access_key" "dps_portal_key-v3" {
   user     = aws_iam_user.dps_portal.name
+  provider = aws.ses
 }
 
 # This just muddies the output, but is good for troubleshooting, so I'm just
@@ -62,11 +66,11 @@ resource "aws_iam_access_key" "dps_portal_key-v1" {
 #}
 
 output dps_portal_smtp_username {
-  value = aws_iam_access_key.dps_portal_key-v1.id
+  value = aws_iam_access_key.dps_portal_key-v3.id
 }
 
 output dps_portal_smtp_password { 
-  value = aws_iam_access_key.dps_portal_key-v1.ses_smtp_password_v4
+  value = aws_iam_access_key.dps_portal_key-v3.ses_smtp_password_v4
 }
 
 ######################
@@ -143,7 +147,7 @@ resource "aws_route53_record" "ses_domain_mail_from_mx" {
   name    = aws_ses_domain_mail_from.public.mail_from_domain
   type    = "MX"
   ttl     = "600"
-  records = ["10 feedback-smtp.${var.aws_partition}.amazonses.com"] 
+  records = ["10 feedback-smtp.${var.ses_region}.amazonses.com"] 
   provider = aws.mdr-common-services-commercial
 }
 

base/mailrelay/vars.tf

@@ -45,6 +45,7 @@ variable "dns_info" { type = map }
 variable "standard_tags" { type = map }
 variable "environment" { type = string }
 variable "aws_region" { type = string }
+variable "ses_region" { type = string }
 variable "aws_partition" { type = string }
 variable "aws_partition_alias" { type = string }
 variable "aws_account_id" { type = string }