Merge pull request #296 from mdr-engineering/hotfix/ftd_ApplyAllUpdates

Updates for ApplyAllEverywhere

bin/terragrunt-apply-all-everywhere

@@ -4,10 +4,12 @@
 
 function argparse {
   PARAMS=""
+  ENVS=()
   while (( "$#" )); do
     case "$1" in
       -h|--help)
-        echo Usage: $0 '[-l|--local] [-t|--test] [-s|--skipqualys] [-d|--debug]'
+        echo Usage: $0 '[-l|--local] [-t|--test] [-s|--skipqualys] [ENVFLAGS] [-d|--debug]'
+        echo "       where ENVFLAGS is one or more of --envprod, --envcommon, --envtest, or --envall. --envall is the default."
         exit 1
         ;;
       -t|--test)
@@ -28,6 +30,24 @@ function argparse {
         debugstr="--debug"
         shift
         ;;
+      --envall)
+        ENVS+=("test")
+        ENVS+=("common")
+        ENVS+=("prod")
+        shift
+        ;;
+      --envtest)
+        ENVS+=("test")
+        shift
+        ;;
+      --envcommon)
+        ENVS+=("common")
+        shift
+        ;;
+      --envprod)
+        ENVS+=("prod")
+        shift
+        ;;
       -s|--skipqualys)
         SKIPQUALYS="--skipqualys"
         shift
@@ -51,6 +71,12 @@ function argparse {
         ;;
     esac
   done
+  if [[ ${#ENVS[@]} == 0 ]]; then
+    # Default to all environments
+    ENVS+=("test")
+    ENVS+=("common")
+    ENVS+=("prod")
+  fi
   # set positional arguments in their proper place
   eval set -- "$PARAMS"
 }
@@ -74,7 +100,8 @@ if [[ $SHORT_PWD != "xdr-terraform-live" ]]; then
   fi
 fi
 
-for e in test common prod; do
+[[ $DEBUG == 1 ]] && >&2 echo debug: ENVS=${ENVS[*]}
+for e in ${ENVS}; do
   pushd $e > /dev/null
   for p in aws aws-us-gov; do
     pushd $p > /dev/null

prod/aws-us-gov/mdr-prod-c2/250-phantom/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/phantom?ref=v1.23.15"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/phantom?ref=v1.23.23"
 }
 
 dependency "vpc" {

test/aws-us-gov/mdr-test-c2/250-phantom/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/phantom?ref=v1.23.15"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/phantom?ref=v1.23.23"
 }
 
 dependency "vpc" {

test/aws/legacy-mdr-test/022-attach-transit-gateway-to-legacy-customer-portal/terragrunt.hcl

@@ -19,7 +19,7 @@ dependency "transit_gateway" {
 # 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/transit_gateway_client?ref=v0.8.3"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/terminated?ref=v1.23.22"
 }
 
 # Include all settings from the root terragrunt.hcl file

test/aws/legacy-mdr-test/045-kinesis-firehose-portal-data-sync/terragrunt.hcl

@@ -38,8 +38,10 @@ inputs = {
   cloudtrail_key_arn = dependency.c2_account_standards.outputs.cloudtrail_logging_bucket.kms_key_id
 
   region = local.region_vars.locals.aws_region
-  arn_cloudwatch_logs_to_ship = "arn:${local.partition_vars.locals.aws_partition}:logs:${local.region_vars.locals.aws_region}::log-group:/aws/lambda/portal_data_sync"
-  name_cloudwatch_logs_to_ship = "/aws/lambda/portal_data_sync"
+  #arn_cloudwatch_logs_to_ship = "arn:${local.partition_vars.locals.aws_partition}:logs:${local.region_vars.locals.aws_region}::log-group:/aws/lambda/portal_data_sync"
+  arn_cloudwatch_logs_to_ship = "arn:${local.partition_vars.locals.aws_partition}:logs:${local.region_vars.locals.aws_region}::log-group:/aws/lambda/test_portal_data_sync"
+  #name_cloudwatch_logs_to_ship = "/aws/lambda/portal_data_sync"
+  name_cloudwatch_logs_to_ship = "/aws/lambda/test_portal_data_sync"
   hec_token = local.account_vars.locals.portal_data_sync_hec_token
   hec_url = "https://${local.environment_vars.locals.hec_pub_ack}:8088"
   firehose_name = "portal_data_sync_to_splunk"

test/aws/legacy-mdr-test/account.hcl

@@ -35,14 +35,14 @@ locals {
     "arn:aws:iam::527700175026:role/mdr_powerusers",
     "arn:aws:iam::527700175026:role/msoc-default-instance-role",
     "arn:aws:iam::527700175026:role/aws-service-role/autoscaling.amazonaws.com/AWSServiceRoleForAutoScaling",
-    "arn:aws:iam::527700175026:role/portal-instance-role",
+#    "arn:aws:iam::527700175026:role/portal-instance-role", # disalbed 2021-04
     "arn:aws:iam::527700175026:role/mdr_iam_admins"
   ]
   extra_ebs_key_attachers = [
     "arn:aws:iam::527700175026:role/mdr_powerusers",
     "arn:aws:iam::527700175026:role/msoc-default-instance-role",
     "arn:aws:iam::527700175026:role/aws-service-role/autoscaling.amazonaws.com/AWSServiceRoleForAutoScaling",
-    "arn:aws:iam::527700175026:role/portal-instance-role",
+#    "arn:aws:iam::527700175026:role/portal-instance-role",
   ] 
 
   # Legacy information