Skip to content

Commit

Permalink
S3 replication metrics
Browse files Browse the repository at this point in the history
  • Loading branch information
max-lobur committed Jan 30, 2022
1 parent e9dcc21 commit 08fa92a
Show file tree
Hide file tree
Showing 10 changed files with 56 additions and 32 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -213,14 +213,14 @@ Available targets:
| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13.0 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.0 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.68.0 |
| <a name="requirement_time"></a> [time](#requirement\_time) | >= 0.7 |

## Providers

| Name | Version |
|------|---------|
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 3.0 |
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 3.68.0 |
| <a name="provider_time"></a> [time](#provider\_time) | >= 0.7 |

## Modules
Expand Down
4 changes: 2 additions & 2 deletions docs/terraform.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13.0 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.0 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.68.0 |
| <a name="requirement_time"></a> [time](#requirement\_time) | >= 0.7 |

## Providers

| Name | Version |
|------|---------|
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 3.0 |
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 3.68.0 |
| <a name="provider_time"></a> [time](#provider\_time) | >= 0.7 |

## Modules
Expand Down
2 changes: 1 addition & 1 deletion examples/complete/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ module "s3_bucket" {
allowed_bucket_actions = var.allowed_bucket_actions
bucket_name = var.bucket_name
object_lock_configuration = var.object_lock_configuration
s3_replication_enabled = local.replication_enabled
s3_replication_enabled = local.s3_replication_enabled
s3_replica_bucket_arn = join("", module.s3_bucket_replication_target.*.bucket_arn)
s3_replication_rules = local.s3_replication_rules
privileged_principal_actions = var.privileged_principal_actions
Expand Down
4 changes: 2 additions & 2 deletions examples/complete/outputs.tf
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ output "bucket_arn" {
}

output "replication_bucket_id" {
value = local.replication_enabled ? join("", module.s3_bucket_replication_target.*.bucket_id) : null
value = local.s3_replication_enabled ? join("", module.s3_bucket_replication_target.*.bucket_id) : null
description = "Replication bucket ID"
}

output "replication_bucket_arn" {
value = local.replication_enabled ? join("", module.s3_bucket_replication_target.*.bucket_arn) : null
value = local.s3_replication_enabled ? join("", module.s3_bucket_replication_target.*.bucket_arn) : null
description = "Replication bucket bucket ARN"
}

Expand Down
44 changes: 31 additions & 13 deletions examples/complete/replication.tf
Original file line number Diff line number Diff line change
@@ -1,19 +1,37 @@
locals {
replication_enabled = length(var.s3_replication_rules) > 0

extra_rule = local.replication_enabled ? {
id = "replication-test-explicit-bucket"
status = "Enabled"
prefix = "/extra"
priority = 5
destination_bucket = module.s3_bucket_replication_target_extra[0].bucket_arn
} : null

s3_replication_rules = local.replication_enabled ? concat(var.s3_replication_rules, [local.extra_rule]) : null
s3_replication_enabled = var.s3_replication_enabled
s3_replication_rules = local.s3_replication_enabled ? [
{
id = "replication-test-explicit-bucket"
status = "Enabled"
prefix = "/extra"
priority = 5
destination_bucket = module.s3_bucket_replication_target_extra[0].bucket_arn
destination = {
account_id = local.account_id
metrics = {
status = null
}
}
},
{
id = "replication-test-metrics"
status = "Enabled"
prefix = "/with-metrics"
priority = 10
destination_bucket = null
destination = {
account_id = local.account_id
metrics = {
status = "Enabled"
}
}
}
] : []
}

module "s3_bucket_replication_target" {
count = local.replication_enabled ? 1 : 0
count = local.s3_replication_enabled ? 1 : 0

source = "../../"

Expand All @@ -28,7 +46,7 @@ module "s3_bucket_replication_target" {
}

module "s3_bucket_replication_target_extra" {
count = local.replication_enabled ? 1 : 0
count = local.s3_replication_enabled ? 1 : 0

source = "../../"

Expand Down
9 changes: 1 addition & 8 deletions examples/complete/replication.us-east-2.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,4 @@ allowed_bucket_actions = [
"s3:AbortMultipartUpload",
]

# Rules will be augmented with an additional bucket rule, so prefix cannot be "/"
s3_replication_rules = [
{
id = "replication-test"
status = "Enabled"
prefix = "/main"
}
]
s3_replication_enabled = true
7 changes: 4 additions & 3 deletions examples/complete/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,10 @@ variable "lifecycle_rules" {
description = "A list of lifecycle rules."
}

variable "s3_replication_rules" {
default = []
description = "S3 replication rules"
variable "s3_replication_enabled" {
type = bool
default = false
description = "Enable or disable S3 replication."
}

variable "policy" {
Expand Down
9 changes: 9 additions & 0 deletions main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,15 @@ resource "aws_s3_bucket" "default" {
replica_kms_key_id = try(rules.value.destination.replica_kms_key_id, null)
account_id = try(rules.value.destination.account_id, null)

# https://docs.aws.amazon.com/AmazonS3/latest/userguide/replication-walkthrough-5.html
dynamic "metrics" {
for_each = try(rules.value.destination.metrics.status, "") == "Enabled" ? [1] : []

content {
status = "Enabled"
}
}

dynamic "access_control_translation" {
for_each = try(rules.value.destination.access_control_translation.owner, null) == null ? [] : [rules.value.destination.access_control_translation.owner]

Expand Down
3 changes: 3 additions & 0 deletions variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,9 @@ variable "s3_replication_rules" {
# owner = string
# })
# account_id = string
# metrics = object({
# status = Enabled
# })
# })
# source_selection_criteria = object({
# sse_kms_encrypted_objects = object({
Expand Down
2 changes: 1 addition & 1 deletion versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ terraform {
required_providers {
aws = {
source = "hashicorp/aws"
version = ">= 3.0"
version = ">= 3.68.0"
}
time = {
source = "hashicorp/time"
Expand Down

0 comments on commit 08fa92a

Please sign in to comment.