Merge pull request #402 from mdr-engineering/feature/bp_MSOCI-1879_scanner_NATGW

Adds NAT GW for vpc-scanners

prod/aws-us-gov/mdr-prod-c2/010-vpc-scanners/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.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/standard_vpc?ref=v2.1.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/standard_vpc?ref=v2.1.3"
 }
 
 dependency "transit_gateway" {
@@ -39,6 +39,7 @@ inputs = {
     Purpose = "Vulnerability Scanners"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
+  enable_nat_gateway = true  #needed for Nessus scanners to scan customer portal.
 }
 terraform_version_constraint = "= 0.15.1"
 terragrunt_version_constraint = ">= 0.29, < 0.30"

prod/aws-us-gov/mdr-prod-c2/200-customer-portal/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.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/customer_portal?ref=v1.24.12"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/customer_portal?ref=v2.1.3"
 }
 
 dependency "vpc" {

prod/aws-us-gov/mdr-prod-c2/275-nessus-security-scanners/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.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/nessus/instance_nessus_scanner?ref=v1.24.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/nessus/instance_nessus_scanner?ref=v2.1.3"
 }
 
 dependency "vpc" {

test/aws-us-gov/mdr-test-c2/010-vpc-scanners/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.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/standard_vpc?ref=v2.1.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/standard_vpc?ref=v2.1.3"
 }
 
 dependency "transit_gateway" {
@@ -39,6 +39,7 @@ inputs = {
     Purpose = "Vulnerability Scanners"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
+  enable_nat_gateway = true  #needed for Nessus scanners to scan customer portal.
 }
 terraform_version_constraint = "= 0.15.1"
 terragrunt_version_constraint = ">= 0.29, < 0.30"

test/aws-us-gov/mdr-test-c2/200-customer-portal/terragrunt.hcl

@@ -13,13 +13,17 @@ 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.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/customer_portal?ref=v1.24.12"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/customer_portal?ref=v2.1.3"
 }
 
 dependency "vpc" {
   config_path = "../010-vpc-portal"
 }
 
+dependency "vpc-scanners" {
+  config_path = "../010-vpc-scanners"
+}
+
 dependency "proxy" {
   config_path = "../080-instance-proxy-server"
 }
@@ -47,6 +51,7 @@ inputs = {
   private_subnets = dependency.vpc.outputs.private_subnets
   public_subnets = dependency.vpc.outputs.public_subnets
   proxy_public_ip = dependency.proxy.outputs.instance_public_ip
+  nat_public_ips = dependency.vpc-scanners.outputs.nat_public_ips
 }
 terraform_version_constraint = "= 0.15.1"
 terragrunt_version_constraint = ">= 0.29, < 0.30"

test/aws-us-gov/mdr-test-c2/275-nessus-security-scanners/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.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/nessus/instance_nessus_scanner?ref=v1.24.10"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/nessus/instance_nessus_scanner?ref=v2.1.3"
 }
 
 dependency "vpc" {