Merge pull request #277 from mdr-engineering/feature/ftd_na_RemoveTestVariables

Cleans up account.hcl

000-skeleton/account.hcl

@@ -31,9 +31,6 @@ locals {
     }
   } 
 
-  # For testing
-  create_test_instance = false
-
   # Qualys Connector - See https://github.mdr.defpoint.com/mdr-engineering/msoc-infrastructure/wiki/Qualys
   qualys_connector_externalid = "LATER" # Needs to come from the qualys console
 

common/aws-us-gov/afs-mdr-common-services-gov/account.hcl

@@ -21,10 +21,6 @@ locals {
     }
   }
 
-  # For testing
-  create_test_instance = false
-  test_instance_key_name = "TODO" # The key with which to provision the test instance
-
   # Panorama / Palo Alto information
   panorama_serial_numbers = [
     "000702891433",

common/aws/mdr-common-services/account.hcl

@@ -44,34 +44,4 @@ locals {
       "ns-417.awsdns-52.com",
     ],
   }
-  
-  # For testing
-  create_test_instance = false
-  test_instance_key_name = "fdamstra" # The key with which to provision the test instance
-
-# Palo Alto moved to govcloud
-#  panorama_count = 2 # We need a second serial number for 2
-#  #panorama_instance_type = "m5.2xlarge"
-#  panorama_instance_type = "t3.xlarge"
-#  panorama_key_name = "fdamstra" # DO NOT CHANGE
-#  palo_alto_count = 2 # should be divisible by 2
-#  palo_alto_instance_type = "m5.xlarge"
-#  palo_alto_key_name = "fdamstra" # DO NOT CHANGE
-#  
-#  # To generate auth keys, log in to the panorama cli and run:
-#  #   request bootstrap vm-auth-key generate lifetime 720
-#  # where 720 is the validity period in hours (720 is 30 days)
-#  # (Should only need to be valid when you stand up the firewall)
-#  palo_alto_auth_keys = [
-#    "919502713609312", # Expires at: 2020/07/30 21:32:44
-#    "655051814206833", # Expires at: 2020/07/30 21:32:45
-#  ]
-#  palo_alto_license_keys = [ # one per count
-#    "32836999",
-#    "65202677"
-#  ]
-#  palo_alto_feature_auth_keys = [ # one per count, not yet implemented
-#    "28341453",
-#    "62158825"
-#  ]
 }

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

@@ -30,9 +30,6 @@ locals {
     }
   } 
 
-  # For testing
-  create_test_instance = false
-
   # Qualys Connector - See https://github.mdr.defpoint.com/mdr-engineering/msoc-infrastructure/wiki/Qualys
   qualys_connector_externalid = "1620314156668" # Needs to come from the qualys console
 

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

@@ -196,9 +196,6 @@ locals {
   # Sensu Server
   sensu_server_instance_type = "t3a.medium"
 
-  # For testing
-  create_test_instance = false
-
   # AS Number used for various resources, but not every account needs one.
   asn = 64810
 

prod/aws-us-gov/mdr-prod-ca-c19/account.hcl

@@ -31,9 +31,6 @@ locals {
     }
   } 
 
-  # For testing
-  create_test_instance = false
-
   # Qualys Connector - See https://github.mdr.defpoint.com/mdr-engineering/msoc-infrastructure/wiki/Qualys
   qualys_connector_externalid = "1622013079905" # Needs to come from the qualys console
 

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

@@ -31,9 +31,6 @@ locals {
     }
   } 
 
-  # For testing
-  create_test_instance = false
-
   # Qualys Connector - See https://github.mdr.defpoint.com/mdr-engineering/msoc-infrastructure/wiki/Qualys
   qualys_connector_externalid = "1617492333604" # Needs to come from the qualys console
 

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

@@ -31,9 +31,6 @@ locals {
     }
   } 
 
-  # For testing
-  create_test_instance = false
-
   # Qualys Connector - See https://github.mdr.defpoint.com/mdr-engineering/msoc-infrastructure/wiki/Qualys
   qualys_connector_externalid = "1619382305452" # Needs to come from the qualys console
 

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

@@ -30,9 +30,6 @@ locals {
     }
   } 
 
-  # For testing
-  create_test_instance = false
-
   # Qualys Connector - See https://github.mdr.defpoint.com/mdr-engineering/msoc-infrastructure/wiki/Qualys
   qualys_connector_externalid = "1616459938233" # Needs to come from the qualys console
 

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

@@ -31,9 +31,6 @@ locals {
     }
   } 
 
-  # For testing
-  create_test_instance = false
-
   # Qualys Connector - See https://github.mdr.defpoint.com/mdr-engineering/msoc-infrastructure/wiki/Qualys
   qualys_connector_externalid = "LATER" # Needs to come from the qualys console
 

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

@@ -21,9 +21,6 @@ locals {
   }
   jira_rds_storage = 50
 
-  # For testing
-  create_test_instance = false
-
   aws_waf_logs_hec_token = "FA38B8DD-1398-46D0-BD79-BA046C6064B0"
   portal_data_sync_hec_token = "eb79bb2d-b27d-455d-bc5c-e8cf3165b294"
 

prod/aws/mdr-prod-c2/account.hcl

@@ -37,10 +37,6 @@ locals {
   # DNS Resolver
   resolver_instance_type = "t3a.micro"
 
-  # For testing
-  create_test_instance = false
-  test_instance_key_name = "fdamstra" # They with which to provision the test instance
-
   # AS Number used for various resources, but not every account needs one.
   asn = 64800
 

prod/aws/mdr-prod-ca-c19/account.hcl

@@ -31,9 +31,6 @@ locals {
     }
   } 
 
-  # For testing
-  create_test_instance = false
-
   # Qualys Connector - See https://github.mdr.defpoint.com/mdr-engineering/msoc-infrastructure/wiki/Qualys
   qualys_connector_externalid = "LATER" # Needs to come from the qualys console
 

prod/aws/mdr-prod-doed/account.hcl

@@ -31,9 +31,6 @@ locals {
     }
   } 
 
-  # For testing
-  create_test_instance = false
-
   # Qualys Connector - See https://github.mdr.defpoint.com/mdr-engineering/msoc-infrastructure/wiki/Qualys
   qualys_connector_externalid = "LATER" # Needs to come from the qualys console
 

prod/aws/mdr-prod-frtib/account.hcl

@@ -31,9 +31,6 @@ locals {
     }
   } 
 
-  # For testing
-  create_test_instance = false
-
   # Qualys Connector - See https://github.mdr.defpoint.com/mdr-engineering/msoc-infrastructure/wiki/Qualys
   qualys_connector_externalid = "LATER" # Needs to come from the qualys console
 

test/aws-us-gov/mdr-test-c2/account.hcl

@@ -207,15 +207,6 @@ locals {
   alsi_elastic_alb = true # https://moose-alsi-elastic.xdr{,test}.accenturefederalcyber.com -> 9200
   alsi_hec_alb = true # https://moose-alsi-hec.xdr{,test}.accenturefederalcyber.com -> 8080
 
-  # For testing:
-  # Note: instead of changing this here, you can pass parameters to terragrunt on the CLI, such as:
-  #   TFVAR_create_test_instance=true TFVAR_test_instance_ami=base terragrunt apply
-  create_test_instance = false
-  # Extra customization if you want it
-  #test_instance_key_name = "fdamstra" # They with which to provision the test instance
-  #test_instance_ami = "base" # default = minion
-  #test_instance_type = "t3a.micro" # default = t3a.micro
-
   # AS Number used for various resources, but not every account needs one.
   asn = 64710 # changing this replaces the gateway
 

test/aws-us-gov/mdr-test-malware/account.hcl

@@ -22,10 +22,6 @@ locals {
     }
   }
 
-  # For testing
-  create_test_instance = false
-  test_instance_key_name = "fdamstra" # if you change it, it will be rebuilt
-
   # VMRay Specific
   vmray_server_instance_type = "t3a.micro"
   vmray_worker_instance_type = "c5n.metal"

test/aws-us-gov/mdr-test-modelclient/account.hcl

@@ -27,15 +27,6 @@ locals {
     }
   } 
 
-  # For testing:
-  # Note: instead of changing this here, you can pass parameters to terragrunt on the CLI, such as:
-  #   TFVAR_create_test_instance=true TFVAR_test_instance_ami=base terragrunt apply
-  create_test_instance = false
-  # Extra customization if you want it
-  #test_instance_key_name = "fdamstra" # They with which to provision the test instance
-  #test_instance_ami = "base" # default = minion
-  #test_instance_type = "t3a.micro" # default = t3a.micro
-  
   # Qualys Connector
   qualys_connector_externalid = "LATER" # Needs to come from the qualys console
 

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

@@ -21,10 +21,6 @@ locals {
   }
   jira_rds_storage = 50
 
-  # For testing
-  create_test_instance = false
-  test_instance_key_name = "TODO" # They with which to provision the test instance
-
   aws_waf_logs_hec_token = "FA38B8DD-1398-46D0-BD79-BA046C6064B0"
   portal_data_sync_hec_token = "eb79bb2d-b27d-455d-bc5c-e8cf3165b294"
 

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

@@ -25,10 +25,6 @@ locals {
   # DNS Resolver
   resolver_instance_type = "t3a.micro"
 
-  # For testing
-  create_test_instance = false
-  test_instance_key_name = "fdamstra" # They with which to provision the test instance
-
   # AS Number used for various resources, but not every account needs one.
   asn = 64700
   security_vpc_cidr = "10.179.132.0/22"

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

@@ -20,8 +20,4 @@ locals {
       tgw_attached = true,
     }
   }
-
-  # For testing
-  create_test_instance = false
-  test_instance_key_name = "fdamstra" # The key with which to provision the test instance
 }