reverted prevent destroy variables as not compatible with terraform -…

… see hashicorp/terraform#10730
ministryofjustice · Jul 16, 2019 · 54ceddf · 54ceddf
1 parent 65d4a32
commit 54ceddf
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 15 deletions.
diff --git a/modules/s3bucket/s3bucket_kms_encryption/main.tf b/modules/s3bucket/s3bucket_kms_encryption/main.tf
@@ -7,7 +7,7 @@ resource "aws_s3_bucket" "environment" {
   }
 
   lifecycle {
-    prevent_destroy = "${var.prevent_destroy}"
+    prevent_destroy = false
   }
 
   server_side_encryption_configuration {

diff --git a/modules/s3bucket/s3bucket_kms_encryption/variables.tf b/modules/s3bucket/s3bucket_kms_encryption/variables.tf
@@ -19,7 +19,3 @@ variable "sse_algorithm" {
 variable "versioning" {
   default = false
 }
-
-variable "prevent_destroy" {
-  default = false
-}
diff --git a/modules/s3bucket/s3bucket_logging_encryption/main.tf b/modules/s3bucket/s3bucket_logging_encryption/main.tf
@@ -7,7 +7,7 @@ resource "aws_s3_bucket" "environment" {
   }
 
   lifecycle {
-    prevent_destroy = "${var.prevent_destroy}"
+    prevent_destroy = false
   }
 
   logging {

diff --git a/modules/s3bucket/s3bucket_logging_encryption/variables.tf b/modules/s3bucket/s3bucket_logging_encryption/variables.tf
@@ -27,8 +27,4 @@ variable "sse_algorithm" {
 
 variable "versioning" {
   default = false
-}
-
-variable "prevent_destroy" {
-  default = false
 }
diff --git a/modules/s3bucket/s3bucket_without_policy/main.tf b/modules/s3bucket/s3bucket_without_policy/main.tf
@@ -7,7 +7,7 @@ resource "aws_s3_bucket" "environment" {
   }
 
   lifecycle {
-    prevent_destroy = "${var.prevent_destroy}"
+    prevent_destroy = false
   }
 
   server_side_encryption_configuration {

diff --git a/modules/s3bucket/s3bucket_without_policy/variables.tf b/modules/s3bucket/s3bucket_without_policy/variables.tf
@@ -11,7 +11,3 @@ variable "tags" {
 variable "versioning" {
   default = true
 }
-
-variable "prevent_destroy" {
-  default = false
-}