Updates 010-standard-vpc to be more specific

A whole lot of changes to do very little.

* Renames `010-standard-vpc` to `010-vpc-splunk`,
  `010-vpc-system-services`, or `vpc-xxx` to meet new naming
  conventions.
* Updates terragrunt.hcl files that reference that vpc
* Updates directory names to reflect appropriate VPC names

All corresponding tfstate files have been moved appropriately.

test/aws-us-gov/mdr-test-modelclient/010-standard-vpc/terragrunt.hcl → 000-skeleton/010-vpc-splunk/terragrunt.hcl

@@ -34,7 +34,7 @@ inputs = {
   name = "vpc_primary_${local.account_vars.locals.account_name}"
   cidr = local.account_vars.locals.standard_vpc_cidr
   tags = {
-    Purpose = "Standard VPC"
+    Purpose = "Splunk VPC"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
 }

000-skeleton/020-attach-transit-gateway-to-standard-vpc/terragrunt.hcl → 000-skeleton/020-attach-transit-gateway-to-vpc-splunk/terragrunt.hcl

@@ -15,8 +15,8 @@ dependency "transit_gateway" {
   config_path = "../../${local.environment_vars.locals.transit_gateway_account_name}/008-transit-gateway-hub"
 }
 
-dependency "standard_vpc" {
-  config_path = "../010-standard-vpc"
+dependency "vpc_splunk" {
+  config_path = "../010-vpc-splunk"
 }
 
 
@@ -44,7 +44,7 @@ inputs = {
   accept_invitation = true # Should only be true for the first one
   share_arn = dependency.transit_gateway.outputs.resource_share_arns[local.account_vars.locals.aws_account_id]
   tgw_id = dependency.transit_gateway.outputs.tgw_id
-  vpc_id = dependency.standard_vpc.outputs.vpc_id
-  subnets = dependency.standard_vpc.outputs.private_subnets
-  route_tables = concat(dependency.standard_vpc.outputs.private_route_tables, dependency.standard_vpc.outputs.public_route_tables)
+  vpc_id = dependency.vpc_splunk.outputs.vpc_id
+  subnets = dependency.vpc_splunk.outputs.private_subnets
+  route_tables = concat(dependency.vpc_splunk.outputs.private_route_tables, dependency.vpc_splunk.outputs.public_route_tables)
 }

000-skeleton/025-test-instance/terragrunt.hcl

@@ -11,8 +11,8 @@ locals {
   global_vars = read_terragrunt_config(find_in_parent_folders("globals.hcl"))
 }
 
-dependency "standard_vpc" {
-  config_path = "../010-standard-vpc"
+dependency "vpc_splunk" {
+  config_path = "../010-vpc-splunk"
 }
 
 # Terragrunt will copy the Terraform configurations specified by the source parameter, along with any files in the
@@ -36,6 +36,6 @@ inputs = {
     Purpose = "Testing Instance"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
-  subnet_id = dependency.standard_vpc.outputs.public_subnets[0]
-  security_group_ids = [ dependency.standard_vpc.outputs.allow_all_from_trusted_sg_id ]
+  subnet_id = dependency.vpc_splunk.outputs.public_subnets[0]
+  security_group_ids = [ dependency.vpc_splunk.outputs.allow_all_from_trusted_sg_id ]
 }

prod/aws-us-gov/mdr-prod-c2/011-private-dns-zone/terragrunt.hcl

@@ -11,8 +11,8 @@ terraform {
   source = "git@github.mdr.defpoint.com:mdr-engineering/xdr-terraform-modules.git//base/dns/private_dns?ref=v0.6.0"
 }
 
-dependency "standard_vpc" {
-  config_path = "../010-standard-vpc"
+dependency "vpc_system_services" {
+  config_path = "../010-vpc-system-services"
 }
 
 include {
@@ -23,6 +23,6 @@ inputs = {
   tags = {
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
-  vpcs = [ dependency.standard_vpc.outputs.vpc_id ] # can add more if desired
-  subnets = dependency.standard_vpc.outputs.private_subnets
+  vpcs = [ dependency.vpc_system_services.outputs.vpc_id ] # can add more if desired
+  subnets = dependency.vpc_system_services.outputs.private_subnets
 }

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

@@ -15,8 +15,8 @@ dependency "transit_gateway" {
   config_path = "../../${local.environment_vars.locals.transit_gateway_account_name}/008-transit-gateway-hub"
 }
 
-dependency "standard_vpc" {
-  config_path = "../010-standard-vpc"
+dependency "vpc_system_services" {
+  config_path = "../010-vpc-system-services"
 }
 
 
@@ -43,7 +43,7 @@ inputs = {
   }
   accept_invitation = false # Should only be true for the first one
   tgw_id = dependency.transit_gateway.outputs.tgw_id
-  vpc_id = dependency.standard_vpc.outputs.vpc_id
-  subnets = dependency.standard_vpc.outputs.private_subnets
-  route_tables = concat(dependency.standard_vpc.outputs.private_route_tables, dependency.standard_vpc.outputs.public_route_tables)
+  vpc_id = dependency.vpc_system_services.outputs.vpc_id
+  subnets = dependency.vpc_system_services.outputs.private_subnets
+  route_tables = concat(dependency.vpc_system_services.outputs.private_route_tables, dependency.vpc_system_services.outputs.public_route_tables)
 }

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

@@ -11,8 +11,8 @@ locals {
   global_vars = read_terragrunt_config(find_in_parent_folders("globals.hcl"))
 }
 
-dependency "standard_vpc" {
-  config_path = "../010-standard-vpc"
+dependency "vpc_system_services" {
+  config_path = "../010-vpc-system-services"
 }
 
 # Terragrunt will copy the Terraform configurations specified by the source parameter, along with any files in the
@@ -36,7 +36,7 @@ inputs = {
     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
+  subnet_id = dependency.vpc_system_services.outputs.public_subnets[0]
+  vpc_id = dependency.vpc_system_services.outputs.vpc_id
   reverse_enabled = true # Set to 'true' on second run
 }

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

@@ -11,8 +11,8 @@ locals {
   global_vars = read_terragrunt_config(find_in_parent_folders("globals.hcl"))
 }
 
-dependency "standard_vpc" {
-  config_path = "../010-standard-vpc"
+dependency "vpc_system_services" {
+  config_path = "../010-vpc-system-services"
 }
 
 # Terragrunt will copy the Terraform configurations specified by the source parameter, along with any files in the
@@ -36,6 +36,6 @@ inputs = {
     Purpose = "Testing Instance"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
-  subnet_id = dependency.standard_vpc.outputs.public_subnets[0]
-  security_group_ids = [ dependency.standard_vpc.outputs.allow_all_from_trusted_sg_id ]
+  subnet_id = dependency.vpc_system_services.outputs.public_subnets[0]
+  security_group_ids = [ dependency.vpc_system_services.outputs.allow_all_from_trusted_sg_id ]
 }

prod/aws/mdr-prod-c2/019-attach-transit-gateway-to-hub-account/terragrunt.hcl

@@ -15,8 +15,8 @@ dependency "transit_gateway" {
   config_path = "../../${local.environment_vars.locals.transit_gateway_account_name}/008-transit-gateway-hub"
 }
 
-dependency "standard_vpc" {
-  config_path = "../010-standard-vpc"
+dependency "vpc_system_services" {
+  config_path = "../010-vpc-system-services"
 }
 
 
@@ -43,7 +43,7 @@ inputs = {
   }
   accept_invitation = false # Should only be true for the first one
   tgw_id = dependency.transit_gateway.outputs.tgw_id
-  vpc_id = dependency.standard_vpc.outputs.vpc_id
-  subnets = dependency.standard_vpc.outputs.private_subnets
-  route_tables = concat(dependency.standard_vpc.outputs.private_route_tables, dependency.standard_vpc.outputs.public_route_tables)
+  vpc_id = dependency.vpc_system_services.outputs.vpc_id
+  subnets = dependency.vpc_system_services.outputs.private_subnets
+  route_tables = concat(dependency.vpc_system_services.outputs.private_route_tables, dependency.vpc_system_services.outputs.public_route_tables)
 }

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

@@ -11,8 +11,8 @@ locals {
   global_vars = read_terragrunt_config(find_in_parent_folders("globals.hcl"))
 }
 
-dependency "standard_vpc" {
-  config_path = "../010-standard-vpc"
+dependency "vpc_system_services" {
+  config_path = "../010-vpc-system-services"
 }
 
 # Terragrunt will copy the Terraform configurations specified by the source parameter, along with any files in the
@@ -36,7 +36,7 @@ inputs = {
     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
+  subnet_id = dependency.vpc_system_services.outputs.public_subnets[0]
+  vpc_id = dependency.vpc_system_services.outputs.vpc_id
   reverse_enabled = true # Set to 'true' on second run
 }

prod/aws/mdr-prod-c2/025-test-instance/terragrunt.hcl

@@ -11,8 +11,8 @@ locals {
   global_vars = read_terragrunt_config(find_in_parent_folders("globals.hcl"))
 }
 
-dependency "standard_vpc" {
-  config_path = "../010-standard-vpc"
+dependency "vpc_system_services" {
+  config_path = "../010-vpc-system-services"
 }
 
 # Terragrunt will copy the Terraform configurations specified by the source parameter, along with any files in the
@@ -36,6 +36,6 @@ inputs = {
     Purpose = "Testing Instance"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
-  subnet_id = dependency.standard_vpc.outputs.public_subnets[0]
-  security_group_ids = [ dependency.standard_vpc.outputs.allow_all_from_trusted_sg_id ]
+  subnet_id = dependency.vpc_system_services.outputs.public_subnets[0]
+  security_group_ids = [ dependency.vpc_system_services.outputs.allow_all_from_trusted_sg_id ]
 }

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

@@ -0,0 +1,40 @@
+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"))
+
+  # Extract out common variables for reuse
+  #env = local.environment_vars.locals.environment
+}
+
+# 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/standard_vpc?ref=v0.7.3"
+}
+
+# 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.
+  name = "vpc_primary_${local.account_vars.locals.account_name}"
+  cidr = local.account_vars.locals.standard_vpc_cidr
+  tags = {
+    Purpose = "VPC for Services Provided to Internal Systems"
+    Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
+  }
+}

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

@@ -11,8 +11,8 @@ terraform {
   source = "git@github.mdr.defpoint.com:mdr-engineering/xdr-terraform-modules.git//base/dns/private_dns?ref=v0.6.2"
 }
 
-dependency "standard_vpc" {
-  config_path = "../010-standard-vpc"
+dependency "vpc_system_services" {
+  config_path = "../010-vpc-system-services"
 }
 
 include {
@@ -23,6 +23,6 @@ inputs = {
   tags = {
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
-  vpcs = [ dependency.standard_vpc.outputs.vpc_id ] # can add more if desired
-  subnets = dependency.standard_vpc.outputs.private_subnets
+  vpcs = [ dependency.vpc_system_services.outputs.vpc_id ] # can add more if desired
+  subnets = dependency.vpc_system_services.outputs.private_subnets
 }

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

@@ -15,8 +15,8 @@ dependency "transit_gateway" {
   config_path = "../../${local.environment_vars.locals.transit_gateway_account_name}/008-transit-gateway-hub"
 }
 
-dependency "standard_vpc" {
-  config_path = "../010-standard-vpc"
+dependency "vpc_system_services" {
+  config_path = "../010-vpc-system-services"
 }
 
 
@@ -43,7 +43,7 @@ inputs = {
   }
   accept_invitation = false # Should only be true for the first one
   tgw_id = dependency.transit_gateway.outputs.tgw_id
-  vpc_id = dependency.standard_vpc.outputs.vpc_id
-  subnets = dependency.standard_vpc.outputs.private_subnets
-  route_tables = concat(dependency.standard_vpc.outputs.private_route_tables, dependency.standard_vpc.outputs.public_route_tables)
+  vpc_id = dependency.vpc_system_services.outputs.vpc_id
+  subnets = dependency.vpc_system_services.outputs.private_subnets
+  route_tables = concat(dependency.vpc_system_services.outputs.private_route_tables, dependency.vpc_system_services.outputs.public_route_tables)
 }

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

@@ -11,8 +11,8 @@ locals {
   global_vars = read_terragrunt_config(find_in_parent_folders("globals.hcl"))
 }
 
-dependency "standard_vpc" {
-  config_path = "../010-standard-vpc"
+dependency "vpc_system_services" {
+  config_path = "../010-vpc-system-services"
 }
 
 # Terragrunt will copy the Terraform configurations specified by the source parameter, along with any files in the
@@ -36,7 +36,7 @@ inputs = {
     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
+  subnet_id = dependency.vpc_system_services.outputs.public_subnets[0]
+  vpc_id = dependency.vpc_system_services.outputs.vpc_id
   reverse_enabled = true # Set to 'true' on second run
 }

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

@@ -11,8 +11,8 @@ locals {
   global_vars = read_terragrunt_config(find_in_parent_folders("globals.hcl"))
 }
 
-dependency "standard_vpc" {
-  config_path = "../010-standard-vpc"
+dependency "vpc_system_services" {
+  config_path = "../010-vpc-system-services"
 }
 
 # Terragrunt will copy the Terraform configurations specified by the source parameter, along with any files in the
@@ -36,6 +36,6 @@ inputs = {
     Purpose = "Testing Instance"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
-  subnet_id = dependency.standard_vpc.outputs.public_subnets[0]
-  security_group_ids = [ dependency.standard_vpc.outputs.allow_all_from_trusted_sg_id ]
+  subnet_id = dependency.vpc_system_services.outputs.public_subnets[0]
+  security_group_ids = [ dependency.vpc_system_services.outputs.allow_all_from_trusted_sg_id ]
 }

test/aws-us-gov/mdr-test-malware/010-standard-vpc/terragrunt.hcl → test/aws-us-gov/mdr-test-malware/010-vpc-vmray/terragrunt.hcl

@@ -34,7 +34,7 @@ inputs = {
   name = "vpc_primary_${local.account_vars.locals.account_name}"
   cidr = local.account_vars.locals.standard_vpc_cidr
   tags = {
-    Purpose = "Standard VPC"
+    Purpose = "VPC for Malware Detonation via VMRay"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
 }

test/aws-us-gov/mdr-test-modelclient/020-attach-transit-gateway-to-standard-vpc/terragrunt.hcl → test/aws-us-gov/mdr-test-malware/020-attach-transit-gateway-to-vpc-vmray/terragrunt.hcl

@@ -15,8 +15,8 @@ dependency "transit_gateway" {
   config_path = "../../${local.environment_vars.locals.transit_gateway_account_name}/008-transit-gateway-hub"
 }
 
-dependency "standard_vpc" {
-  config_path = "../010-standard-vpc"
+dependency "vpc-vmray" {
+  config_path = "../010-vpc-vmray"
 }
 
 
@@ -44,7 +44,7 @@ inputs = {
   accept_invitation = true # Should only be true for the first one
   share_arn = dependency.transit_gateway.outputs.resource_share_arns[local.account_vars.locals.aws_account_id]
   tgw_id = dependency.transit_gateway.outputs.tgw_id
-  vpc_id = dependency.standard_vpc.outputs.vpc_id
-  subnets = dependency.standard_vpc.outputs.private_subnets
-  route_tables = concat(dependency.standard_vpc.outputs.private_route_tables, dependency.standard_vpc.outputs.public_route_tables)
+  vpc_id = dependency.vpc-vmray.outputs.vpc_id
+  subnets = dependency.vpc-vmray.outputs.private_subnets
+  route_tables = concat(dependency.vpc-vmray.outputs.private_route_tables, dependency.vpc-vmray.outputs.public_route_tables)
 }

test/aws-us-gov/mdr-test-malware/025-test-instance/terragrunt.hcl

@@ -11,8 +11,8 @@ locals {
   global_vars = read_terragrunt_config(find_in_parent_folders("globals.hcl"))
 }
 
-dependency "standard_vpc" {
-  config_path = "../010-standard-vpc"
+dependency "vpc_malware" {
+  config_path = "../010-vpc-malware"
 }
 
 # Terragrunt will copy the Terraform configurations specified by the source parameter, along with any files in the
@@ -36,6 +36,6 @@ inputs = {
     Purpose = "Testing Instance"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
-  subnet_id = dependency.standard_vpc.outputs.public_subnets[0]
-  security_group_ids = [ dependency.standard_vpc.outputs.allow_all_from_trusted_sg_id ]
+  subnet_id = dependency.vpc_malware.outputs.public_subnets[0]
+  security_group_ids = [ dependency.vpc_malware.outputs.allow_all_from_trusted_sg_id ]
 }

prod/aws/mdr-prod-c2/010-standard-vpc/terragrunt.hcl → test/aws-us-gov/mdr-test-modelclient/010-vpc-splunk/terragrunt.hcl

@@ -34,7 +34,7 @@ inputs = {
   name = "vpc_primary_${local.account_vars.locals.account_name}"
   cidr = local.account_vars.locals.standard_vpc_cidr
   tags = {
-    Purpose = "Standard VPC"
+    Purpose = "Splunk VPC"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
 }

test/aws-us-gov/mdr-test-malware/020-attach-transit-gateway-to-standard-vpc/terragrunt.hcl → test/aws-us-gov/mdr-test-modelclient/020-attach-transit-gateway-to-vpc-splunk/terragrunt.hcl

@@ -16,7 +16,7 @@ dependency "transit_gateway" {
 }
 
 dependency "standard_vpc" {
-  config_path = "../010-standard-vpc"
+  config_path = "../010-vpc-splunk"
 }
 
 

test/aws-us-gov/mdr-test-modelclient/025-test-instance/terragrunt.hcl

@@ -12,7 +12,7 @@ locals {
 }
 
 dependency "standard_vpc" {
-  config_path = "../010-standard-vpc"
+  config_path = "../010-vpc-splunk"
 }
 
 # Terragrunt will copy the Terraform configurations specified by the source parameter, along with any files in the

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

@@ -1,40 +0,0 @@
-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"))
-
-  # Extract out common variables for reuse
-  #env = local.environment_vars.locals.environment
-}
-
-# 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/standard_vpc?ref=v0.7.3"
-}
-
-# 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.
-  name = "vpc_primary_${local.account_vars.locals.account_name}"
-  cidr = local.account_vars.locals.standard_vpc_cidr
-  tags = {
-    Purpose = "Standard VPC"
-    Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
-  }
-}

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

@@ -0,0 +1,40 @@
+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"))
+
+  # Extract out common variables for reuse
+  #env = local.environment_vars.locals.environment
+}
+
+# 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/standard_vpc?ref=v0.7.3"
+}
+
+# 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.
+  name = "vpc_primary_${local.account_vars.locals.account_name}"
+  cidr = local.account_vars.locals.standard_vpc_cidr
+  tags = {
+    Purpose = "VPC for Services Provided to Internal Systems"
+    Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
+  }
+}

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

@@ -15,8 +15,8 @@ dependency "transit_gateway" {
   config_path = "../../${local.environment_vars.locals.transit_gateway_account_name}/008-transit-gateway-hub"
 }
 
-dependency "standard_vpc" {
-  config_path = "../010-standard-vpc"
+dependency "vpc_system_services" {
+  config_path = "../010-vpc-system-services"
 }
 
 
@@ -43,7 +43,7 @@ inputs = {
   }
   accept_invitation = false # Should only be true for the first one
   tgw_id = dependency.transit_gateway.outputs.tgw_id
-  vpc_id = dependency.standard_vpc.outputs.vpc_id
-  subnets = dependency.standard_vpc.outputs.private_subnets
-  route_tables = concat(dependency.standard_vpc.outputs.private_route_tables, dependency.standard_vpc.outputs.public_route_tables)
+  vpc_id = dependency.vpc_system_services.outputs.vpc_id
+  subnets = dependency.vpc_system_services.outputs.private_subnets
+  route_tables = concat(dependency.vpc_system_services.outputs.private_route_tables, dependency.vpc_system_services.outputs.public_route_tables)
 }

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

@@ -11,8 +11,8 @@ locals {
   global_vars = read_terragrunt_config(find_in_parent_folders("globals.hcl"))
 }
 
-dependency "standard_vpc" {
-  config_path = "../010-standard-vpc"
+dependency "vpc_system_services" {
+  config_path = "../010-vpc-system-services"
 }
 
 # Terragrunt will copy the Terraform configurations specified by the source parameter, along with any files in the
@@ -36,7 +36,7 @@ inputs = {
     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
+  subnet_id = dependency.vpc_system_services.outputs.public_subnets[0]
+  vpc_id = dependency.vpc_system_services.outputs.vpc_id
   reverse_enabled = true # Set to 'true' on second run
 }

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

@@ -11,8 +11,8 @@ locals {
   global_vars = read_terragrunt_config(find_in_parent_folders("globals.hcl"))
 }
 
-dependency "standard_vpc" {
-  config_path = "../010-standard-vpc"
+dependency "vpc_malware" {
+  config_path = "../010-vpc-malware"
 }
 
 # Terragrunt will copy the Terraform configurations specified by the source parameter, along with any files in the
@@ -36,6 +36,6 @@ inputs = {
     Purpose = "Testing Instance"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
-  subnet_id = dependency.standard_vpc.outputs.public_subnets[0]
-  security_group_ids = [ dependency.standard_vpc.outputs.allow_all_from_trusted_sg_id ]
+  subnet_id = dependency.vpc_malware.outputs.public_subnets[0]
+  security_group_ids = [ dependency.vpc_malware.outputs.allow_all_from_trusted_sg_id ]
 }

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

@@ -1,40 +0,0 @@
-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"))
-
-  # Extract out common variables for reuse
-  #env = local.environment_vars.locals.environment
-}
-
-# 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/standard_vpc?ref=v0.7.3"
-}
-
-# 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.
-  name = "vpc_primary_${local.account_vars.locals.account_name}"
-  cidr = local.account_vars.locals.standard_vpc_cidr
-  tags = {
-    Purpose = "Standard VPC"
-    Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
-  }
-}

test/aws-us-gov/mdr-test-c2/010-standard-vpc/terragrunt.hcl → test/aws/mdr-test-modelclient/010-vpc-splunk/terragrunt.hcl

@@ -34,7 +34,7 @@ inputs = {
   name = "vpc_primary_${local.account_vars.locals.account_name}"
   cidr = local.account_vars.locals.standard_vpc_cidr
   tags = {
-    Purpose = "Standard VPC"
+    Purpose = "Splunk VPC"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
 }

test/aws/mdr-test-modelclient/020-attach-transit-gateway-to-standard-vpc/terragrunt.hcl → test/aws/mdr-test-modelclient/020-attach-transit-gateway-to-vpc-splunk/terragrunt.hcl

@@ -15,8 +15,8 @@ dependency "transit_gateway" {
   config_path = "../../${local.environment_vars.locals.transit_gateway_account_name}/008-transit-gateway-hub"
 }
 
-dependency "standard_vpc" {
-  config_path = "../010-standard-vpc"
+dependency "vpc_splunk" {
+  config_path = "../010-vpc-splunk"
 }
 
 
@@ -44,7 +44,7 @@ inputs = {
   accept_invitation = true # Should only be true for the first one
   share_arn = dependency.transit_gateway.outputs.resource_share_arns[local.account_vars.locals.aws_account_id]
   tgw_id = dependency.transit_gateway.outputs.tgw_id
-  vpc_id = dependency.standard_vpc.outputs.vpc_id
-  subnets = dependency.standard_vpc.outputs.private_subnets
-  route_tables = concat(dependency.standard_vpc.outputs.private_route_tables, dependency.standard_vpc.outputs.public_route_tables)
+  vpc_id = dependency.vpc_splunk.outputs.vpc_id
+  subnets = dependency.vpc_splunk.outputs.private_subnets
+  route_tables = concat(dependency.vpc_splunk.outputs.private_route_tables, dependency.vpc_splunk.outputs.public_route_tables)
 }

test/aws/mdr-test-modelclient/025-test-instance/terragrunt.hcl

@@ -11,8 +11,8 @@ locals {
   global_vars = read_terragrunt_config(find_in_parent_folders("globals.hcl"))
 }
 
-dependency "standard_vpc" {
-  config_path = "../010-standard-vpc"
+dependency "vpc_splunk" {
+  config_path = "../010-vpc-splunk"
 }
 
 # Terragrunt will copy the Terraform configurations specified by the source parameter, along with any files in the
@@ -36,6 +36,6 @@ inputs = {
     Purpose = "Testing Instance"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
-  subnet_id = dependency.standard_vpc.outputs.public_subnets[0]
-  security_group_ids = [ dependency.standard_vpc.outputs.allow_all_from_trusted_sg_id ]
+  subnet_id = dependency.vpc_splunk.outputs.public_subnets[0]
+  security_group_ids = [ dependency.vpc_splunk.outputs.allow_all_from_trusted_sg_id ]
 }