Skip to content

Commit

Permalink
Fix source_policy_documents combined with var.policy being ignored (
Browse files Browse the repository at this point in the history
#201)

* fix: source_policy_documents combined with var.policy is ignored
* fix readme

---------

Co-authored-by: Matt Calhoun <[email protected]>
  • Loading branch information
johncblandii and mcalhoun authored Aug 3, 2023
1 parent 7030cbd commit d7a4943
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 5 deletions.
4 changes: 0 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -111,10 +111,6 @@ We highly recommend that in your code you pin the version to the exact version y
using so that your infrastructure remains stable, and update versions in a
systematic way so that they do not catch you by surprise.

Also, because of a bug in the Terraform registry ([hashicorp/terraform#21417](https://github.com/hashicorp/terraform/issues/21417)),
the registry shows many of our inputs as required when in fact they are optional.
The table below correctly indicates which inputs are required.


Using a [canned ACL](https://docs.aws.amazon.com/AmazonS3/latest/dev/acl-overview.html).

Expand Down
2 changes: 1 addition & 1 deletion main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -459,7 +459,7 @@ data "aws_iam_policy_document" "aggregated_policy" {
}

resource "aws_s3_bucket_policy" "default" {
count = local.enabled && (var.allow_ssl_requests_only || var.allow_encrypted_uploads_only || length(var.s3_replication_source_roles) > 0 || length(var.privileged_principal_arns) > 0 || length(var.source_policy_documents) > 0) ? 1 : 0
count = local.enabled && (var.allow_ssl_requests_only || var.allow_encrypted_uploads_only || length(var.s3_replication_source_roles) > 0 || length(var.privileged_principal_arns) > 0 || length(local.source_policy_documents) > 0) ? 1 : 0
bucket = join("", aws_s3_bucket.default[*].id)
policy = join("", data.aws_iam_policy_document.aggregated_policy[*].json)
depends_on = [aws_s3_bucket_public_access_block.default]
Expand Down

0 comments on commit d7a4943

Please sign in to comment.