Forráskód Böngészése

Live Updates

* Added repo servers to standard sg
* Updated all modules in mdr-test-c2 to latest
* Updated all 010-standard-vpc modules to latest (adds required_group
  SG)
* Updated interconnect-instances in prod to latest (adds required
  security group)
* Updated `dns_servers` environment variable to be more correct resolver
  endpoint name.
* Added dns resolver instances to prod
Fred Damstra 5 éve
szülő
commit
1347351afa
44 módosított fájl, 201 hozzáadás és 39 törlés
  1. 1 1
      000-skeleton/010-standard-vpc/terragrunt.hcl
  2. 1 1
      prod/aws-us-gov/mdr-prod-c2/010-standard-vpc/terragrunt.hcl
  3. 1 1
      prod/aws-us-gov/mdr-prod-c2/018-interconnect-instances/terragrunt.hcl
  4. 7 0
      prod/aws-us-gov/mdr-prod-c2/023-dns-resolver-instance/README.md
  5. 42 0
      prod/aws-us-gov/mdr-prod-c2/023-dns-resolver-instance/terragrunt.hcl
  6. 10 0
      prod/aws-us-gov/mdr-prod-c2/account.hcl
  7. 44 0
      prod/aws/legacy-mdr-prod/025-outbound_dns_resolver/terragrunt.hcl
  8. 1 1
      prod/aws/legacy-mdr-prod/026-legacy-dns-entries/terragrunt.hcl
  9. 1 1
      prod/aws/mdr-prod-c2/010-standard-vpc/terragrunt.hcl
  10. 7 0
      prod/aws/mdr-prod-c2/023-dns-resolver-instance/README.md
  11. 42 0
      prod/aws/mdr-prod-c2/023-dns-resolver-instance/terragrunt.hcl
  12. 10 0
      prod/aws/mdr-prod-c2/account.hcl
  13. 2 2
      prod/env.hcl
  14. 1 1
      test/aws-us-gov/mdr-test-c2/005-account-standards-c2/terragrunt.hcl
  15. 1 1
      test/aws-us-gov/mdr-test-c2/005-iam/terragrunt.hcl
  16. 1 1
      test/aws-us-gov/mdr-test-c2/006-account-standards/terragrunt.hcl
  17. 1 1
      test/aws-us-gov/mdr-test-c2/008-transit-gateway-hub/terragrunt.hcl
  18. 1 1
      test/aws-us-gov/mdr-test-c2/010-standard-vpc/terragrunt.hcl
  19. 1 1
      test/aws-us-gov/mdr-test-c2/011-private-dns-zone/terragrunt.hcl
  20. 1 1
      test/aws-us-gov/mdr-test-c2/015-security-vpc/terragrunt.hcl
  21. 1 1
      test/aws-us-gov/mdr-test-c2/018-interconnect-instances/terragrunt.hcl
  22. 1 1
      test/aws-us-gov/mdr-test-c2/019-attach-transit-gateway-to-hub-account/terragrunt.hcl
  23. 1 1
      test/aws-us-gov/mdr-test-c2/020-transit-gateway-interconnect-vpn/terragrunt.hcl
  24. 1 1
      test/aws-us-gov/mdr-test-c2/021-qualys-connector-role/terragrunt.hcl
  25. 1 1
      test/aws-us-gov/mdr-test-c2/023-dns-resolver-instance/terragrunt.hcl
  26. 1 1
      test/aws-us-gov/mdr-test-c2/025-test-instance/terragrunt.hcl
  27. 1 1
      test/aws-us-gov/mdr-test-c2/030-qualys-vpc/terragrunt.hcl
  28. 1 1
      test/aws-us-gov/mdr-test-c2/031-attach-qualys-vpc-to-transit-gateway/terragrunt.hcl
  29. 1 1
      test/aws-us-gov/mdr-test-malware/010-standard-vpc/terragrunt.hcl
  30. 1 1
      test/aws-us-gov/mdr-test-modelclient/010-standard-vpc/terragrunt.hcl
  31. 1 1
      test/aws/legacy-mdr-test/025-outbound_dns_resolver/terragrunt.hcl
  32. 1 1
      test/aws/legacy-mdr-test/026-legacy-dns-entries/terragrunt.hcl
  33. 1 1
      test/aws/mdr-test-c2/005-account-standards-c2/terragrunt.hcl
  34. 1 1
      test/aws/mdr-test-c2/005-iam/terragrunt.hcl
  35. 1 1
      test/aws/mdr-test-c2/006-account-standards/terragrunt.hcl
  36. 1 1
      test/aws/mdr-test-c2/008-transit-gateway-hub/terragrunt.hcl
  37. 1 1
      test/aws/mdr-test-c2/010-standard-vpc/terragrunt.hcl
  38. 1 1
      test/aws/mdr-test-c2/019-attach-transit-gateway-to-hub-account/terragrunt.hcl
  39. 1 1
      test/aws/mdr-test-c2/020-transit-gateway-interconnect-vpn/terragrunt.hcl
  40. 1 1
      test/aws/mdr-test-c2/021-qualys-connector-role/terragrunt.hcl
  41. 1 1
      test/aws/mdr-test-c2/023-dns-resolver-instance/terragrunt.hcl
  42. 1 1
      test/aws/mdr-test-c2/025-test-instance/terragrunt.hcl
  43. 1 1
      test/aws/mdr-test-modelclient/010-standard-vpc/terragrunt.hcl
  44. 2 2
      test/env.hcl

+ 1 - 1
000-skeleton/010-standard-vpc/terragrunt.hcl

@@ -18,7 +18,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.5.10"
+  source = "git@github.mdr.defpoint.com:mdr-engineering/xdr-terraform-modules.git//base/standard_vpc?ref=v0.6.2"
 }
 
 # Include all settings from the root terragrunt.hcl file

+ 1 - 1
prod/aws-us-gov/mdr-prod-c2/010-standard-vpc/terragrunt.hcl

@@ -18,7 +18,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.5.10"
+  source = "git@github.mdr.defpoint.com:mdr-engineering/xdr-terraform-modules.git//base/standard_vpc?ref=v0.6.2"
 }
 
 # Include all settings from the root terragrunt.hcl file

+ 1 - 1
prod/aws-us-gov/mdr-prod-c2/018-interconnect-instances/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/interconnects?ref=v0.5.9"
+  source = "git@github.mdr.defpoint.com:mdr-engineering/xdr-terraform-modules.git//base/interconnects?ref=v0.6.2"
 }
 
 dependency "security_vpc" {

+ 7 - 0
prod/aws-us-gov/mdr-prod-c2/023-dns-resolver-instance/README.md

@@ -0,0 +1,7 @@
+Build Note: For a fresh install, you may need to first build the instance:
+```
+terragrunt-local init
+terragrunt-local apply --target aws_instance.instance
+```
+
+Alternatively, you can disable reverse dns in terragrunt.hcl, but the above method should reduce errors where we forget to create the reverse record.

+ 42 - 0
prod/aws-us-gov/mdr-prod-c2/023-dns-resolver-instance/terragrunt.hcl

@@ -0,0 +1,42 @@
+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.
+
+  # e.g. inherited variables:
+  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"))
+}
+
+dependency "standard_vpc" {
+  config_path = "../010-standard-vpc"
+}
+
+# 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/dns/resolver_instance?ref=v0.6.2"
+}
+
+# Include all settings from the root terragrunt.hcl file
+include {
+  path = find_in_parent_folders()
+}
+
+# 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 = "DNS Resolver"
+    Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
+  }
+  subnet_id = dependency.standard_vpc.outputs.public_subnets[0]
+  vpc_id = dependency.standard_vpc.outputs.vpc_id
+  reverse_enabled = true # Set to 'true' on second run
+}

+ 10 - 0
prod/aws-us-gov/mdr-prod-c2/account.hcl

@@ -12,6 +12,16 @@ locals {
   # For CIDR assignment, see https://github.mdr.defpoint.com/mdr-engineering/msoc-infrastructure/wiki/IP-Address-Allocation
   standard_vpc_cidr = "10.40.0.0/22"
 
+  vpc_cidrs = {
+    "standard_vpc" = "10.40.0.0/22",
+    "qualys_vpc" = "10.40.12.0/22",
+    "security_vpc" = "10.179.0.0/22"
+  }
+
+  # 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

+ 44 - 0
prod/aws/legacy-mdr-prod/025-outbound_dns_resolver/terragrunt.hcl

@@ -0,0 +1,44 @@
+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.
+
+  # e.g. inherited variables:
+  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/dns/outbound_dns_resolver?ref=v0.6.2"
+}
+
+# Include all settings from the root terragrunt.hcl file
+include {
+  path = find_in_parent_folders()
+}
+
+# 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 = {
+    Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
+  }
+  primary_vpc = local.account_vars.locals.legacy_vpcs["main_infrastructure"]["id"]
+  subnets = slice(local.account_vars.locals.legacy_vpcs["main_infrastructure"]["private_subnets"], 0, 2)
+  additional_vpcs = [ 
+    local.account_vars.locals.legacy_vpcs["main_infrastructure"]["id"],
+#    local.account_vars.locals.legacy_vpcs["ma-c19"]["id"],
+    local.account_vars.locals.legacy_vpcs["customer-portal"]["id"],
+#    local.account_vars.locals.legacy_vpcs["afs"]["id"],
+#    local.account_vars.locals.legacy_vpcs["la-c19"]["id"],
+#    local.account_vars.locals.legacy_vpcs["dc-c19"]["id"],
+  ]
+}

+ 1 - 1
prod/aws/legacy-mdr-prod/026-legacy-dns-entries/terragrunt.hcl

@@ -15,7 +15,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/dns/legacy_dns_entries?ref=v0.5.12"
+  source = "git@github.mdr.defpoint.com:mdr-engineering/xdr-terraform-modules.git//base/dns/legacy_dns_entries?ref=v0.6.2"
 }
 
 # Include all settings from the root terragrunt.hcl file

+ 1 - 1
prod/aws/mdr-prod-c2/010-standard-vpc/terragrunt.hcl

@@ -18,7 +18,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.5.10"
+  source = "git@github.mdr.defpoint.com:mdr-engineering/xdr-terraform-modules.git//base/standard_vpc?ref=v0.6.2"
 }
 
 # Include all settings from the root terragrunt.hcl file

+ 7 - 0
prod/aws/mdr-prod-c2/023-dns-resolver-instance/README.md

@@ -0,0 +1,7 @@
+Build Note: For a fresh install, you may need to first build the instance:
+```
+terragrunt-local init
+terragrunt-local apply --target aws_instance.instance
+```
+
+Alternatively, you can disable reverse dns in terragrunt.hcl, but the above method should reduce errors where we forget to create the reverse record.

+ 42 - 0
prod/aws/mdr-prod-c2/023-dns-resolver-instance/terragrunt.hcl

@@ -0,0 +1,42 @@
+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.
+
+  # e.g. inherited variables:
+  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"))
+}
+
+dependency "standard_vpc" {
+  config_path = "../010-standard-vpc"
+}
+
+# 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/dns/resolver_instance?ref=v0.6.2"
+}
+
+# Include all settings from the root terragrunt.hcl file
+include {
+  path = find_in_parent_folders()
+}
+
+# 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 = "DNS Resolver"
+    Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
+  }
+  subnet_id = dependency.standard_vpc.outputs.public_subnets[0]
+  vpc_id = dependency.standard_vpc.outputs.vpc_id
+  reverse_enabled = true # Set to 'true' on second run
+}

+ 10 - 0
prod/aws/mdr-prod-c2/account.hcl

@@ -12,6 +12,16 @@ locals {
   # For CIDR assignment, see https://github.mdr.defpoint.com/mdr-engineering/msoc-infrastructure/wiki/IP-Address-Allocation
   standard_vpc_cidr = "10.32.0.0/22"
 
+  vpc_cidrs = {
+    "standard_vpc" = "10.32.0.0/22",
+    "qualys_vpc" = "10.32.12.0/22",
+    "security_vpc" = "10.179.4.0/22"
+  }
+
+  # 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

+ 2 - 2
prod/env.hcl

@@ -23,7 +23,7 @@ locals {
     "dns"      = [ "10.40.0.0/22", "10.32.0.0/22" ], # DNS is in standard
     "monitoring" = [ "10.80.101.230/32" ],
     "salt"     = [ "10.80.101.170/32" ],
-    "web"      = [ "10.80.101.166/32" ], # Things systems need http/https access to, such as the proxy
+    "web"      = [ "10.80.101.166/32", "10.80.101.197/32" ], # Things systems need http/https access to, such as the proxy and the repo
     "smtp"     = [ "10.80.1.107/32" ],
     "moose"    = [ "10.80.0.0/16" ],
   }
@@ -34,7 +34,7 @@ locals {
     "aws"        = "045312110490" # mdr-prod-c2
   }
 
-  dns_servers = [ 
+  inbound_resolver_endpoints = [ 
     "10.40.0.198",
     "10.40.0.64",
   ]

+ 1 - 1
test/aws-us-gov/mdr-test-c2/005-account-standards-c2/terragrunt.hcl

@@ -15,7 +15,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/account_standards_c2?ref=v0.5.1"
+  source = "git@github.mdr.defpoint.com:mdr-engineering/xdr-terraform-modules.git//base/account_standards_c2?ref=v0.6.2"
 }
 
 # Include all settings from the root terragrunt.hcl file

+ 1 - 1
test/aws-us-gov/mdr-test-c2/005-iam/terragrunt.hcl

@@ -18,7 +18,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/iam?ref=v0.5.1"
+  source = "git@github.mdr.defpoint.com:mdr-engineering/xdr-terraform-modules.git//base/iam?ref=v0.6.2"
 }
 
 # Include all settings from the root terragrunt.hcl file

+ 1 - 1
test/aws-us-gov/mdr-test-c2/006-account-standards/terragrunt.hcl

@@ -14,7 +14,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/account_standards?ref=v0.5.7"
+  source = "git@github.mdr.defpoint.com:mdr-engineering/xdr-terraform-modules.git//base/account_standards?ref=v0.6.2"
 }
 
 dependency "c2_account_standards" {

+ 1 - 1
test/aws-us-gov/mdr-test-c2/008-transit-gateway-hub/terragrunt.hcl

@@ -15,7 +15,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/transit_gateway_hub?ref=v0.5.1"
+  source = "git@github.mdr.defpoint.com:mdr-engineering/xdr-terraform-modules.git//base/transit_gateway_hub?ref=v0.6.2"
 }
 
 # Include all settings from the root terragrunt.hcl file

+ 1 - 1
test/aws-us-gov/mdr-test-c2/010-standard-vpc/terragrunt.hcl

@@ -18,7 +18,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.5.10"
+  source = "git@github.mdr.defpoint.com:mdr-engineering/xdr-terraform-modules.git//base/standard_vpc?ref=v0.6.2"
 }
 
 # Include all settings from the root terragrunt.hcl file

+ 1 - 1
test/aws-us-gov/mdr-test-c2/011-private-dns-zone/terragrunt.hcl

@@ -8,7 +8,7 @@ locals {
 
 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/dns/private_dns?ref=v0.6.0"
+  source = "git@github.mdr.defpoint.com:mdr-engineering/xdr-terraform-modules.git//base/dns/private_dns?ref=v0.6.2"
 }
 
 dependency "standard_vpc" {

+ 1 - 1
test/aws-us-gov/mdr-test-c2/015-security-vpc/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/security_vpc?ref=v0.5.10"
+  source = "git@github.mdr.defpoint.com:mdr-engineering/xdr-terraform-modules.git//base/security_vpc?ref=v0.6.2"
 }
 
 # Include all settings from the root terragrunt.hcl file

+ 1 - 1
test/aws-us-gov/mdr-test-c2/018-interconnect-instances/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/interconnects?ref=v0.6.0"
+  source = "git@github.mdr.defpoint.com:mdr-engineering/xdr-terraform-modules.git//base/interconnects?ref=v0.6.2"
 }
 
 dependency "security_vpc" {

+ 1 - 1
test/aws-us-gov/mdr-test-c2/019-attach-transit-gateway-to-hub-account/terragrunt.hcl

@@ -24,7 +24,7 @@ dependency "standard_vpc" {
 # 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/transit_gateway_client?ref=v0.5.1"
+  source = "git@github.mdr.defpoint.com:mdr-engineering/xdr-terraform-modules.git//base/transit_gateway_client?ref=v0.6.2"
 }
 
 # Include all settings from the root terragrunt.hcl file

+ 1 - 1
test/aws-us-gov/mdr-test-c2/020-transit-gateway-interconnect-vpn/terragrunt.hcl

@@ -8,7 +8,7 @@ locals {
 
 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/transit_gateway_interconnect_vpn?ref=v0.5.1"
+  source = "git@github.mdr.defpoint.com:mdr-engineering/xdr-terraform-modules.git//base/transit_gateway_interconnect_vpn?ref=v0.6.2"
 }
 
 dependency "transit-gateway-hub" {

+ 1 - 1
test/aws-us-gov/mdr-test-c2/021-qualys-connector-role/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/qualys_connector_role?ref=v0.5.8"
+  source = "git@github.mdr.defpoint.com:mdr-engineering/xdr-terraform-modules.git//base/qualys_connector_role?ref=v0.6.2"
 }
 
 # Include all settings from the root terragrunt.hcl file

+ 1 - 1
test/aws-us-gov/mdr-test-c2/023-dns-resolver-instance/terragrunt.hcl

@@ -19,7 +19,7 @@ dependency "standard_vpc" {
 # 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/dns/resolver_instance?ref=v0.6.0"
+  source = "git@github.mdr.defpoint.com:mdr-engineering/xdr-terraform-modules.git//base/dns/resolver_instance?ref=v0.6.2"
 }
 
 # Include all settings from the root terragrunt.hcl file

+ 1 - 1
test/aws-us-gov/mdr-test-c2/025-test-instance/terragrunt.hcl

@@ -19,7 +19,7 @@ dependency "standard_vpc" {
 # 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/test_instance?ref=v0.6.0"
+  source = "git@github.mdr.defpoint.com:mdr-engineering/xdr-terraform-modules.git//base/test_instance?ref=v0.6.2"
 }
 
 # Include all settings from the root terragrunt.hcl file

+ 1 - 1
test/aws-us-gov/mdr-test-c2/030-qualys-vpc/terragrunt.hcl

@@ -18,7 +18,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/qualys_scanners?ref=v0.5.6"
+  source = "git@github.mdr.defpoint.com:mdr-engineering/xdr-terraform-modules.git//base/qualys_scanners?ref=v0.6.2"
 }
 
 # Include all settings from the root terragrunt.hcl file

+ 1 - 1
test/aws-us-gov/mdr-test-c2/031-attach-qualys-vpc-to-transit-gateway/terragrunt.hcl

@@ -24,7 +24,7 @@ dependency "target_vpc" {
 # 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/transit_gateway_client?ref=v0.5.6"
+  source = "git@github.mdr.defpoint.com:mdr-engineering/xdr-terraform-modules.git//base/transit_gateway_client?ref=v0.6.2"
 }
 
 # Include all settings from the root terragrunt.hcl file

+ 1 - 1
test/aws-us-gov/mdr-test-malware/010-standard-vpc/terragrunt.hcl

@@ -18,7 +18,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.5.10"
+  source = "git@github.mdr.defpoint.com:mdr-engineering/xdr-terraform-modules.git//base/standard_vpc?ref=v0.6.2"
 }
 
 # Include all settings from the root terragrunt.hcl file

+ 1 - 1
test/aws-us-gov/mdr-test-modelclient/010-standard-vpc/terragrunt.hcl

@@ -18,7 +18,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.5.10"
+  source = "git@github.mdr.defpoint.com:mdr-engineering/xdr-terraform-modules.git//base/standard_vpc?ref=v0.6.2"
 }
 
 # Include all settings from the root terragrunt.hcl file

+ 1 - 1
test/aws/legacy-mdr-test/025-outbound_dns_resolver/terragrunt.hcl

@@ -15,7 +15,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/dns/outbound_dns_resolver?ref=v0.5.11"
+  source = "git@github.mdr.defpoint.com:mdr-engineering/xdr-terraform-modules.git//base/dns/outbound_dns_resolver?ref=v0.6.2"
 }
 
 # Include all settings from the root terragrunt.hcl file

+ 1 - 1
test/aws/legacy-mdr-test/026-legacy-dns-entries/terragrunt.hcl

@@ -15,7 +15,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/dns/legacy_dns_entries?ref=v0.5.12"
+  source = "git@github.mdr.defpoint.com:mdr-engineering/xdr-terraform-modules.git//base/dns/legacy_dns_entries?ref=v0.6.2"
 }
 
 # Include all settings from the root terragrunt.hcl file

+ 1 - 1
test/aws/mdr-test-c2/005-account-standards-c2/terragrunt.hcl

@@ -15,7 +15,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/account_standards_c2?ref=v0.5.1"
+  source = "git@github.mdr.defpoint.com:mdr-engineering/xdr-terraform-modules.git//base/account_standards_c2?ref=v0.6.2"
 }
 
 # Include all settings from the root terragrunt.hcl file

+ 1 - 1
test/aws/mdr-test-c2/005-iam/terragrunt.hcl

@@ -18,7 +18,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/iam?ref=v0.5.1"
+  source = "git@github.mdr.defpoint.com:mdr-engineering/xdr-terraform-modules.git//base/iam?ref=v0.6.2"
 }
 
 # Include all settings from the root terragrunt.hcl file

+ 1 - 1
test/aws/mdr-test-c2/006-account-standards/terragrunt.hcl

@@ -14,7 +14,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/account_standards?ref=v0.5.7"
+  source = "git@github.mdr.defpoint.com:mdr-engineering/xdr-terraform-modules.git//base/account_standards?ref=v0.6.2"
 }
 
 dependency "c2_account_standards" {

+ 1 - 1
test/aws/mdr-test-c2/008-transit-gateway-hub/terragrunt.hcl

@@ -15,7 +15,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/transit_gateway_hub?ref=v0.5.1"
+  source = "git@github.mdr.defpoint.com:mdr-engineering/xdr-terraform-modules.git//base/transit_gateway_hub?ref=v0.6.2"
 }
 
 # Include all settings from the root terragrunt.hcl file

+ 1 - 1
test/aws/mdr-test-c2/010-standard-vpc/terragrunt.hcl

@@ -18,7 +18,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.5.10"
+  source = "git@github.mdr.defpoint.com:mdr-engineering/xdr-terraform-modules.git//base/standard_vpc?ref=v0.6.2"
 }
 
 # Include all settings from the root terragrunt.hcl file

+ 1 - 1
test/aws/mdr-test-c2/019-attach-transit-gateway-to-hub-account/terragrunt.hcl

@@ -24,7 +24,7 @@ dependency "standard_vpc" {
 # 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/transit_gateway_client?ref=v0.5.1"
+  source = "git@github.mdr.defpoint.com:mdr-engineering/xdr-terraform-modules.git//base/transit_gateway_client?ref=v0.6.2"
 }
 
 # Include all settings from the root terragrunt.hcl file

+ 1 - 1
test/aws/mdr-test-c2/020-transit-gateway-interconnect-vpn/terragrunt.hcl

@@ -8,7 +8,7 @@ locals {
 
 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/transit_gateway_interconnect_vpn?ref=v0.5.1"
+  source = "git@github.mdr.defpoint.com:mdr-engineering/xdr-terraform-modules.git//base/transit_gateway_interconnect_vpn?ref=v0.6.2"
 }
 
 dependency "transit-gateway-hub" {

+ 1 - 1
test/aws/mdr-test-c2/021-qualys-connector-role/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/qualys_connector_role?ref=v0.5.8"
+  source = "git@github.mdr.defpoint.com:mdr-engineering/xdr-terraform-modules.git//base/qualys_connector_role?ref=v0.6.2"
 }
 
 # Include all settings from the root terragrunt.hcl file

+ 1 - 1
test/aws/mdr-test-c2/023-dns-resolver-instance/terragrunt.hcl

@@ -19,7 +19,7 @@ dependency "standard_vpc" {
 # 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/dns/resolver_instance?ref=v0.6.0"
+  source = "git@github.mdr.defpoint.com:mdr-engineering/xdr-terraform-modules.git//base/dns/resolver_instance?ref=v0.6.2"
 }
 
 # Include all settings from the root terragrunt.hcl file

+ 1 - 1
test/aws/mdr-test-c2/025-test-instance/terragrunt.hcl

@@ -19,7 +19,7 @@ dependency "standard_vpc" {
 # 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/test_instance?ref=v0.5.1"
+  source = "git@github.mdr.defpoint.com:mdr-engineering/xdr-terraform-modules.git//base/test_instance?ref=v0.6.2"
 }
 
 # Include all settings from the root terragrunt.hcl file

+ 1 - 1
test/aws/mdr-test-modelclient/010-standard-vpc/terragrunt.hcl

@@ -18,7 +18,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.5.10"
+  source = "git@github.mdr.defpoint.com:mdr-engineering/xdr-terraform-modules.git//base/standard_vpc?ref=v0.6.2"
 }
 
 # Include all settings from the root terragrunt.hcl file

+ 2 - 2
test/env.hcl

@@ -23,7 +23,7 @@ locals {
     "dns"      = [ "10.20.0.0/22", "10.16.0.0/22" ], # DNS is in standard
     "monitoring" = [ "10.96.101.43/32" ],
     "salt"     = [ "10.96.101.161/32" ],
-    "web"      = [ "10.96.101.188/32" ], # Things systems need http/https access to, such as the proxy
+    "web"      = [ "10.96.101.188/32", "10.96.101.160/32" ], # Things systems need http/https access to, such as the proxy and the rep
     "smtp"     = [ "10.96.1.160/32" ],
     "moose"    = [ "10.96.0.0/16" ],
   }
@@ -34,7 +34,7 @@ locals {
     "aws"        = "816914342178" # mdr-test-c2
   }
 
-  dns_servers = [
+  inbound_resolver_endpoints = [
     "10.20.0.119",
     "10.20.0.211",
   ]