S3 Replication Improvements #93
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -49,7 +49,7 @@ output "user_unique_id" { | |
| } | ||
|
|
||
| output "replication_role_arn" { | ||
| value = module.this.enabled && local.replication_enabled ? join("", aws_iam_role.replication.*.arn) : "" | ||
| description = "The ARN of the replication IAM Role" | ||
| } | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,12 @@ | ||
| resource "aws_iam_role" "replication" { | ||
| count = module.this.enabled && local.replication_enabled ? 1 : 0 | ||
|
|
||
| name = format("%s-replication", module.this.id) | ||
| assume_role_policy = data.aws_iam_policy_document.replication_sts[0].json | ||
| } | ||
|
|
||
| data "aws_iam_policy_document" "replication_sts" { | ||
| count = module.this.enabled && local.replication_enabled ? 1 : 0 | ||
|
|
||
| statement { | ||
| sid = "AllowPrimaryToAssumeServiceRole" | ||
|
|
@@ -23,14 +23,14 @@ data "aws_iam_policy_document" "replication_sts" { | |
| } | ||
|
|
||
| resource "aws_iam_policy" "replication" { | ||
| count = module.this.enabled && local.replication_enabled ? 1 : 0 | ||
|
|
||
| name = format("%s-replication", module.this.id) | ||
| policy = data.aws_iam_policy_document.replication[0].json | ||
| } | ||
|
|
||
| data "aws_iam_policy_document" "replication" { | ||
| count = module.this.enabled && local.replication_enabled ? 1 : 0 | ||
|
|
||
| statement { | ||
| sid = "AllowPrimaryToGetReplicationConfiguration" | ||
|
|
@@ -56,12 +56,12 @@ data "aws_iam_policy_document" "replication" { | |
| "s3:ObjectOwnerOverrideToBucketOwner" | ||
| ] | ||
|
|
||
| resources = toset([for rule in var.replication_rules : "${rule.destination.bucket}/*"]) | ||
| } | ||
| } | ||
|
|
||
| resource "aws_iam_role_policy_attachment" "replication" { | ||
| count = module.this.enabled && local.replication_enabled ? 1 : 0 | ||
| role = aws_iam_role.replication[0].name | ||
| policy_arn = aws_iam_policy.replication[0].arn | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -166,25 +166,14 @@ variable "restrict_public_buckets" { | |
| description = "Set to `false` to disable the restricting of making the bucket public" | ||
| } | ||
|
|
||
|
There was a problem hiding this comment. I will need to weigh in on @Nuru and @osterman to decide on whether removing these outright is the best upgrade path for our module's users. In this particular case I feel like There was a problem hiding this comment. Let me know. As someone who went through the change of lifecycle rules from individual variables to the There was a problem hiding this comment. Please add this to the bottom of # The variables below are DEPRECATED and should not be used anymore
variable "s3_replication_enabled" {
type = bool
default = null
description = "DEPRECATED. Use `replication_rules` instead."
}
variable "s3_replica_bucket_arn" {
type = string
default = null
description = "DEPRECATED. Use `replication_rules` instead."
} |
||
| variable "replication_rules" { | ||
| # type = list(object({ | ||
| # id = string | ||
| # priority = number | ||
| # prefix = string | ||
| # status = string | ||
| # destination = object({ | ||
| # bucket = string | ||
| # storage_class = string | ||
| # replica_kms_key_id = string | ||
| # access_control_translation = object({ | ||
|
|
@@ -202,10 +191,8 @@ variable "replication_rules" { | |
| # tags = map(string) | ||
| # }) | ||
| # })) | ||
| default = [] | ||
| description = "S3 replication rules" | ||
| } | ||
|
|
||
| variable "bucket_name" { | ||
|
|
@@ -235,4 +222,10 @@ variable "website_inputs" { | |
| default = null | ||
|
|
||
| description = "Specifies the static website hosting configuration object." | ||
| } | ||
|
|
||
| variable "replication_source_roles" { | ||
| type = list(string) | ||
| default = [] | ||
| description = "Cross-account IAM Role ARNs that will be allowed to perform S3 replication to this bucket (for replication within the same AWS account, it's not necessary to adjust the bucket policy)." | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.