feat!: Update Terraform and AWS provider versions to 1.11 and 6.0 respectively
#14
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 |
|---|---|---|
|
|
@@ -38,8 +38,8 @@ module "secrets_manager" { | |
| # Policy | ||
| create_policy = true | ||
| block_public_policy = true | ||
| policy_statements = [ | ||
| { | ||
| sid = "AllowAccountRead" | ||
| principals = [{ | ||
| type = "AWS" | ||
|
|
@@ -48,12 +48,11 @@ module "secrets_manager" { | |
| actions = ["secretsmanager:GetSecretValue"] | ||
| resources = ["*"] | ||
| } | ||
| ] | ||
|
|
||
| # Version | ||
| secret_string_wo = ephemeral.random_password.password.result | ||
| secret_string_wo_version = 1 | ||
|
|
||
| tags = local.tags | ||
| } | ||
|
|
@@ -69,8 +68,8 @@ module "secrets_manager_rotate" { | |
| # Policy | ||
| create_policy = true | ||
| block_public_policy = true | ||
| policy_statements = [ | ||
| { | ||
| sid = "LambdaReadWrite" | ||
| principals = [{ | ||
| type = "AWS" | ||
|
|
@@ -83,8 +82,8 @@ module "secrets_manager_rotate" { | |
| "secretsmanager:UpdateSecretVersionStage", | ||
| ] | ||
| resources = ["*"] | ||
| }, | ||
| { | ||
| sid = "AccountDescribe" | ||
| principals = [{ | ||
| type = "AWS" | ||
|
|
@@ -93,15 +92,15 @@ module "secrets_manager_rotate" { | |
| actions = ["secretsmanager:DescribeSecret"] | ||
| resources = ["*"] | ||
| } | ||
| ] | ||
|
|
||
| # Version | ||
| ignore_secret_changes = true | ||
| secret_string = jsonencode({ | ||
| engine = "mariadb", | ||
| host = "mydb.cluster-123456789012.us-east-1.rds.amazonaws.com", | ||
| username = "Bill", | ||
| password = "ThisIsMySuperSecretString12356!", | ||
| dbname = "mydb", | ||
| port = 3306 | ||
| }) | ||
|
|
@@ -127,6 +126,12 @@ module "secrets_manager_disabled" { | |
| # Supporting Resources | ||
| ################################################################################ | ||
|
|
||
| ephemeral "random_password" "password" { | ||
|
There was a problem hiding this comment. ephemeral outside of the module is fine, but I think we should have ephemeral within the module as well. This way, users can just call the module without any external resources/ephemerals. There was a problem hiding this comment. It looks like OpenTofu doesn't support ephemeral variables yet, so if we add ephemeral variables into the module, it will break it for OpenTofu users. https://opentofu.org/docs/language/values/variables/#arguments There was a problem hiding this comment. re-added using ephemeral resource 9682e45 |
||
| length = 16 | ||
| special = true | ||
| override_special = "!#$%&*()-_=+[]{}<>:?" | ||
| } | ||
|
|
||
| # https://docs.aws.amazon.com/secretsmanager/latest/userguide/rotating-secrets-required-permissions-function.html | ||
| data "aws_iam_policy_document" "this" { | ||
| statement { | ||
|
|
@@ -152,13 +157,13 @@ data "aws_iam_policy_document" "this" { | |
|
|
||
| module "lambda" { | ||
| source = "terraform-aws-modules/lambda/aws" | ||
| version = "~> 8.0" | ||
|
|
||
| function_name = local.name | ||
| description = "Example Secrets Manager secret rotation lambda function" | ||
|
|
||
| handler = "function.lambda_handler" | ||
| runtime = "python3.12" | ||
|
There was a problem hiding this comment. Just for being lazy for another more year, let's put it to |
||
| timeout = 60 | ||
| memory_size = 512 | ||
| source_path = "${path.module}/function.py" | ||
|
|
||
This file contains hidden or 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,10 +1,14 @@ | ||
| terraform { | ||
| required_version = ">= 1.11" | ||
|
|
||
| required_providers { | ||
| aws = { | ||
| source = "hashicorp/aws" | ||
| version = ">= 6.0" | ||
| } | ||
| random = { | ||
| source = "hashicorp/random" | ||
| version = ">= 3.7" | ||
| } | ||
| } | ||
| } |
This file contains hidden or 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
Oops, something went wrong.
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.
What was the reason for the change from map to list? I like maps, because keys there are like comments. Also,
*_statementsare maps in other modules, I guess.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.
crap, looks like I've mixed up and some are maps some are lists in the other updated modules - I'll move this back to a map
Uh oh!
There was an error while loading. Please reload this page.
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.
fixed in f5ac140