Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 3 additions & 5 deletions main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ module "bucket_name" {

module "aws_s3_bucket" {
source = "cloudposse/s3-bucket/aws"
version = "3.1.3"
version = "4.10.0"

bucket_name = local.bucket_name
acl = var.acl
Expand All @@ -26,18 +26,16 @@ module "aws_s3_bucket" {
versioning_enabled = var.versioning_enabled

source_policy_documents = var.source_policy_documents
# Support deprecated `policy` input
policy = var.policy

lifecycle_configuration_rules = var.lifecycle_configuration_rules
# Support deprecated lifecycle inputs
lifecycle_rule_ids = local.deprecated_lifecycle_rule.enabled ? [module.this.id] : null
lifecycle_rules = local.deprecated_lifecycle_rule.enabled ? [local.deprecated_lifecycle_rule] : null

logging = var.access_log_bucket_name == "" ? null : {
logging = var.access_log_bucket_name == "" ? null : [{
bucket_name = var.access_log_bucket_name
prefix = "${var.access_log_bucket_prefix}${local.bucket_name}/"
}
}]

sse_algorithm = var.sse_algorithm
kms_master_key_arn = var.kms_master_key_arn
Expand Down
6 changes: 0 additions & 6 deletions variables-deprecated.tf
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
variable "policy" {
type = string
description = "(Deprecated, use `source_policy_documents` instead): A valid bucket policy JSON document."
default = null
}

variable "lifecycle_rule_enabled" {
type = bool
description = <<-EOF
Expand Down