From 45cd79ed905f4e7a43582e83ca03155ff4f07239 Mon Sep 17 00:00:00 2001 From: Anton Babenko Date: Fri, 27 Aug 2021 09:54:31 +0200 Subject: [PATCH] feat: Added delete marker in replication rules (#108) --- README.md | 6 +++--- examples/complete/README.md | 6 +++--- examples/complete/versions.tf | 4 ++-- examples/notification/README.md | 6 +++--- examples/notification/versions.tf | 4 ++-- examples/object/README.md | 4 ++-- examples/object/versions.tf | 2 +- examples/s3-replication/README.md | 8 ++++---- examples/s3-replication/versions.tf | 4 ++-- main.tf | 9 +++++---- versions.tf | 4 ++-- 11 files changed, 29 insertions(+), 28 deletions(-) diff --git a/README.md b/README.md index cc74afcb..639a045b 100644 --- a/README.md +++ b/README.md @@ -107,14 +107,14 @@ inputs = { | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 0.12.26 | -| [aws](#requirement\_aws) | >= 3.36 | +| [terraform](#requirement\_terraform) | >= 0.12.31 | +| [aws](#requirement\_aws) | >= 3.50 | ## Providers | Name | Version | |------|---------| -| [aws](#provider\_aws) | >= 3.36 | +| [aws](#provider\_aws) | >= 3.50 | ## Modules diff --git a/examples/complete/README.md b/examples/complete/README.md index 442a7afc..dfe7b7fb 100644 --- a/examples/complete/README.md +++ b/examples/complete/README.md @@ -29,15 +29,15 @@ Note that this example may create resources which cost money. Run `terraform des | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 0.12.26 | -| [aws](#requirement\_aws) | >= 3.36 | +| [terraform](#requirement\_terraform) | >= 0.12.31 | +| [aws](#requirement\_aws) | >= 3.50 | | [random](#requirement\_random) | >= 2.0 | ## Providers | Name | Version | |------|---------| -| [aws](#provider\_aws) | >= 3.36 | +| [aws](#provider\_aws) | >= 3.50 | | [random](#provider\_random) | >= 2.0 | ## Modules diff --git a/examples/complete/versions.tf b/examples/complete/versions.tf index 633a9b29..995a0190 100644 --- a/examples/complete/versions.tf +++ b/examples/complete/versions.tf @@ -1,8 +1,8 @@ terraform { - required_version = ">= 0.12.26" + required_version = ">= 0.12.31" required_providers { - aws = ">= 3.36" + aws = ">= 3.50" random = ">= 2.0" } } diff --git a/examples/notification/README.md b/examples/notification/README.md index 9bad715c..ef79d2f4 100644 --- a/examples/notification/README.md +++ b/examples/notification/README.md @@ -19,8 +19,8 @@ Note that this example may create resources which cost money. Run `terraform des | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 0.12.26 | -| [aws](#requirement\_aws) | >= 3.36 | +| [terraform](#requirement\_terraform) | >= 0.12.31 | +| [aws](#requirement\_aws) | >= 3.50 | | [null](#requirement\_null) | >= 2.0 | | [random](#requirement\_random) | >= 2.0 | @@ -28,7 +28,7 @@ Note that this example may create resources which cost money. Run `terraform des | Name | Version | |------|---------| -| [aws](#provider\_aws) | >= 3.36 | +| [aws](#provider\_aws) | >= 3.50 | | [null](#provider\_null) | >= 2.0 | | [random](#provider\_random) | >= 2.0 | diff --git a/examples/notification/versions.tf b/examples/notification/versions.tf index e3c4ff79..9932ccff 100644 --- a/examples/notification/versions.tf +++ b/examples/notification/versions.tf @@ -1,8 +1,8 @@ terraform { - required_version = ">= 0.12.26" + required_version = ">= 0.12.31" required_providers { - aws = ">= 3.36" + aws = ">= 3.50" random = ">= 2.0" null = ">= 2.0" } diff --git a/examples/object/README.md b/examples/object/README.md index d3fec7a8..e3f5b5a0 100644 --- a/examples/object/README.md +++ b/examples/object/README.md @@ -20,14 +20,14 @@ Note that this example may create resources which cost money. Run `terraform des | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 0.13 | -| [aws](#requirement\_aws) | >= 3.36 | +| [aws](#requirement\_aws) | >= 3.50 | | [random](#requirement\_random) | >= 2.0 | ## Providers | Name | Version | |------|---------| -| [aws](#provider\_aws) | >= 3.36 | +| [aws](#provider\_aws) | >= 3.50 | | [random](#provider\_random) | >= 2.0 | ## Modules diff --git a/examples/object/versions.tf b/examples/object/versions.tf index d051dac7..596d3015 100644 --- a/examples/object/versions.tf +++ b/examples/object/versions.tf @@ -2,7 +2,7 @@ terraform { required_version = ">= 0.13" required_providers { - aws = ">= 3.36" + aws = ">= 3.50" random = ">= 2.0" } } diff --git a/examples/s3-replication/README.md b/examples/s3-replication/README.md index 3f220489..41f8df0a 100644 --- a/examples/s3-replication/README.md +++ b/examples/s3-replication/README.md @@ -21,16 +21,16 @@ Note that this example may create resources which cost money. Run `terraform des | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 0.12.26 | -| [aws](#requirement\_aws) | >= 3.36 | +| [terraform](#requirement\_terraform) | >= 0.12.31 | +| [aws](#requirement\_aws) | >= 3.50 | | [random](#requirement\_random) | >= 2.0 | ## Providers | Name | Version | |------|---------| -| [aws](#provider\_aws) | >= 3.36 | -| [aws.replica](#provider\_aws.replica) | >= 3.36 | +| [aws](#provider\_aws) | >= 3.50 | +| [aws.replica](#provider\_aws.replica) | >= 3.50 | | [random](#provider\_random) | >= 2.0 | ## Modules diff --git a/examples/s3-replication/versions.tf b/examples/s3-replication/versions.tf index 633a9b29..995a0190 100644 --- a/examples/s3-replication/versions.tf +++ b/examples/s3-replication/versions.tf @@ -1,8 +1,8 @@ terraform { - required_version = ">= 0.12.26" + required_version = ">= 0.12.31" required_providers { - aws = ">= 3.36" + aws = ">= 3.50" random = ">= 2.0" } } diff --git a/main.tf b/main.tf index 4ca1fe4d..c42492b1 100644 --- a/main.tf +++ b/main.tf @@ -132,10 +132,11 @@ resource "aws_s3_bucket" "this" { for_each = replication_configuration.value.rules content { - id = lookup(rules.value, "id", null) - priority = lookup(rules.value, "priority", null) - prefix = lookup(rules.value, "prefix", null) - status = rules.value.status + id = lookup(rules.value, "id", null) + priority = lookup(rules.value, "priority", null) + prefix = lookup(rules.value, "prefix", null) + delete_marker_replication_status = lookup(rules.value, "delete_marker_replication_status", null) + status = rules.value.status dynamic "destination" { for_each = length(keys(lookup(rules.value, "destination", {}))) == 0 ? [] : [lookup(rules.value, "destination", {})] diff --git a/versions.tf b/versions.tf index 4a6afc07..7457daa6 100644 --- a/versions.tf +++ b/versions.tf @@ -1,7 +1,7 @@ terraform { - required_version = ">= 0.12.26" + required_version = ">= 0.12.31" required_providers { - aws = ">= 3.36" + aws = ">= 3.50" } }