reverted prevent destroy variables as not compatible with terraform - see hashicorp/terraform#10730

Paul Crimes · Paul Crimes · commit 54ceddffc916 · 2019-07-16T11:19:04.000+01:00
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
-}

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ resource "aws_s3_bucket" "environment" {`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`lifecycle {`
`10`		`- prevent_destroy = "${var.prevent_destroy}"`
	`10`	`+ prevent_destroy = false`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`server_side_encryption_configuration {`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,3 @@ variable "sse_algorithm" {`
`19`	`19`	`variable "versioning" {`
`20`	`20`	`default = false`
`21`	`21`	`}`
`22`		`-`
`23`		`-variable "prevent_destroy" {`
`24`		`- default = false`
`25`		`-}`
Original file line number	Diff line number	Diff line change
`@@ -27,8 +27,4 @@ variable "sse_algorithm" {`
`27`	`27`
`28`	`28`	`variable "versioning" {`
`29`	`29`	`default = false`
`30`		`-}`
`31`		`-`
`32`		`-variable "prevent_destroy" {`
`33`		`- default = false`
`34`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,3 @@ variable "tags" {`
`11`	`11`	`variable "versioning" {`
`12`	`12`	`default = true`
`13`	`13`	`}`
`14`		`-`
`15`		`-variable "prevent_destroy" {`
`16`		`- default = false`
`17`		`-}`