Skip to content

Fix: Warnings on deprecated expected_bucket_owner attribute #383

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

Draft
alexander-rondon wants to merge 1 commit into
base: master
Choose a base branch
from
+10 −28
Draft

Fix: Warnings on deprecated expected_bucket_owner attribute #383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,6 @@ No modules.
| <a name="input_create_bucket"></a> [create\_bucket](#input\_create\_bucket) | Controls if S3 bucket should be created | `bool` | `true` | no |
| <a name="input_create_metadata_configuration"></a> [create\_metadata\_configuration](#input\_create\_metadata\_configuration) | Whether to create metadata configuration resource | `bool` | `false` | no |
| <a name="input_data_redundancy"></a> [data\_redundancy](#input\_data\_redundancy) | Data redundancy. Valid values: `SingleAvailabilityZone` | `string` | `null` | no |
| <a name="input_expected_bucket_owner"></a> [expected\_bucket\_owner](#input\_expected\_bucket\_owner) | The account ID of the expected bucket owner | `string` | `null` | no |
| <a name="input_force_destroy"></a> [force\_destroy](#input\_force\_destroy) | (Optional, Default:false ) A boolean that indicates all objects should be deleted from the bucket so that the bucket can be destroyed without error. These objects are not recoverable. | `bool` | `false` | no |
| <a name="input_grant"></a> [grant](#input\_grant) | An ACL policy grant. Conflicts with `acl` | `any` | `[]` | no |
| <a name="input_ignore_public_acls"></a> [ignore\_public\_acls](#input\_ignore\_public\_acls) | Whether Amazon S3 should ignore public ACLs for this bucket. | `bool` | `true` | no |
Expand Down
1 change: 0 additions & 1 deletion examples/complete/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,6 @@ module "s3_bucket" {
control_object_ownership = true
object_ownership = "BucketOwnerPreferred"

expected_bucket_owner = data.aws_caller_identity.current.account_id
transition_default_minimum_object_size = "varies_by_storage_class"

acl = "private" # "acl" conflicts with "grant" and "owner"
Expand Down
29 changes: 10 additions & 19 deletions main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,7 @@ resource "aws_s3_bucket_acl" "this" {

region = var.region

bucket = aws_s3_bucket.this[0].id
expected_bucket_owner = var.expected_bucket_owner
bucket = aws_s3_bucket.this[0].id

# hack when `null` value can't be used (eg, from terragrunt, https://github.com/gruntwork-io/terragrunt/pull/1367)
acl = var.acl == "null" ? null : var.acl
Expand Down Expand Up @@ -151,8 +150,7 @@ resource "aws_s3_bucket_website_configuration" "this" {

region = var.region

bucket = aws_s3_bucket.this[0].id
expected_bucket_owner = var.expected_bucket_owner
bucket = aws_s3_bucket.this[0].id

dynamic "index_document" {
for_each = try([var.website["index_document"]], [])
Expand Down Expand Up @@ -208,9 +206,8 @@ resource "aws_s3_bucket_versioning" "this" {

region = var.region

bucket = aws_s3_bucket.this[0].id
expected_bucket_owner = var.expected_bucket_owner
mfa = try(var.versioning["mfa"], null)
bucket = aws_s3_bucket.this[0].id
mfa = try(var.versioning["mfa"], null)

versioning_configuration {
# Valid values: "Enabled" or "Suspended"
Expand All @@ -226,8 +223,7 @@ resource "aws_s3_bucket_server_side_encryption_configuration" "this" {

region = var.region

bucket = var.is_directory_bucket ? aws_s3_directory_bucket.this[0].bucket : aws_s3_bucket.this[0].id
expected_bucket_owner = var.expected_bucket_owner
bucket = var.is_directory_bucket ? aws_s3_directory_bucket.this[0].bucket : aws_s3_bucket.this[0].id

dynamic "rule" {
for_each = try(flatten([var.server_side_encryption_configuration["rule"]]), [])
Expand All @@ -253,8 +249,7 @@ resource "aws_s3_bucket_accelerate_configuration" "this" {

region = var.region

bucket = aws_s3_bucket.this[0].id
expected_bucket_owner = var.expected_bucket_owner
bucket = aws_s3_bucket.this[0].id

# Valid values: "Enabled" or "Suspended"
status = title(lower(var.acceleration_status))
Expand All @@ -265,8 +260,7 @@ resource "aws_s3_bucket_request_payment_configuration" "this" {

region = var.region

bucket = aws_s3_bucket.this[0].id
expected_bucket_owner = var.expected_bucket_owner
bucket = aws_s3_bucket.this[0].id

# Valid values: "BucketOwner" or "Requester"
payer = lower(var.request_payer) == "requester" ? "Requester" : "BucketOwner"
Expand All @@ -277,8 +271,7 @@ resource "aws_s3_bucket_cors_configuration" "this" {

region = var.region

bucket = aws_s3_bucket.this[0].id
expected_bucket_owner = var.expected_bucket_owner
bucket = aws_s3_bucket.this[0].id

dynamic "cors_rule" {
for_each = local.cors_rules
Expand All @@ -300,7 +293,6 @@ resource "aws_s3_bucket_lifecycle_configuration" "this" {
region = var.region

bucket = var.is_directory_bucket ? aws_s3_directory_bucket.this[0].bucket : aws_s3_bucket.this[0].id
expected_bucket_owner = var.expected_bucket_owner
transition_default_minimum_object_size = var.transition_default_minimum_object_size

dynamic "rule" {
Expand Down Expand Up @@ -421,9 +413,8 @@ resource "aws_s3_bucket_object_lock_configuration" "this" {

region = var.region

bucket = aws_s3_bucket.this[0].id
expected_bucket_owner = var.expected_bucket_owner
token = try(var.object_lock_configuration.token, null)
bucket = aws_s3_bucket.this[0].id
token = try(var.object_lock_configuration.token, null)

rule {
default_retention {
Expand Down
6 changes: 0 additions & 6 deletions variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,12 +220,6 @@ variable "owner" {
default = {}
}

variable "expected_bucket_owner" {
description = "The account ID of the expected bucket owner"
type = string
default = null
}

variable "transition_default_minimum_object_size" {
description = "The default minimum object size behavior applied to the lifecycle configuration. Valid values: all_storage_classes_128K (default), varies_by_storage_class"
type = string
Expand Down
1 change: 0 additions & 1 deletion wrappers/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ module "wrapper" {
create_bucket = try(each.value.create_bucket, var.defaults.create_bucket, true)
create_metadata_configuration = try(each.value.create_metadata_configuration, var.defaults.create_metadata_configuration, false)
data_redundancy = try(each.value.data_redundancy, var.defaults.data_redundancy, null)
expected_bucket_owner = try(each.value.expected_bucket_owner, var.defaults.expected_bucket_owner, null)
force_destroy = try(each.value.force_destroy, var.defaults.force_destroy, false)
grant = try(each.value.grant, var.defaults.grant, [])
ignore_public_acls = try(each.value.ignore_public_acls, var.defaults.ignore_public_acls, true)
Expand Down
Loading