fix: Disable endpoint creation when setting create_proxy = false (#12)

fatmcgav-depop · bryantbiggs · web-flow · commit 26724abef985 · 2022-08-10T14:34:48.000-04:00
Co-authored-by: Bryant Biggs &lt;bryantbiggs@gmail.com&gt;
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/antonbabenko/pre-commit-terraform
-    rev: v1.68.1
+    rev: v1.74.1
     hooks:
       - id: terraform_fmt
       - id: terraform_validate
@@ -23,7 +23,7 @@ repos:
           - '--args=--only=terraform_standard_module_structure'
           - '--args=--only=terraform_workspace_remote'
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.2.0
+    rev: v4.3.0
     hooks:
       - id: check-merge-conflict
       - id: end-of-file-fixer
diff --git a/examples/mysql_iam_cluster/main.tf b/examples/mysql_iam_cluster/main.tf
@@ -47,7 +47,7 @@ module "rds_proxy" {
   }
 
   secrets = {
-    "${local.db_username}" = {
+    (local.db_username) = {
       description = aws_secretsmanager_secret.superuser.description
       arn         = aws_secretsmanager_secret.superuser.arn
       kms_key_id  = aws_secretsmanager_secret.superuser.kms_key_id
diff --git a/examples/mysql_iam_instance/main.tf b/examples/mysql_iam_instance/main.tf
@@ -47,7 +47,7 @@ module "rds_proxy" {
   }
 
   secrets = {
-    "${local.db_username}" = {
+    (local.db_username) = {
       description = aws_secretsmanager_secret.superuser.description
       arn         = aws_secretsmanager_secret.superuser.arn
       kms_key_id  = aws_secretsmanager_secret.superuser.kms_key_id
diff --git a/examples/postgresql_iam_cluster/main.tf b/examples/postgresql_iam_cluster/main.tf
@@ -47,7 +47,7 @@ module "rds_proxy" {
   }
 
   secrets = {
-    "${local.db_username}" = {
+    (local.db_username) = {
       description = aws_secretsmanager_secret.superuser.description
       arn         = aws_secretsmanager_secret.superuser.arn
       kms_key_id  = aws_secretsmanager_secret.superuser.kms_key_id
diff --git a/examples/postgresql_iam_instance/main.tf b/examples/postgresql_iam_instance/main.tf
@@ -47,7 +47,7 @@ module "rds_proxy" {
   }
 
   secrets = {
-    "${local.db_username}" = {
+    (local.db_username) = {
       description = aws_secretsmanager_secret.superuser.description
       arn         = aws_secretsmanager_secret.superuser.arn
       kms_key_id  = aws_secretsmanager_secret.superuser.kms_key_id
diff --git a/main.tf b/main.tf
@@ -68,7 +68,7 @@ resource "aws_db_proxy_target" "db_cluster" {
 }
 
 resource "aws_db_proxy_endpoint" "this" {
-  for_each = var.db_proxy_endpoints
+  for_each = { for k, v in var.db_proxy_endpoints : k => v if var.create_proxy }
 
   db_proxy_name          = aws_db_proxy.this[0].name
   db_proxy_endpoint_name = each.value.name

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ module "rds_proxy" {`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`secrets = {`
`50`		`- "${local.db_username}" = {`
	`50`	`+ (local.db_username) = {`
`51`	`51`	`description = aws_secretsmanager_secret.superuser.description`
`52`	`52`	`arn = aws_secretsmanager_secret.superuser.arn`
`53`	`53`	`kms_key_id = aws_secretsmanager_secret.superuser.kms_key_id`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ resource "aws_db_proxy_target" "db_cluster" {`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`resource "aws_db_proxy_endpoint" "this" {`
`71`		`- for_each = var.db_proxy_endpoints`
	`71`	`+ for_each = { for k, v in var.db_proxy_endpoints : k => v if var.create_proxy }`
`72`	`72`
`73`	`73`	`db_proxy_name = aws_db_proxy.this[0].name`
`74`	`74`	`db_proxy_endpoint_name = each.value.name`