Revert "INFRA-516 add lifecycle support for expire and transition"

This reverts commit e32ffa9.

Author: wesleung-appzen

main.tf

@@ -93,22 +93,9 @@ resource "aws_s3_bucket" "this" {
   tags = "${module.labels.tags[count.index]}"
 }
 
-resource "aws_s3_bucket_lifecycle_configuration" "abort" {
-  count  = "${var.lc_abort_day != "" ? 1 : 0}"
-  bucket = "${aws_s3_bucket.this.bucket}"
-
-  rule {
-    id = "abort"
-    abort_incomplete_multipart_upload {
-      days_after_initiation = "${var.lc_abort_day}"
-    }
-    status = "Enabled"
-  }
-}
-
 resource "aws_s3_bucket_lifecycle_configuration" "expire" {
   count  = "${var.lc_expire_day != "" ? 1 : 0}"
-  bucket = "${aws_s3_bucket.this.bucket}"
+  bucket = aws_s3_bucket.this.bucket
 
   rule {
     id = "expire"
@@ -122,9 +109,9 @@ resource "aws_s3_bucket_lifecycle_configuration" "expire" {
   }
 }
 
-resource "aws_s3_bucket_lifecycle_configuration" "transition" {
+resource "aws_s3_bucket_lifecycle_configuration" "expire" {
   count  = "${var.lc_transition_day != "" ? 1 : 0}"
-  bucket = "${aws_s3_bucket.this.bucket}"
+  bucket = aws_s3_bucket.this.bucket
 
   rule {
     id = "transition"

variables.tf

@@ -150,11 +150,6 @@ variable "restrict_public_buckets" {
   default     = true
 }
 
-variable "lc_abort_day" {
-  description = "S3 LifeCycle abort_incomplete_multipart_upload days"
-  default     = "1"
-}
-
 variable "lc_expire_day" {
   description = "S3 LifeCycle expiration days"
   default     = ""