Allow creating a policy for an existing S3 bucket (#154)

emyller · web-flow · commit f6c3ce29aada · 2021-04-26T17:31:51.000-06:00
diff --git a/main.tf b/main.tf
@@ -87,8 +87,11 @@ data "aws_iam_policy_document" "origin_website" {
 }
 
 resource "aws_s3_bucket_policy" "default" {
-  count  = (module.this.enabled && (! local.using_existing_origin || var.override_origin_bucket_policy)) ? 1 : 0
-  bucket = join("", aws_s3_bucket.origin.*.bucket)
+  count = (module.this.enabled && (! local.using_existing_origin || var.override_origin_bucket_policy)) ? 1 : 0
+  bucket = join("", local.using_existing_origin
+    ? data.aws_s3_bucket.selected.*.bucket # Existing origin S3 bucket
+    : aws_s3_bucket.origin.*.bucket        # Origin S3 bucket this module manages
+  )
   policy = local.iam_policy_document
 }
 

Original file line number	Diff line number	Diff line change
`@@ -87,8 +87,11 @@ data "aws_iam_policy_document" "origin_website" {`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`resource "aws_s3_bucket_policy" "default" {`
`90`		`- count = (module.this.enabled && (! local.using_existing_origin \|\| var.override_origin_bucket_policy)) ? 1 : 0`
`91`		`- bucket = join("", aws_s3_bucket.origin.*.bucket)`
	`90`	`+ count = (module.this.enabled && (! local.using_existing_origin \|\| var.override_origin_bucket_policy)) ? 1 : 0`
	`91`	`+ bucket = join("", local.using_existing_origin`
	`92`	`+ ? data.aws_s3_bucket.selected.*.bucket # Existing origin S3 bucket`
	`93`	`+ : aws_s3_bucket.origin.*.bucket # Origin S3 bucket this module manages`
	`94`	`+ )`
`92`	`95`	`policy = local.iam_policy_document`
`93`	`96`	`}`
`94`	`97`