Skip to content

fix: Use aws_service data sources instead of aws_region for AWS provider v4-v6 compatibility #8

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
pawelpesz merged 2 commits into from
Sep 12, 2025
Merged

fix: Use aws_service data sources instead of aws_region for AWS provider v4-v6 compatibility #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2da7f2c
refactor: Replication IAM policies as data sources
pawelpesz Sep 12, 2025
b84e64d
fix: Use aws_service data sources instead of aws_region for AWS provi…
pawelpesz Sep 12, 2025
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
3 changes: 0 additions & 3 deletions bucket.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@ locals {
define_lifecycle_rule = var.noncurrent_version_expiration != null || length(var.noncurrent_version_transitions) > 0
}

data "aws_region" "state" {
}

#---------------------------------------------------------------------------------------------------
# KMS Key to Encrypt S3 Bucket
#---------------------------------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion dynamo.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ resource "aws_dynamodb_table" "lock" {
dynamic "replica" {
for_each = var.enable_replication == true ? [1] : []
content {
region_name = data.aws_region.replica[0].name
region_name = data.aws_service.s3_replica[0].region
kms_key_arn = var.dynamodb_enable_server_side_encryption ? aws_kms_key.replica[0].arn : null
}
}
Expand Down
167 changes: 81 additions & 86 deletions replica.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,15 @@ locals {
replication_role_count = var.iam_role_arn == null && var.enable_replication ? 1 : 0
}

data "aws_region" "replica" {
count = var.enable_replication ? 1 : 0
provider = aws.replica
data "aws_service" "s3" {
count = var.enable_replication ? 1 : 0
service_id = "s3"
}

data "aws_service" "s3_replica" {
count = var.enable_replication ? 1 : 0
service_id = "s3"
provider = aws.replica
}

#---------------------------------------------------------------------------------------------------
Expand All @@ -28,103 +34,92 @@ resource "aws_kms_key" "replica" {

# IAM Role for Replication
# https://docs.aws.amazon.com/AmazonS3/latest/dev/crr-replication-config-for-kms-objects.html
resource "aws_iam_role" "replication" {
data "aws_iam_policy_document" "replication_assume_role" {
count = local.replication_role_count

name_prefix = var.override_iam_role_name ? null : var.iam_role_name_prefix
name = var.override_iam_role_name ? var.iam_role_name : null
assume_role_policy = <<POLICY
{
"Version": "2012-10-17",
"Statement": [
{
"Action": "sts:AssumeRole",
"Principal": {
"Service": "s3.amazonaws.com"
},
"Effect": "Allow"
statement {
actions = ["sts:AssumeRole"]
principals {
type = "Service"
identifiers = ["s3.amazonaws.com"]
}
]
}
}
POLICY

resource "aws_iam_role" "replication" {
count = local.replication_role_count

name_prefix = var.override_iam_role_name ? null : var.iam_role_name_prefix
name = var.override_iam_role_name ? var.iam_role_name : null
assume_role_policy = data.aws_iam_policy_document.replication_assume_role[0].json
permissions_boundary = var.iam_role_permissions_boundary
tags = var.tags
}

resource "aws_iam_policy" "replication" {
data "aws_iam_policy_document" "replication" {
count = local.replication_role_count

name_prefix = var.override_iam_policy_name ? null : var.iam_policy_name_prefix
name = var.override_iam_policy_name ? var.iam_policy_name : null
policy = <<POLICY
{
"Version": "2012-10-17",
"Statement": [
{
"Action": [
"s3:GetReplicationConfiguration",
"s3:ListBucket"
],
"Effect": "Allow",
"Resource": [
"${aws_s3_bucket.state.arn}"
]
},
{
"Action": [
"s3:GetObjectVersionForReplication",
"s3:GetObjectVersionAcl"
],
"Effect": "Allow",
"Resource": [
"${aws_s3_bucket.state.arn}/*"
]
},
{
"Action": [
"s3:ReplicateObject",
"s3:ReplicateDelete"
],
"Effect": "Allow",
"Resource": "${aws_s3_bucket.replica[0].arn}/*"
},
{
"Effect": "Allow",
"Action": [
"kms:Decrypt"
],
"Resource": "${aws_kms_key.this.arn}",
"Condition": {
"StringLike": {
"kms:ViaService": "s3.${data.aws_region.state.name}.amazonaws.com",
"kms:EncryptionContext:aws:s3:arn": [
"${aws_s3_bucket.state.arn}/*"
]
}
}
},
{
"Effect": "Allow",
"Action": [
"kms:Encrypt",
"kms:GenerateDataKey"
],
"Resource": "${aws_kms_key.replica[0].arn}",
"Condition": {
"StringLike": {
"kms:ViaService": "s3.${data.aws_region.replica[0].name}.amazonaws.com",
"kms:EncryptionContext:aws:s3:arn": [
"${aws_s3_bucket.replica[0].arn}/*"
]
}
}
statement {
actions = [
"s3:GetReplicationConfiguration",
"s3:ListBucket"
]
resources = [aws_s3_bucket.state.arn]
}
statement {
actions = [
"s3:GetObjectVersionAcl",
"s3:GetObjectVersionForReplication"
]
resources = ["${aws_s3_bucket.state.arn}/*"]
}
statement {
actions = [
"s3:ReplicateDelete",
"s3:ReplicateObject"
]
resources = ["${aws_s3_bucket.replica[0].arn}/*"]
}
statement {
actions = ["kms:Decrypt"]
resources = [aws_kms_key.this.arn]
condition {
test = "StringLike"
variable = "kms:ViaService"
values = [data.aws_service.s3[0].dns_name]
}
condition {
test = "StringLike"
variable = "kms:EncryptionContext:aws:s3:arn"
values = ["${aws_s3_bucket.state.arn}/*"]
}
]
}
statement {
actions = [
"kms:Encrypt",
"kms:GenerateDataKey"
]
resources = [aws_kms_key.replica[0].arn]
condition {
test = "StringLike"
variable = "kms:ViaService"
values = [data.aws_service.s3_replica[0].dns_name]
}
condition {
test = "StringLike"
variable = "kms:EncryptionContext:aws:s3:arn"
values = ["${aws_s3_bucket.replica[0].arn}/*"]
}
}
}
POLICY

tags = var.tags
resource "aws_iam_policy" "replication" {
count = local.replication_role_count

name_prefix = var.override_iam_policy_name ? null : var.iam_policy_name_prefix
name = var.override_iam_policy_name ? var.iam_policy_name : null
policy = data.aws_iam_policy_document.replication[0].json
tags = var.tags
}

resource "aws_iam_policy_attachment" "replication" {
Expand Down