From 494634d102980875c18ef64ccba94d32fd9f1170 Mon Sep 17 00:00:00 2001 From: Owen Ben Davies <734943+owenbendavies@users.noreply.github.com> Date: Sun, 14 Apr 2024 12:08:35 +0100 Subject: [PATCH] Remove Terraform prevent_destroy --- .../modules/aws_cloudfront/main.tf | 4 ---- .../modules/aws_cognito/main.tf | 4 ---- .../app_environment/modules/aws_s3/main.tf | 8 -------- .../app_environment/modules/heroku/main.tf | 20 ------------------- 4 files changed, 36 deletions(-) diff --git a/terraform/app_environment/modules/aws_cloudfront/main.tf b/terraform/app_environment/modules/aws_cloudfront/main.tf index 1150ca5b2f..bc7ff04e0f 100644 --- a/terraform/app_environment/modules/aws_cloudfront/main.tf +++ b/terraform/app_environment/modules/aws_cloudfront/main.tf @@ -19,10 +19,6 @@ resource "aws_cloudfront_distribution" "assets" { } } - lifecycle { - prevent_destroy = true - } - logging_config { bucket = var.logs_domain prefix = "AWSLogs/${data.aws_caller_identity.main.account_id}/cloudfront/${var.name}/" diff --git a/terraform/app_environment/modules/aws_cognito/main.tf b/terraform/app_environment/modules/aws_cognito/main.tf index b29d66f630..1cba6a8ea6 100644 --- a/terraform/app_environment/modules/aws_cognito/main.tf +++ b/terraform/app_environment/modules/aws_cognito/main.tf @@ -19,10 +19,6 @@ resource "aws_cognito_user_pool" "app" { allow_admin_create_user_only = true } - lifecycle { - prevent_destroy = true - } - schema { attribute_data_type = "String" mutable = true diff --git a/terraform/app_environment/modules/aws_s3/main.tf b/terraform/app_environment/modules/aws_s3/main.tf index eb9f096469..30be6faaa5 100644 --- a/terraform/app_environment/modules/aws_s3/main.tf +++ b/terraform/app_environment/modules/aws_s3/main.tf @@ -1,10 +1,6 @@ resource "aws_s3_bucket" "assets" { bucket = var.name - lifecycle { - prevent_destroy = true - } - lifecycle_rule { abort_incomplete_multipart_upload_days = 1 enabled = true @@ -37,10 +33,6 @@ resource "aws_s3_bucket" "logs" { acl = "log-delivery-write" bucket = "${var.name}-logs" - lifecycle { - prevent_destroy = true - } - lifecycle_rule { abort_incomplete_multipart_upload_days = 1 enabled = true diff --git a/terraform/app_environment/modules/heroku/main.tf b/terraform/app_environment/modules/heroku/main.tf index 398e6b3cf1..4aef17a3d7 100644 --- a/terraform/app_environment/modules/heroku/main.tf +++ b/terraform/app_environment/modules/heroku/main.tf @@ -1,37 +1,21 @@ resource "heroku_addon" "app_postgresql" { app_id = heroku_app.app.id plan = "heroku-postgresql:mini" - - lifecycle { - prevent_destroy = true - } } resource "heroku_addon" "app_rollbar" { app_id = heroku_app.app.id plan = "rollbar:trial-5k" - - lifecycle { - prevent_destroy = false - } } resource "heroku_addon" "app_scheduler" { app_id = heroku_app.app.id plan = "scheduler:standard" - - lifecycle { - prevent_destroy = true - } } resource "heroku_addon" "app_scout" { app_id = heroku_app.app.id plan = "scout:chair" - - lifecycle { - prevent_destroy = false - } } resource "heroku_app" "app" { @@ -44,10 +28,6 @@ resource "heroku_app" "app" { "heroku/ruby", ] - lifecycle { - prevent_destroy = true - } - sensitive_config_vars = { AWS_ACCESS_KEY_ID = var.aws_access_key_id AWS_COGNITO_CLIENT_ID = var.aws_cognito_client_id