Merge branch 'master' into feature/dw_MSOCI-2137_add_frtib_chaos_lcps

000-skeleton/005-iam/terragrunt.hcl

@@ -6,15 +6,15 @@ locals {
   # 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"))
+  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
-  aws_region     = local.region_vars.locals.aws_region
-  account_id     = local.account_vars.locals.aws_account_id
-  
+  aws_region = local.region_vars.locals.aws_region
+  account_id = local.account_vars.locals.aws_account_id
+
 }
 
 # TODO: For provisioning only. Comment out after provisioning
@@ -58,5 +58,5 @@ inputs = {
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
 }
-terraform_version_constraint = "= 1.1.6"
+terraform_version_constraint  = "= 1.1.6"
 terragrunt_version_constraint = "= 0.36.2"

000-skeleton/006-account-standards-regional/us-gov-west-1/terragrunt.hcl

@@ -4,10 +4,10 @@ locals {
   # 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"))
+  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"))
 
   aws_partition  = local.partition_vars.locals.aws_partition
   account_id     = local.account_vars.locals.aws_account_id
@@ -58,5 +58,5 @@ inputs = {
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
 }
-terraform_version_constraint = "= 1.1.6"
+terraform_version_constraint  = "= 1.1.6"
 terragrunt_version_constraint = "= 0.36.2"

000-skeleton/006-account-standards/terragrunt.hcl

@@ -4,10 +4,10 @@ locals {
   # 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"))
+  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
@@ -36,5 +36,5 @@ inputs = {
   }
   cloudtrail_key_arn = dependency.c2_account_standards.outputs.cloudtrail_logging_bucket.kms_key_id
 }
-terraform_version_constraint = "= 1.1.6"
+terraform_version_constraint  = "= 1.1.6"
 terragrunt_version_constraint = "= 0.36.2"

000-skeleton/007-backups/terragrunt.hcl

@@ -4,10 +4,10 @@ locals {
   # 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"))
+  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
@@ -31,5 +31,5 @@ inputs = {
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
 }
-terraform_version_constraint = "= 1.1.6"
+terraform_version_constraint  = "= 1.1.6"
 terragrunt_version_constraint = "= 0.36.2"

000-skeleton/010-vpc-splunk/terragrunt.hcl

@@ -5,10 +5,10 @@ locals {
 
   # 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"))
+  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
@@ -36,14 +36,14 @@ inputs = {
   # (via the `inputs` section of the root `terragrunt.hcl`). However, modules
   # will be more flexible if you specify particular input values.
   accept_tgw_invitation = true # Should we accept the Transit GT invitation? Should only be true for the first vpc
-  tgw_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_info = local.account_vars.locals.vpc_info["vpc-splunk"]
+  tgw_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_info              = local.account_vars.locals.vpc_info["vpc-splunk"]
   tags = {
     #Purpose # grabbed from vpc_info
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
   accept_tgw_invitation = true
 }
-terraform_version_constraint = "= 1.1.6"
+terraform_version_constraint  = "= 1.1.6"
 terragrunt_version_constraint = "= 0.36.2"

000-skeleton/072-salt-master-inventory-role/terragrunt.hcl

@@ -3,10 +3,10 @@ locals {
   # 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"))
+  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
@@ -27,9 +27,9 @@ inputs = {
   # (via the `inputs` section of the root `terragrunt.hcl`). However, modules
   # will be more flexible if you specify particular input values.
   tags = {
-    Purpose = "Inventory for FedRAMP Compliance"
+    Purpose   = "Inventory for FedRAMP Compliance"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
 }
-terraform_version_constraint = "= 1.1.6"
+terraform_version_constraint  = "= 1.1.6"
 terragrunt_version_constraint = "= 0.36.2"

000-skeleton/140-splunk-frozen-bucket/terragrunt.hcl

@@ -3,10 +3,10 @@ locals {
   # 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"))
+  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
@@ -27,9 +27,9 @@ inputs = {
   # (via the `inputs` section of the root `terragrunt.hcl`). However, modules
   # will be more flexible if you specify particular input values.
   tags = {
-    Purpose = "Splunk Frozen Data"
+    Purpose   = "Splunk Frozen Data"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
 }
-terraform_version_constraint = "= 1.1.6"
+terraform_version_constraint  = "= 1.1.6"
 terragrunt_version_constraint = "= 0.36.2"

000-skeleton/145-splunk-smartstore-s3/terragrunt.hcl

@@ -3,10 +3,10 @@ locals {
   # 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"))
+  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
@@ -27,9 +27,9 @@ inputs = {
   # (via the `inputs` section of the root `terragrunt.hcl`). However, modules
   # will be more flexible if you specify particular input values.
   tags = {
-    Purpose = "Splunk SmartStore Data"
+    Purpose   = "Splunk SmartStore Data"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
 }
-terraform_version_constraint = "= 1.1.6"
+terraform_version_constraint  = "= 1.1.6"
 terragrunt_version_constraint = "= 0.36.2"

000-skeleton/150-splunk-cluster-master/terragrunt.hcl

@@ -3,10 +3,10 @@ locals {
   # 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"))
+  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
@@ -31,15 +31,15 @@ inputs = {
   # (via the `inputs` section of the root `terragrunt.hcl`). However, modules
   # will be more flexible if you specify particular input values.
   tags = {
-    Purpose = "Splunk Cluster Master"
+    Purpose   = "Splunk Cluster Master"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
-  prefix = local.account_vars.locals.splunk_prefix
+  prefix        = local.account_vars.locals.splunk_prefix
   instance_type = local.account_vars.locals.instance_types["splunk-cm"]
-  vpc_id = dependency.vpc.outputs.vpc_id
-  vpc_cidr = local.account_vars.locals.vpc_info["vpc-splunk"]["cidr"]
-  azs = dependency.vpc.outputs.azs
-  subnets = dependency.vpc.outputs.private_subnets
+  vpc_id        = dependency.vpc.outputs.vpc_id
+  vpc_cidr      = local.account_vars.locals.vpc_info["vpc-splunk"]["cidr"]
+  azs           = dependency.vpc.outputs.azs
+  subnets       = dependency.vpc.outputs.private_subnets
 }
-terraform_version_constraint = "= 1.1.6"
+terraform_version_constraint  = "= 1.1.6"
 terragrunt_version_constraint = "= 0.36.2"

000-skeleton/160-splunk-indexer-cluster/terragrunt.hcl

@@ -3,10 +3,10 @@ locals {
   # 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"))
+  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
@@ -31,16 +31,17 @@ inputs = {
   # (via the `inputs` section of the root `terragrunt.hcl`). However, modules
   # will be more flexible if you specify particular input values.
   tags = {
-    Purpose = "Splunk Indexer Cluster"
+    Purpose   = "Splunk Indexer Cluster"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
-  prefix = local.account_vars.locals.splunk_prefix
-  instance_type = local.account_vars.locals.instance_types["splunk-indexer"]
-  vpc_id = dependency.vpc.outputs.vpc_id
-  vpc_cidr = local.account_vars.locals.vpc_info["vpc-splunk"]["cidr"]
-  azs = dependency.vpc.outputs.azs
+  prefix          = local.account_vars.locals.splunk_prefix
+  instance_type   = local.account_vars.locals.instance_types["splunk-indexer"]
+  vpc_id          = dependency.vpc.outputs.vpc_id
+  vpc_cidr        = local.account_vars.locals.vpc_info["vpc-splunk"]["cidr"]
+  azs             = dependency.vpc.outputs.azs
   private_subnets = dependency.vpc.outputs.private_subnets
   public_subnets  = dependency.vpc.outputs.public_subnets
+  hec_listen_443  = false
 }
-terraform_version_constraint = "= 1.1.6"
+terraform_version_constraint  = "= 1.1.6"
 terragrunt_version_constraint = "= 0.36.2"

000-skeleton/170-splunk-searchhead/terragrunt.hcl

@@ -3,10 +3,10 @@ locals {
   # 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"))
+  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
@@ -31,15 +31,15 @@ inputs = {
   # (via the `inputs` section of the root `terragrunt.hcl`). However, modules
   # will be more flexible if you specify particular input values.
   tags = {
-    Purpose = "Splunk Searchhead"
+    Purpose   = "Splunk Searchhead"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
-  prefix = local.account_vars.locals.splunk_prefix
+  prefix        = local.account_vars.locals.splunk_prefix
   instance_type = local.account_vars.locals.instance_types["splunk-sh"]
-  vpc_id = dependency.vpc.outputs.vpc_id
-  vpc_cidr = local.account_vars.locals.vpc_info["vpc-splunk"]["cidr"]
-  azs = dependency.vpc.outputs.azs
-  subnets = dependency.vpc.outputs.private_subnets
+  vpc_id        = dependency.vpc.outputs.vpc_id
+  vpc_cidr      = local.account_vars.locals.vpc_info["vpc-splunk"]["cidr"]
+  azs           = dependency.vpc.outputs.azs
+  subnets       = dependency.vpc.outputs.private_subnets
 }
-terraform_version_constraint = "= 1.1.6"
+terraform_version_constraint  = "= 1.1.6"
 terragrunt_version_constraint = "= 0.36.2"

000-skeleton/180-splunk-heavy-forwarder/terragrunt.hcl

@@ -3,10 +3,10 @@ locals {
   # 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"))
+  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
@@ -31,15 +31,15 @@ inputs = {
   # (via the `inputs` section of the root `terragrunt.hcl`). However, modules
   # will be more flexible if you specify particular input values.
   tags = {
-    Purpose = "Splunk Heavy Forwarder"
+    Purpose   = "Splunk Heavy Forwarder"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
-  prefix = local.account_vars.locals.splunk_prefix
+  prefix        = local.account_vars.locals.splunk_prefix
   instance_type = local.account_vars.locals.instance_types["splunk-hf"]
-  vpc_id = dependency.vpc.outputs.vpc_id
-  vpc_cidr = local.account_vars.locals.vpc_info["vpc-splunk"]["cidr"]
-  azs = dependency.vpc.outputs.azs
-  subnets = dependency.vpc.outputs.private_subnets
+  vpc_id        = dependency.vpc.outputs.vpc_id
+  vpc_cidr      = local.account_vars.locals.vpc_info["vpc-splunk"]["cidr"]
+  azs           = dependency.vpc.outputs.azs
+  subnets       = dependency.vpc.outputs.private_subnets
 }
-terraform_version_constraint = "= 1.1.6"
+terraform_version_constraint  = "= 1.1.6"
 terragrunt_version_constraint = "= 0.36.2"

000-skeleton/195-splunk-apps-s3/terragrunt.hcl

@@ -3,10 +3,10 @@ locals {
   # 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"))
+  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
@@ -27,9 +27,9 @@ inputs = {
   # (via the `inputs` section of the root `terragrunt.hcl`). However, modules
   # will be more flexible if you specify particular input values.
   tags = {
-    Purpose = "Splunk Appliation Distribution"
+    Purpose   = "Splunk Appliation Distribution"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
 }
-terraform_version_constraint = "= 1.1.6"
+terraform_version_constraint  = "= 1.1.6"
 terragrunt_version_constraint = "= 0.36.2"

000-skeleton/360-codebuild-splunk-apps-fm/terragrunt.hcl

@@ -3,10 +3,10 @@ locals {
   # 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"))
+  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
@@ -66,12 +66,12 @@ inputs = {
   # (via the `inputs` section of the root `terragrunt.hcl`). However, modules
   # will be more flexible if you specify particular input values.
   tags = {
-    Purpose = "Build Splunk Apps and place in bucket"
+    Purpose   = "Build Splunk Apps and place in bucket"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
-  repository = "fm_source"
-  source_version = "main"
+  repository      = "fm_source"
+  source_version  = "main"
   enable_webhooks = false
 }
-terraform_version_constraint = "= 1.1.6"
+terraform_version_constraint  = "= 1.1.6"
 terragrunt_version_constraint = "= 0.36.2"

000-skeleton/360-codebuild-splunk-apps/terragrunt.hcl

@@ -3,10 +3,10 @@ locals {
   # 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"))
+  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
@@ -66,12 +66,12 @@ inputs = {
   # (via the `inputs` section of the root `terragrunt.hcl`). However, modules
   # will be more flexible if you specify particular input values.
   tags = {
-    Purpose = "Build Splunk Apps and place in bucket"
+    Purpose   = "Build Splunk Apps and place in bucket"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
-  source_version = "develop"
+  source_version  = "develop"
   enable_webhooks = false
-  repository = "content_source"
+  repository      = "content_source"
 }
-terraform_version_constraint = "= 1.1.6"
+terraform_version_constraint  = "= 1.1.6"
 terragrunt_version_constraint = "= 0.36.2"

000-skeleton/435-s3-portal-customer-artifacts/terragrunt.hcl

@@ -3,17 +3,17 @@ locals {
   # 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"))
+  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"))
 
   # A few variables for easier access below
-  env = local.environment_vars.locals.environment  
-  aws_partition = local.partition_vars.locals.aws_partition
+  env            = local.environment_vars.locals.environment
+  aws_partition  = local.partition_vars.locals.aws_partition
   aws_account_id = local.account_vars.locals.aws_account_id
-  c2_account = local.environment_vars.locals.c2_accounts[local.aws_partition]
-  splunk_prefix = local.account_vars.locals.splunk_prefix
+  c2_account     = local.environment_vars.locals.c2_accounts[local.aws_partition]
+  splunk_prefix  = local.account_vars.locals.splunk_prefix
 }
 
 # Terragrunt will copy the Terraform configurations specified by the source parameter, along with any files in the
@@ -34,11 +34,11 @@ inputs = {
   # (via the `inputs` section of the root `terragrunt.hcl`). However, modules
   # will be more flexible if you specify particular input values.
   tags = {
-    Purpose = "Bucket for files portal distributes to customers."
+    Purpose   = "Bucket for files portal distributes to customers."
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
-  name = "${ local.splunk_prefix }-portal-customer-artifacts"
-  role_assumers = [ "arn:${ local.aws_partition }:iam::${ local.c2_account }:role/portal-instance-role" ]
+  name          = "${local.splunk_prefix}-portal-customer-artifacts"
+  role_assumers = ["arn:${local.aws_partition}:iam::${local.c2_account}:role/portal-instance-role"]
 }
-terraform_version_constraint = "= 1.1.6"
+terraform_version_constraint  = "= 1.1.6"
 terragrunt_version_constraint = "= 0.36.2"

000-skeleton/account.hcl

@@ -2,34 +2,34 @@
 # terragrunt.hcl configuration.
 locals {
   # TODO put the right values here
-  account_name   = "TODO"
-  account_alias  = "TODO"
-  aws_account_id = "TODO"
+  account_name                    = "TODO"
+  account_alias                   = "TODO"
+  aws_account_id                  = "TODO"
   instance_termination_protection = TODO # set to true for production!
-  splunk_prefix = "TODO"
-  splunk_private_hec = TODO # True if the customer needs a private HTTP Event Collector such as for ALSI
+  splunk_prefix                   = "TODO"
+  splunk_private_hec              = TODO # True if the customer needs a private HTTP Event Collector such as for ALSI
 
   splunk_data_sources = [
     "x.x.x.x/32", # TODO: Add customer's public IP addresses
   ]
-  splunk_legacy_cidr = [ ] # Should not be needed for new customers
-  splunk_asg_sizes   = [ 1, 1, 1 ] # How many indexers in each site
-  
-  
+  splunk_legacy_cidr = []        # Should not be needed for new customers
+  splunk_asg_sizes   = [1, 1, 1] # How many indexers in each site
+
+
   account_tags = {
-    "Client": local.splunk_prefix,
-  } 
+    "Client" : local.splunk_prefix,
+  }
   c2_account_standards_path = "../../mdr-TODO-c2/005-account-standards-c2" # TODO: Subsitute with test or prod
 
   # For CIDR assignment, see https://github.xdr.accenturefederalcyber.com/mdr-engineering/msoc-infrastructure/wiki/IP-Address-Allocation
-  vpc_info = { 
+  vpc_info = {
     "vpc-splunk" = {
-       "name" = "vpc-splunk",
-       "purpose" = "Splunk Systems (TODO)", # TODO: Substitute with Customer Name
-       "cidr" = "TODO",
-       "tgw_attached" = true
+      "name"         = "vpc-splunk",
+      "purpose"      = "Splunk Systems (TODO)", # TODO: Substitute with Customer Name
+      "cidr"         = "TODO",
+      "tgw_attached" = true
     }
-  } 
+  }
 
   # Qualys Connector - See https://github.xdr.accenturefederalcyber.com/mdr-engineering/msoc-infrastructure/wiki/Qualys
   qualys_connector_externalid = "LATER" # Needs to come from the qualys console
@@ -43,63 +43,63 @@ locals {
     "alsi-worker"    = "t3a.small",
     "splunk-cm"      = "t3a.small",  # legacy: t2.small
     "splunk-indexer" = "i3en.large", # legacy: t2.small, but whats the point if we don't have instance storage.
-    "splunk-hf"      = "t3a.small", # legacy: t2.medium
-    "splunk-sh"      = "t3a.small", # legacy: ? not sure
+    "splunk-hf"      = "t3a.small",  # legacy: t2.medium
+    "splunk-sh"      = "t3a.small",  # legacy: ? not sure
   }
 
   # Splunk Volume Sizes are probably fine at defaults
   splunk_volume_sizes = {
     "cluster_master" = {
-      "swap": 8,  # minimum: 8
-      "/": 10,    # minimum: 10
-      "/home": 4, # minimum: 4
-      "/var": 15, # minimum: 15
-      "/var/tmp": 4, # minimum: 4
-      "/var/log": 8, # minimum: 8
-      "/var/log/audit": 8, # minimum: 8
-      "/tmp": 4,  # minimum: 4
-      "/opt/splunk": 30, # No minimum; not in base image
+      "swap" : 8,           # minimum: 8
+      "/" : 10,             # minimum: 10
+      "/home" : 4,          # minimum: 4
+      "/var" : 15,          # minimum: 15
+      "/var/tmp" : 4,       # minimum: 4
+      "/var/log" : 8,       # minimum: 8
+      "/var/log/audit" : 8, # minimum: 8
+      "/tmp" : 4,           # minimum: 4
+      "/opt/splunk" : 30,   # No minimum; not in base image
     },
     "indexer" = {
-      "swap": 8,  # minimum: 8
-      "/": 10,    # minimum: 10
-      "/home": 4, # minimum: 4
-      "/var": 15, # minimum: 15
-      "/var/tmp": 4, # minimum: 4
-      "/var/log": 8, # minimum: 8
-      "/var/log/audit": 8, # minimum: 8
-      "/tmp": 4,  # minimum: 4
-      "/opt/splunk": 30, # No minimum; not in base image
+      "swap" : 8,           # minimum: 8
+      "/" : 10,             # minimum: 10
+      "/home" : 4,          # minimum: 4
+      "/var" : 15,          # minimum: 15
+      "/var/tmp" : 4,       # minimum: 4
+      "/var/log" : 8,       # minimum: 8
+      "/var/log/audit" : 8, # minimum: 8
+      "/tmp" : 4,           # minimum: 4
+      "/opt/splunk" : 30,   # No minimum; not in base image
     },
     "searchhead" = {
-      "swap": 8,  # minimum: 8
-      "/": 10,    # minimum: 10
-      "/home": 4, # minimum: 4
-      "/var": 15, # minimum: 15
-      "/var/tmp": 4, # minimum: 4
-      "/var/log": 8, # minimum: 8
-      "/var/log/audit": 8, # minimum: 8
-      "/tmp": 4,  # minimum: 4
-      "/opt/splunk": 30, # No minimum; not in base image
+      "swap" : 8,           # minimum: 8
+      "/" : 10,             # minimum: 10
+      "/home" : 4,          # minimum: 4
+      "/var" : 15,          # minimum: 15
+      "/var/tmp" : 4,       # minimum: 4
+      "/var/log" : 8,       # minimum: 8
+      "/var/log/audit" : 8, # minimum: 8
+      "/tmp" : 4,           # minimum: 4
+      "/opt/splunk" : 30,   # No minimum; not in base image
     },
     "heavy_forwarder" = {
-      "swap": 8,  # minimum: 8
-      "/": 10,    # minimum: 10
-      "/home": 4, # minimum: 4
-      "/var": 15, # minimum: 15
-      "/var/tmp": 4, # minimum: 4
-      "/var/log": 8, # minimum: 8
-      "/var/log/audit": 8, # minimum: 8
-      "/tmp": 4,  # minimum: 4
-      "/opt/splunk": 30, # No minimum; not in base image
+      "swap" : 8,           # minimum: 8
+      "/" : 10,             # minimum: 10
+      "/home" : 4,          # minimum: 4
+      "/var" : 15,          # minimum: 15
+      "/var/tmp" : 4,       # minimum: 4
+      "/var/log" : 8,       # minimum: 8
+      "/var/log/audit" : 8, # minimum: 8
+      "/tmp" : 4,           # minimum: 4
+      "/opt/splunk" : 30,   # No minimum; not in base image
     },
   }
 
   # ALSI - Aggregated Log Source Ingestion
   #
   # If cribl is being used for log ingestion, remember to turn on splunk_private_hec, too.
-  alsi_workers = 0 # how many cribl workers
-  alsi_splunk_nlb = false # splunk://moose-alsi-splunk.xdr{,test}.accenturefederalcyber.com:9997 and 9998
+  alsi_workers     = 0     # how many cribl workers
+  alsi_splunk_nlb  = false # splunk://moose-alsi-splunk.xdr{,test}.accenturefederalcyber.com:9997 and 9998
   alsi_elastic_alb = false # https://moose-alsi-elastic.xdr{,test}.accenturefederalcyber.com -> 9200
-  alsi_hec_alb = false # https://moose-alsi-hec.xdr{,test}.accenturefederalcyber.com -> 8080
+  alsi_hec_alb     = false # https://moose-alsi-hec.xdr{,test}.accenturefederalcyber.com -> 8080
 }

common/aws-us-gov/afs-mdr-common-services-gov/004-iam-okta/terragrunt.hcl

@@ -4,10 +4,10 @@ locals {
   # 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"))
+  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
@@ -50,5 +50,5 @@ inputs = {
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
 }
-terraform_version_constraint = "= 1.1.6"
+terraform_version_constraint  = "= 1.1.6"
 terragrunt_version_constraint = "= 0.36.2"

common/aws-us-gov/afs-mdr-common-services-gov/005-standard-iam/terragrunt.hcl

@@ -4,17 +4,17 @@ locals {
   # 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"))
+  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.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/standard_iam?ref=v4.0.12"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/standard_iam?ref=v4.2.5"
 }
 
 # Include all settings from the root terragrunt.hcl file
@@ -32,5 +32,5 @@ inputs = {
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
 }
-terraform_version_constraint = "= 1.1.6"
+terraform_version_constraint  = "= 1.1.6"
 terragrunt_version_constraint = "= 0.36.2"

common/aws-us-gov/afs-mdr-common-services-gov/006-account-standards-regional/us-gov-west-1/terragrunt.hcl

@@ -4,10 +4,10 @@ locals {
   # 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"))
+  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"))
 
   aws_partition  = local.partition_vars.locals.aws_partition
   account_id     = local.account_vars.locals.aws_account_id
@@ -58,5 +58,5 @@ inputs = {
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
 }
-terraform_version_constraint = "= 1.1.6"
+terraform_version_constraint  = "= 1.1.6"
 terragrunt_version_constraint = "= 0.36.2"

common/aws-us-gov/afs-mdr-common-services-gov/006-account-standards/terragrunt.hcl

@@ -4,17 +4,17 @@ locals {
   # 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"))
+  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.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/account_standards?ref=v4.0.10"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/account_standards?ref=v4.2.0"
 }
 
 dependency "c2_account_standards" {
@@ -36,5 +36,5 @@ inputs = {
   }
   cloudtrail_key_arn = dependency.c2_account_standards.outputs.cloudtrail_logging_bucket.kms_key_id
 }
-terraform_version_constraint = "= 1.1.6"
+terraform_version_constraint  = "= 1.1.6"
 terragrunt_version_constraint = "= 0.36.2"

common/aws-us-gov/afs-mdr-common-services-gov/008-xdr-binaries/terragrunt.hcl

@@ -30,9 +30,9 @@ include {
 inputs = {
   name = local.global_vars.locals.binaries_bucket
   tags = {
-    Purpose = "Storage of replaceable binaries for XDR."
+    Purpose   = "Storage of replaceable binaries for XDR."
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
 }
-terraform_version_constraint = "= 1.1.6"
+terraform_version_constraint  = "= 1.1.6"
 terragrunt_version_constraint = "= 0.36.2"

common/aws-us-gov/afs-mdr-common-services-gov/010-shared-ami-key/terragrunt.hcl

@@ -1,9 +1,9 @@
 locals {
   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"))
+  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"))
 }
 
 terraform {
@@ -17,9 +17,9 @@ include {
 
 inputs = {
   tags = {
-    Purpose = "Sharing the AMI amongst accounts"
+    Purpose   = "Sharing the AMI amongst accounts"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
 }
-terraform_version_constraint = "= 1.1.6"
+terraform_version_constraint  = "= 1.1.6"
 terragrunt_version_constraint = "= 0.36.2"

common/aws-us-gov/afs-mdr-common-services-gov/015-security-vpc/terragrunt.hcl

@@ -3,10 +3,10 @@ locals {
   # 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"))
+  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
@@ -31,5 +31,5 @@ inputs = {
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
 }
-terraform_version_constraint = "= 1.1.6"
+terraform_version_constraint  = "= 1.1.6"
 terragrunt_version_constraint = "= 0.36.2"

common/aws-us-gov/afs-mdr-common-services-gov/019-qualys-service-account/terragrunt.hcl

@@ -3,10 +3,10 @@ locals {
   # 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"))
+  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
@@ -28,11 +28,11 @@ inputs = {
   # (via the `inputs` section of the root `terragrunt.hcl`). However, modules
   # will be more flexible if you specify particular input values.
   tags = {
-    Purpose = "Account for Qualys"
+    Purpose   = "Account for Qualys"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
-  
+
   pgp_key = file("../../../../keys/duane_waddle.pgp")
 }
-terraform_version_constraint = "= 1.1.6"
+terraform_version_constraint  = "= 1.1.6"
 terragrunt_version_constraint = "= 0.36.2"

common/aws-us-gov/afs-mdr-common-services-gov/050-lcp-ami-sharing/terragrunt.hcl

@@ -3,10 +3,10 @@ locals {
   # 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"))
+  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
@@ -31,9 +31,9 @@ inputs = {
   #account_list = local.partition_vars.locals.customer_aws_accounts_to_share_lcp_with
 
   tags = {
-    Purpose = "Shares LCP AMI with customers"
+    Purpose   = "Shares LCP AMI with customers"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
 }
-terraform_version_constraint = "= 1.1.6"
+terraform_version_constraint  = "= 1.1.6"
 terragrunt_version_constraint = "= 0.36.2"

common/aws-us-gov/afs-mdr-common-services-gov/072-salt-master-inventory-role/terragrunt.hcl

@@ -3,17 +3,17 @@ locals {
   # 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"))
+  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.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/salt_master_inventory_role?ref=v3.5.16"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/salt_master_inventory_role?ref=v4.2.0"
 }
 
 # Include all settings from the root terragrunt.hcl file
@@ -27,9 +27,9 @@ inputs = {
   # (via the `inputs` section of the root `terragrunt.hcl`). However, modules
   # will be more flexible if you specify particular input values.
   tags = {
-    Purpose = "Inventory for FedRAMP Compliance"
+    Purpose   = "Inventory for FedRAMP Compliance"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
 }
-terraform_version_constraint = "= 1.1.6"
+terraform_version_constraint  = "= 1.1.6"
 terragrunt_version_constraint = "= 0.36.2"

common/aws-us-gov/afs-mdr-common-services-gov/075-codebuild-ecr-base/terragrunt.hcl

@@ -3,10 +3,10 @@ locals {
   # 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"))
+  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
@@ -55,9 +55,9 @@ inputs = {
   # (via the `inputs` section of the root `terragrunt.hcl`). However, modules
   # will be more flexible if you specify particular input values.
   tags = {
-    Purpose = "Base module for Codebuild"
+    Purpose   = "Base module for Codebuild"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
 }
-terraform_version_constraint = "= 1.1.6"
+terraform_version_constraint  = "= 1.1.6"
 terragrunt_version_constraint = "= 0.36.2"

common/aws-us-gov/afs-mdr-common-services-gov/080-codebuild-ecr-sample/terragrunt.hcl

@@ -3,10 +3,10 @@ locals {
   # 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"))
+  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
@@ -57,18 +57,18 @@ inputs = {
   # (via the `inputs` section of the root `terragrunt.hcl`). However, modules
   # will be more flexible if you specify particular input values.
   tags = {
-    Purpose = "Build Sample Docker Container with Codebuild"
+    Purpose   = "Build Sample Docker Container with Codebuild"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
-  name                  = "xdr-container-sample"
-  service_role          = dependency.codebuild-ecr-base.outputs.service_role
-  kms_key               = dependency.codebuild-ecr-base.outputs.kms_key
-  codebuild_image       = "aws/codebuild/amazonlinux2-x86_64-standard:3.0"
+  name            = "xdr-container-sample"
+  service_role    = dependency.codebuild-ecr-base.outputs.service_role
+  kms_key         = dependency.codebuild-ecr-base.outputs.kms_key
+  codebuild_image = "aws/codebuild/amazonlinux2-x86_64-standard:3.0"
   #codebuild_image      = dependency.codebuild-ecr-base.outputs.codebuild_image_centos7
   #codebuild_image      = dependency.codebuild-ecr-base.outputs.codebuild_image_rhel7
-  artifact_s3_bucket    = ""
+  artifact_s3_bucket = ""
   #artifact_s3_bucket   = dependency.codebuild-ecr-base.outputs.artifact_s3_bucket
   webhook_branch_filter = "release/.*"
 }
-terraform_version_constraint = "= 1.1.6"
+terraform_version_constraint  = "= 1.1.6"
 terragrunt_version_constraint = "= 0.36.2"

common/aws-us-gov/afs-mdr-common-services-gov/081-codebuild-rpm-collectd/terragrunt.hcl

@@ -3,10 +3,10 @@ locals {
   # 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"))
+  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
@@ -57,16 +57,16 @@ inputs = {
   # (via the `inputs` section of the root `terragrunt.hcl`). However, modules
   # will be more flexible if you specify particular input values.
   tags = {
-    Purpose = "Build RPM with Codebuild"
+    Purpose   = "Build RPM with Codebuild"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
-  name                = "collectd-rpm"
-  service_role        = dependency.codebuild-ecr-base.outputs.service_role
-  kms_key             = dependency.codebuild-ecr-base.outputs.kms_key
+  name         = "collectd-rpm"
+  service_role = dependency.codebuild-ecr-base.outputs.service_role
+  kms_key      = dependency.codebuild-ecr-base.outputs.kms_key
   #codebuild_image     = "aws/codebuild/amazonlinux2-x86_64-standard:3.0"
   #codebuild_image    = dependency.codebuild-ecr-base.outputs.codebuild_image_centos7
   codebuild_image    = dependency.codebuild-ecr-base.outputs.codebuild_image_rhel7
   artifact_s3_bucket = dependency.codebuild-ecr-base.outputs.artifact_s3_bucket
 }
-terraform_version_constraint = "= 1.1.6"
+terraform_version_constraint  = "= 1.1.6"
 terragrunt_version_constraint = "= 0.36.2"

common/aws-us-gov/afs-mdr-common-services-gov/085-codebuild-ecr-customer-portal/terragrunt.hcl

@@ -3,10 +3,10 @@ locals {
   # 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"))
+  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
@@ -76,18 +76,18 @@ inputs = {
   # (via the `inputs` section of the root `terragrunt.hcl`). However, modules
   # will be more flexible if you specify particular input values.
   tags = {
-    Purpose = "Build Docker Container with Codebuild"
+    Purpose   = "Build Docker Container with Codebuild"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
-  name                  = "customer_portal"
-  service_role          = dependency.codebuild-ecr-base.outputs.service_role
-  kms_key               = dependency.codebuild-ecr-base.outputs.kms_key
-  codebuild_image       = "aws/codebuild/amazonlinux2-x86_64-standard:3.0"
+  name            = "customer_portal"
+  service_role    = dependency.codebuild-ecr-base.outputs.service_role
+  kms_key         = dependency.codebuild-ecr-base.outputs.kms_key
+  codebuild_image = "aws/codebuild/amazonlinux2-x86_64-standard:3.0"
   #codebuild_image      = dependency.codebuild-ecr-base.outputs.codebuild_image_centos7
   #codebuild_image      = dependency.codebuild-ecr-base.outputs.codebuild_image_rhel7
-  artifact_s3_bucket    = ""
+  artifact_s3_bucket = ""
   #artifact_s3_bucket   = dependency.codebuild-ecr-base.outputs.artifact_s3_bucket
   webhook_branch_filter = "release/.*"
 }
-terraform_version_constraint = "= 1.1.6"
+terraform_version_constraint  = "= 1.1.6"
 terragrunt_version_constraint = "= 0.36.2"

common/aws-us-gov/afs-mdr-common-services-gov/090-codebuild-rpm-tmux/terragrunt.hcl

@@ -3,10 +3,10 @@ locals {
   # 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"))
+  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
@@ -57,16 +57,16 @@ inputs = {
   # (via the `inputs` section of the root `terragrunt.hcl`). However, modules
   # will be more flexible if you specify particular input values.
   tags = {
-    Purpose = "Build RPM with Codebuild"
+    Purpose   = "Build RPM with Codebuild"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
-  name                = "tmux-rpm"
-  service_role        = dependency.codebuild-ecr-base.outputs.service_role
-  kms_key             = dependency.codebuild-ecr-base.outputs.kms_key
+  name         = "tmux-rpm"
+  service_role = dependency.codebuild-ecr-base.outputs.service_role
+  kms_key      = dependency.codebuild-ecr-base.outputs.kms_key
   #codebuild_image     = "aws/codebuild/amazonlinux2-x86_64-standard:3.0"
   #codebuild_image    = dependency.codebuild-ecr-base.outputs.codebuild_image_centos7
   codebuild_image    = dependency.codebuild-ecr-base.outputs.codebuild_image_rhel7
   artifact_s3_bucket = dependency.codebuild-ecr-base.outputs.artifact_s3_bucket
 }
-terraform_version_constraint = "= 1.1.6"
+terraform_version_constraint  = "= 1.1.6"
 terragrunt_version_constraint = "= 0.36.2"

common/aws-us-gov/afs-mdr-common-services-gov/095-codebuild-rpm-aws-efs-utils/terragrunt.hcl

@@ -3,10 +3,10 @@ locals {
   # 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"))
+  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
@@ -57,16 +57,16 @@ inputs = {
   # (via the `inputs` section of the root `terragrunt.hcl`). However, modules
   # will be more flexible if you specify particular input values.
   tags = {
-    Purpose = "Build RPM with Codebuild"
+    Purpose   = "Build RPM with Codebuild"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
-  name                = "aws-efs-utils"
-  service_role        = dependency.codebuild-ecr-base.outputs.service_role
-  kms_key             = dependency.codebuild-ecr-base.outputs.kms_key
+  name         = "aws-efs-utils"
+  service_role = dependency.codebuild-ecr-base.outputs.service_role
+  kms_key      = dependency.codebuild-ecr-base.outputs.kms_key
   #codebuild_image     = "aws/codebuild/amazonlinux2-x86_64-standard:3.0"
   #codebuild_image    = dependency.codebuild-ecr-base.outputs.codebuild_image_centos7
   codebuild_image    = dependency.codebuild-ecr-base.outputs.codebuild_image_rhel7
   artifact_s3_bucket = dependency.codebuild-ecr-base.outputs.artifact_s3_bucket
 }
-terraform_version_constraint = "= 1.1.6"
+terraform_version_constraint  = "= 1.1.6"
 terragrunt_version_constraint = "= 0.36.2"

common/aws-us-gov/afs-mdr-common-services-gov/100-codebuild-rpm-syslog-ng/terragrunt.hcl

@@ -3,10 +3,10 @@ locals {
   # 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"))
+  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
@@ -57,16 +57,16 @@ inputs = {
   # (via the `inputs` section of the root `terragrunt.hcl`). However, modules
   # will be more flexible if you specify particular input values.
   tags = {
-    Purpose = "Build RPM with Codebuild"
+    Purpose   = "Build RPM with Codebuild"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
-  name                = "syslog-ng-rpm"
-  service_role        = dependency.codebuild-ecr-base.outputs.service_role
-  kms_key             = dependency.codebuild-ecr-base.outputs.kms_key
+  name         = "syslog-ng-rpm"
+  service_role = dependency.codebuild-ecr-base.outputs.service_role
+  kms_key      = dependency.codebuild-ecr-base.outputs.kms_key
   #codebuild_image     = "aws/codebuild/amazonlinux2-x86_64-standard:3.0"
   #codebuild_image    = dependency.codebuild-ecr-base.outputs.codebuild_image_centos7
   codebuild_image    = dependency.codebuild-ecr-base.outputs.codebuild_image_rhel7
   artifact_s3_bucket = dependency.codebuild-ecr-base.outputs.artifact_s3_bucket
 }
-terraform_version_constraint = "= 1.1.6"
+terraform_version_constraint  = "= 1.1.6"
 terragrunt_version_constraint = "= 0.36.2"

common/aws-us-gov/afs-mdr-common-services-gov/105-codebuild-ecr-mcas-container/terragrunt.hcl

@@ -3,10 +3,10 @@ locals {
   # 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"))
+  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
@@ -57,17 +57,17 @@ inputs = {
   # (via the `inputs` section of the root `terragrunt.hcl`). However, modules
   # will be more flexible if you specify particular input values.
   tags = {
-    Purpose = "Build Docker Container with Codebuild"
+    Purpose   = "Build Docker Container with Codebuild"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
-  name                  = "mcas-agent-container"
-  service_role          = dependency.codebuild-ecr-base.outputs.service_role
-  kms_key               = dependency.codebuild-ecr-base.outputs.kms_key
+  name         = "mcas-agent-container"
+  service_role = dependency.codebuild-ecr-base.outputs.service_role
+  kms_key      = dependency.codebuild-ecr-base.outputs.kms_key
   #codebuild_image       = "aws/codebuild/amazonlinux2-x86_64-standard:3.0"
   #codebuild_image      = dependency.codebuild-ecr-base.outputs.codebuild_image_centos7
-  codebuild_image      = dependency.codebuild-ecr-base.outputs.codebuild_image_rhel7
-  artifact_s3_bucket    = ""
+  codebuild_image    = dependency.codebuild-ecr-base.outputs.codebuild_image_rhel7
+  artifact_s3_bucket = ""
   #artifact_s3_bucket   = dependency.codebuild-ecr-base.outputs.artifact_s3_bucket
 }
-terraform_version_constraint = "= 1.1.6"
+terraform_version_constraint  = "= 1.1.6"
 terragrunt_version_constraint = "= 0.36.2"

common/aws-us-gov/afs-mdr-common-services-gov/110-xdr-binaries-write-role/terragrunt.hcl

@@ -3,17 +3,17 @@ locals {
   # 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"))
+  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.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/s3_bucket_writer_role?ref=v4.0.10"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/s3_bucket_writer_role?ref=v4.2.5"
 }
 
 # Include all settings from the root terragrunt.hcl file
@@ -47,13 +47,13 @@ inputs = {
   # (via the `inputs` section of the root `terragrunt.hcl`). However, modules
   # will be more flexible if you specify particular input values.
   tags = {
-    Purpose = "Read/Write access to afsxdr-binaries s3 bucket"
+    Purpose   = "Read/Write access to afsxdr-binaries s3 bucket"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
 
-  bucket       = dependency.bucket.outputs.arn
-  name         = "afsxdr-binaries_writers"
-  description  = "Write access to the s3 bucket for afsxdr-binaries"
+  bucket      = dependency.bucket.outputs.arn
+  name        = "afsxdr-binaries_writers"
+  description = "Write access to the s3 bucket for afsxdr-binaries"
   trusted_arns = [
     dependency.prod-salt-master.outputs.role_arn,
     dependency.test-salt-master.outputs.role_arn,
@@ -63,5 +63,5 @@ inputs = {
     dependency.bucket.outputs.kms_key_arn
   ]
 }
-terraform_version_constraint = "= 1.1.6"
+terraform_version_constraint  = "= 1.1.6"
 terragrunt_version_constraint = "= 0.36.2"

common/aws-us-gov/afs-mdr-common-services-gov/300-s3-xdr-trumpet/terragrunt.hcl

@@ -5,10 +5,10 @@ locals {
 
   # 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"))
+  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
@@ -28,13 +28,13 @@ include {
 
 # These are the variables we have to pass in to use the module specified in the terragrunt source above
 inputs = {
-  name = "xdr-trumpet-${local.region_vars.locals.aws_region}"
-  encryption = "SSE-S3"
+  name           = "xdr-trumpet-${local.region_vars.locals.aws_region}"
+  encryption     = "SSE-S3"
   extra_accounts = local.partition_vars.locals.customer_accounts
   tags = {
-    Purpose = "Storage of Trumpet Scripts"
+    Purpose   = "Storage of Trumpet Scripts"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
 }
-terraform_version_constraint = "= 1.1.6"
+terraform_version_constraint  = "= 1.1.6"
 terragrunt_version_constraint = "= 0.36.2"

common/aws-us-gov/afs-mdr-common-services-gov/350-codebuild-ecr-content-generator-build-image/terragrunt.hcl

@@ -3,10 +3,10 @@ locals {
   # 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"))
+  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
@@ -70,18 +70,18 @@ inputs = {
   # (via the `inputs` section of the root `terragrunt.hcl`). However, modules
   # will be more flexible if you specify particular input values.
   tags = {
-    Purpose = "Build Docker Container for CodeBuild that Generates Splunk App Packages"
+    Purpose   = "Build Docker Container for CodeBuild that Generates Splunk App Packages"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
-  name                  = "content_generator"
-  service_role          = dependency.codebuild-ecr-base.outputs.service_role
-  kms_key               = dependency.codebuild-ecr-base.outputs.kms_key
-  codebuild_image       = "aws/codebuild/amazonlinux2-x86_64-standard:3.0"
+  name            = "content_generator"
+  service_role    = dependency.codebuild-ecr-base.outputs.service_role
+  kms_key         = dependency.codebuild-ecr-base.outputs.kms_key
+  codebuild_image = "aws/codebuild/amazonlinux2-x86_64-standard:3.0"
   #codebuild_image       = ""
-  artifact_s3_bucket    = ""
-  source_version        = "develop"
-  enable_webhooks       = true
-  fetch_submodules      = true
+  artifact_s3_bucket = ""
+  source_version     = "develop"
+  enable_webhooks    = true
+  fetch_submodules   = true
 }
-terraform_version_constraint = "= 1.1.6"
+terraform_version_constraint  = "= 1.1.6"
 terragrunt_version_constraint = "= 0.36.2"

common/aws-us-gov/afs-mdr-common-services-gov/351-codebuild-splunk-uf-configs/terragrunt.hcl

@@ -3,10 +3,10 @@ locals {
   # 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"))
+  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
@@ -71,12 +71,12 @@ inputs = {
   # (via the `inputs` section of the root `terragrunt.hcl`). However, modules
   # will be more flexible if you specify particular input values.
   tags = {
-    Purpose = "Build RPM with Codebuild"
+    Purpose   = "Build RPM with Codebuild"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
-  name                    = "splunk-config-rpm-maker"
-  service_role            = dependency.codebuild-ecr-base.outputs.service_role
-  kms_key                 = dependency.codebuild-ecr-base.outputs.kms_key
+  name         = "splunk-config-rpm-maker"
+  service_role = dependency.codebuild-ecr-base.outputs.service_role
+  kms_key      = dependency.codebuild-ecr-base.outputs.kms_key
   #codebuild_image        = "aws/codebuild/amazonlinux2-x86_64-standard:3.0"
   #codebuild_image        = dependency.codebuild-ecr-base.outputs.codebuild_image_centos7
   #codebuild_image        = dependency.codebuild-ecr-base.outputs.codebuild_image_rhel7
@@ -86,5 +86,5 @@ inputs = {
   override_artifact_name  = true
   webhook_branch_filter   = "^main$"
 }
-terraform_version_constraint = "= 1.1.6"
+terraform_version_constraint  = "= 1.1.6"
 terragrunt_version_constraint = "= 0.36.2"

common/aws-us-gov/afs-mdr-common-services-gov/355-codebuild-xdr-base-image/terragrunt.hcl

@@ -3,10 +3,10 @@ locals {
   # 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"))
+  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
@@ -59,16 +59,16 @@ inputs = {
   # (via the `inputs` section of the root `terragrunt.hcl`). However, modules
   # will be more flexible if you specify particular input values.
   tags = {
-    Purpose = "Build EC2 Base Image"
+    Purpose   = "Build EC2 Base Image"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
-  name                    = "xdr-ec2-base-image"
-  service_role            = dependency.codebuild-ecr-base.outputs.service_role
-  kms_key                 = dependency.codebuild-ecr-base.outputs.kms_key
-  image                   = "701290387780.dkr.ecr.us-gov-east-1.amazonaws.com/codebuild-rhel7"
-  github_clone_url        = "https://github.xdr.accenturefederalcyber.com/mdr-engineering/xdr-images"
-  source_version          = "main"
-  buildspec               = "base/aws/buildspec.yml"
+  name             = "xdr-ec2-base-image"
+  service_role     = dependency.codebuild-ecr-base.outputs.service_role
+  kms_key          = dependency.codebuild-ecr-base.outputs.kms_key
+  image            = "701290387780.dkr.ecr.us-gov-east-1.amazonaws.com/codebuild-rhel7"
+  github_clone_url = "https://github.xdr.accenturefederalcyber.com/mdr-engineering/xdr-images"
+  source_version   = "main"
+  buildspec        = "base/aws/buildspec.yml"
 }
-terraform_version_constraint = "= 1.1.6"
+terraform_version_constraint  = "= 1.1.6"
 terragrunt_version_constraint = "= 0.36.2"

common/aws-us-gov/afs-mdr-common-services-gov/360-codebuild-vpc/README.md

@@ -0,0 +1,3 @@
+# Codebuild VPC
+
+Creates a VPC for codebuild related infrastructure such as Magic Machine.

common/aws-us-gov/afs-mdr-common-services-gov/021-qualys-connector-role/terragrunt.hcl → common/aws-us-gov/afs-mdr-common-services-gov/360-codebuild-vpc/terragrunt.hcl

@@ -3,18 +3,17 @@ locals {
   # 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"))
+  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.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/qualys_connector_role?ref=v3.5.16"
-  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/terminated?ref=v4.1.6"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/standalone_vpc?ref=v4.2.5"
 }
 
 # Include all settings from the root terragrunt.hcl file
@@ -27,10 +26,10 @@ 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.
+  vpc_info = local.account_vars.locals.vpc_info["vpc-codebuild"]
   tags = {
-    Purpose = "Qualys Connector Role"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
 }
-terraform_version_constraint = "= 1.1.6"
+terraform_version_constraint  = "= 1.1.6"
 terragrunt_version_constraint = "= 0.36.2"

common/aws-us-gov/afs-mdr-common-services-gov/365-codebuild-lcp-magic-machine/terragrunt.hcl

@@ -0,0 +1,113 @@
+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.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/codebuild_lcp_magic_machine?ref=v4.2.5"
+}
+
+# KMS Key
+dependency "codebuild-ecr-base" {
+  config_path = "../075-codebuild-ecr-base"
+}
+
+# Service Role
+dependency "standard-iam" {
+  config_path = "../005-standard-iam"
+}
+
+# S3 bucket dependency
+dependency "xdr-binaries" {
+  config_path = "../008-xdr-binaries"
+}
+
+# S3 bucket policy dependency
+dependency "xdr-s3-binaries-policy" {
+  config_path = "../110-xdr-binaries-write-role"
+}
+
+
+# VPC id dependency
+dependency "codebuild-vpc" {
+  config_path = "../360-codebuild-vpc"
+}
+
+#Github specific provider
+generate "required_providers" {
+  path      = "required_provider.tf"
+  if_exists = "overwrite_terragrunt"
+  contents  = <<EOF
+terraform {
+  required_providers {
+    aws = {
+      source  = "hashicorp/aws"
+      version = "4.4.0" # 2022-03-08: upgrade from 3.63.0; 2021-09-21: upgrade from 3.37.0
+    }
+    vault = {
+      source  = "hashicorp/vault"
+      version = "3.4.1" # 2022-04-08: upgrade from 2.19.1; 2021-04-29: upgrade from 2.18.0
+    }
+    sensu = {
+      source  = "jtopjian/sensu"
+      version = "0.12.1" # 2022-04-06: upgrade from 0.10.5
+    }
+    github = {
+      source  = "integrations/github"
+      version = "~> 4.0" # 2022-04-06: upgrade from 4.2.0
+    }
+  }
+}
+EOF
+}
+
+generate "github-provider" {
+  path      = "github-provider.tf"
+  if_exists = "overwrite_terragrunt"
+  contents  = <<EOF
+provider "github" {
+  owner        = "mdr-engineering"
+  base_url     = "https://github.xdr.accenturefederalcyber.com/"
+}
+EOF
+}
+
+# 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   = "Build LCP OCI Image"
+    Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
+  }
+  name                   = "lcp-magic-machine"
+  repository_name        = "xdr-images"
+  service_role           = dependency.standard-iam.outputs.service_role
+  xdr-s3-binaries-policy = dependency.xdr-s3-binaries-policy.outputs.binaries_writers_policy
+  kms_key                = dependency.codebuild-ecr-base.outputs.kms_key
+  vpc_id                 = dependency.codebuild-vpc.outputs.vpc_id
+  public_subnets         = dependency.codebuild-vpc.outputs.public_subnets
+  private_subnets        = dependency.codebuild-vpc.outputs.private_subnets
+  github_clone_url       = "https://github.xdr.accenturefederalcyber.com/mdr-engineering/xdr-images"
+  source_version         = "feature/bp_MSOCI-1883_lcp-oci-image"
+  webhook_filter_pattern = "^refs/heads/main$"
+  buildspec              = "base/rhel7/oci/buildspec.yml"
+
+}
+terraform_version_constraint  = "= 1.1.6"
+terragrunt_version_constraint = "= 0.36.2"

common/aws-us-gov/afs-mdr-common-services-gov/account.hcl

@@ -1,24 +1,29 @@
 # Set account-wide variables. These are automatically pulled in to configure the remote state bucket in the root
 # terragrunt.hcl configuration.
 locals {
-  account_name   = "afs-mdr-common-services-gov"
-  account_alias  = "afs-mdr-common-services-gov"
-  aws_account_id = "701290387780"
+  account_name                    = "afs-mdr-common-services-gov"
+  account_alias                   = "afs-mdr-common-services-gov"
+  aws_account_id                  = "701290387780"
   instance_termination_protection = true # set to true for production!
-  splunk_prefix = "moose"
-  okta_app = "AWS - GovCloud"
+  splunk_prefix                   = "moose"
+  okta_app                        = "AWS - GovCloud"
 
   account_tags = {
-    "Client": local.splunk_prefix
+    "Client" : local.splunk_prefix
   }
   c2_account_standards_path = "../../../../prod/aws-us-gov/mdr-prod-c2/005-account-standards-c2"
 
   # For CIDR assignment, see https://github.mdr.defpoint.com/mdr-engineering/msoc-infrastructure/wiki/IP-Address-Allocation
   vpc_info = {
     "vpc-security" = {
-      "name" = "vpc-security",
+      "name"    = "vpc-security",
       "purpose" = "Palo altos, can probably be removed.",
-      "cidr" = "10.1.128.0/22"
+      "cidr"    = "10.1.128.0/22"
+    }
+    "vpc-codebuild" = {
+      "name" = "vpc-codebuild",
+      "purpose" = "VPC for codebuild Magic Machine",
+      "cidr" = "10.1.132.0/22"
     }
   }
 
@@ -27,13 +32,13 @@ locals {
     "000702891433",
     "000702138816"
   ]
-  panorama_count = 0 # We need a second serial number for 2
+  panorama_count         = 0 # We need a second serial number for 2
   panorama_instance_type = "m5.2xlarge"
   #panorama_instance_type = "t3.xlarge"
-  panorama_key_name = "fdamstra" # DO NOT CHANGE
-  palo_alto_count = 0 # should be divisible by 2
+  panorama_key_name       = "fdamstra" # DO NOT CHANGE
+  palo_alto_count         = 0          # should be divisible by 2
   palo_alto_instance_type = "m5.xlarge"
-  palo_alto_key_name = "fdamstra" # DO NOT CHANGE
+  palo_alto_key_name      = "fdamstra" # DO NOT CHANGE
 
   # To generate auth keys, log in to the panorama cli and run:
   #   request bootstrap vm-auth-key generate lifetime 720

common/aws-us-gov/afs-mdr-common-services-gov/disabled/016-panorama/terragrunt.hcl

@@ -3,10 +3,10 @@ locals {
   # 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"))
+  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
@@ -31,17 +31,17 @@ inputs = {
   # (via the `inputs` section of the root `terragrunt.hcl`). However, modules
   # will be more flexible if you specify particular input values.
   tags = {
-    Purpose = "Palo Alto Panorama"
+    Purpose   = "Palo Alto Panorama"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
   azs = dependency.security_vpc.outputs.azs
-  panorama_security_group_ids = [ 
+  panorama_security_group_ids = [
     dependency.security_vpc.outputs.security_groups["allow_trusted"],
     dependency.security_vpc.outputs.security_groups["allow_all_intravpc"]
-  ] 
-  subnet_id_map = dependency.security_vpc.outputs.subnet_id_map
+  ]
+  subnet_id_map   = dependency.security_vpc.outputs.subnet_id_map
   subnet_cidr_map = dependency.security_vpc.outputs.subnet_cidr_map
-  ebs_key = dependency.security_vpc.outputs.kms_palo_key_arn
+  ebs_key         = dependency.security_vpc.outputs.kms_palo_key_arn
 }
-terraform_version_constraint = "= 1.1.6"
+terraform_version_constraint  = "= 1.1.6"
 terragrunt_version_constraint = "= 0.36.2"

common/aws-us-gov/afs-mdr-common-services-gov/disabled/017-palo-alto-bootstrap/terragrunt.hcl

@@ -3,10 +3,10 @@ locals {
   # 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"))
+  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
@@ -35,10 +35,10 @@ inputs = {
   # (via the `inputs` section of the root `terragrunt.hcl`). However, modules
   # will be more flexible if you specify particular input values.
   tags = {
-    Purpose = "Palo Alto Firewalls"
+    Purpose   = "Palo Alto Firewalls"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
   panorama_servers = dependency.panorama.outputs.management_private_ips
 }
-terraform_version_constraint = "= 1.1.6"
+terraform_version_constraint  = "= 1.1.6"
 terragrunt_version_constraint = "= 0.36.2"

common/aws-us-gov/afs-mdr-common-services-gov/disabled/018-palo-alto-firewalls/terragrunt.hcl

@@ -3,10 +3,10 @@ locals {
   # 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"))
+  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
@@ -35,16 +35,16 @@ inputs = {
   # (via the `inputs` section of the root `terragrunt.hcl`). However, modules
   # will be more flexible if you specify particular input values.
   tags = {
-    Purpose = "Palo Alto Firewalls"
+    Purpose   = "Palo Alto Firewalls"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
-  azs = dependency.security_vpc.outputs.azs
-  management_security_group_ids = [ dependency.security_vpc.outputs.security_groups["allow_trusted"] ]
-  untrusted_security_group_ids = [ dependency.security_vpc.outputs.security_groups["allow_all"] ]
-  subnet_id_map = dependency.security_vpc.outputs.subnet_id_map
-  subnet_cidr_map = dependency.security_vpc.outputs.subnet_cidr_map
-  bucket_ids = dependency.palo_alto_bootstrap.outputs.bucket_ids
-  instance_profile_names = dependency.palo_alto_bootstrap.outputs.instance_profile_names
+  azs                           = dependency.security_vpc.outputs.azs
+  management_security_group_ids = [dependency.security_vpc.outputs.security_groups["allow_trusted"]]
+  untrusted_security_group_ids  = [dependency.security_vpc.outputs.security_groups["allow_all"]]
+  subnet_id_map                 = dependency.security_vpc.outputs.subnet_id_map
+  subnet_cidr_map               = dependency.security_vpc.outputs.subnet_cidr_map
+  bucket_ids                    = dependency.palo_alto_bootstrap.outputs.bucket_ids
+  instance_profile_names        = dependency.palo_alto_bootstrap.outputs.instance_profile_names
 }
-terraform_version_constraint = "= 1.1.6"
+terraform_version_constraint  = "= 1.1.6"
 terragrunt_version_constraint = "= 0.36.2"

common/aws-us-gov/afs-mdr-common-services-gov/us-gov-west-1/050-lcp-ami-sharing/terragrunt.hcl

@@ -3,10 +3,10 @@ locals {
   # 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"))
+  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
@@ -32,9 +32,9 @@ inputs = {
   #customer_account_list = local.partition_vars.locals.customer_aws_accounts_to_share_lcp_with
 
   tags = {
-    Purpose = "Shares LCP AMI with customers"
+    Purpose   = "Shares LCP AMI with customers"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
 }
-terraform_version_constraint = "= 1.1.6"
+terraform_version_constraint  = "= 1.1.6"
 terragrunt_version_constraint = "= 0.36.2"

common/aws-us-gov/afs-mdr-common-services-gov/us-gov-west-1/300-s3-xdr-trumpet/terragrunt.hcl

@@ -5,10 +5,10 @@ locals {
 
   # 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"))
+  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
@@ -28,13 +28,13 @@ include {
 
 # These are the variables we have to pass in to use the module specified in the terragrunt source above
 inputs = {
-  name = "xdr-trumpet-${local.region_vars.locals.aws_region}"
-  encryption = "SSE-S3"
+  name           = "xdr-trumpet-${local.region_vars.locals.aws_region}"
+  encryption     = "SSE-S3"
   extra_accounts = local.partition_vars.locals.customer_accounts
   tags = {
-    Purpose = "Storage of Trumpet Scripts"
+    Purpose   = "Storage of Trumpet Scripts"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
 }
-terraform_version_constraint = "= 1.1.6"
+terraform_version_constraint  = "= 1.1.6"
 terragrunt_version_constraint = "= 0.36.2"

common/aws-us-gov/afs-mdr-common-services-gov/us-gov-west-1/region.hcl

@@ -5,6 +5,6 @@
 # 
 # At some point, this may need to be added as a hierarchical directory when we move to additional regions.
 locals {
-  aws_region = "us-gov-west-1"
-  region_tags = { }
+  aws_region  = "us-gov-west-1"
+  region_tags = {}
 }

common/aws-us-gov/partition.hcl

@@ -3,12 +3,12 @@
 # 
 # NOTE: There is only one copy of this, in the `common/` tree, and the others are symbolic links.
 locals {
-  aws_partition = "aws-us-gov"
-  aws_partition_alias = "govcloud"
+  aws_partition           = "aws-us-gov"
+  aws_partition_alias     = "govcloud"
   common_services_account = "701290387780"
-  common_profile = "${local.aws_partition == "aws-us-gov" ? "govcloud" : "commercial"}"
-  tfstate_region = "us-gov-east-1"
-  binaries_key = "key/a3ed054e-73be-45b4-acf8-6d06cb18cff9"
+  common_profile          = "${local.aws_partition == "aws-us-gov" ? "govcloud" : "commercial"}"
+  tfstate_region          = "us-gov-east-1"
+  binaries_key            = "key/a3ed054e-73be-45b4-acf8-6d06cb18cff9"
 
   # Statically setting the 'last known good' ami gives us some added flexibility
   # in building amis more regularly.
@@ -53,7 +53,7 @@ locals {
   }
   # flatten the map into a single list
   account_list = flatten([
-    for env, accounts in local.account_map: accounts
+    for env, accounts in local.account_map : accounts
   ])
   # This is similar to the account_map, but used for "what accounts am I responsible for"?
   responsible_accounts = {
@@ -67,11 +67,11 @@ locals {
   }
 
   customer_accounts = [
-    "738577959608",  # AFS/CMPS AIP VA (No Ticket, email from Dalling in 10/2020)
-    "902039776828",  # AFS/CMPS FRTIB (MSOCI-1549)
-    "314025119334",  # AFS/CMPS BAS-Commerce (MSOCI-1554)
-    "454144835690",  # DGI (MSOCI-1769)
-    "172805180504",  # DGI (MSOCI-1769)
-    "296374800867",  # FRTIB/CMPS (No Ticket, email from Nguyen, Brian A.)
+    "738577959608", # AFS/CMPS AIP VA (No Ticket, email from Dalling in 10/2020)
+    "902039776828", # AFS/CMPS FRTIB (MSOCI-1549)
+    "314025119334", # AFS/CMPS BAS-Commerce (MSOCI-1554)
+    "454144835690", # DGI (MSOCI-1769)
+    "172805180504", # DGI (MSOCI-1769)
+    "296374800867", # FRTIB/CMPS (No Ticket, email from Nguyen, Brian A.)
   ]
 }

common/aws-us-gov/region.hcl

@@ -5,6 +5,6 @@
 # 
 # At some point, this may need to be added as a hierarchical directory when we move to additional regions.
 locals {
-  aws_region = "us-gov-east-1"
-  region_tags = { }
+  aws_region  = "us-gov-east-1"
+  region_tags = {}
 }

common/aws/legacy-mdr-root/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.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/iam?ref=v3.5.16"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/iam?ref=v4.2.0"
 }
 
 # Include all settings from the root terragrunt.hcl file
@@ -35,5 +35,5 @@ inputs = {
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
 }
-terraform_version_constraint = "= 1.1.6"
+terraform_version_constraint  = "= 1.1.6"
 terragrunt_version_constraint = "= 0.36.2"

common/aws/legacy-mdr-root/006-account-standards-regional/us-west-1/terragrunt.hcl

@@ -4,10 +4,10 @@ locals {
   # 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"))
+  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"))
 
   aws_partition  = local.partition_vars.locals.aws_partition
   account_id     = local.account_vars.locals.aws_account_id
@@ -58,5 +58,5 @@ inputs = {
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
 }
-terraform_version_constraint = "= 1.1.6"
+terraform_version_constraint  = "= 1.1.6"
 terragrunt_version_constraint = "= 0.36.2"

common/aws/legacy-mdr-root/006-account-standards/terragrunt.hcl

@@ -4,17 +4,17 @@ locals {
   # 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"))
+  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.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/account_standards?ref=v4.0.10"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/account_standards?ref=v4.2.0"
 }
 
 dependency "c2_account_standards" {
@@ -36,5 +36,5 @@ inputs = {
   }
   cloudtrail_key_arn = dependency.c2_account_standards.outputs.cloudtrail_logging_bucket.kms_key_id
 }
-terraform_version_constraint = "= 1.1.6"
+terraform_version_constraint  = "= 1.1.6"
 terragrunt_version_constraint = "= 0.36.2"

common/aws/legacy-mdr-root/072-salt-master-inventory-role/terragrunt.hcl

@@ -3,17 +3,17 @@ locals {
   # 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"))
+  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.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/salt_master_inventory_role?ref=v3.5.16"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/salt_master_inventory_role?ref=v4.2.0"
 }
 
 # Include all settings from the root terragrunt.hcl file
@@ -27,9 +27,9 @@ inputs = {
   # (via the `inputs` section of the root `terragrunt.hcl`). However, modules
   # will be more flexible if you specify particular input values.
   tags = {
-    Purpose = "Inventory for FedRAMP Compliance"
+    Purpose   = "Inventory for FedRAMP Compliance"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
 }
-terraform_version_constraint = "= 1.1.6"
+terraform_version_constraint  = "= 1.1.6"
 terragrunt_version_constraint = "= 0.36.2"

common/aws/legacy-mdr-root/account.hcl

@@ -4,10 +4,10 @@ locals {
   account_name   = "legacy-mdr-root"
   account_alias  = ""
   aws_account_id = "350838957895"
-  splunk_prefix = "moose"
+  splunk_prefix  = "moose"
 
   account_tags = {
-    "Client": local.splunk_prefix
+    "Client" : local.splunk_prefix
   }
   c2_account_standards_path = "../../../../prod/aws/mdr-prod-c2/005-account-standards-c2"
 }

common/aws/mdr-common-services/004-iam-okta/terragrunt.hcl

@@ -4,10 +4,10 @@ locals {
   # 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"))
+  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
@@ -50,5 +50,5 @@ inputs = {
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
 }
-terraform_version_constraint = "= 1.1.6"
+terraform_version_constraint  = "= 1.1.6"
 terragrunt_version_constraint = "= 0.36.2"

common/aws/mdr-common-services/006-account-standards-regional/us-west-1/terragrunt.hcl

@@ -4,10 +4,10 @@ locals {
   # 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"))
+  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"))
 
   aws_partition  = local.partition_vars.locals.aws_partition
   account_id     = local.account_vars.locals.aws_account_id
@@ -58,5 +58,5 @@ inputs = {
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
 }
-terraform_version_constraint = "= 1.1.6"
+terraform_version_constraint  = "= 1.1.6"
 terragrunt_version_constraint = "= 0.36.2"

common/aws/mdr-common-services/006-account-standards/terragrunt.hcl

@@ -4,17 +4,17 @@ locals {
   # 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"))
+  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.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/account_standards?ref=v4.0.10"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/account_standards?ref=v4.2.0"
 }
 
 dependency "c2_account_standards" {
@@ -36,5 +36,5 @@ inputs = {
   }
   cloudtrail_key_arn = dependency.c2_account_standards.outputs.cloudtrail_logging_bucket.kms_key_id
 }
-terraform_version_constraint = "= 1.1.6"
+terraform_version_constraint  = "= 1.1.6"
 terragrunt_version_constraint = "= 0.36.2"

common/aws/mdr-common-services/008-xdr-binaries/terragrunt.hcl

@@ -30,9 +30,9 @@ include {
 inputs = {
   name = local.global_vars.locals.binaries_bucket
   tags = {
-    Purpose = "Storage of replaceable binaries for XDR."
+    Purpose   = "Storage of replaceable binaries for XDR."
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
 }
-terraform_version_constraint = "= 1.1.6"
+terraform_version_constraint  = "= 1.1.6"
 terragrunt_version_constraint = "= 0.36.2"

common/aws/mdr-common-services/010-public-dns/terragrunt.hcl

@@ -1,9 +1,9 @@
 locals {
   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"))
+  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"))
 }
 
 terraform {
@@ -20,5 +20,5 @@ inputs = {
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
 }
-terraform_version_constraint = "= 1.1.6"
+terraform_version_constraint  = "= 1.1.6"
 terragrunt_version_constraint = "= 0.36.2"

common/aws/mdr-common-services/010-shared-ami-key/terragrunt.hcl

@@ -1,9 +1,9 @@
 locals {
   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"))
+  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"))
 }
 
 terraform {
@@ -17,9 +17,9 @@ include {
 
 inputs = {
   tags = {
-    Purpose = "Sharing the AMI amongst accounts"
+    Purpose   = "Sharing the AMI amongst accounts"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
 }
-terraform_version_constraint = "= 1.1.6"
+terraform_version_constraint  = "= 1.1.6"
 terragrunt_version_constraint = "= 0.36.2"

common/aws/mdr-common-services/011-defpoint_com-legacy-dns/terragrunt.hcl

@@ -1,9 +1,9 @@
 locals {
   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"))
+  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"))
 }
 
 terraform {
@@ -20,5 +20,5 @@ inputs = {
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
 }
-terraform_version_constraint = "= 1.1.6"
+terraform_version_constraint  = "= 1.1.6"
 terragrunt_version_constraint = "= 0.36.2"

common/aws/mdr-common-services/015-security-vpc/terragrunt.hcl

@@ -3,10 +3,10 @@ locals {
   # 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"))
+  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
@@ -31,5 +31,5 @@ inputs = {
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
 }
-terraform_version_constraint = "= 1.1.6"
+terraform_version_constraint  = "= 1.1.6"
 terragrunt_version_constraint = "= 0.36.2"

common/aws/mdr-common-services/019-qualys-service-account/terragrunt.hcl

@@ -3,10 +3,10 @@ locals {
   # 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"))
+  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
@@ -28,11 +28,11 @@ inputs = {
   # (via the `inputs` section of the root `terragrunt.hcl`). However, modules
   # will be more flexible if you specify particular input values.
   tags = {
-    Purpose = "Account for Qualys"
+    Purpose   = "Account for Qualys"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
-  
+
   pgp_key = file("../../../../keys/duane_waddle.pgp")
 }
-terraform_version_constraint = "= 1.1.6"
+terraform_version_constraint  = "= 1.1.6"
 terragrunt_version_constraint = "= 0.36.2"

common/aws/mdr-common-services/050-lcp-ami-sharing/terragrunt.hcl

@@ -3,10 +3,10 @@ locals {
   # 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"))
+  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
@@ -31,9 +31,9 @@ inputs = {
   #account_list = local.partition_vars.locals.customer_aws_accounts_to_share_lcp_with
 
   tags = {
-    Purpose = "Shares LCP AMI with customers"
+    Purpose   = "Shares LCP AMI with customers"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
 }
-terraform_version_constraint = "= 1.1.6"
+terraform_version_constraint  = "= 1.1.6"
 terragrunt_version_constraint = "= 0.36.2"

common/aws/mdr-common-services/072-salt-master-inventory-role/terragrunt.hcl

@@ -3,17 +3,17 @@ locals {
   # 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"))
+  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.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/salt_master_inventory_role?ref=v3.5.16"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/salt_master_inventory_role?ref=v4.2.0"
 }
 
 # Include all settings from the root terragrunt.hcl file
@@ -27,9 +27,9 @@ inputs = {
   # (via the `inputs` section of the root `terragrunt.hcl`). However, modules
   # will be more flexible if you specify particular input values.
   tags = {
-    Purpose = "Inventory for FedRAMP Compliance"
+    Purpose   = "Inventory for FedRAMP Compliance"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
 }
-terraform_version_constraint = "= 1.1.6"
+terraform_version_constraint  = "= 1.1.6"
 terragrunt_version_constraint = "= 0.36.2"

common/aws/mdr-common-services/110-xdr-binaries-write-role/terragrunt.hcl

@@ -3,10 +3,10 @@ locals {
   # 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"))
+  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
@@ -56,16 +56,16 @@ inputs = {
   # (via the `inputs` section of the root `terragrunt.hcl`). However, modules
   # will be more flexible if you specify particular input values.
   tags = {
-    Purpose = "Read/Write access to afsxdr-binaries s3 bucket"
+    Purpose   = "Read/Write access to afsxdr-binaries s3 bucket"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
 
-  bucket       = dependency.bucket.outputs.arn
-  name         = "afsxdr-binaries_writers"
-  description  = "Write access to the s3 bucket for afsxdr-binaries"
+  bucket      = dependency.bucket.outputs.arn
+  name        = "afsxdr-binaries_writers"
+  description = "Write access to the s3 bucket for afsxdr-binaries"
   trusted_arns = [
-    "arn:aws:iam::477548533976:role/salt-master-instance-role",  # Legacy prod salt master
-    "arn:aws:iam::527700175026:role/salt-master-instance-role",  # Legacy test salt master
+    "arn:aws:iam::477548533976:role/salt-master-instance-role", # Legacy prod salt master
+    "arn:aws:iam::527700175026:role/salt-master-instance-role", # Legacy test salt master
     dependency.test-user.outputs.salt-master-c2-commercial-user-arn,
     dependency.prod-user.outputs.salt-master-c2-commercial-user-arn,
   ]
@@ -74,5 +74,5 @@ inputs = {
     dependency.bucket.outputs.kms_key_arn
   ]
 }
-terraform_version_constraint = "= 1.1.6"
+terraform_version_constraint  = "= 1.1.6"
 terragrunt_version_constraint = "= 0.36.2"

common/aws/mdr-common-services/300-s3-xdr-trumpet/terragrunt.hcl

@@ -5,10 +5,10 @@ locals {
 
   # 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"))
+  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
@@ -28,13 +28,13 @@ include {
 
 # These are the variables we have to pass in to use the module specified in the terragrunt source above
 inputs = {
-  name = "xdr-trumpet-${local.region_vars.locals.aws_region}"
-  encryption = "SSE-S3"
+  name           = "xdr-trumpet-${local.region_vars.locals.aws_region}"
+  encryption     = "SSE-S3"
   extra_accounts = local.partition_vars.locals.customer_accounts
   tags = {
-    Purpose = "Storage of Trumpet Scripts"
+    Purpose   = "Storage of Trumpet Scripts"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
 }
-terraform_version_constraint = "= 1.1.6"
+terraform_version_constraint  = "= 1.1.6"
 terragrunt_version_constraint = "= 0.36.2"

common/aws/mdr-common-services/account.hcl

@@ -1,24 +1,24 @@
 # Set account-wide variables. These are automatically pulled in to configure the remote state bucket in the root
 # terragrunt.hcl configuration.
 locals {
-  account_name   = "afs-mdr-common-services"
-  account_alias  = "afs-mdr-common-services"
-  aws_account_id = "471284459109"
+  account_name                    = "afs-mdr-common-services"
+  account_alias                   = "afs-mdr-common-services"
+  aws_account_id                  = "471284459109"
   instance_termination_protection = true # set to true for production!
-  splunk_prefix = "moose"
-  okta_app = "AWS - Commercial"
+  splunk_prefix                   = "moose"
+  okta_app                        = "AWS - Commercial"
 
   account_tags = {
-    "Client": local.splunk_prefix
+    "Client" : local.splunk_prefix
   }
   c2_account_standards_path = "../../../../prod/aws/mdr-prod-c2/005-account-standards-c2"
 
   # For CIDR assignment, see https://github.mdr.defpoint.com/mdr-engineering/msoc-infrastructure/wiki/IP-Address-Allocation
   vpc_info = {
     "vpc-security" = {
-      "name" = "vpc-security",
+      "name"    = "vpc-security",
       "purpose" = "created for palo altos, can probably be removed.",
-      "cidr" = "10.1.0.0/22",
+      "cidr"    = "10.1.0.0/22",
     }
   }
 

common/aws/mdr-common-services/us-east-2/050-lcp-ami-sharing/terragrunt.hcl

@@ -3,10 +3,10 @@ locals {
   # 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"))
+  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
@@ -31,9 +31,9 @@ inputs = {
   #account_list = local.partition_vars.locals.customer_aws_accounts_to_share_lcp_with
 
   tags = {
-    Purpose = "Shares LCP AMI with customers"
+    Purpose   = "Shares LCP AMI with customers"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
 }
-terraform_version_constraint = "= 1.1.6"
+terraform_version_constraint  = "= 1.1.6"
 terragrunt_version_constraint = "= 0.36.2"

common/aws/mdr-common-services/us-east-2/300-s3-xdr-trumpet/terragrunt.hcl

@@ -5,10 +5,10 @@ locals {
 
   # 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"))
+  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
@@ -28,13 +28,13 @@ include {
 
 # These are the variables we have to pass in to use the module specified in the terragrunt source above
 inputs = {
-  name = "xdr-trumpet-${local.region_vars.locals.aws_region}"
-  encryption = "SSE-S3"
+  name           = "xdr-trumpet-${local.region_vars.locals.aws_region}"
+  encryption     = "SSE-S3"
   extra_accounts = local.partition_vars.locals.customer_accounts
   tags = {
-    Purpose = "Storage of Trumpet Scripts"
+    Purpose   = "Storage of Trumpet Scripts"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
 }
-terraform_version_constraint = "= 1.1.6"
+terraform_version_constraint  = "= 1.1.6"
 terragrunt_version_constraint = "= 0.36.2"

common/aws/mdr-common-services/us-east-2/region.hcl

@@ -5,6 +5,6 @@
 # 
 # At some point, this may need to be added as a hierarchical directory when we move to additional regions.
 locals {
-  aws_region = "us-east-2"
-  region_tags = { }
+  aws_region  = "us-east-2"
+  region_tags = {}
 }

common/aws/mdr-common-services/us-west-1/050-lcp-ami-sharing/terragrunt.hcl

@@ -3,10 +3,10 @@ locals {
   # 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"))
+  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
@@ -31,9 +31,9 @@ inputs = {
   #account_list = local.partition_vars.locals.customer_aws_accounts_to_share_lcp_with
 
   tags = {
-    Purpose = "Shares LCP AMI with customers"
+    Purpose   = "Shares LCP AMI with customers"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
 }
-terraform_version_constraint = "= 1.1.6"
+terraform_version_constraint  = "= 1.1.6"
 terragrunt_version_constraint = "= 0.36.2"

common/aws/mdr-common-services/us-west-1/300-s3-xdr-trumpet/terragrunt.hcl

@@ -5,10 +5,10 @@ locals {
 
   # 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"))
+  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
@@ -28,13 +28,13 @@ include {
 
 # These are the variables we have to pass in to use the module specified in the terragrunt source above
 inputs = {
-  name = "xdr-trumpet-${local.region_vars.locals.aws_region}"
-  encryption = "SSE-S3"
+  name           = "xdr-trumpet-${local.region_vars.locals.aws_region}"
+  encryption     = "SSE-S3"
   extra_accounts = local.partition_vars.locals.customer_accounts
   tags = {
-    Purpose = "Storage of Trumpet Scripts"
+    Purpose   = "Storage of Trumpet Scripts"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
 }
-terraform_version_constraint = "= 1.1.6"
+terraform_version_constraint  = "= 1.1.6"
 terragrunt_version_constraint = "= 0.36.2"

common/aws/mdr-common-services/us-west-1/region.hcl

@@ -5,6 +5,6 @@
 # 
 # At some point, this may need to be added as a hierarchical directory when we move to additional regions.
 locals {
-  aws_region = "us-west-1"
-  region_tags = { }
+  aws_region  = "us-west-1"
+  region_tags = {}
 }

common/aws/mdr-common-services/us-west-2/050-lcp-ami-sharing/terragrunt.hcl

@@ -3,10 +3,10 @@ locals {
   # 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"))
+  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
@@ -31,9 +31,9 @@ inputs = {
   #account_list = local.partition_vars.locals.customer_aws_accounts_to_share_lcp_with
 
   tags = {
-    Purpose = "Shares LCP AMI with customers"
+    Purpose   = "Shares LCP AMI with customers"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
 }
-terraform_version_constraint = "= 1.1.6"
+terraform_version_constraint  = "= 1.1.6"
 terragrunt_version_constraint = "= 0.36.2"

common/aws/mdr-common-services/us-west-2/300-s3-xdr-trumpet/terragrunt.hcl

@@ -5,10 +5,10 @@ locals {
 
   # 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"))
+  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
@@ -28,13 +28,13 @@ include {
 
 # These are the variables we have to pass in to use the module specified in the terragrunt source above
 inputs = {
-  name = "xdr-trumpet-${local.region_vars.locals.aws_region}"
-  encryption = "SSE-S3"
+  name           = "xdr-trumpet-${local.region_vars.locals.aws_region}"
+  encryption     = "SSE-S3"
   extra_accounts = local.partition_vars.locals.customer_accounts
   tags = {
-    Purpose = "Storage of Trumpet Scripts"
+    Purpose   = "Storage of Trumpet Scripts"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
 }
-terraform_version_constraint = "= 1.1.6"
+terraform_version_constraint  = "= 1.1.6"
 terragrunt_version_constraint = "= 0.36.2"

common/aws/mdr-common-services/us-west-2/region.hcl

@@ -5,6 +5,6 @@
 # 
 # At some point, this may need to be added as a hierarchical directory when we move to additional regions.
 locals {
-  aws_region = "us-west-2"
-  region_tags = { }
+  aws_region  = "us-west-2"
+  region_tags = {}
 }

common/aws/mdr-cyber-range/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.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/iam?ref=v3.5.16"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/iam?ref=v4.2.0"
 }
 
 # Include all settings from the root terragrunt.hcl file
@@ -35,5 +35,5 @@ inputs = {
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
 }
-terraform_version_constraint = "= 1.1.6"
+terraform_version_constraint  = "= 1.1.6"
 terragrunt_version_constraint = "= 0.36.2"

common/aws/mdr-cyber-range/006-account-standards-regional/us-west-1/terragrunt.hcl

@@ -4,10 +4,10 @@ locals {
   # 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"))
+  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"))
 
   aws_partition  = local.partition_vars.locals.aws_partition
   account_id     = local.account_vars.locals.aws_account_id
@@ -58,5 +58,5 @@ inputs = {
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
 }
-terraform_version_constraint = "= 1.1.6"
+terraform_version_constraint  = "= 1.1.6"
 terragrunt_version_constraint = "= 0.36.2"

common/aws/mdr-cyber-range/006-account-standards/terragrunt.hcl

@@ -4,17 +4,17 @@ locals {
   # 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"))
+  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.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/account_standards?ref=v4.0.10"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/account_standards?ref=v4.2.0"
 }
 
 dependency "c2_account_standards" {
@@ -36,5 +36,5 @@ inputs = {
   }
   cloudtrail_key_arn = dependency.c2_account_standards.outputs.cloudtrail_logging_bucket.kms_key_id
 }
-terraform_version_constraint = "= 1.1.6"
+terraform_version_constraint  = "= 1.1.6"
 terragrunt_version_constraint = "= 0.36.2"

common/aws/mdr-cyber-range/007-aws-scheduler/terragrunt.hcl

@@ -4,17 +4,17 @@ locals {
   # 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"))
+  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.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/aws_scheduler?ref=v3.5.16"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/aws_scheduler?ref=v4.2.0"
 }
 
 # Include all settings from the root terragrunt.hcl file
@@ -31,6 +31,6 @@ inputs = {
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
 }
-terraform_version_constraint = "= 1.1.6"
+terraform_version_constraint  = "= 1.1.6"
 terragrunt_version_constraint = "= 0.36.2"
 

common/aws/mdr-cyber-range/010-shared-ami-key/terragrunt.hcl

@@ -1,9 +1,9 @@
 locals {
   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"))
+  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"))
 }
 
 terraform {
@@ -21,12 +21,12 @@ include {
 
 inputs = {
   tags = {
-    Purpose = "Sharing the AMI amongst accounts"
+    Purpose   = "Sharing the AMI amongst accounts"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
-  ami_bucket_name = "cyberrange-shared-amis"
-  vmimport_extra_keys = [ dependency.account_standards.outputs.kms_key_id ]
-  vmimport_extra_buckets = [ "arn:aws:s3:::victim-windows10-enterprise-x64" ]
+  ami_bucket_name        = "cyberrange-shared-amis"
+  vmimport_extra_keys    = [dependency.account_standards.outputs.kms_key_id]
+  vmimport_extra_buckets = ["arn:aws:s3:::victim-windows10-enterprise-x64"]
 }
-terraform_version_constraint = "= 1.1.6"
+terraform_version_constraint  = "= 1.1.6"
 terragrunt_version_constraint = "= 0.36.2"

common/aws/mdr-cyber-range/072-salt-master-inventory-role/terragrunt.hcl

@@ -3,17 +3,17 @@ locals {
   # 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"))
+  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.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/salt_master_inventory_role?ref=v3.5.16"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/salt_master_inventory_role?ref=v4.2.0"
 }
 
 # Include all settings from the root terragrunt.hcl file
@@ -27,9 +27,9 @@ inputs = {
   # (via the `inputs` section of the root `terragrunt.hcl`). However, modules
   # will be more flexible if you specify particular input values.
   tags = {
-    Purpose = "Inventory for FedRAMP Compliance"
+    Purpose   = "Inventory for FedRAMP Compliance"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
 }
-terraform_version_constraint = "= 1.1.6"
+terraform_version_constraint  = "= 1.1.6"
 terragrunt_version_constraint = "= 0.36.2"

common/aws/mdr-cyber-range/255-phantom-archive-s3/terragrunt.hcl

@@ -3,10 +3,10 @@ locals {
   # 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"))
+  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
@@ -27,9 +27,9 @@ inputs = {
   # (via the `inputs` section of the root `terragrunt.hcl`). However, modules
   # will be more flexible if you specify particular input values.
   tags = {
-    Purpose = "Phantom S3 Bucket for Archival Purposes"
+    Purpose   = "Phantom S3 Bucket for Archival Purposes"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
 }
-terraform_version_constraint = "= 1.1.6"
+terraform_version_constraint  = "= 1.1.6"
 terragrunt_version_constraint = "= 0.36.2"

common/aws/mdr-cyber-range/account.hcl

@@ -2,18 +2,18 @@
 # terragrunt.hcl configuration.
 locals {
   # TODO put the right values here
-  account_name   = "afs-mdr-prod-cyber-range"
-  account_alias  = "afs-mdr-prod-cyber-range"
-  aws_account_id = "952430311316"
+  account_name                    = "afs-mdr-prod-cyber-range"
+  account_alias                   = "afs-mdr-prod-cyber-range"
+  aws_account_id                  = "952430311316"
   instance_termination_protection = true
-  splunk_prefix = "caasp"
-  
-  account_tags = { } 
+  splunk_prefix                   = "caasp"
+
+  account_tags              = {}
   c2_account_standards_path = "../../../../prod/aws/mdr-prod-c2/005-account-standards-c2"
 
-  iam_additional_trusted_arns = [ "arn:aws:iam::471284459109:role/user/mdr_developer_readonly" ]
+  iam_additional_trusted_arns = ["arn:aws:iam::471284459109:role/user/mdr_developer_readonly"]
 
-  extra_ebs_key_admins = [ ]
-  extra_ebs_key_users = [ ]
-  extra_ebs_key_attachers = [ ]
+  extra_ebs_key_admins    = []
+  extra_ebs_key_users     = []
+  extra_ebs_key_attachers = []
 }

common/aws/mdr-dev-ai/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.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/iam?ref=v3.5.16"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/iam?ref=v4.2.0"
 }
 
 # Include all settings from the root terragrunt.hcl file
@@ -35,5 +35,5 @@ inputs = {
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
 }
-terraform_version_constraint = "= 1.1.6"
+terraform_version_constraint  = "= 1.1.6"
 terragrunt_version_constraint = "= 0.36.2"

common/aws/mdr-dev-ai/account.hcl

@@ -4,9 +4,9 @@ locals {
   account_name   = "afs-mdr-dev-ai"
   account_alias  = "afs-mdr-dev-ai"
   aws_account_id = "228011623757"
-  
-  account_tags = { } 
+
+  account_tags              = {}
   c2_account_standards_path = "../../../../prod/aws/mdr-prod-c2/005-account-standards-c2"
 
-  iam_additional_trusted_arns = [ "arn:aws:iam::471284459109:role/user/mdr_developer_readonly" ]
+  iam_additional_trusted_arns = ["arn:aws:iam::471284459109:role/user/mdr_developer_readonly"]
 }

common/aws/partition.hcl

@@ -3,12 +3,12 @@
 #
 # NOTE: There is only one copy of this, in the `common/` tree, and the others are symbolic links.
 locals {
-  aws_partition = "aws"
-  aws_partition_alias = "commercial"
+  aws_partition           = "aws"
+  aws_partition_alias     = "commercial"
   common_services_account = "471284459109"
-  common_profile = "${local.aws_partition == "aws-us-gov" ? "govcloud" : "commercial"}"
-  tfstate_region = "us-east-1"
-  binaries_key = "key/b51760b2-d6e1-438a-afd4-1e56f5ac82ef"
+  common_profile          = "${local.aws_partition == "aws-us-gov" ? "govcloud" : "commercial"}"
+  tfstate_region          = "us-east-1"
+  binaries_key            = "key/b51760b2-d6e1-438a-afd4-1e56f5ac82ef"
 
   # Statically setting the 'last known good' ami gives us some added flexibility
   # in building amis more regularly.
@@ -31,10 +31,10 @@ locals {
       "045312110490", # mdr-prod-c2
       "425831147305", # mdr-prod-modelclient
       "369723129071", # mdr-prod-malware
-# These two apparently don't have the account-standards / skeleton
-# set up for them (yet?)  For now I'm leaving them commented out
-#      "821415252513", # mdr-prod-nihors
-#      "153282776295", # mdr-prod-bas
+      # These two apparently don't have the account-standards / skeleton
+      # set up for them (yet?)  For now I'm leaving them commented out
+      #      "821415252513", # mdr-prod-nihors
+      #      "153282776295", # mdr-prod-bas
       "815967312032", # mdr-prod-doed
       "752106061897", # mdr-prod-frtib
       "054411035179", # mdr-prod-ca-c19
@@ -48,14 +48,14 @@ locals {
     "common" = [
       "471284459109", # mdr-common-services
       "350838957895", # MDR Service Root
-#      "035764279020", # MDR Playground / "Duane Test"
+      #      "035764279020", # MDR Playground / "Duane Test"
       "228011623757", # mdr-dev-ai
       "952430311316", # mdr-cyber-range
     ],
   }
   # flatten the map into a single list
   account_list = flatten([
-    for env, accounts in local.account_map: accounts
+    for env, accounts in local.account_map : accounts
   ])
   # This is similar to the account_map, but used for "what accounts am I responsible for"?
   responsible_accounts = {
@@ -69,7 +69,7 @@ locals {
   }
 
   customer_accounts = [
-    "392153378647",  # CA Dept of Health (MSOCI-1637)
+    "392153378647", # CA Dept of Health (MSOCI-1637)
     "083790825559", #web-dev
     "096166358174", #feedzai-dev
     "475533160228", #datalake-dev
@@ -89,6 +89,6 @@ locals {
     "625579355395", #web-prod
     "650564742306", #feedzai
     "689680997102", #generalservices-prod
-    "892774870883" # frtib-alight
+    "892774870883"  # frtib-alight
   ]
 }

common/aws/region.hcl

@@ -5,6 +5,6 @@
 # 
 # At some point, this may need to be added as a hierarchical directory when we move to additional regions.
 locals {
-  aws_region = "us-east-1"
-  region_tags = { }
+  aws_region  = "us-east-1"
+  region_tags = {}
 }

common/env.hcl

@@ -1,34 +1,34 @@
 # Set common variables for the environment. This is automatically pulled in in the root terragrunt.hcl configuration to
 # feed forward to the child modules.
 locals {
-  environment = "common"
+  environment                  = "common"
   transit_gateway_account_name = "mdr-prod-c2" # Which account has the transit gateway
 
   environment_tags = {
-    "Schedule" = "none",
+    "Schedule"  = "none",
     Environment = local.environment
   }
 
-  proxy = "proxy.pvt.xdr.accenturefederalcyber.com"
-  proxy_ip = "10.40.2.107"
-  salt_master = "salt-master.pvt.xdr.accenturefederalcyber.com"
+  proxy          = "proxy.pvt.xdr.accenturefederalcyber.com"
+  proxy_ip       = "10.40.2.107"
+  salt_master    = "salt-master.pvt.xdr.accenturefederalcyber.com"
   salt_master_ip = "10.40.2.106"
-  hec = "moose-hec.pvt.xdr.accenturefederalcyber.com"
-  hec_pub = "moose-hec.xdr.accenturefederalcyber.com"
-  hec_pub_ack = "moose-hec-ack.xdr.accenturefederalcyber.com"
+  hec            = "moose-hec.pvt.xdr.accenturefederalcyber.com"
+  hec_pub        = "moose-hec.xdr.accenturefederalcyber.com"
+  hec_pub_ack    = "moose-hec-ack.xdr.accenturefederalcyber.com"
 
   # When there are multiples, put govcloud first, then commercial, and alternate if there are more than 2.
   # Put any standalone IPs at the end.
   cidr_map = {
-    "bastions" = [ "10.40.20.0/22" ], # vpc-access in mdr-prod-c2-gov
-    "vpns"     = [ "10.40.20.0/22" ], # vpc-access in mdr-prod-c2-gov
-    "scanners" = [ "10.40.12.0/22" ], # vpc-qualys
-    "dns"      = [ "10.40.0.0/22", "10.32.0.0/22" ], # vpc-system-services in commercial nad gov
-    "monitoring" = [ "10.40.0.0/22" ], # legacy sensu, and vpc-system-services in gov
-    "salt"     = [ "10.40.0.0/22" ], # legacy salt-master, and vpc-system-services in gov
-    "web"      = [ "10.40.0.0/22" ], # legacy proxy/repo, and vpc-system-services in gov
-    "smtp"     = [ "10.20.0.0/22" ], # legacy relay, and vpc-system-services in gov
-    "moose"    = [ "10.40.16.0/22" ], # legacy vpc, and vpc-system-services in gov
+    "bastions"   = ["10.40.20.0/22"],                # vpc-access in mdr-prod-c2-gov
+    "vpns"       = ["10.40.20.0/22"],                # vpc-access in mdr-prod-c2-gov
+    "scanners"   = ["10.40.12.0/22"],                # vpc-qualys
+    "dns"        = ["10.40.0.0/22", "10.32.0.0/22"], # vpc-system-services in commercial nad gov
+    "monitoring" = ["10.40.0.0/22"],                 # legacy sensu, and vpc-system-services in gov
+    "salt"       = ["10.40.0.0/22"],                 # legacy salt-master, and vpc-system-services in gov
+    "web"        = ["10.40.0.0/22"],                 # legacy proxy/repo, and vpc-system-services in gov
+    "smtp"       = ["10.20.0.0/22"],                 # legacy relay, and vpc-system-services in gov
+    "moose"      = ["10.40.16.0/22"],                # legacy vpc, and vpc-system-services in gov
   }
 
   legacy_account = "477548533976"
@@ -45,35 +45,35 @@ locals {
   # Note: 'private' and 'reverse' do not presently work in common services
   dns_info = {
     "private" = {
-      zone = "pvt.xdr.accenturefederalcyber.com",
+      zone    = "pvt.xdr.accenturefederalcyber.com",
       zone_id = "Z08498911YSZW4A0XN4AG"
     },
     "public" = {
-      zone = "xdr.accenturefederalcyber.com"
+      zone    = "xdr.accenturefederalcyber.com"
       zone_id = "Z0083657A94URZM2TM87"
     },
     "legacy_private" = {
-      zone = "msoc.defpoint.local"
+      zone    = "msoc.defpoint.local"
       zone_id = "Z2JVOIKXZP64QP"
     },
     "legacy_public" = {
-      zone = "mdr.defpoint.com"
+      zone    = "mdr.defpoint.com"
       zone_id = "Z2HYR9YEZ4KLDE"
     },
   }
 
   # legacy DNS
   dns_private = {
-    "id" = "Z2JVOIKXZP64QP"
+    "id"   = "Z2JVOIKXZP64QP"
     "name" = "msoc.defpoint.local"
   }
   dns_private2 = {
     # There are many of these... future task to figure it out
-    "id" = "Z2RGT77XQU1QBX"
+    "id"   = "Z2RGT77XQU1QBX"
     "name" = "mdr.defpoint.com"
   }
   dns_public = {
-    "id" = "Z2HYR9YEZ4KLDE"
+    "id"   = "Z2HYR9YEZ4KLDE"
     "name" = "mdr.defpoint.com"
   }
 }

globals.hcl

@@ -9,36 +9,36 @@ locals {
     #"Last_Updated" = timestamp() # while this is cool, its usefulness does not warrant the constant updates.
   }
 
-  trusted_ips = [ # IPs for 'permissive' ingress. Used for the bastion host and for testing. Think twice before employing.
-    "108.203.37.38/32",    # Duane Waddle
-    "24.11.231.98/32",     # George Starcher
-    "99.151.37.185/32",    # Wesley Leonard
-    "73.10.53.113/32",     # Rick Page Home
-    "74.211.32.26/32",     # Brad Poulton
-    "70.160.60.248/32",    # Brandon Naughton
-    "99.56.213.129/32",    # Fred Damstra
+  trusted_ips = [       # IPs for 'permissive' ingress. Used for the bastion host and for testing. Think twice before employing.
+    "108.203.37.38/32", # Duane Waddle
+    "24.11.231.98/32",  # George Starcher
+    "99.151.37.185/32", # Wesley Leonard
+    "73.10.53.113/32",  # Rick Page Home
+    "74.211.32.26/32",  # Brad Poulton
+    "70.160.60.248/32", # Brandon Naughton
+    "99.56.213.129/32", # Fred Damstra
     #"76.173.128.126/32",   # Jeremy Cooper
-    "97.117.83.215/32",    # Colby Williams
+    "97.117.83.215/32", # Colby Williams
   ]
 
   portal_test_whitelist = [ # IPs for Portal Test and vmray
-    "12.245.107.250/32",   # DPS Office Legato
-    "12.204.167.162/32",   # DPS Office San Antonio
-    "54.86.98.62/32",      # DPS AWS User VPN
-    "108.203.37.38/32",    # Duane Waddle
-    "24.11.231.98/32",     # George Starcher
-    "99.151.37.185/32",    # Wesley Leonard
-    "73.10.53.113/32",     # Rick Page Home
-    "74.211.32.26/32",     # Brad Poulton
-    "70.160.60.248/32",    # Brandon Naughton 
-    "99.56.213.129/32",    # Frederick Damstra
-    "97.117.83.215/32",    # Colby Williams
+    "12.245.107.250/32",    # DPS Office Legato
+    "12.204.167.162/32",    # DPS Office San Antonio
+    "54.86.98.62/32",       # DPS AWS User VPN
+    "108.203.37.38/32",     # Duane Waddle
+    "24.11.231.98/32",      # George Starcher
+    "99.151.37.185/32",     # Wesley Leonard
+    "73.10.53.113/32",      # Rick Page Home
+    "74.211.32.26/32",      # Brad Poulton
+    "70.160.60.248/32",     # Brandon Naughton 
+    "99.56.213.129/32",     # Frederick Damstra
+    "97.117.83.215/32",     # Colby Williams
     #"76.173.128.126/32",   # Jeremy Cooper
-    "73.213.108.186/32",   # LaDonia Wicks
+    "73.213.108.186/32", # LaDonia Wicks
   ]
 
-  admin_ips = [ 
-    "108.28.25.119/32",  # James Kerr Home
+  admin_ips = [
+    "108.28.25.119/32",   # James Kerr Home
     "73.10.53.113/32",    # Rick Page Home
     "99.151.37.185/32",   # Wesley Leonard Home
     "74.211.32.26/32",    # Brad Poulton Home
@@ -85,55 +85,55 @@ locals {
     {
       description = "Test LCPs"
       cidr_blocks = [
-        "18.252.65.137/32",                 # Test LCP in Govcloud (EIP in common-services-gov)
-        "54.224.56.231/32",                 # Test LCP in Commercial (EIP in common-services)
+        "18.252.65.137/32", # Test LCP in Govcloud (EIP in common-services-gov)
+        "54.224.56.231/32", # Test LCP in Commercial (EIP in common-services)
       ]
     },
     {
       description = "NGA"
       cidr_blocks = [
-        "199.16.64.3/32",                    #  NGA
+        "199.16.64.3/32", #  NGA
       ]
     },
     {
       description = "AFS OnPrem"
       cidr_blocks = [
-        "170.248.172.0/23",                  #  AFS Onprem
+        "170.248.172.0/23", #  AFS Onprem
       ]
     },
     {
       description = "AFS Azure"
       cidr_blocks = [
-        "20.190.250.137/32",                 # EastUS2_External_Access
-        "52.232.227.197/32",                 # Azure US-East Palo
-        "52.185.64.173/32",                  # CentralUS_External_Access
-        "52.242.225.98/32",                  # Azure US-Central Palo 20200721
-        "52.177.84.83/32",                   # Lab_External_Access
+        "20.190.250.137/32", # EastUS2_External_Access
+        "52.232.227.197/32", # Azure US-East Palo
+        "52.185.64.173/32",  # CentralUS_External_Access
+        "52.242.225.98/32",  # Azure US-Central Palo 20200721
+        "52.177.84.83/32",   # Lab_External_Access
       ]
     },
     {
       description = "BAS-Commerce CMPS"
       cidr_blocks = [
-        "52.61.137.158/32",                 # 2021-04-06 From Daniel Dicke <daniel.dicke@asmr.com>
-        "52.61.70.43/32",	            # 2021-04-15 yanked from VPC flow logs
+        "52.61.137.158/32", # 2021-04-06 From Daniel Dicke <daniel.dicke@asmr.com>
+        "52.61.70.43/32",   # 2021-04-15 yanked from VPC flow logs
       ]
     },
     {
       description = "FRTIB VDI"
       cidr_blocks = [
-        "52.61.113.202/32",                 # 2021-04-15 From Brian Nguyen brian.a.nguyen@accenturefederal.com
+        "52.61.113.202/32", # 2021-04-15 From Brian Nguyen brian.a.nguyen@accenturefederal.com
       ]
     },
     {
       description = "FRTIB CMPS"
       cidr_blocks = [
-        "15.200.226.57/32",                # 2021-07-12 From Brian Nguyen brian.a.nguyen@accenturefederal.com
+        "15.200.226.57/32", # 2021-07-12 From Brian Nguyen brian.a.nguyen@accenturefederal.com
       ]
     },
     {
       description = "FRTIB ALIGHT"
       cidr_blocks = [
-        "54.205.60.17/32",             # 2021-05-04 From John Conrad john.conrad.2@alight.com
+        "54.205.60.17/32", # 2021-05-04 From John Conrad john.conrad.2@alight.com
         "52.206.203.98/32",
         "34.233.188.131/32",
       ]
@@ -141,7 +141,7 @@ locals {
     {
       description = "FRTIB ALIGHT 2"
       cidr_blocks = [
-        "34.214.247.125/32",             # 2022-01-20 From John Conrad john.conrad.2@alight.com
+        "34.214.247.125/32", # 2022-01-20 From John Conrad john.conrad.2@alight.com
         "44.235.174.214/32",
         "52.89.203.9/32",
       ]
@@ -149,30 +149,30 @@ locals {
     {
       description = "CA-C19"
       cidr_blocks = [
-        "34.223.59.103/32",         # 2021-05-04 From Wes Leonard 
+        "34.223.59.103/32", # 2021-05-04 From Wes Leonard 
         "44.234.190.14/32",
         "44.228.141.151/32",
-        "18.215.158.202/32",           # 2022-01-03 From Ben Troglia
-        "54.234.108.195/32", 
-        "34.228.38.91/32", 
+        "18.215.158.202/32", # 2022-01-03 From Ben Troglia
+        "54.234.108.195/32",
+        "34.228.38.91/32",
       ]
     },
     {
       description = "DGI"
       cidr_blocks = [
-        "3.32.175.159/32",         # 2021-06-24 From Angelita Crawley MSOCI-1776 
+        "3.32.175.159/32", # 2021-06-24 From Angelita Crawley MSOCI-1776 
         "15.200.13.143/32",
       ]
     },
     {
       description = "FRTIB Chaos test us-east-1"
       cidr_blocks = [
-          "3.221.245.113/32",
-          "34.237.100.242/32",
-          "35.172.75.107/32",
-          "54.164.205.89/32",
-          "54.209.105.32/32",
-          "54.224.69.136/32",
+        "3.221.245.113/32",
+        "34.237.100.242/32",
+        "35.172.75.107/32",
+        "54.164.205.89/32",
+        "54.209.105.32/32",
+        "54.224.69.136/32",
       ]
     },
     {
@@ -187,34 +187,34 @@ locals {
   ]
 
   dns_zone_map = {
-    "accenturefederalcyber.com" = "Z03575081VGXN3FUZ8ERU"
-    "accenturefederalcyber.net" = "Z07771312N8X39HKP141M"
-    "xdr.accenturefederalcyber.com" = "Z0083657A94URZM2TM87"
+    "accenturefederalcyber.com"         = "Z03575081VGXN3FUZ8ERU"
+    "accenturefederalcyber.net"         = "Z07771312N8X39HKP141M"
+    "xdr.accenturefederalcyber.com"     = "Z0083657A94URZM2TM87"
     "xdrtest.accenturefederalcyber.com" = "Z01677392W0QM639KU2KC"
   }
 
   repo_server_whitelist = concat(
-    [ "52.179.13.17/32",  #???
+    ["52.179.13.17/32", #???
     ],
   )
 
   key_pairs = {
     # Should be your username -> key pair
     "msoc-build" = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDv8N5N/ECQNKdqZKmjQqGkPiAtJc3WmWdpcZmhxUfplGRFW0IlHGH/wPUgkXXg+djWNpMyT+bqWI8B4Q18uw0Y+w09lN+F1t/vp2GNPYyIPHTGbr2u/r5RCuPXc5Gg6ogkneyAipPCPAhBRbvPaFtfLSJ94ba01LoFs4xgCIZXetr/3ql61OlLyB8vb8FohpW/7u32zzOVJwObA+QlDrRgivaYpwNBxd+No9HEz29dUVFMsKb3ko0GpBuu4pptbj73XxP0EeodMj0hee0FH4kEkZy80LVbg2WeTsq6Mi/FRZmeGt5f3oZEcfflGqYOPA4FmhTrc9O9pp36DDOGts79TeZ6abky+a0jRJQvaeN8x8DZ6PQXfVGpOrNst5zw0Z9EP3ZrFAkX6CYfZkckq0h5Fs+rcWLeUfM/ppZqcyNBDys7zxjFNdmWk86pgn+XvdCVIlsp99B6CzgDoAJkay09ROVqh39HTK7m2aKZoyFWZvUpaqUOlLkOb47bMQzIBSp8Yaoo4PozSg0lQOzkJl3JTR0OZksbeN0pFKY4qNcUcpgUU5mVYs5SXWAOsih51kC5s+0F6Uxt+iDjT9ASaF1O+Bl46UnhpwrtN4ckpHsFnp58mdfhJCUMjt6PX+UPxjRlSL21EkjGALybG2C0gPuoGo0x5bEsZl/gFrFJ+3r6gQ== MSOC Build Key",
-    "fdamstra" = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDF3pGU9+HufgfEhPP7P0Lt7kqfGWLTGd6sfJgSypcSo3FP1XhwFOWkaNvZIpoIeQXhux5vTm+RoqYZ/3Gj7hcGMLdoHWArvLHD2AGjxbFnsmiCioQgsC/rYLBjiWNsDdVF5Arofby/RwzivMAi7yivhY4nGzXPsHZoucB0Wi34/9AmxbvXWv6ckuWkMjrXVe+uwFje3U7jQHRW9jQRpCRRfUjVA4FmH0PWqWFBlt/zqsDPOzbxNNhAvyrJho7jVBNjCLsq0++lT8BDKrYbaZiT0F2c9uIDRpHJSdjpqVCf9bghmeJWYMoNHAkGR7WCFjPCJ7QM57a2oRBtm1A/EWcr",
+    "fdamstra"   = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDF3pGU9+HufgfEhPP7P0Lt7kqfGWLTGd6sfJgSypcSo3FP1XhwFOWkaNvZIpoIeQXhux5vTm+RoqYZ/3Gj7hcGMLdoHWArvLHD2AGjxbFnsmiCioQgsC/rYLBjiWNsDdVF5Arofby/RwzivMAi7yivhY4nGzXPsHZoucB0Wi34/9AmxbvXWv6ckuWkMjrXVe+uwFje3U7jQHRW9jQRpCRRfUjVA4FmH0PWqWFBlt/zqsDPOzbxNNhAvyrJho7jVBNjCLsq0++lT8BDKrYbaZiT0F2c9uIDRpHJSdjpqVCf9bghmeJWYMoNHAkGR7WCFjPCJ7QM57a2oRBtm1A/EWcr",
   }
 
   # Sensu Thresholds
   sensu_checks = {
-    "dns": {
-       "warning":  "5.0", # warn if no resolution for 5 seconds
-       "critical": "10.0" # critical if no resolution for 10 seconds
+    "dns" : {
+      "warning" : "5.0",  # warn if no resolution for 5 seconds
+      "critical" : "10.0" # critical if no resolution for 10 seconds
     },
   }
 
   # Some sane defaults we don't want to specify everywhere
-  is_legacy = false # By default, accounts are not legacy accounts
-  extra_ebs_key_admins = [ ]
-  extra_ebs_key_users  = [ ]
-  extra_ebs_key_attachers = [ ]
+  is_legacy               = false # By default, accounts are not legacy accounts
+  extra_ebs_key_admins    = []
+  extra_ebs_key_users     = []
+  extra_ebs_key_attachers = []
 }

prod/aws-us-gov/mdr-prod-afs/005-iam/terragrunt.hcl

@@ -6,15 +6,15 @@ locals {
   # 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"))
+  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
-  aws_region     = local.region_vars.locals.aws_region
-  account_id     = local.account_vars.locals.aws_account_id
-  
+  aws_region = local.region_vars.locals.aws_region
+  account_id = local.account_vars.locals.aws_account_id
+
 }
 
 # TODO: For provisioning only. Comment out after provisioning
@@ -41,7 +41,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/iam?ref=v3.5.16"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/iam?ref=v4.2.0"
 }
 
 # Include all settings from the root terragrunt.hcl file
@@ -58,5 +58,5 @@ inputs = {
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
 }
-terraform_version_constraint = "= 1.1.6"
+terraform_version_constraint  = "= 1.1.6"
 terragrunt_version_constraint = "= 0.36.2"

prod/aws-us-gov/mdr-prod-afs/006-account-standards-regional/us-gov-west-1/terragrunt.hcl

@@ -4,10 +4,10 @@ locals {
   # 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"))
+  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"))
 
   aws_partition  = local.partition_vars.locals.aws_partition
   account_id     = local.account_vars.locals.aws_account_id
@@ -58,5 +58,5 @@ inputs = {
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
 }
-terraform_version_constraint = "= 1.1.6"
+terraform_version_constraint  = "= 1.1.6"
 terragrunt_version_constraint = "= 0.36.2"

prod/aws-us-gov/mdr-prod-afs/006-account-standards/terragrunt.hcl

@@ -4,17 +4,17 @@ locals {
   # 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"))
+  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.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/account_standards?ref=v4.0.10"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/account_standards?ref=v4.2.0"
 }
 
 dependency "c2_account_standards" {
@@ -36,5 +36,5 @@ inputs = {
   }
   cloudtrail_key_arn = dependency.c2_account_standards.outputs.cloudtrail_logging_bucket.kms_key_id
 }
-terraform_version_constraint = "= 1.1.6"
+terraform_version_constraint  = "= 1.1.6"
 terragrunt_version_constraint = "= 0.36.2"

prod/aws-us-gov/mdr-prod-afs/007-backups/terragrunt.hcl

@@ -4,17 +4,17 @@ locals {
   # 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"))
+  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.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/backups?ref=v3.5.16"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/backups?ref=v4.2.0"
 }
 
 # Include all settings from the root terragrunt.hcl file
@@ -31,5 +31,5 @@ inputs = {
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
 }
-terraform_version_constraint = "= 1.1.6"
+terraform_version_constraint  = "= 1.1.6"
 terragrunt_version_constraint = "= 0.36.2"

prod/aws-us-gov/mdr-prod-afs/010-vpc-splunk/terragrunt.hcl

@@ -5,10 +5,10 @@ locals {
 
   # 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"))
+  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
@@ -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.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/standard_vpc?ref=v3.6.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/standard_vpc?ref=v4.2.0"
 }
 
 # Include all settings from the root terragrunt.hcl file
@@ -36,14 +36,14 @@ inputs = {
   # (via the `inputs` section of the root `terragrunt.hcl`). However, modules
   # will be more flexible if you specify particular input values.
   accept_tgw_invitation = true # Should we accept the Transit GT invitation? Should only be true for the first vpc
-  tgw_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_info = local.account_vars.locals.vpc_info["vpc-splunk"]
+  tgw_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_info              = local.account_vars.locals.vpc_info["vpc-splunk"]
   tags = {
     #Purpose # grabbed from vpc_info
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
   accept_tgw_invitation = true
 }
-terraform_version_constraint = "= 1.1.6"
+terraform_version_constraint  = "= 1.1.6"
 terragrunt_version_constraint = "= 0.36.2"

prod/aws-us-gov/mdr-prod-afs/021-qualys-connector-role/terragrunt.hcl

@@ -1,36 +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.
-  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.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/qualys_connector_role?ref=v3.5.16"
-  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/terminated?ref=v4.1.6"
-}
-
-# 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 = "Qualys Connector Role"
-    Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
-  }
-}
-terraform_version_constraint = "= 1.1.6"
-terragrunt_version_constraint = "= 0.36.2"