Skip to content

feat!: Update to support AWS provider v3.75 and newer (including v4.x) #139

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

Merged
antonbabenko merged 9 commits into from
Mar 30, 2022
Merged

feat!: Update to support AWS provider v3.75 and newer (including v4.x) #139

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1cb11a0
feat: Update to support AWS provider v4
antonbabenko Mar 8, 2022
dd73c7a
Merge branch 'master' into fix-tf-provider-v4
antonbabenko Mar 25, 2022
0f20ac0
Updated almost everything
antonbabenko Mar 29, 2022
17bbd89
Updated almost everything
antonbabenko Mar 29, 2022
4d72cdb
Upgraded wrappers
antonbabenko Mar 29, 2022
3b1aeb8
Minor fixes
antonbabenko Mar 29, 2022
9b7b536
Fixed s3-replication example
antonbabenko Mar 30, 2022
bd9f216
Updated UPGRADE-3.0.md with better case for ACL
antonbabenko Mar 30, 2022
da399f0
Updated UPGRADE-3.0.md with better case for ACL
antonbabenko Mar 30, 2022
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
Prev Previous commit
Next Next commit
Upgraded wrappers
  • Loading branch information
@antonbabenko
antonbabenko committed Mar 29, 2022
commit 4d72cdb6802efec9ce1f75ce0f3366e1117131ab
62 changes: 33 additions & 29 deletions wrappers/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,33 +3,37 @@ module "wrapper" {

for_each = var.items

create_bucket = lookup(each.value, "create_bucket", true)
attach_elb_log_delivery_policy = lookup(each.value, "attach_elb_log_delivery_policy", false)
attach_lb_log_delivery_policy = lookup(each.value, "attach_lb_log_delivery_policy", false)
attach_deny_insecure_transport_policy = lookup(each.value, "attach_deny_insecure_transport_policy", false)
attach_policy = lookup(each.value, "attach_policy", false)
attach_public_policy = lookup(each.value, "attach_public_policy", true)
bucket = lookup(each.value, "bucket", null)
bucket_prefix = lookup(each.value, "bucket_prefix", null)
acl = lookup(each.value, "acl", "private")
policy = lookup(each.value, "policy", null)
tags = lookup(each.value, "tags", {})
force_destroy = lookup(each.value, "force_destroy", false)
acceleration_status = lookup(each.value, "acceleration_status", null)
request_payer = lookup(each.value, "request_payer", null)
website = lookup(each.value, "website", {})
cors_rule = lookup(each.value, "cors_rule", [])
versioning = lookup(each.value, "versioning", {})
logging = lookup(each.value, "logging", {})
grant = lookup(each.value, "grant", [])
lifecycle_rule = lookup(each.value, "lifecycle_rule", [])
replication_configuration = lookup(each.value, "replication_configuration", {})
server_side_encryption_configuration = lookup(each.value, "server_side_encryption_configuration", {})
object_lock_configuration = lookup(each.value, "object_lock_configuration", {})
block_public_acls = lookup(each.value, "block_public_acls", false)
block_public_policy = lookup(each.value, "block_public_policy", false)
ignore_public_acls = lookup(each.value, "ignore_public_acls", false)
restrict_public_buckets = lookup(each.value, "restrict_public_buckets", false)
control_object_ownership = lookup(each.value, "control_object_ownership", false)
object_ownership = lookup(each.value, "object_ownership", "ObjectWriter")
create_bucket = try(each.value.create_bucket, true)
attach_elb_log_delivery_policy = try(each.value.attach_elb_log_delivery_policy, false)
attach_lb_log_delivery_policy = try(each.value.attach_lb_log_delivery_policy, false)
attach_deny_insecure_transport_policy = try(each.value.attach_deny_insecure_transport_policy, false)
attach_require_latest_tls_policy = try(each.value.attach_require_latest_tls_policy, false)
attach_policy = try(each.value.attach_policy, false)
attach_public_policy = try(each.value.attach_public_policy, true)
bucket = try(each.value.bucket, null)
bucket_prefix = try(each.value.bucket_prefix, null)
acl = try(each.value.acl, null)
policy = try(each.value.policy, null)
tags = try(each.value.tags, {})
force_destroy = try(each.value.force_destroy, false)
acceleration_status = try(each.value.acceleration_status, null)
request_payer = try(each.value.request_payer, null)
website = try(each.value.website, {})
cors_rule = try(each.value.cors_rule, [])
versioning = try(each.value.versioning, {})
logging = try(each.value.logging, {})
grant = try(each.value.grant, [])
owner = try(each.value.owner, {})
expected_bucket_owner = try(each.value.expected_bucket_owner, null)
lifecycle_rule = try(each.value.lifecycle_rule, [])
replication_configuration = try(each.value.replication_configuration, {})
server_side_encryption_configuration = try(each.value.server_side_encryption_configuration, {})
object_lock_configuration = try(each.value.object_lock_configuration, {})
block_public_acls = try(each.value.block_public_acls, false)
block_public_policy = try(each.value.block_public_policy, false)
ignore_public_acls = try(each.value.ignore_public_acls, false)
restrict_public_buckets = try(each.value.restrict_public_buckets, false)
control_object_ownership = try(each.value.control_object_ownership, false)
object_ownership = try(each.value.object_ownership, "ObjectWriter")
putin_khuylo = try(each.value.putin_khuylo, true)
}
17 changes: 9 additions & 8 deletions wrappers/notification/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@ module "wrapper" {

for_each = var.items

create = lookup(each.value, "create", true)
create_sns_policy = lookup(each.value, "create_sns_policy", true)
create_sqs_policy = lookup(each.value, "create_sqs_policy", true)
bucket = lookup(each.value, "bucket", "")
bucket_arn = lookup(each.value, "bucket_arn", null)
lambda_notifications = lookup(each.value, "lambda_notifications", {})
sqs_notifications = lookup(each.value, "sqs_notifications", {})
sns_notifications = lookup(each.value, "sns_notifications", {})
create = try(each.value.create, true)
create_sns_policy = try(each.value.create_sns_policy, true)
create_sqs_policy = try(each.value.create_sqs_policy, true)
bucket = try(each.value.bucket, "")
bucket_arn = try(each.value.bucket_arn, null)
eventbridge = try(each.value.eventbridge, null)
lambda_notifications = try(each.value.lambda_notifications, {})
sqs_notifications = try(each.value.sqs_notifications, {})
sns_notifications = try(each.value.sns_notifications, {})
}
48 changes: 24 additions & 24 deletions wrappers/object/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,28 +3,28 @@ module "wrapper" {

for_each = var.items

create = lookup(each.value, "create", true)
bucket = lookup(each.value, "bucket", "")
key = lookup(each.value, "key", "")
file_source = lookup(each.value, "file_source", null)
content = lookup(each.value, "content", null)
content_base64 = lookup(each.value, "content_base64", null)
acl = lookup(each.value, "acl", null)
cache_control = lookup(each.value, "cache_control", null)
content_disposition = lookup(each.value, "content_disposition", null)
content_encoding = lookup(each.value, "content_encoding", null)
content_language = lookup(each.value, "content_language", null)
content_type = lookup(each.value, "content_type", null)
website_redirect = lookup(each.value, "website_redirect", null)
storage_class = lookup(each.value, "storage_class", null)
etag = lookup(each.value, "etag", null)
server_side_encryption = lookup(each.value, "server_side_encryption", null)
kms_key_id = lookup(each.value, "kms_key_id", null)
bucket_key_enabled = lookup(each.value, "bucket_key_enabled", null)
metadata = lookup(each.value, "metadata", {})
tags = lookup(each.value, "tags", {})
force_destroy = lookup(each.value, "force_destroy", false)
object_lock_legal_hold_status = lookup(each.value, "object_lock_legal_hold_status", null)
object_lock_mode = lookup(each.value, "object_lock_mode", null)
object_lock_retain_until_date = lookup(each.value, "object_lock_retain_until_date", null)
create = try(each.value.create, true)
bucket = try(each.value.bucket, "")
key = try(each.value.key, "")
file_source = try(each.value.file_source, null)
content = try(each.value.content, null)
content_base64 = try(each.value.content_base64, null)
acl = try(each.value.acl, null)
cache_control = try(each.value.cache_control, null)
content_disposition = try(each.value.content_disposition, null)
content_encoding = try(each.value.content_encoding, null)
content_language = try(each.value.content_language, null)
content_type = try(each.value.content_type, null)
website_redirect = try(each.value.website_redirect, null)
storage_class = try(each.value.storage_class, null)
etag = try(each.value.etag, null)
server_side_encryption = try(each.value.server_side_encryption, null)
kms_key_id = try(each.value.kms_key_id, null)
bucket_key_enabled = try(each.value.bucket_key_enabled, null)
metadata = try(each.value.metadata, {})
tags = try(each.value.tags, {})
force_destroy = try(each.value.force_destroy, false)
object_lock_legal_hold_status = try(each.value.object_lock_legal_hold_status, null)
object_lock_mode = try(each.value.object_lock_mode, null)
object_lock_retain_until_date = try(each.value.object_lock_retain_until_date, null)
}