From 65ee04b1750ad07f67f7dc9c960753453cfd1942 Mon Sep 17 00:00:00 2001 From: comutrex <36967782+comutrex@users.noreply.github.com> Date: Wed, 27 Apr 2022 12:37:57 +0200 Subject: [PATCH 1/3] Add `source_db_instance_automated_backups_arn` to restore_to_point_in_time --- modules/db_instance/main.tf | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/modules/db_instance/main.tf b/modules/db_instance/main.tf index 09a40d85..2b52ec73 100644 --- a/modules/db_instance/main.tf +++ b/modules/db_instance/main.tf @@ -89,10 +89,11 @@ resource "aws_db_instance" "this" { for_each = var.restore_to_point_in_time != null ? [var.restore_to_point_in_time] : [] content { - restore_time = lookup(restore_to_point_in_time.value, "restore_time", null) - source_db_instance_identifier = lookup(restore_to_point_in_time.value, "source_db_instance_identifier", null) - source_dbi_resource_id = lookup(restore_to_point_in_time.value, "source_dbi_resource_id", null) - use_latest_restorable_time = lookup(restore_to_point_in_time.value, "use_latest_restorable_time", null) + restore_time = lookup(restore_to_point_in_time.value, "restore_time", null) + source_db_instance_identifier = lookup(restore_to_point_in_time.value, "source_db_instance_identifier", null) + source_dbi_resource_id = lookup(restore_to_point_in_time.value, "source_dbi_resource_id", null) + use_latest_restorable_time = lookup(restore_to_point_in_time.value, "use_latest_restorable_time", null) + source_db_instance_automated_backups_arn = lookup(restore_to_point_in_time.value, "source_db_instance_automated_backups_arn", null) } } From d02d56474d63d9c1850b16c1dd6418485aa8b534 Mon Sep 17 00:00:00 2001 From: comutrex <36967782+comutrex@users.noreply.github.com> Date: Wed, 27 Apr 2022 14:08:55 +0200 Subject: [PATCH 2/3] Alphabetical order --- modules/db_instance/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/db_instance/main.tf b/modules/db_instance/main.tf index 2b52ec73..cf28adfc 100644 --- a/modules/db_instance/main.tf +++ b/modules/db_instance/main.tf @@ -90,10 +90,10 @@ resource "aws_db_instance" "this" { content { restore_time = lookup(restore_to_point_in_time.value, "restore_time", null) + source_db_instance_automated_backups_arn = lookup(restore_to_point_in_time.value, "source_db_instance_automated_backups_arn", null) source_db_instance_identifier = lookup(restore_to_point_in_time.value, "source_db_instance_identifier", null) source_dbi_resource_id = lookup(restore_to_point_in_time.value, "source_dbi_resource_id", null) use_latest_restorable_time = lookup(restore_to_point_in_time.value, "use_latest_restorable_time", null) - source_db_instance_automated_backups_arn = lookup(restore_to_point_in_time.value, "source_db_instance_automated_backups_arn", null) } } From f1de197708ed0ea9b4c4b10a359a594c4580c5f7 Mon Sep 17 00:00:00 2001 From: comutrex <36967782+comutrex@users.noreply.github.com> Date: Wed, 27 Apr 2022 15:43:46 +0200 Subject: [PATCH 3/3] Bump the minimum AWS provider version to 4.6 --- README.md | 2 +- examples/complete-mssql/README.md | 4 ++-- examples/complete-mssql/versions.tf | 2 +- examples/complete-mysql/README.md | 2 +- examples/complete-mysql/versions.tf | 2 +- examples/complete-oracle/README.md | 2 +- examples/complete-oracle/versions.tf | 2 +- examples/complete-postgres/README.md | 2 +- examples/complete-postgres/versions.tf | 2 +- examples/cross-region-replica-postgres/README.md | 2 +- examples/cross-region-replica-postgres/versions.tf | 2 +- examples/enhanced-monitoring/README.md | 4 ++-- examples/enhanced-monitoring/versions.tf | 2 +- examples/groups/README.md | 2 +- examples/groups/versions.tf | 2 +- examples/replica-mysql/README.md | 2 +- examples/replica-mysql/versions.tf | 2 +- examples/replica-postgres/README.md | 2 +- examples/replica-postgres/versions.tf | 2 +- examples/s3-import-mysql/README.md | 4 ++-- examples/s3-import-mysql/versions.tf | 2 +- modules/db_instance/README.md | 4 ++-- modules/db_instance/versions.tf | 2 +- versions.tf | 2 +- 24 files changed, 28 insertions(+), 28 deletions(-) diff --git a/README.md b/README.md index 07acb4b8..7f952be4 100644 --- a/README.md +++ b/README.md @@ -208,7 +208,7 @@ Users have the ability to: | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 0.13.1 | -| [aws](#requirement\_aws) | >= 4.0 | +| [aws](#requirement\_aws) | >= 4.6 | | [random](#requirement\_random) | >= 3.1 | ## Providers diff --git a/examples/complete-mssql/README.md b/examples/complete-mssql/README.md index 342899fd..59588071 100644 --- a/examples/complete-mssql/README.md +++ b/examples/complete-mssql/README.md @@ -20,13 +20,13 @@ Note that this example may create resources which cost money. Run `terraform des | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 0.13.1 | -| [aws](#requirement\_aws) | >= 4.0 | +| [aws](#requirement\_aws) | >= 4.6 | ## Providers | Name | Version | |------|---------| -| [aws](#provider\_aws) | >= 4.0 | +| [aws](#provider\_aws) | >= 4.6 | ## Modules diff --git a/examples/complete-mssql/versions.tf b/examples/complete-mssql/versions.tf index 3752560a..f916e398 100644 --- a/examples/complete-mssql/versions.tf +++ b/examples/complete-mssql/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = ">= 4.0" + version = ">= 4.6" } } } diff --git a/examples/complete-mysql/README.md b/examples/complete-mysql/README.md index 5337410b..d22e33a6 100644 --- a/examples/complete-mysql/README.md +++ b/examples/complete-mysql/README.md @@ -20,7 +20,7 @@ Note that this example may create resources which cost money. Run `terraform des | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 0.13.1 | -| [aws](#requirement\_aws) | >= 4.0 | +| [aws](#requirement\_aws) | >= 4.6 | ## Providers diff --git a/examples/complete-mysql/versions.tf b/examples/complete-mysql/versions.tf index 3752560a..f916e398 100644 --- a/examples/complete-mysql/versions.tf +++ b/examples/complete-mysql/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = ">= 4.0" + version = ">= 4.6" } } } diff --git a/examples/complete-oracle/README.md b/examples/complete-oracle/README.md index fe11d4f9..240226ea 100644 --- a/examples/complete-oracle/README.md +++ b/examples/complete-oracle/README.md @@ -20,7 +20,7 @@ Note that this example may create resources which cost money. Run `terraform des | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 0.13.1 | -| [aws](#requirement\_aws) | >= 4.0 | +| [aws](#requirement\_aws) | >= 4.6 | ## Providers diff --git a/examples/complete-oracle/versions.tf b/examples/complete-oracle/versions.tf index 3752560a..f916e398 100644 --- a/examples/complete-oracle/versions.tf +++ b/examples/complete-oracle/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = ">= 4.0" + version = ">= 4.6" } } } diff --git a/examples/complete-postgres/README.md b/examples/complete-postgres/README.md index d6d9b97b..fee2ac67 100644 --- a/examples/complete-postgres/README.md +++ b/examples/complete-postgres/README.md @@ -20,7 +20,7 @@ Note that this example may create resources which cost money. Run `terraform des | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 0.13.1 | -| [aws](#requirement\_aws) | >= 4.0 | +| [aws](#requirement\_aws) | >= 4.6 | ## Providers diff --git a/examples/complete-postgres/versions.tf b/examples/complete-postgres/versions.tf index 3752560a..f916e398 100644 --- a/examples/complete-postgres/versions.tf +++ b/examples/complete-postgres/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = ">= 4.0" + version = ">= 4.6" } } } diff --git a/examples/cross-region-replica-postgres/README.md b/examples/cross-region-replica-postgres/README.md index e338764c..37665f6b 100644 --- a/examples/cross-region-replica-postgres/README.md +++ b/examples/cross-region-replica-postgres/README.md @@ -20,7 +20,7 @@ Note that this example may create resources which cost money. Run `terraform des | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 0.13.1 | -| [aws](#requirement\_aws) | >= 4.0 | +| [aws](#requirement\_aws) | >= 4.6 | ## Providers diff --git a/examples/cross-region-replica-postgres/versions.tf b/examples/cross-region-replica-postgres/versions.tf index 3752560a..f916e398 100644 --- a/examples/cross-region-replica-postgres/versions.tf +++ b/examples/cross-region-replica-postgres/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = ">= 4.0" + version = ">= 4.6" } } } diff --git a/examples/enhanced-monitoring/README.md b/examples/enhanced-monitoring/README.md index cfc4898e..466ca8ef 100644 --- a/examples/enhanced-monitoring/README.md +++ b/examples/enhanced-monitoring/README.md @@ -22,13 +22,13 @@ Note that this example may create resources which cost money. Run `terraform des | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 0.13.1 | -| [aws](#requirement\_aws) | >= 4.0 | +| [aws](#requirement\_aws) | >= 4.6 | ## Providers | Name | Version | |------|---------| -| [aws](#provider\_aws) | >= 4.0 | +| [aws](#provider\_aws) | >= 4.6 | ## Modules diff --git a/examples/enhanced-monitoring/versions.tf b/examples/enhanced-monitoring/versions.tf index 3752560a..f916e398 100644 --- a/examples/enhanced-monitoring/versions.tf +++ b/examples/enhanced-monitoring/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = ">= 4.0" + version = ">= 4.6" } } } diff --git a/examples/groups/README.md b/examples/groups/README.md index 85566cef..3ee20ced 100644 --- a/examples/groups/README.md +++ b/examples/groups/README.md @@ -20,7 +20,7 @@ Note that this example may create resources which cost money. Run `terraform des | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 0.13.1 | -| [aws](#requirement\_aws) | >= 4.0 | +| [aws](#requirement\_aws) | >= 4.6 | ## Providers diff --git a/examples/groups/versions.tf b/examples/groups/versions.tf index 3752560a..f916e398 100644 --- a/examples/groups/versions.tf +++ b/examples/groups/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = ">= 4.0" + version = ">= 4.6" } } } diff --git a/examples/replica-mysql/README.md b/examples/replica-mysql/README.md index f49bdcee..3014e810 100644 --- a/examples/replica-mysql/README.md +++ b/examples/replica-mysql/README.md @@ -20,7 +20,7 @@ Note that this example may create resources which cost money. Run `terraform des | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 0.13.1 | -| [aws](#requirement\_aws) | >= 4.0 | +| [aws](#requirement\_aws) | >= 4.6 | ## Providers diff --git a/examples/replica-mysql/versions.tf b/examples/replica-mysql/versions.tf index 3752560a..f916e398 100644 --- a/examples/replica-mysql/versions.tf +++ b/examples/replica-mysql/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = ">= 4.0" + version = ">= 4.6" } } } diff --git a/examples/replica-postgres/README.md b/examples/replica-postgres/README.md index 0f8b810f..7a177ff7 100644 --- a/examples/replica-postgres/README.md +++ b/examples/replica-postgres/README.md @@ -20,7 +20,7 @@ Note that this example may create resources which cost money. Run `terraform des | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 0.13.1 | -| [aws](#requirement\_aws) | >= 4.0 | +| [aws](#requirement\_aws) | >= 4.6 | ## Providers diff --git a/examples/replica-postgres/versions.tf b/examples/replica-postgres/versions.tf index 3752560a..f916e398 100644 --- a/examples/replica-postgres/versions.tf +++ b/examples/replica-postgres/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = ">= 4.0" + version = ">= 4.6" } } } diff --git a/examples/s3-import-mysql/README.md b/examples/s3-import-mysql/README.md index d17cb0a7..f05a9cae 100644 --- a/examples/s3-import-mysql/README.md +++ b/examples/s3-import-mysql/README.md @@ -49,14 +49,14 @@ Note that this example may create resources which cost money. Run `terraform des | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 0.13.1 | -| [aws](#requirement\_aws) | >= 4.0 | +| [aws](#requirement\_aws) | >= 4.6 | | [random](#requirement\_random) | >= 3.1 | ## Providers | Name | Version | |------|---------| -| [aws](#provider\_aws) | >= 4.0 | +| [aws](#provider\_aws) | >= 4.6 | | [random](#provider\_random) | >= 3.1 | ## Modules diff --git a/examples/s3-import-mysql/versions.tf b/examples/s3-import-mysql/versions.tf index c849c1e9..99ad04f3 100644 --- a/examples/s3-import-mysql/versions.tf +++ b/examples/s3-import-mysql/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = ">= 4.0" + version = ">= 4.6" } random = { diff --git a/modules/db_instance/README.md b/modules/db_instance/README.md index f3814b36..cc9f844c 100644 --- a/modules/db_instance/README.md +++ b/modules/db_instance/README.md @@ -6,14 +6,14 @@ | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 0.13.1 | -| [aws](#requirement\_aws) | >= 4.0 | +| [aws](#requirement\_aws) | >= 4.6 | | [random](#requirement\_random) | >= 3.1 | ## Providers | Name | Version | |------|---------| -| [aws](#provider\_aws) | >= 4.0 | +| [aws](#provider\_aws) | >= 4.6 | | [random](#provider\_random) | >= 3.1 | ## Modules diff --git a/modules/db_instance/versions.tf b/modules/db_instance/versions.tf index c849c1e9..99ad04f3 100644 --- a/modules/db_instance/versions.tf +++ b/modules/db_instance/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = ">= 4.0" + version = ">= 4.6" } random = { diff --git a/versions.tf b/versions.tf index c849c1e9..99ad04f3 100644 --- a/versions.tf +++ b/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = ">= 4.0" + version = ">= 4.6" } random = {