Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Conditionally create aws_s3_bucket_public_access_block #94

Merged
merged 6 commits into from
Aug 25, 2021
Merged

Conditionally create aws_s3_bucket_public_access_block #94

Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
50c32ef
Conditionally create aws_s3_bucket_public_access_block
alexjurkiewicz Jun 28, 2021
4619c03
Merge branch 'master' into only-create-block-when-required
alexjurkiewicz Jun 29, 2021
c6d01f1
Merge branch 'master' into only-create-block-when-required
alexjurkiewicz Jul 6, 2021
56524f4
Merge branch 'master' into only-create-block-when-required
nitrocode Aug 16, 2021
76e70f1
Pull out an expression into a local
alexjurkiewicz Aug 17, 2021
702d517
Merge branch 'master' into only-create-block-when-required
nitrocode Aug 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ locals {
# Deprecate `replication_rules` in favor of `s3_replication_rules` to keep all the replication related
# inputs grouped under s3_replica[tion]
s3_replication_rules = var.replication_rules == null ? var.s3_replication_rules : var.replication_rules

public_access_block_enabled = var.block_public_acls || var.block_public_policy || var.ignore_public_acls || var.restrict_public_buckets
}

resource "aws_s3_bucket" "default" {
Expand Down Expand Up @@ -374,7 +376,7 @@ resource "aws_s3_bucket_policy" "default" {
# https://www.terraform.io/docs/providers/aws/r/s3_bucket_public_access_block.html
# for the nuances of the blocking options
resource "aws_s3_bucket_public_access_block" "default" {
count = local.enabled ? 1 : 0
count = module.this.enabled && local.public_access_block_enabled ? 1 : 0
bucket = join("", aws_s3_bucket.default.*.id)

block_public_acls = var.block_public_acls
Expand Down