Merge pull request #79 from mdr-engineering/feature/ftd_na_ApplyAllEverywhere_20200921

Rectified Issues

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

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

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

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

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

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