Browse Source

Updates terragrunt-apply-all to support --upgrade; Updates C2 to 3.4.0

Fred Damstra [afs macbook] 3 years ago
parent
commit
59ec834fa4

+ 7 - 3
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

+ 1 - 1
prod/aws-us-gov/mdr-prod-c2/005-account-standards-c2/terragrunt.hcl

@@ -15,7 +15,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_c2?ref=v3.0.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/account_standards_c2?ref=v3.4.0"
 }
 
 # Include all settings from the root terragrunt.hcl file

+ 1 - 1
prod/aws/mdr-prod-c2/005-account-standards-c2/terragrunt.hcl

@@ -15,7 +15,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_c2?ref=v3.0.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/account_standards_c2?ref=v3.4.0"
 }
 
 # Include all settings from the root terragrunt.hcl file

+ 1 - 1
test/aws-us-gov/mdr-test-c2/005-account-standards-c2/terragrunt.hcl

@@ -15,7 +15,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_c2?ref=v3.0.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/account_standards_c2?ref=v3.4.0"
 }
 
 # Include all settings from the root terragrunt.hcl file

+ 1 - 1
test/aws-us-gov/mdr-test-modelclient/190-splunk-customer-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/customer_searchhead?ref=v3.3.8"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/splunk_servers/customer_searchhead?ref=v3.4.0"
 }
 
 dependency "vpc" {

+ 1 - 1
test/aws/mdr-test-c2/005-account-standards-c2/terragrunt.hcl

@@ -15,7 +15,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_c2?ref=v3.0.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/account_standards_c2?ref=v3.4.0"
 }
 
 # Include all settings from the root terragrunt.hcl file