Merge branch 'master' into feature/cw_NA_GitHubActionsS3

000-skeleton/005-iam/terragrunt.hcl

@@ -58,5 +58,5 @@ inputs = {
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
 }
-terraform_version_constraint = "= 1.0.7"
-terragrunt_version_constraint = "= 0.32.3"
+terraform_version_constraint = "= 1.1.6"
+terragrunt_version_constraint = "= 0.36.2"

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

@@ -58,5 +58,5 @@ inputs = {
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
 }
-terraform_version_constraint = "= 1.0.7"
-terragrunt_version_constraint = "= 0.32.3"
+terraform_version_constraint = "= 1.1.6"
+terragrunt_version_constraint = "= 0.36.2"

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

@@ -36,5 +36,5 @@ inputs = {
   }
   cloudtrail_key_arn = dependency.c2_account_standards.outputs.cloudtrail_logging_bucket.kms_key_id
 }
-terraform_version_constraint = "= 1.0.7"
-terragrunt_version_constraint = "= 0.32.3"
+terraform_version_constraint = "= 1.1.6"
+terragrunt_version_constraint = "= 0.36.2"

000-skeleton/007-backups/terragrunt.hcl

@@ -31,5 +31,5 @@ inputs = {
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
 }
-terraform_version_constraint = "= 1.0.7"
-terragrunt_version_constraint = "= 0.32.3"
+terraform_version_constraint = "= 1.1.6"
+terragrunt_version_constraint = "= 0.36.2"

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

@@ -45,5 +45,5 @@ inputs = {
   }
   accept_tgw_invitation = true
 }
-terraform_version_constraint = "= 1.0.7"
-terragrunt_version_constraint = "= 0.32.3"
+terraform_version_constraint = "= 1.1.6"
+terragrunt_version_constraint = "= 0.36.2"

000-skeleton/021-qualys-connector-role/terragrunt.hcl

@@ -31,5 +31,5 @@ inputs = {
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
 }
-terraform_version_constraint = "= 1.0.7"
-terragrunt_version_constraint = "= 0.32.3"
+terraform_version_constraint = "= 1.1.6"
+terragrunt_version_constraint = "= 0.36.2"

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

@@ -31,5 +31,5 @@ inputs = {
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
 }
-terraform_version_constraint = "= 1.0.7"
-terragrunt_version_constraint = "= 0.32.3"
+terraform_version_constraint = "= 1.1.6"
+terragrunt_version_constraint = "= 0.36.2"

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

@@ -31,5 +31,5 @@ inputs = {
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
 }
-terraform_version_constraint = "= 1.0.7"
-terragrunt_version_constraint = "= 0.32.3"
+terraform_version_constraint = "= 1.1.6"
+terragrunt_version_constraint = "= 0.36.2"

prod/aws-us-gov/mdr-prod-ma-c19/072-salt-master-inventory-role/terragrunt.hcl → 000-skeleton/145-splunk-smartstore-s3/terragrunt.hcl

@@ -13,7 +13,7 @@ locals {
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
   # Double slash is intentional and required to show root of modules
-  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/salt_master_inventory_role?ref=v3.0.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/splunk_servers/smartstore_s3_bucket?ref=v3.5.17"
 }
 
 # 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 = "Splunk SmartStore Data"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
 }
-terraform_version_constraint = "= 1.0.7"
-terragrunt_version_constraint = "= 0.32.3"
+terraform_version_constraint = "= 1.1.6"
+terragrunt_version_constraint = "= 0.36.2"

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

@@ -41,5 +41,5 @@ inputs = {
   azs = dependency.vpc.outputs.azs
   subnets = dependency.vpc.outputs.private_subnets
 }
-terraform_version_constraint = "= 1.0.7"
-terragrunt_version_constraint = "= 0.32.3"
+terraform_version_constraint = "= 1.1.6"
+terragrunt_version_constraint = "= 0.36.2"

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

@@ -42,5 +42,5 @@ inputs = {
   private_subnets = dependency.vpc.outputs.private_subnets
   public_subnets  = dependency.vpc.outputs.public_subnets
 }
-terraform_version_constraint = "= 1.0.7"
-terragrunt_version_constraint = "= 0.32.3"
+terraform_version_constraint = "= 1.1.6"
+terragrunt_version_constraint = "= 0.36.2"

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

@@ -41,5 +41,5 @@ inputs = {
   azs = dependency.vpc.outputs.azs
   subnets = dependency.vpc.outputs.private_subnets
 }
-terraform_version_constraint = "= 1.0.7"
-terragrunt_version_constraint = "= 0.32.3"
+terraform_version_constraint = "= 1.1.6"
+terragrunt_version_constraint = "= 0.36.2"

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

@@ -41,5 +41,5 @@ inputs = {
   azs = dependency.vpc.outputs.azs
   subnets = dependency.vpc.outputs.private_subnets
 }
-terraform_version_constraint = "= 1.0.7"
-terragrunt_version_constraint = "= 0.32.3"
+terraform_version_constraint = "= 1.1.6"
+terragrunt_version_constraint = "= 0.36.2"

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

@@ -0,0 +1,35 @@
+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/splunk_servers/app_s3_bucket?ref=v1.00.00"
+}
+
+# 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 = "Splunk Appliation Distribution"
+    Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
+  }
+}
+terraform_version_constraint = "= 1.1.6"
+terragrunt_version_constraint = "= 0.36.2"

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

@@ -0,0 +1,76 @@
+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_splunk_apps?ref=v1.00.00"
+}
+
+#Github specific provider
+generate "required_providers" {
+  path      = "required_provider.tf"
+  if_exists = "overwrite_terragrunt"
+  contents  = <<EOF
+terraform {
+  required_providers {
+    aws = {
+      source = "hashicorp/aws"
+      version = "= 3.59.0" # 2021-09-21: upgrade from 3.37.0
+    }
+    vault = {
+      source = "hashicorp/vault"
+      version = "= 2.19.1" # 2021-04-29: upgrade from 2.18.0
+    }
+    sensu = {
+      source = "jtopjian/sensu"
+      version = "= 0.10.5"
+    }
+    github = {
+      source = "integrations/github"
+      version = "4.2.0"
+    }
+  }
+}
+EOF
+}
+
+generate "github-provider" {
+  path      = "github-provider.tf"
+  if_exists = "overwrite_terragrunt"
+  contents  = <<EOF
+provider "github" {
+  organization = "content-delivery"
+  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 Splunk Apps and place in bucket"
+    Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
+  }
+  source_version = "develop"
+  enable_webhooks = false
+}
+terraform_version_constraint = "= 1.1.6"
+terragrunt_version_constraint = "= 0.36.2"

000-skeleton/account.hcl

@@ -21,7 +21,7 @@ locals {
   } 
   c2_account_standards_path = "../../mdr-TODO-c2/005-account-standards-c2" # TODO: Subsitute with test or prod
 
-  # For CIDR assignment, see https://github.mdr.defpoint.com/mdr-engineering/msoc-infrastructure/wiki/IP-Address-Allocation
+  # For CIDR assignment, see https://github.xdr.accenturefederalcyber.com/mdr-engineering/msoc-infrastructure/wiki/IP-Address-Allocation
   vpc_info = { 
     "vpc-splunk" = {
        "name" = "vpc-splunk",
@@ -31,7 +31,7 @@ locals {
     }
   } 
 
-  # Qualys Connector - See https://github.mdr.defpoint.com/mdr-engineering/msoc-infrastructure/wiki/Qualys
+  # 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
 
   # End of TODO

bin/terragrunt-apply-all

@@ -7,13 +7,17 @@ function argparse {
   while (( "$#" )); do
     case "$1" in
       -h|--help)
-        echo Usage: $0 '[-r|--refresh] [-l|--local] [-t|--test] [-s|--skipqualys] [-d|--debug]'
+        echo Usage: $0 '[-r|--refresh] [-l|--local] [-t|--test] [-u|--upgrade] [-s|--skipqualys] [-d|--debug]'
         exit 0
         ;;
       -t|--test)
         TESTING="/bin/echo TESTING: "
         shift
         ;;
+      -u|--upgrade)
+        UPGRADE="--upgrade"
+        shift
+        ;;
       -l|--local)
         LOCAL="1"
         shift
@@ -137,7 +141,7 @@ for i in `seq -f "%g*" 0 9 | sort -n`; do
           pushd . > /dev/null
           cd $i
           [[ $TESTING ]] && ${TERRAGRUNT_BIN} plan  # Run a plan if testing
-          [[ $TESTING ]] || ${TERRAGRUNT_BIN} init  # Run an init and apply
+          [[ $TESTING ]] || ${TERRAGRUNT_BIN} init ${UPGRADE}  # Run an init and apply
           [[ $TESTING ]] || ${TERRAGRUNT_BIN} apply ${REFRESH}
           EXITCODE=$?
           popd > /dev/null
@@ -149,7 +153,7 @@ for i in `seq -f "%g*" 0 9 | sort -n`; do
       EXITCODE=0
     else
       [[ $TESTING ]] && ${TERRAGRUNT_BIN} plan  # Run a plan if testing
-      [[ $TESTING ]] || ${TERRAGRUNT_BIN} init  # Run an init and apply otherwise
+      [[ $TESTING ]] || ${TERRAGRUNT_BIN} init ${UPGRADE} # Run an init and apply otherwise
       [[ $TESTING ]] || ${TERRAGRUNT_BIN} apply ${REFRESH}
       EXITCODE=$?
     fi

bin/terragrunt-apply-all-everywhere

@@ -8,7 +8,7 @@ function argparse {
   while (( "$#" )); do
     case "$1" in
       -h|--help)
-        echo Usage: $0 '[-l|--local] [-t|--test] [-s|--skipqualys] [ENVFLAGS] [-d|--debug]'
+        echo Usage: $0 '[-l|--local] [-t|--test] [-s|--skipqualys] [-u|--upgrade] [ENVFLAGS] [-d|--debug]'
         echo "       where ENVFLAGS is one or more of --envprod, --envcommon, --envtest, or --envall. --envall is the default."
         exit 1
         ;;
@@ -56,6 +56,10 @@ function argparse {
         SKIPQUALYS="--skipqualys"
         shift
         ;;
+      -u|--upgrade)
+        UPGRADE="--upgrade"
+        shift
+        ;;
 #      -p|--only-path)
 #        if [ -n "$2" ] && [ ${2:0:1} != "-" ]; then
 #          ONLY_PATH=$2
@@ -134,10 +138,10 @@ for e in ${ENVS[*]}; do
 
       EXITCODE=1 # Assume error
       if [[ $DEBUG == 1 ]]; then
-        echo debug: Would run: terragrunt-apply-all $TESTING $REFRESH $LOCAL $NOTLOCAL $debugstr $SKIPQUALYS
+        echo debug: Would run: terragrunt-apply-all $TESTING $REFRESH $LOCAL $NOTLOCAL $UPGRADE $debugstr $SKIPQUALYS
         EXITCODE=$?
       else
-        terragrunt-apply-all $TESTING $REFRESH $LOCAL $NOTLOCAL $DEBUG $SKIPQUALYS
+        terragrunt-apply-all $TESTING $REFRESH $LOCAL $NOTLOCAL $UPGRADE $DEBUG $SKIPQUALYS
         EXITCODE=$?
       fi
 

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

@@ -14,7 +14,7 @@ locals {
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
   # Double slash is intentional and required to show root of modules
-  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/iam-okta?ref=v3.0.1"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/iam-okta?ref=v3.5.16"
 }
 
 # Include all settings from the root terragrunt.hcl file
@@ -50,5 +50,5 @@ inputs = {
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
 }
-terraform_version_constraint = "= 1.0.7"
-terragrunt_version_constraint = "= 0.32.3"
+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

@@ -20,7 +20,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/account_standards_regional?ref=v3.0.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/account_standards_regional?ref=v3.5.16"
 }
 
 # 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.0.7"
-terragrunt_version_constraint = "= 0.32.3"
+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

@@ -14,7 +14,7 @@ locals {
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
   # Double slash is intentional and required to show root of modules
-  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/account_standards?ref=v3.0.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/account_standards?ref=v3.5.16"
 }
 
 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.0.7"
-terragrunt_version_constraint = "= 0.32.3"
+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

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

@@ -8,7 +8,7 @@ locals {
 
 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/shared_ami_key?ref=v3.0.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/shared_ami_key?ref=v3.5.16"
 }
 
 include {
@@ -21,5 +21,5 @@ inputs = {
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
 }
-terraform_version_constraint = "= 1.0.7"
-terragrunt_version_constraint = "= 0.32.3"
+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

@@ -13,7 +13,7 @@ locals {
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
   # Double slash is intentional and required to show root of modules
-  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/security_vpc?ref=v3.2.15"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/security_vpc?ref=v3.5.16"
 }
 
 # 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.0.7"
-terragrunt_version_constraint = "= 0.32.3"
+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

@@ -13,7 +13,7 @@ locals {
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
   # Double slash is intentional and required to show root of modules
-  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/qualys_iam_baseaccount?ref=v3.0.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/qualys_iam_baseaccount?ref=v3.5.16"
 }
 
 # Include all settings from the root terragrunt.hcl file
@@ -33,5 +33,5 @@ inputs = {
   
   pgp_key = file("../../../../keys/duane_waddle.pgp")
 }
-terraform_version_constraint = "= 1.0.7"
-terragrunt_version_constraint = "= 0.32.3"
+terraform_version_constraint = "= 1.1.6"
+terragrunt_version_constraint = "= 0.36.2"

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

@@ -13,7 +13,7 @@ locals {
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
   # Double slash is intentional and required to show root of modules
-  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/qualys_connector_role?ref=v3.0.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/qualys_connector_role?ref=v3.5.16"
 }
 
 # 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.0.7"
-terragrunt_version_constraint = "= 0.32.3"
+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

@@ -13,7 +13,7 @@ locals {
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
   # Double slash is intentional and required to show root of modules
-  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/lcp_ami_key?ref=v3.0.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/lcp_ami_key?ref=v3.5.16"
 }
 
 # 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.0.7"
-terragrunt_version_constraint = "= 0.32.3"
+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

@@ -13,7 +13,7 @@ locals {
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
   # Double slash is intentional and required to show root of modules
-  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/salt_master_inventory_role?ref=v3.0.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/salt_master_inventory_role?ref=v3.5.16"
 }
 
 # 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.0.7"
-terragrunt_version_constraint = "= 0.32.3"
+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

@@ -13,7 +13,7 @@ locals {
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
   # Double slash is intentional and required to show root of modules
-  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/codebuild_ecr_base?ref=v3.0.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/codebuild_ecr_base?ref=v3.5.16"
 }
 
 # 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.0.7"
-terragrunt_version_constraint = "= 0.32.3"
+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

@@ -13,7 +13,7 @@ locals {
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
   # Double slash is intentional and required to show root of modules
-  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/codebuild_ecr_project?ref=v3.0.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/codebuild_ecr_project?ref=v3.5.16"
 }
 
 dependency "codebuild-ecr-base" {
@@ -70,5 +70,5 @@ inputs = {
   #artifact_s3_bucket   = dependency.codebuild-ecr-base.outputs.artifact_s3_bucket
   webhook_branch_filter = "release/.*"
 }
-terraform_version_constraint = "= 1.0.7"
-terragrunt_version_constraint = "= 0.32.3"
+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

@@ -13,7 +13,7 @@ locals {
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
   # Double slash is intentional and required to show root of modules
-  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/codebuild_artifact?ref=v3.0.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/codebuild_artifact?ref=v3.5.16"
 }
 
 dependency "codebuild-ecr-base" {
@@ -68,5 +68,5 @@ inputs = {
   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.0.7"
-terragrunt_version_constraint = "= 0.32.3"
+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

@@ -13,7 +13,7 @@ locals {
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
   # Double slash is intentional and required to show root of modules
-  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/codebuild_ecr_customer_portal?ref=v3.0.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/codebuild_ecr_customer_portal?ref=v3.5.16"
 }
 
 dependency "codebuild-ecr-base" {
@@ -89,5 +89,5 @@ inputs = {
   #artifact_s3_bucket   = dependency.codebuild-ecr-base.outputs.artifact_s3_bucket
   webhook_branch_filter = "release/.*"
 }
-terraform_version_constraint = "= 1.0.7"
-terragrunt_version_constraint = "= 0.32.3"
+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

@@ -13,7 +13,7 @@ locals {
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
   # Double slash is intentional and required to show root of modules
-  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/codebuild_artifact?ref=v3.0.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/codebuild_artifact?ref=v3.5.16"
 }
 
 dependency "codebuild-ecr-base" {
@@ -68,5 +68,5 @@ inputs = {
   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.0.7"
-terragrunt_version_constraint = "= 0.32.3"
+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

@@ -13,7 +13,7 @@ locals {
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
   # Double slash is intentional and required to show root of modules
-  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/codebuild_artifact?ref=v3.0.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/codebuild_artifact?ref=v3.5.16"
 }
 
 dependency "codebuild-ecr-base" {
@@ -68,5 +68,5 @@ inputs = {
   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.0.7"
-terragrunt_version_constraint = "= 0.32.3"
+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

@@ -13,7 +13,7 @@ locals {
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
   # Double slash is intentional and required to show root of modules
-  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/codebuild_artifact?ref=v3.0.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/codebuild_artifact?ref=v3.5.16"
 }
 
 dependency "codebuild-ecr-base" {
@@ -68,5 +68,5 @@ inputs = {
   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.0.7"
-terragrunt_version_constraint = "= 0.32.3"
+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

@@ -13,7 +13,7 @@ locals {
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
   # Double slash is intentional and required to show root of modules
-  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/codebuild_ecr_project?ref=v3.0.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/codebuild_ecr_project?ref=v3.5.16"
 }
 
 dependency "codebuild-ecr-base" {
@@ -69,5 +69,5 @@ inputs = {
   artifact_s3_bucket    = ""
   #artifact_s3_bucket   = dependency.codebuild-ecr-base.outputs.artifact_s3_bucket
 }
-terraform_version_constraint = "= 1.0.7"
-terragrunt_version_constraint = "= 0.32.3"
+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

@@ -13,7 +13,7 @@ locals {
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
   # Double slash is intentional and required to show root of modules
-  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/s3_bucket_writer_role?ref=v3.0.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/s3_bucket_writer_role?ref=v3.5.16"
 }
 
 # Include all settings from the root terragrunt.hcl file
@@ -63,5 +63,5 @@ inputs = {
     dependency.bucket.outputs.kms_key_arn
   ]
 }
-terraform_version_constraint = "= 1.0.7"
-terragrunt_version_constraint = "= 0.32.3"
+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

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

prod/aws-us-gov/mdr-prod-ma-c19/165-splunk-legacy-hec/terragrunt.hcl → common/aws-us-gov/afs-mdr-common-services-gov/350-codebuild-ecr-content-generator-build-image/terragrunt.hcl

@@ -13,36 +13,50 @@ 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/splunk_servers/legacy_hec?ref=v3.0.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/codebuild_ecr_project?ref=v3.5.16"
 }
 
-generate "provider-legacy" {
-  path      = "provider-legacy.tf"
+dependency "codebuild-ecr-base" {
+  config_path = "../075-codebuild-ecr-base"
+}
+
+#Github specific provider
+generate "required_providers" {
+  path      = "required_provider.tf"
   if_exists = "overwrite_terragrunt"
   contents  = <<EOF
-provider "aws" {
-  region = "us-east-1"
-
-  assume_role {
-    role_arn = "arn:aws:iam::${local.environment_vars.locals.legacy_account}:role/user/mdr_terraformer"
-    session_name = "terraform-legacy"
+terraform {
+  required_providers {
+    aws = {
+      source = "hashicorp/aws"
+      version = "= 3.59.0" # 2021-09-21: upgrade from 3.37.0
+    }
+    vault = {
+      source = "hashicorp/vault"
+      version = "= 2.19.1" # 2021-04-29: upgrade from 2.18.0
+    }
+    sensu = {
+      source = "jtopjian/sensu"
+      version = "= 0.10.5"
+    }
+    github = {
+      source = "integrations/github"
+      version = "4.2.0"
+    }
   }
-
-  profile = "commercial"
-  alias   = "legacy"
-
-  # Only these AWS Account IDs may be operated on by this template
-  allowed_account_ids = [ ${local.environment_vars.locals.legacy_account} ]
 }
 EOF
 }
 
-dependency "vpc" {
-  config_path = "../010-vpc-splunk"
+generate "github-provider" {
+  path      = "github-provider.tf"
+  if_exists = "overwrite_terragrunt"
+  contents  = <<EOF
+provider "github" {
+  organization = "content-delivery"
+  base_url     = "https://github.xdr.accenturefederalcyber.com/"
 }
-
-dependency "indexers" {
-  config_path = "../160-splunk-indexer-cluster"
+EOF
 }
 
 # Include all settings from the root terragrunt.hcl file
@@ -56,17 +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 = "Legacy ELB for Splunk Migration"
+    Purpose = "Build Docker Container for CodeBuild that Generates Splunk App Packages"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
-    Schedule  = "none"
   }
-  prefix = local.account_vars.locals.splunk_prefix
-  vpc_id = dependency.vpc.outputs.vpc_id
-  vpc_cidr = local.account_vars.locals.vpc_info["vpc-splunk"]["cidr"]
-  azs = dependency.vpc.outputs.azs
-  public_subnets  = dependency.vpc.outputs.public_subnets
-  private_subnets  = dependency.vpc.outputs.private_subnets
-  elb_attachments = dependency.indexers.outputs.elb_attachments
+  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
 }
-terraform_version_constraint = "= 1.0.7"
-terragrunt_version_constraint = "= 0.32.3"
+terraform_version_constraint = "= 1.1.6"
+terragrunt_version_constraint = "= 0.36.2"

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

@@ -13,7 +13,7 @@ locals {
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
   # Double slash is intentional and required to show root of modules
-  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/palo_alto/panorama?ref=v3.0.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/palo_alto/panorama?ref=v3.5.16"
 }
 
 dependency "security_vpc" {
@@ -43,5 +43,5 @@ inputs = {
   subnet_cidr_map = dependency.security_vpc.outputs.subnet_cidr_map
   ebs_key = dependency.security_vpc.outputs.kms_palo_key_arn
 }
-terraform_version_constraint = "= 1.0.7"
-terragrunt_version_constraint = "= 0.32.3"
+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

@@ -13,7 +13,7 @@ locals {
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
   # Double slash is intentional and required to show root of modules
-  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/palo_alto/bootstrap?ref=v3.0.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/palo_alto/bootstrap?ref=v3.5.16"
 }
 
 dependency "security_vpc" {
@@ -40,5 +40,5 @@ inputs = {
   }
   panorama_servers = dependency.panorama.outputs.management_private_ips
 }
-terraform_version_constraint = "= 1.0.7"
-terragrunt_version_constraint = "= 0.32.3"
+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

@@ -13,7 +13,7 @@ locals {
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
   # Double slash is intentional and required to show root of modules
-  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/palo_alto/firewall_nodes?ref=v3.0.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/palo_alto/firewall_nodes?ref=v3.5.16"
 }
 
 dependency "security_vpc" {
@@ -46,5 +46,5 @@ inputs = {
   bucket_ids = dependency.palo_alto_bootstrap.outputs.bucket_ids
   instance_profile_names = dependency.palo_alto_bootstrap.outputs.instance_profile_names
 }
-terraform_version_constraint = "= 1.0.7"
-terragrunt_version_constraint = "= 0.32.3"
+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

@@ -13,7 +13,7 @@ locals {
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
   # Double slash is intentional and required to show root of modules
-  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/lcp_ami_key?ref=v3.0.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/lcp_ami_key?ref=v3.5.16"
 }
 
 # Include all settings from the root terragrunt.hcl file
@@ -36,5 +36,5 @@ inputs = {
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
 }
-terraform_version_constraint = "= 1.0.7"
-terragrunt_version_constraint = "= 0.32.3"
+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

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

common/aws-us-gov/partition.hcl

@@ -35,7 +35,6 @@ locals {
       "137793331041", # mdr-prod-doed
       "237704155425", # mdr-prod-frtib
       "520722177857", # mdr-prod-la-c19
-      "555457296585", # mdr-prod-ma-c19
       "738736370544", # mdr-prod-modelclient
       "876865127438", # mdr-prod-malware
       "417441737377", # mdr-prod-nga

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.0.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/iam?ref=v3.5.16"
 }
 
 # 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.0.7"
-terragrunt_version_constraint = "= 0.32.3"
+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

@@ -20,7 +20,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/account_standards_regional?ref=v3.0.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/account_standards_regional?ref=v3.5.16"
 }
 
 # 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.0.7"
-terragrunt_version_constraint = "= 0.32.3"
+terraform_version_constraint = "= 1.1.6"
+terragrunt_version_constraint = "= 0.36.2"

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

@@ -14,7 +14,7 @@ locals {
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
   # Double slash is intentional and required to show root of modules
-  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/account_standards?ref=v3.0.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/account_standards?ref=v3.5.16"
 }
 
 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.0.7"
-terragrunt_version_constraint = "= 0.32.3"
+terraform_version_constraint = "= 1.1.6"
+terragrunt_version_constraint = "= 0.36.2"

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

@@ -13,7 +13,7 @@ locals {
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
   # Double slash is intentional and required to show root of modules
-  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/salt_master_inventory_role?ref=v3.0.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/salt_master_inventory_role?ref=v3.5.16"
 }
 
 # 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.0.7"
-terragrunt_version_constraint = "= 0.32.3"
+terraform_version_constraint = "= 1.1.6"
+terragrunt_version_constraint = "= 0.36.2"

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

@@ -14,7 +14,7 @@ locals {
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
   # Double slash is intentional and required to show root of modules
-  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/iam-okta?ref=v3.0.1"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/iam-okta?ref=v3.5.16"
 }
 
 # Include all settings from the root terragrunt.hcl file
@@ -50,5 +50,5 @@ inputs = {
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
 }
-terraform_version_constraint = "= 1.0.7"
-terragrunt_version_constraint = "= 0.32.3"
+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

@@ -20,7 +20,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/account_standards_regional?ref=v3.0.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/account_standards_regional?ref=v3.5.16"
 }
 
 # 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.0.7"
-terragrunt_version_constraint = "= 0.32.3"
+terraform_version_constraint = "= 1.1.6"
+terragrunt_version_constraint = "= 0.36.2"

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

@@ -14,7 +14,7 @@ locals {
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
   # Double slash is intentional and required to show root of modules
-  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/account_standards?ref=v3.0.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/account_standards?ref=v3.5.16"
 }
 
 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.0.7"
-terragrunt_version_constraint = "= 0.32.3"
+terraform_version_constraint = "= 1.1.6"
+terragrunt_version_constraint = "= 0.36.2"

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

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

@@ -8,7 +8,7 @@ locals {
 
 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/dns/public_dns?ref=v3.0.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/dns/public_dns?ref=v3.5.16"
 }
 
 include {
@@ -20,5 +20,5 @@ inputs = {
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
 }
-terraform_version_constraint = "= 1.0.7"
-terragrunt_version_constraint = "= 0.32.3"
+terraform_version_constraint = "= 1.1.6"
+terragrunt_version_constraint = "= 0.36.2"

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

@@ -8,7 +8,7 @@ locals {
 
 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/shared_ami_key?ref=v3.0.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/shared_ami_key?ref=v3.5.16"
 }
 
 include {
@@ -21,5 +21,5 @@ inputs = {
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
 }
-terraform_version_constraint = "= 1.0.7"
-terragrunt_version_constraint = "= 0.32.3"
+terraform_version_constraint = "= 1.1.6"
+terragrunt_version_constraint = "= 0.36.2"

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

@@ -8,7 +8,7 @@ locals {
 
 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/dns/legacy_defpoint_com?ref=v3.0.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/dns/legacy_defpoint_com?ref=v3.5.16"
 }
 
 include {
@@ -20,5 +20,5 @@ inputs = {
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
 }
-terraform_version_constraint = "= 1.0.7"
-terragrunt_version_constraint = "= 0.32.3"
+terraform_version_constraint = "= 1.1.6"
+terragrunt_version_constraint = "= 0.36.2"

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

@@ -13,7 +13,7 @@ locals {
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
   # Double slash is intentional and required to show root of modules
-  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/security_vpc?ref=v3.2.15"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/security_vpc?ref=v3.5.16"
 }
 
 # 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.0.7"
-terragrunt_version_constraint = "= 0.32.3"
+terraform_version_constraint = "= 1.1.6"
+terragrunt_version_constraint = "= 0.36.2"

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

@@ -13,7 +13,7 @@ locals {
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
   # Double slash is intentional and required to show root of modules
-  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/qualys_iam_baseaccount?ref=v3.0.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/qualys_iam_baseaccount?ref=v3.5.16"
 }
 
 # Include all settings from the root terragrunt.hcl file
@@ -33,5 +33,5 @@ inputs = {
   
   pgp_key = file("../../../../keys/duane_waddle.pgp")
 }
-terraform_version_constraint = "= 1.0.7"
-terragrunt_version_constraint = "= 0.32.3"
+terraform_version_constraint = "= 1.1.6"
+terragrunt_version_constraint = "= 0.36.2"

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

@@ -13,7 +13,7 @@ locals {
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
   # Double slash is intentional and required to show root of modules
-  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/lcp_ami_key?ref=v3.0.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/lcp_ami_key?ref=v3.5.16"
 }
 
 # 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.0.7"
-terragrunt_version_constraint = "= 0.32.3"
+terraform_version_constraint = "= 1.1.6"
+terragrunt_version_constraint = "= 0.36.2"

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

@@ -13,7 +13,7 @@ locals {
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
   # Double slash is intentional and required to show root of modules
-  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/salt_master_inventory_role?ref=v3.0.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/salt_master_inventory_role?ref=v3.5.16"
 }
 
 # 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.0.7"
-terragrunt_version_constraint = "= 0.32.3"
+terraform_version_constraint = "= 1.1.6"
+terragrunt_version_constraint = "= 0.36.2"

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

@@ -13,7 +13,7 @@ locals {
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
   # Double slash is intentional and required to show root of modules
-  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/s3_bucket_writer_role?ref=v3.0.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/s3_bucket_writer_role?ref=v3.5.16"
 }
 
 # Include all settings from the root terragrunt.hcl file
@@ -74,5 +74,5 @@ inputs = {
     dependency.bucket.outputs.kms_key_arn
   ]
 }
-terraform_version_constraint = "= 1.0.7"
-terragrunt_version_constraint = "= 0.32.3"
+terraform_version_constraint = "= 1.1.6"
+terragrunt_version_constraint = "= 0.36.2"

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

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

@@ -13,7 +13,7 @@ locals {
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
   # Double slash is intentional and required to show root of modules
-  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/lcp_ami_key?ref=v3.0.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/lcp_ami_key?ref=v3.5.16"
 }
 
 # 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.0.7"
-terragrunt_version_constraint = "= 0.32.3"
+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

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

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

@@ -13,7 +13,7 @@ locals {
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
   # Double slash is intentional and required to show root of modules
-  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/lcp_ami_key?ref=v3.0.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/lcp_ami_key?ref=v3.5.16"
 }
 
 # 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.0.7"
-terragrunt_version_constraint = "= 0.32.3"
+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

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

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

@@ -13,7 +13,7 @@ locals {
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
   # Double slash is intentional and required to show root of modules
-  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/lcp_ami_key?ref=v3.0.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/lcp_ami_key?ref=v3.5.16"
 }
 
 # 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.0.7"
-terragrunt_version_constraint = "= 0.32.3"
+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

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

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.0.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/iam?ref=v3.5.16"
 }
 
 # 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.0.7"
-terragrunt_version_constraint = "= 0.32.3"
+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

@@ -20,7 +20,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/account_standards_regional?ref=v3.0.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/account_standards_regional?ref=v3.5.16"
 }
 
 # 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.0.7"
-terragrunt_version_constraint = "= 0.32.3"
+terraform_version_constraint = "= 1.1.6"
+terragrunt_version_constraint = "= 0.36.2"

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

@@ -14,7 +14,7 @@ locals {
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
   # Double slash is intentional and required to show root of modules
-  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/account_standards?ref=v3.0.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/account_standards?ref=v3.5.16"
 }
 
 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.0.7"
-terragrunt_version_constraint = "= 0.32.3"
+terraform_version_constraint = "= 1.1.6"
+terragrunt_version_constraint = "= 0.36.2"

prod/aws-us-gov/mdr-prod-ma-c19/007-backups/terragrunt.hcl → common/aws/mdr-cyber-range/007-aws-scheduler/terragrunt.hcl

@@ -14,7 +14,7 @@ locals {
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
   # Double slash is intentional and required to show root of modules
-  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/backups?ref=v3.2.11"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/aws_scheduler?ref=v3.5.16"
 }
 
 # Include all settings from the root terragrunt.hcl file
@@ -31,5 +31,6 @@ inputs = {
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
 }
-terraform_version_constraint = "= 1.0.7"
-terragrunt_version_constraint = "= 0.32.3"
+terraform_version_constraint = "= 1.1.6"
+terragrunt_version_constraint = "= 0.36.2"
+

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

@@ -8,7 +8,7 @@ locals {
 
 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/shared_ami_key?ref=v3.0.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/shared_ami_key?ref=v3.5.16"
 }
 
 dependency "account_standards" {
@@ -28,5 +28,5 @@ inputs = {
   vmimport_extra_keys = [ dependency.account_standards.outputs.kms_key_id ]
   vmimport_extra_buckets = [ "arn:aws:s3:::victim-windows10-enterprise-x64" ]
 }
-terraform_version_constraint = "= 1.0.7"
-terragrunt_version_constraint = "= 0.32.3"
+terraform_version_constraint = "= 1.1.6"
+terragrunt_version_constraint = "= 0.36.2"

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

@@ -13,7 +13,7 @@ locals {
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
   # Double slash is intentional and required to show root of modules
-  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/salt_master_inventory_role?ref=v3.0.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/salt_master_inventory_role?ref=v3.5.16"
 }
 
 # 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.0.7"
-terragrunt_version_constraint = "= 0.32.3"
+terraform_version_constraint = "= 1.1.6"
+terragrunt_version_constraint = "= 0.36.2"

prod/aws-us-gov/mdr-prod-ma-c19/021-qualys-connector-role/terragrunt.hcl → common/aws/mdr-cyber-range/255-phantom-archive-s3/terragrunt.hcl

@@ -13,7 +13,7 @@ locals {
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
   # Double slash is intentional and required to show root of modules
-  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/qualys_connector_role?ref=v3.0.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/phantom_s3_bucket?ref=v3.5.16"
 }
 
 # 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 = "Qualys Connector Role"
+    Purpose = "Phantom S3 Bucket for Archival Purposes"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
 }
-terraform_version_constraint = "= 1.0.7"
-terragrunt_version_constraint = "= 0.32.3"
+terraform_version_constraint = "= 1.1.6"
+terragrunt_version_constraint = "= 0.36.2"

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

@@ -6,6 +6,7 @@ locals {
   account_alias  = "afs-mdr-prod-cyber-range"
   aws_account_id = "952430311316"
   instance_termination_protection = true
+  splunk_prefix = "caasp"
   
   account_tags = { } 
   c2_account_standards_path = "../../../../prod/aws/mdr-prod-c2/005-account-standards-c2"

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.0.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/iam?ref=v3.5.16"
 }
 
 # 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.0.7"
-terragrunt_version_constraint = "= 0.32.3"
+terraform_version_constraint = "= 1.1.6"
+terragrunt_version_constraint = "= 0.36.2"

globals.hcl

@@ -13,13 +13,12 @@ locals {
     "108.203.37.38/32",    # Duane Waddle
     "24.11.231.98/32",     # George Starcher
     "99.151.37.185/32",    # Wesley Leonard
-    "70.106.200.157/32",   # John Reuther
     "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.75.199/32",    # Colby Williams
+    "97.117.83.215/32",    # Colby Williams
   ]
 
   portal_test_whitelist = [ # IPs for Portal Test and vmray
@@ -29,18 +28,17 @@ locals {
     "108.203.37.38/32",    # Duane Waddle
     "24.11.231.98/32",     # George Starcher
     "99.151.37.185/32",    # Wesley Leonard
-    "70.106.200.157/32",   # John Reuther
     "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.75.199/32",    # Colby Williams
+    "97.117.83.215/32",    # Colby Williams
     #"76.173.128.126/32",   # Jeremy Cooper
     "73.213.108.186/32",   # LaDonia Wicks
   ]
 
   admin_ips = [ 
-    "108.28.205.174/32",  # James Kerr Home
+    "71.163.33.176/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
@@ -48,11 +46,11 @@ locals {
     "100.4.76.3/32",      # Brandon Naughton Home
     "170.248.173.247/32", # AFS site
     "170.248.173.245/32", # AFS site
-    #"70.120.41.230/32",   # Will Ledesma Home - Away on Leave
     "107.207.74.118/32",  # Angelita Crawley Home
     "69.207.192.131/32",  # Aaron Flores Home
     "70.120.19.33/32",    # Hilda Colon-Martinez Home
     "198.13.82.11/32",    # Hussein Carrenard Home
+    "136.226.18.198/32",  # Jose Alvarez Home 
   ]
 
   # from https://config.zscaler.com/zscalergov.net/cenr
@@ -140,12 +138,23 @@ locals {
         "34.233.188.131/32",
       ]
     },
+    {
+      description = "FRTIB ALIGHT 2"
+      cidr_blocks = [
+        "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",
+      ]
+    },
     {
       description = "CA-C19"
       cidr_blocks = [
         "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", 
       ]
     },
     {

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

@@ -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.0.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/iam?ref=v3.5.16"
 }
 
 # 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.0.7"
-terragrunt_version_constraint = "= 0.32.3"
+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

@@ -20,7 +20,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/account_standards_regional?ref=v3.0.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/account_standards_regional?ref=v3.5.16"
 }
 
 # 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.0.7"
-terragrunt_version_constraint = "= 0.32.3"
+terraform_version_constraint = "= 1.1.6"
+terragrunt_version_constraint = "= 0.36.2"

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

@@ -14,7 +14,7 @@ locals {
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
   # Double slash is intentional and required to show root of modules
-  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/account_standards?ref=v3.0.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/account_standards?ref=v3.5.16"
 }
 
 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.0.7"
-terragrunt_version_constraint = "= 0.32.3"
+terraform_version_constraint = "= 1.1.6"
+terragrunt_version_constraint = "= 0.36.2"

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

@@ -14,7 +14,7 @@ locals {
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
   # Double slash is intentional and required to show root of modules
-  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/backups?ref=v3.2.11"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/backups?ref=v3.5.16"
 }
 
 # 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.0.7"
-terragrunt_version_constraint = "= 0.32.3"
+terraform_version_constraint = "= 1.1.6"
+terragrunt_version_constraint = "= 0.36.2"

prod/aws-us-gov/mdr-prod-afs/010-vpc-splunk/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/standard_vpc?ref=v3.2.15"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/standard_vpc?ref=v3.6.0"
 }
 
 # Include all settings from the root terragrunt.hcl file
@@ -45,5 +45,5 @@ inputs = {
   }
   accept_tgw_invitation = true
 }
-terraform_version_constraint = "= 1.0.7"
-terragrunt_version_constraint = "= 0.32.3"
+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

@@ -13,7 +13,7 @@ locals {
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
   # Double slash is intentional and required to show root of modules
-  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/qualys_connector_role?ref=v3.0.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/qualys_connector_role?ref=v3.5.16"
 }
 
 # 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.0.7"
-terragrunt_version_constraint = "= 0.32.3"
+terraform_version_constraint = "= 1.1.6"
+terragrunt_version_constraint = "= 0.36.2"

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

@@ -13,7 +13,7 @@ locals {
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
   # Double slash is intentional and required to show root of modules
-  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/salt_master_inventory_role?ref=v3.0.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/salt_master_inventory_role?ref=v3.5.16"
 }
 
 # 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.0.7"
-terragrunt_version_constraint = "= 0.32.3"
+terraform_version_constraint = "= 1.1.6"
+terragrunt_version_constraint = "= 0.36.2"

prod/aws-us-gov/mdr-prod-afs/140-splunk-frozen-bucket/terragrunt.hcl

@@ -13,7 +13,7 @@ locals {
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
   # Double slash is intentional and required to show root of modules
-  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/splunk_servers/frozen_s3_bucket?ref=v3.0.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/splunk_servers/frozen_s3_bucket?ref=v3.6.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.0.7"
-terragrunt_version_constraint = "= 0.32.3"
+terraform_version_constraint = "= 1.1.6"
+terragrunt_version_constraint = "= 0.36.2"

prod/aws-us-gov/mdr-prod-ma-c19/140-splunk-frozen-bucket/terragrunt.hcl → prod/aws-us-gov/mdr-prod-afs/145-splunk-smartstore-s3/terragrunt.hcl

@@ -13,7 +13,7 @@ locals {
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
   # Double slash is intentional and required to show root of modules
-  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/splunk_servers/frozen_s3_bucket?ref=v3.0.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/splunk_servers/smartstore_s3_bucket?ref=v3.6.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 = "Splunk Frozen Data"
+    Purpose = "Splunk SmartStore Data"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
 }
-terraform_version_constraint = "= 1.0.7"
-terragrunt_version_constraint = "= 0.32.3"
+terraform_version_constraint = "= 1.1.6"
+terragrunt_version_constraint = "= 0.36.2"

prod/aws-us-gov/mdr-prod-afs/150-splunk-cluster-master/terragrunt.hcl

@@ -13,7 +13,7 @@ locals {
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
   # Double slash is intentional and required to show root of modules
-  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/splunk_servers/cluster_master?ref=v3.0.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/splunk_servers/cluster_master?ref=v3.6.0"
 }
 
 dependency "vpc" {
@@ -41,5 +41,5 @@ inputs = {
   azs = dependency.vpc.outputs.azs
   subnets = dependency.vpc.outputs.private_subnets
 }
-terraform_version_constraint = "= 1.0.7"
-terragrunt_version_constraint = "= 0.32.3"
+terraform_version_constraint = "= 1.1.6"
+terragrunt_version_constraint = "= 0.36.2"

prod/aws-us-gov/mdr-prod-afs/160-splunk-indexer-cluster/terragrunt.hcl

@@ -13,7 +13,7 @@ locals {
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
   # Double slash is intentional and required to show root of modules
-  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/splunk_servers/indexer_cluster?ref=v3.0.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/splunk_servers/indexer_cluster?ref=v3.6.0"
 }
 
 dependency "vpc" {
@@ -43,5 +43,5 @@ inputs = {
   public_subnets  = dependency.vpc.outputs.public_subnets
   hec_listen_443 = true
 }
-terraform_version_constraint = "= 1.0.7"
-terragrunt_version_constraint = "= 0.32.3"
+terraform_version_constraint = "= 1.1.6"
+terragrunt_version_constraint = "= 0.36.2"

prod/aws-us-gov/mdr-prod-afs/165-splunk-legacy-hec/terragrunt.hcl

@@ -13,7 +13,7 @@ locals {
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
   # Double slash is intentional and required to show root of modules
-  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/splunk_servers/legacy_hec?ref=v3.0.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/splunk_servers/legacy_hec?ref=v3.6.0"
 }
 
 generate "provider-legacy" {
@@ -68,5 +68,5 @@ inputs = {
   private_subnets  = dependency.vpc.outputs.private_subnets
   elb_attachments = dependency.indexers.outputs.elb_attachments
 }
-terraform_version_constraint = "= 1.0.7"
-terragrunt_version_constraint = "= 0.32.3"
+terraform_version_constraint = "= 1.1.6"
+terragrunt_version_constraint = "= 0.36.2"

prod/aws-us-gov/mdr-prod-afs/170-splunk-searchhead/terragrunt.hcl

@@ -13,7 +13,7 @@ locals {
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
   # Double slash is intentional and required to show root of modules
-  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/splunk_servers/searchhead?ref=v3.0.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/splunk_servers/searchhead?ref=v3.6.0"
 }
 
 dependency "vpc" {
@@ -41,5 +41,5 @@ inputs = {
   azs = dependency.vpc.outputs.azs
   subnets = dependency.vpc.outputs.private_subnets
 }
-terraform_version_constraint = "= 1.0.7"
-terragrunt_version_constraint = "= 0.32.3"
+terraform_version_constraint = "= 1.1.6"
+terragrunt_version_constraint = "= 0.36.2"

prod/aws-us-gov/mdr-prod-afs/180-splunk-heavy-forwarder/terragrunt.hcl

@@ -13,7 +13,7 @@ locals {
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
   # Double slash is intentional and required to show root of modules
-  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/splunk_servers/heavy_forwarder?ref=v3.0.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/splunk_servers/heavy_forwarder?ref=v3.6.0"
 }
 
 dependency "vpc" {
@@ -41,5 +41,5 @@ inputs = {
   azs = dependency.vpc.outputs.azs
   subnets = dependency.vpc.outputs.private_subnets
 }
-terraform_version_constraint = "= 1.0.7"
-terragrunt_version_constraint = "= 0.32.3"
+terraform_version_constraint = "= 1.1.6"
+terragrunt_version_constraint = "= 0.36.2"

prod/aws-us-gov/mdr-prod-afs/195-splunk-apps-s3/terragrunt.hcl

@@ -0,0 +1,36 @@
+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/splunk_servers/app_s3_bucket?ref=v3.6.0"
+}
+
+# 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 = "Splunk Appliation Distribution"
+    Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
+  }
+  has_cust_sh = false
+}
+terraform_version_constraint = "= 1.1.6"
+terragrunt_version_constraint = "= 0.36.2"

prod/aws-us-gov/mdr-prod-ma-c19/006-account-standards-regional/us-gov-west-1/terragrunt.hcl → prod/aws-us-gov/mdr-prod-afs/360-codebuild-splunk-apps/terragrunt.hcl

@@ -2,61 +2,75 @@ 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"))
-
-  aws_partition  = local.partition_vars.locals.aws_partition
-  account_id     = local.account_vars.locals.aws_account_id
-  common_profile = local.partition_vars.locals.common_profile
-
-  target_aws_region = "us-gov-west-1"
 }
 
 # 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_regional?ref=v3.0.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/codebuild_splunk_apps?ref=v3.6.0"
 }
 
-# Include all settings from the root terragrunt.hcl file
-include {
-  path = find_in_parent_folders()
-}
-
-############# Custom provider for the region
-generate "provider" {
-  path      = "provider.tf"
+#Github specific provider
+generate "required_providers" {
+  path      = "required_provider.tf"
   if_exists = "overwrite_terragrunt"
   contents  = <<EOF
-provider "aws" {
-  region = "${local.target_aws_region}"
-
-  assume_role {
-    role_arn = "arn:${local.aws_partition}:iam::${local.account_id}:role/user/mdr_terraformer"
-    session_name = "terraform"
+terraform {
+  required_providers {
+    aws = {
+      source = "hashicorp/aws"
+      version = "= 3.59.0" # 2021-09-21: upgrade from 3.37.0
+    }
+    vault = {
+      source = "hashicorp/vault"
+      version = "= 2.19.1" # 2021-04-29: upgrade from 2.18.0
+    }
+    sensu = {
+      source = "jtopjian/sensu"
+      version = "= 0.10.5"
+    }
+    github = {
+      source = "integrations/github"
+      version = "4.2.0"
+    }
   }
+}
+EOF
+}
 
-  profile = "${local.common_profile}"
-
-  # Only these AWS Account IDs may be operated on by this template
-  allowed_account_ids = ["${local.account_id}"]
+generate "github-provider" {
+  path      = "github-provider.tf"
+  if_exists = "overwrite_terragrunt"
+  contents  = <<EOF
+provider "github" {
+  organization = "content-delivery"
+  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 Splunk Apps and place in bucket"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
+  source_version = "develop"
+  enable_webhooks = false
 }
-terraform_version_constraint = "= 1.0.7"
-terragrunt_version_constraint = "= 0.32.3"
+terraform_version_constraint = "= 1.1.6"
+terragrunt_version_constraint = "= 0.36.2"

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

@@ -56,7 +56,7 @@ locals {
   splunk_volume_sizes = {
     "cluster_master" = {
       "swap": 8,  # minimum: 8
-      "/": 10,    # minimum: 10
+      "/": 20,    # minimum: 20
       "/home": 4, # minimum: 4
       "/var": 15, # minimum: 15
       "/var/tmp": 4, # minimum: 4
@@ -67,7 +67,7 @@ locals {
     },
     "indexer" = {
       "swap": 8,  # minimum: 8
-      "/": 10,    # minimum: 10
+      "/": 20,    # minimum: 20
       "/home": 4, # minimum: 4
       "/var": 15, # minimum: 15
       "/var/tmp": 4, # minimum: 4
@@ -78,7 +78,7 @@ locals {
     },
     "searchhead" = {
       "swap": 8,  # minimum: 8
-      "/": 10,    # minimum: 10
+      "/": 20,    # minimum: 20
       "/home": 4, # minimum: 4
       "/var": 15, # minimum: 15
       "/var/tmp": 4, # minimum: 4
@@ -89,7 +89,7 @@ locals {
     },
     "heavy_forwarder" = {
       "swap": 8,  # minimum: 8
-      "/": 10,    # minimum: 10
+      "/": 20,    # minimum: 20
       "/home": 4, # minimum: 4
       "/var": 15, # minimum: 15
       "/var/tmp": 4, # minimum: 4

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

@@ -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.0.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/iam?ref=v3.5.16"
 }
 
 # 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.0.7"
-terragrunt_version_constraint = "= 0.32.3"
+terraform_version_constraint = "= 1.1.6"
+terragrunt_version_constraint = "= 0.36.2"

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

@@ -20,7 +20,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/account_standards_regional?ref=v3.0.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/account_standards_regional?ref=v3.5.16"
 }
 
 # 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.0.7"
-terragrunt_version_constraint = "= 0.32.3"
+terraform_version_constraint = "= 1.1.6"
+terragrunt_version_constraint = "= 0.36.2"

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

@@ -14,7 +14,7 @@ locals {
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
   # Double slash is intentional and required to show root of modules
-  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/account_standards?ref=v3.0.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/account_standards?ref=v3.5.16"
 }
 
 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.0.7"
-terragrunt_version_constraint = "= 0.32.3"
+terraform_version_constraint = "= 1.1.6"
+terragrunt_version_constraint = "= 0.36.2"

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

@@ -14,7 +14,7 @@ locals {
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
   # Double slash is intentional and required to show root of modules
-  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/backups?ref=v3.2.11"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/backups?ref=v3.5.16"
 }
 
 # 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.0.7"
-terragrunt_version_constraint = "= 0.32.3"
+terraform_version_constraint = "= 1.1.6"
+terragrunt_version_constraint = "= 0.36.2"

prod/aws-us-gov/mdr-prod-bas/010-vpc-splunk/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/standard_vpc?ref=v3.2.15"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/standard_vpc?ref=v3.6.0"
 }
 
 # Include all settings from the root terragrunt.hcl file
@@ -45,5 +45,5 @@ inputs = {
   }
   accept_tgw_invitation = true
 }
-terraform_version_constraint = "= 1.0.7"
-terragrunt_version_constraint = "= 0.32.3"
+terraform_version_constraint = "= 1.1.6"
+terragrunt_version_constraint = "= 0.36.2"