Merge pull request mozmeao#142 from escattone/ryan-s3-bucket-changes

update Terraform to reflect S3 bucket changes
jwhitlock · Nov 1, 2018 · 7669346 · 7669346
2 parents d15785b + 1720f20
commit 7669346
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 89 deletions.
diff --git a/apps/mdn/mdn-aws/infra/modules/shared/mdn_shared_infra.tf b/apps/mdn/mdn-aws/infra/modules/shared/mdn_shared_infra.tf
@@ -6,7 +6,6 @@ resource "random_id" "rand-var" {
   count = "${var.enabled}"
 
   keepers = {
-    db_storage_bucket_name = "${var.db_storage_bucket_name}"
     elb_logs_bucket_name   = "${var.elb_logs_bucket_name}"
     downloads_bucket_name  = "${var.downloads_bucket_name}"
   }
@@ -15,71 +14,11 @@ resource "random_id" "rand-var" {
 }
 
 locals {
-  db_storage            = "${var.db_storage_bucket_name}-${random_id.rand-var.hex}"
-  db_storage_anonymized = "${var.db_storage_bucket_name}-anonymized-${random_id.rand-var.hex}"
+  downloads             = "${var.downloads_bucket_name}"
   elb_logs              = "${var.elb_logs_bucket_name}-${random_id.rand-var.hex}"
-  downloads             = "${var.downloads_bucket_name}-${random_id.rand-var.hex}"
   shared_backup         = "${var.shared_backup_bucket_name}-${random_id.rand-var.hex}"
 }
 
-# access is controlled via private IAM policy
-# do NOT enable public access to this bucket
-resource "aws_s3_bucket" "mdn-db-storage-anonymized" {
-  bucket              = "${local.db_storage_anonymized}"
-  region              = "${var.region}"
-  acceleration_status = "Enabled"
-  acl                 = "log-delivery-write"
-
-  logging {
-    target_bucket = "${local.db_storage_anonymized}"
-    target_prefix = "logs/"
-  }
-
-  versioning {
-    enabled = true
-  }
-
-  tags {
-    Name        = "${local.db_storage_anonymized}"
-    Stack       = "MDN"
-    Environment = "shared"
-    Purpose     = "db-storage"
-  }
-}
-
-resource "aws_s3_bucket" "mdn-db-storage-logs" {
-  count  = "${var.enabled}"
-  bucket = "${local.db_storage}-logs"
-  acl    = "log-delivery-write"
-}
-
-# access is controlled via private IAM policy
-# do NOT enable public access to this bucket
-resource "aws_s3_bucket" "mdn-db-storage" {
-  count = "${var.enabled}"
-
-  bucket              = "${local.db_storage}"
-  region              = "${var.region}"
-  acceleration_status = "Enabled"
-  acl                 = "private"
-
-  logging {
-    target_bucket = "${aws_s3_bucket.mdn-db-storage-logs.id}"
-    target_prefix = "logs/"
-  }
-
-  versioning {
-    enabled = true
-  }
-
-  tags {
-    Name        = "${local.db_storage}"
-    Stack       = "MDN"
-    Environment = "shared"
-    Purpose     = "db-storage"
-  }
-}
-
 resource "aws_s3_bucket" "mdn-elb-logs" {
   count = "${var.enabled}"
 
@@ -113,12 +52,6 @@ EOF
   }
 }
 
-resource "aws_s3_bucket" "mdn-downloads-logs" {
-  count  = "${var.enabled}"
-  bucket = "${local.downloads}-logs"
-  acl    = "log-delivery-write"
-}
-
 resource "aws_s3_bucket" "mdn-downloads" {
   count         = "${var.enabled}"
   bucket        = "${local.downloads}"
@@ -136,7 +69,7 @@ resource "aws_s3_bucket" "mdn-downloads" {
   hosted_zone_id = "${lookup(var.hosted-zone-id-defs, var.region)}"
 
   logging {
-    target_bucket = "${aws_s3_bucket.mdn-downloads-logs.id}"
+    target_bucket = "${local.downloads}"
     target_prefix = "logs/"
   }
 

diff --git a/apps/mdn/mdn-aws/infra/modules/shared/outputs.tf b/apps/mdn/mdn-aws/infra/modules/shared/outputs.tf
@@ -17,11 +17,3 @@ output downloads_bucket_name {
 output downloads_bucket_website_endpoint {
   value = "${element(concat(aws_s3_bucket.mdn-downloads.*.website_endpoint, list("")), 0)}"
 }
-
-output db_storage_bucket_name {
-  value = "${element(concat(aws_s3_bucket.mdn-db-storage.*.id, list("")), 0)}"
-}
-
-output db_storage_bucket_anonymized_name {
-  value = "${element(concat(aws_s3_bucket.mdn-db-storage-anonymized.*.id, list("")), 0)}"
-}
diff --git a/apps/mdn/mdn-aws/infra/modules/shared/variables.tf b/apps/mdn/mdn-aws/infra/modules/shared/variables.tf
@@ -4,10 +4,6 @@ variable "region" {
 
 variable enabled {}
 
-variable db_storage_bucket_name {
-  default = "mdn-db-storage"
-}
-
 variable elb_logs_bucket_name {
   default = "mdn-elb-logs"
 }

diff --git a/apps/mdn/mdn-aws/infra/outputs.tf b/apps/mdn/mdn-aws/infra/outputs.tf
@@ -26,14 +26,6 @@ output "downloads_bucket_website" {
   value = "${module.mdn_shared.downloads_bucket_website_endpoint}"
 }
 
-output "db_storage_bucket_name" {
-  value = "${module.mdn_shared.db_storage_bucket_name}"
-}
-
-output "db_storage_anonymized_bucket_name" {
-  value = "${module.mdn_shared.db_storage_bucket_anonymized_name}"
-}
-
 output "us-west-2-efs-dns" {
   value = "${module.efs-us-west-2.efs_dns}"
 }