Przeglądaj źródła

Fixes Issues Encountered During `terragrunt-apply-all-everywhere`

* VPC modules needed updating / locking to version
* GHE backup needed to ignore lifecycle for ebs volumes
* VMRay and Modelclient Instances marked as 'terminated' as they don't exist
* Keycloak module pointed to invalid tag
* Teleport module pointed to outdated tag
* Nessus pointed to updated tag
* Updates shared-ami-key to latest
Fred Damstra [afs macbook] 4 lat temu
rodzic
commit
71361b9214
20 zmienionych plików z 25 dodań i 20 usunięć
  1. 1 1
      common/aws-us-gov/afs-mdr-common-services-gov/015-security-vpc/terragrunt.hcl
  2. 1 1
      common/aws/mdr-common-services/015-security-vpc/terragrunt.hcl
  3. 1 1
      common/aws/mdr-cyber-range/010-shared-ami-key/terragrunt.hcl
  4. 1 1
      prod/aws-us-gov/mdr-prod-c2/015-security-vpc-interconnects/terragrunt.hcl
  5. 1 1
      prod/aws-us-gov/mdr-prod-c2/090-instance-github/terragrunt.hcl
  6. 1 1
      prod/aws-us-gov/mdr-prod-c2/270-nessus-security-center/terragrunt.hcl
  7. 1 1
      prod/aws-us-gov/mdr-prod-c2/275-nessus-security-scanners/terragrunt.hcl
  8. 1 1
      test/aws-us-gov/mdr-test-c2/015-security-vpc-interconnects/terragrunt.hcl
  9. 1 1
      test/aws-us-gov/mdr-test-c2/030-qualys-vpc/terragrunt.hcl
  10. 1 1
      test/aws-us-gov/mdr-test-c2/071-instance-salt-master/terragrunt.hcl
  11. 1 1
      test/aws-us-gov/mdr-test-c2/090-instance-github/terragrunt.hcl
  12. 1 1
      test/aws-us-gov/mdr-test-c2/090-instance-keycloak/terragrunt.hcl
  13. 1 1
      test/aws-us-gov/mdr-test-c2/090-instance-teleport/terragrunt.hcl
  14. 1 1
      test/aws-us-gov/mdr-test-c2/270-nessus-security-center/terragrunt.hcl
  15. 1 1
      test/aws-us-gov/mdr-test-c2/275-nessus-security-scanners/terragrunt.hcl
  16. 2 1
      test/aws-us-gov/mdr-test-malware/044-VMRay-Instances/terragrunt.hcl
  17. 2 1
      test/aws-us-gov/mdr-test-modelclient/150-splunk-cluster-master/terragrunt.hcl
  18. 2 1
      test/aws-us-gov/mdr-test-modelclient/160-splunk-indexer-cluster/terragrunt.hcl
  19. 2 1
      test/aws-us-gov/mdr-test-modelclient/170-splunk-searchhead/terragrunt.hcl
  20. 2 1
      test/aws-us-gov/mdr-test-modelclient/180-splunk-heavy-forwarder/terragrunt.hcl

+ 1 - 1
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=v1.20.8"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/security_vpc?ref=v1.23.22"
 }
 
 # Include all settings from the root terragrunt.hcl file

+ 1 - 1
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=v1.20.8"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/security_vpc?ref=v1.23.22"
 }
 
 # Include all settings from the root terragrunt.hcl file

+ 1 - 1
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=v1.10.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/shared_ami_key?ref=v1.23.22"
 }
 
 dependency "account_standards" {

+ 1 - 1
prod/aws-us-gov/mdr-prod-c2/015-security-vpc-interconnects/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=v1.20.8"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/security_vpc?ref=v1.23.22"
 }
 
 # Include all settings from the root terragrunt.hcl file

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

+ 1 - 1
prod/aws-us-gov/mdr-prod-c2/270-nessus-security-center/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/nessus/instance_security_center?ref=v1.23.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/nessus/instance_security_center?ref=v1.23.22"
 }
 
 dependency "vpc" {

+ 1 - 1
prod/aws-us-gov/mdr-prod-c2/275-nessus-security-scanners/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/nessus/instance_nessus_scanner?ref=v1.23.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/nessus/instance_nessus_scanner?ref=v1.23.22"
 }
 
 dependency "vpc" {

+ 1 - 1
test/aws-us-gov/mdr-test-c2/015-security-vpc-interconnects/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=v1.20.8"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/security_vpc?ref=v1.23.22"
 }
 
 # Include all settings from the root terragrunt.hcl file

+ 1 - 1
test/aws-us-gov/mdr-test-c2/030-qualys-vpc/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/qualys_scanners?ref=v1.20.8"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/qualys_scanners?ref=v1.23.22"
 }
 
 # Include all settings from the root terragrunt.hcl file

+ 1 - 1
test/aws-us-gov/mdr-test-c2/071-instance-salt-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/salt_master?ref=v1.23.10"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/salt_master?ref=v1.23.21"
 }
 
 dependency "vpc-system-services" {

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

+ 1 - 1
test/aws-us-gov/mdr-test-c2/090-instance-keycloak/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/keycloak-single-instance?ref=v1.20.7"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/keycloak-single-instance?ref=v1.23.21"
 }
 
 dependency "vpc-public" {

+ 1 - 1
test/aws-us-gov/mdr-test-c2/090-instance-teleport/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/teleport-single-instance?ref=v1.10.5"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/teleport-single-instance?ref=v1.23.21"
 }
 
 dependency "vpc-system-services" {

+ 1 - 1
test/aws-us-gov/mdr-test-c2/270-nessus-security-center/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/nessus/instance_security_center?ref=v1.23.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/nessus/instance_security_center?ref=v1.23.22"
 }
 
 dependency "vpc" {

+ 1 - 1
test/aws-us-gov/mdr-test-c2/275-nessus-security-scanners/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/nessus/instance_nessus_scanner?ref=v1.23.0"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/nessus/instance_nessus_scanner?ref=v1.23.22"
 }
 
 dependency "vpc" {

+ 2 - 1
test/aws-us-gov/mdr-test-malware/044-VMRay-Instances/terragrunt.hcl

@@ -18,7 +18,8 @@ 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/vmray_instances?ref=v0.9.4"
+  #source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/vmray_instances?ref=v0.9.4"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/terminated?ref=v1.23.6"
 }
 
 # Include all settings from the root terragrunt.hcl file

+ 2 - 1
test/aws-us-gov/mdr-test-modelclient/150-splunk-cluster-master/terragrunt.hcl

@@ -13,7 +13,8 @@ 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=v1.23.4"
+  #source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/splunk_servers/cluster_master?ref=v1.23.4"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/terminated?ref=v1.23.4"
 }
 
 dependency "vpc" {

+ 2 - 1
test/aws-us-gov/mdr-test-modelclient/160-splunk-indexer-cluster/terragrunt.hcl

@@ -13,7 +13,8 @@ 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=v1.23.4"
+  #source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/splunk_servers/indexer_cluster?ref=v1.23.4"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/terminated?ref=v1.23.4"
 }
 
 dependency "vpc" {

+ 2 - 1
test/aws-us-gov/mdr-test-modelclient/170-splunk-searchhead/terragrunt.hcl

@@ -13,7 +13,8 @@ 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=v1.23.13"
+#  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/splunk_servers/searchhead?ref=v1.23.13"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/terminated?ref=v1.23.4"
 }
 
 dependency "vpc" {

+ 2 - 1
test/aws-us-gov/mdr-test-modelclient/180-splunk-heavy-forwarder/terragrunt.hcl

@@ -13,7 +13,8 @@ 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=v1.23.4"
+#  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/splunk_servers/heavy_forwarder?ref=v1.23.4"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/terminated?ref=v1.23.4"
 }
 
 dependency "vpc" {