Delete environment fixes

aws/common/newrelic.tf

@@ -91,7 +91,7 @@ resource "newrelic_api_access_key" "newrelic_aws_access_key" {
   count      = var.enable_new_relic && var.env != "production" ? 1 : 0
   account_id = var.new_relic_account_id
   key_type   = "USER"
-  name       = "notify_tf_provider"
+  name       = var.env == "staging" ? "notify_tf_provider" : "notify_tf_provider_${var.env}"
   notes      = "Used by Notify Terraform Code to create New Relic Resources"
 }
 
@@ -119,8 +119,8 @@ EOF
 resource "random_string" "s3-bucket-name" {
   count   = var.enable_new_relic && var.env != "production" ? 1 : 0
   length  = 8
-  special = true
-  upper   = true
+  special = false
+  upper   = false
 }
 
 resource "aws_s3_bucket" "newrelic_aws_bucket" {

env/dev_config.tfvars

@@ -40,7 +40,7 @@ notification_queue_prefix              = "eks-notification-canada-ca"
 
 # ENVIRONMENT
 enable_new_relic           = true
-create_cbs_bucket          = true
+create_cbs_bucket          = false
 force_destroy_s3           = true
 force_delete_ecr           = true
 force_destroy_athena       = true

scripts/deleteEnvironment.sh

@@ -56,6 +56,9 @@ echo "Done."
 echo "Deleting Cloud Based Sensor S3 Bucket..."
 pushd ../env/$ENVIRONMENT/common
 terragrunt destroy -var-file ../$ENVIRONMENT.tfvars --target module.cbs_logs_bucket --terragrunt-non-interactive -auto-approve
+terragrunt destroy -var-file ../$ENVIRONMENT.tfvars --target 'newrelic_cloud_aws_link_account.newrelic_cloud_integration_push[0]' --terragrunt-non-interactive -auto-approve
+terragrunt destroy -var-file ../$ENVIRONMENT.tfvars --target 'newrelic_api_access_key.newrelic_aws_access_key[0]' --terragrunt-non-interactive -auto-approve
+terragrunt destroy -var-file ../$ENVIRONMENT.tfvars --target 'newrelic_cloud_aws_link_account.newrelic_cloud_integration_pull[0]' --terragrunt-non-interactive -auto-approve
 popd
 echo "Done."