From 7bff71fe0dbcc8072793220e9a89dd7363e34314 Mon Sep 17 00:00:00 2001
From: Ryan King <rking@chanzuckerberg.com>
Date: Tue, 3 Dec 2019 14:44:49 -0800
Subject: [PATCH 1/2] [feature] lifecycle policy for s3 buckets

S3 buckets will now have a lifecycle policy that does a few things

1. incomplete multipart uploads will be aborted after 14 days [doc](https://docs.aws.amazon.com/AmazonS3/latest/dev/mpuoverview.html#mpu-abort-incomplete-mpu-lifecycle-config)
2. non-current versions will be moved to infrequent-access storage after 30 days
3. non-current versions will be deleted after 365 days

The test for this module is also changed from just 'init' to doing an apply.
---
 aws-s3-private-bucket/main.tf        | 21 +++++++++++++++++++++
 aws-s3-private-bucket/module_test.go | 27 +++++++++++++++++++++++----
 aws-s3-private-bucket/variables.tf   |  6 ++++++
 3 files changed, 50 insertions(+), 4 deletions(-)

diff --git a/aws-s3-private-bucket/main.tf b/aws-s3-private-bucket/main.tf
index f37ee62c..4b9d621a 100755
--- a/aws-s3-private-bucket/main.tf
+++ b/aws-s3-private-bucket/main.tf
@@ -18,6 +18,27 @@ resource "aws_s3_bucket" "bucket" {
     enabled = var.enable_versioning
   }
 
+  lifecycle_rule {
+    enabled = true
+
+    abort_incomplete_multipart_upload_days = var.abort_incomplete_multipart_upload_days
+
+    expiration {
+      expired_object_delete_marker = true
+    }
+
+    noncurrent_version_transition {
+      days          = 30
+      storage_class = "STANDARD_IA"
+    }
+
+    noncurrent_version_expiration {
+      days = 365
+    }
+  }
+
+
+
   # TODO
   #   logging {
   #   target_bucket = ""
diff --git a/aws-s3-private-bucket/module_test.go b/aws-s3-private-bucket/module_test.go
index 9a58e4d8..770f8fbd 100644
--- a/aws-s3-private-bucket/module_test.go
+++ b/aws-s3-private-bucket/module_test.go
@@ -3,12 +3,31 @@ package test
 import (
 	"testing"
 
+	"github.com/chanzuckerberg/cztack/testutil"
 	"github.com/gruntwork-io/terratest/modules/terraform"
 )
 
 func TestPrivateBucket(t *testing.T) {
-	options := &terraform.Options{
-		TerraformDir: ".",
-	}
-	terraform.Init(t, options)
+
+	project := testutil.UniqueId()
+	env := testutil.UniqueId()
+	service := testutil.UniqueId()
+	owner := testutil.UniqueId()
+
+	bucketName := testutil.UniqueId()
+
+	options := testutil.Options(
+		testutil.DefaultRegion,
+		map[string]interface{}{
+			"project": project,
+			"env":     env,
+			"service": service,
+			"owner":   owner,
+
+			"bucket_name": bucketName,
+		},
+	)
+
+	defer terraform.Destroy(t, options)
+	testutil.Run(t, options)
 }
diff --git a/aws-s3-private-bucket/variables.tf b/aws-s3-private-bucket/variables.tf
index 264751af..ed4bae40 100755
--- a/aws-s3-private-bucket/variables.tf
+++ b/aws-s3-private-bucket/variables.tf
@@ -28,3 +28,9 @@ variable "enable_versioning" {
   description = "Keep old versions of overwritten S3 objects."
   default     = true
 }
+
+variable "abort_incomplete_multipart_upload_days" {
+  type        = number
+  description = "Number of days after which an incomplete multipart upload is canceled."
+  default     = 14
+}

From c97de18cdeecceecb5bb20187694814180fecc89 Mon Sep 17 00:00:00 2001
From: Ryan King <rking@chanzuckerberg.com>
Date: Wed, 4 Dec 2019 09:39:53 -0800
Subject: [PATCH 2/2] makefile format

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 3990a7fd..cbaac29c 100644
--- a/Makefile
+++ b/Makefile
@@ -59,7 +59,7 @@ check-docs:
 .PHONY: check-docs
 
 clean:
-		rm **/*.tfstate*; true
+	rm **/*.tfstate*; true
 .PHONY: clean
 
 test: fmt