Mailrelay in GC move in Prod

prod/aws-us-gov/mdr-prod-c2/010-vpc-system-services/terragrunt.hcl

@@ -13,7 +13,7 @@ locals {
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
   # Double slash is intentional and required to show root of modules
-  source = "git@github.mdr.defpoint.com:mdr-engineering/xdr-terraform-modules.git//base/standard_vpc?ref=v0.9.4"
+  source = "git@github.mdr.defpoint.com:mdr-engineering/xdr-terraform-modules.git//base/standard_vpc?ref=v0.9.5"
 }
 
 dependency "transit_gateway" {
@@ -38,4 +38,5 @@ inputs = {
   tags = {
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
+  enable_nat_gateway = true # most VPCs have no need
 }

prod/aws-us-gov/mdr-prod-c2/090-instance-mailrelay/README.md

@@ -0,0 +1 @@
+NOTE: This module adds a provider for ses

prod/aws-us-gov/mdr-prod-c2/090-instance-mailrelay/terragrunt.hcl

@@ -0,0 +1,61 @@
+locals {
+  # If you want to use any of the variables in _this_ file, you have to load them here.
+  # However, they will all be available as inputs to the module loaded in terraform.source
+  # below.
+  environment_vars = read_terragrunt_config(find_in_parent_folders("env.hcl"))
+  partition_vars = read_terragrunt_config(find_in_parent_folders("partition.hcl"))
+  region_vars = read_terragrunt_config(find_in_parent_folders("region.hcl"))
+  account_vars = read_terragrunt_config(find_in_parent_folders("account.hcl"))
+  global_vars = read_terragrunt_config(find_in_parent_folders("globals.hcl"))
+}
+
+# Terragrunt will copy the Terraform configurations specified by the source parameter, along with any files in the
+# working directory, into a temporary folder, and execute your Terraform commands in that folder.
+terraform {
+  # Double slash is intentional and required to show root of modules
+  source = "git@github.mdr.defpoint.com:mdr-engineering/xdr-terraform-modules.git//base/mailrelay?ref=v0.9.5"
+}
+
+dependency "vpc-system-services" {
+  config_path = "../010-vpc-system-services"
+}
+
+# Include all settings from the root terragrunt.hcl file
+include {
+  path = find_in_parent_folders()
+}
+
+generate "provider-ses" {
+  path = "provider-ses.tf"
+  if_exists = "overwrite_terragrunt"
+  contents = <<EOF
+provider "aws" {
+  version = "~> 3.0"
+  region = "${local.region_vars.locals.ses_region}"
+  allowed_account_ids = [ "${local.account_vars.locals.aws_account_id}" ]
+  profile = "govcloud"
+  alias   = "ses"
+
+  assume_role {
+    role_arn = "arn:${local.partition_vars.locals.aws_partition}:iam::${local.account_vars.locals.aws_account_id}:role/user/mdr_terraformer"
+    session_name = "terraform-ses"
+  }
+}
+EOF
+}
+
+# These are the variables we have to pass in to use the module specified in the terragrunt source above
+inputs = {
+  # All of the inputs from the inherited hcl files are available automatically
+  # (via the `inputs` section of the root `terragrunt.hcl`). However, modules
+  # will be more flexible if you specify particular input values.
+  tags = {
+    Purpose = "Mail Relay - Proxy between our systems and SES"
+    Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
+  }
+  instance_name = "mailrelay" # TODO: Fix this when actual swap is taking place.
+  instance_type = local.account_vars.locals.mailrelay_instance_type
+  vpc_id = dependency.vpc-system-services.outputs.vpc_id
+  azs = dependency.vpc-system-services.outputs.azs
+  subnets = dependency.vpc-system-services.outputs.private_subnets
+}

prod/aws-us-gov/mdr-prod-c2/account.hcl

@@ -69,6 +69,9 @@ locals {
   # Salt Master
   salt_master_instance_type = "t3a.large"
 
+  # mailrelay
+  mailrelay_instance_type = "t3a.micro"
+
   # Proxy
   proxy_server_instance_type = "t3a.medium"
 
@@ -77,11 +80,9 @@ locals {
 
   # DNS Resolver
   resolver_instance_type = "t3a.micro"
-  resolver_instance_key_name = "fdamstra"
 
   # For testing
   create_test_instance = false
-  test_instance_key_name = "fdamstra" # They with which to provision the test instance
 
   # AS Number used for various resources, but not every account needs one.
   asn = 64810

prod/env.hcl

@@ -87,7 +87,7 @@ locals {
   legacy_private_dns = {
     "moose-splunk-sh" = "10.80.101.65", # Needed for xdr-inventory
     #"jira-server" = "10.80.101.250",
-    "mailrelay" = "10.80.1.107",
+    #"mailrelay" = "10.80.1.107",
     #"openvpn" = "10.100.0.129",
     #"phantom" = "10.80.101.221",
     #"proxy" = "10.80.101.166",

test/aws-us-gov/mdr-test-c2/010-vpc-private-services/terragrunt.hcl

@@ -38,5 +38,5 @@ inputs = {
   tags = {
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
-  enable_nat_gateway = true # most VPCs have no need
+  enable_nat_gateway = false # most VPCs have no need
 }

test/aws-us-gov/mdr-test-c2/010-vpc-system-services/terragrunt.hcl

@@ -13,7 +13,7 @@ locals {
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
   # Double slash is intentional and required to show root of modules
-  source = "git@github.mdr.defpoint.com:mdr-engineering/xdr-terraform-modules.git//base/standard_vpc?ref=v0.9.4"
+  source = "git@github.mdr.defpoint.com:mdr-engineering/xdr-terraform-modules.git//base/standard_vpc?ref=v0.9.5"
 }
 
 dependency "transit_gateway" {
@@ -38,4 +38,5 @@ inputs = {
   tags = {
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
+  enable_nat_gateway = true # most VPCs have no need
 }