From c8e61c3f895168497a957045bdc84375ac8d5f1a Mon Sep 17 00:00:00 2001 From: darrenl33 Date: Wed, 16 Oct 2024 14:48:31 -0700 Subject: [PATCH 1/6] allow removal of cluster name from aurora ssm parameter --- modules/aurora-postgres/ssm.tf | 2 +- modules/aurora-postgres/variables.tf | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/modules/aurora-postgres/ssm.tf b/modules/aurora-postgres/ssm.tf index 9b74979dd..5ea73830d 100644 --- a/modules/aurora-postgres/ssm.tf +++ b/modules/aurora-postgres/ssm.tf @@ -1,5 +1,5 @@ locals { - ssm_path_prefix = format("/%s/%s", var.ssm_path_prefix, module.cluster.id) + ssm_path_prefix = var.ssm_cluster_name_override ? var.ssm_path_prefix : format("/%s/%s", var.ssm_path_prefix, module.cluster.id) admin_user_key = format("%s/%s/%s", local.ssm_path_prefix, "admin", "user") admin_password_key = format("%s/%s/%s", local.ssm_path_prefix, "admin", "password") diff --git a/modules/aurora-postgres/variables.tf b/modules/aurora-postgres/variables.tf index ea71e52f0..5e037ef42 100644 --- a/modules/aurora-postgres/variables.tf +++ b/modules/aurora-postgres/variables.tf @@ -352,3 +352,9 @@ variable "backup_window" { default = "07:00-09:00" description = "Daily time range during which the backups happen, UTC" } + +variable "ssm_cluster_name_override" { + type = bool + default = false + description = "If set to true, we don't set cluster name into ssm parameter store name" +} \ No newline at end of file From d2d2cc646981ef21e63f0c96f0373083d48f743f Mon Sep 17 00:00:00 2001 From: Darren Lee <167146344+darrenl33@users.noreply.github.com> Date: Wed, 16 Oct 2024 15:17:37 -0700 Subject: [PATCH 2/6] update conditional --- modules/aurora-postgres/ssm.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/aurora-postgres/ssm.tf b/modules/aurora-postgres/ssm.tf index 5ea73830d..ecda3063e 100644 --- a/modules/aurora-postgres/ssm.tf +++ b/modules/aurora-postgres/ssm.tf @@ -1,5 +1,5 @@ locals { - ssm_path_prefix = var.ssm_cluster_name_override ? var.ssm_path_prefix : format("/%s/%s", var.ssm_path_prefix, module.cluster.id) + ssm_path_prefix = var.ssm_cluster_name_override ? format("/%s", var.ssm_path_prefix) : format("/%s/%s", var.ssm_path_prefix, module.cluster.id) admin_user_key = format("%s/%s/%s", local.ssm_path_prefix, "admin", "user") admin_password_key = format("%s/%s/%s", local.ssm_path_prefix, "admin", "password") From 1b6df577018fb4e46d48d1b1e68da620cc381bd3 Mon Sep 17 00:00:00 2001 From: Darren Lee <167146344+darrenl33@users.noreply.github.com> Date: Wed, 16 Oct 2024 16:09:37 -0700 Subject: [PATCH 3/6] update variable for ssm_cluster_name_override --- modules/aurora-postgres/variables.tf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/aurora-postgres/variables.tf b/modules/aurora-postgres/variables.tf index 5e037ef42..ba9ad02a6 100644 --- a/modules/aurora-postgres/variables.tf +++ b/modules/aurora-postgres/variables.tf @@ -354,7 +354,7 @@ variable "backup_window" { } variable "ssm_cluster_name_override" { - type = bool - default = false - description = "If set to true, we don't set cluster name into ssm parameter store name" -} \ No newline at end of file + type = string + default = "" + description = "Set a cluster name to in the ssm path prefix" +} From 33d9a0233be1eac19dd126821246a720efce67ff Mon Sep 17 00:00:00 2001 From: Darren Lee <167146344+darrenl33@users.noreply.github.com> Date: Wed, 16 Oct 2024 16:10:31 -0700 Subject: [PATCH 4/6] Apply suggestions from code review Co-authored-by: Benjamin Smith --- modules/aurora-postgres/ssm.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/aurora-postgres/ssm.tf b/modules/aurora-postgres/ssm.tf index ecda3063e..6980180d2 100644 --- a/modules/aurora-postgres/ssm.tf +++ b/modules/aurora-postgres/ssm.tf @@ -1,5 +1,5 @@ locals { - ssm_path_prefix = var.ssm_cluster_name_override ? format("/%s", var.ssm_path_prefix) : format("/%s/%s", var.ssm_path_prefix, module.cluster.id) + ssm_path_prefix = var.ssm_cluster_name_override ? format("/%s/%s", var.ssm_path_prefix, var.ssm_cluster_name_override) : format("/%s/%s", var.ssm_path_prefix, module.cluster.id) admin_user_key = format("%s/%s/%s", local.ssm_path_prefix, "admin", "user") admin_password_key = format("%s/%s/%s", local.ssm_path_prefix, "admin", "password") From 80f77addd04161e451546dff26024d2fb80fe6c9 Mon Sep 17 00:00:00 2001 From: Darren Lee <167146344+darrenl33@users.noreply.github.com> Date: Wed, 16 Oct 2024 16:16:35 -0700 Subject: [PATCH 5/6] Update variables.tf --- modules/aurora-postgres/variables.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/aurora-postgres/variables.tf b/modules/aurora-postgres/variables.tf index ba9ad02a6..1bc227790 100644 --- a/modules/aurora-postgres/variables.tf +++ b/modules/aurora-postgres/variables.tf @@ -356,5 +356,5 @@ variable "backup_window" { variable "ssm_cluster_name_override" { type = string default = "" - description = "Set a cluster name to in the ssm path prefix" + description = "Set a cluster name into the ssm path prefix" } From a590f192a2e5b9883c3c1a5bbd82087bd2741c91 Mon Sep 17 00:00:00 2001 From: Darren Lee <167146344+darrenl33@users.noreply.github.com> Date: Wed, 16 Oct 2024 16:24:56 -0700 Subject: [PATCH 6/6] update conditional expression to type of bool --- modules/aurora-postgres/ssm.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/aurora-postgres/ssm.tf b/modules/aurora-postgres/ssm.tf index 6980180d2..9e62a508f 100644 --- a/modules/aurora-postgres/ssm.tf +++ b/modules/aurora-postgres/ssm.tf @@ -1,5 +1,5 @@ locals { - ssm_path_prefix = var.ssm_cluster_name_override ? format("/%s/%s", var.ssm_path_prefix, var.ssm_cluster_name_override) : format("/%s/%s", var.ssm_path_prefix, module.cluster.id) + ssm_path_prefix = length(var.ssm_cluster_name_override) > 0 ? format("/%s/%s", var.ssm_path_prefix, var.ssm_cluster_name_override) : format("/%s/%s", var.ssm_path_prefix, module.cluster.id) admin_user_key = format("%s/%s/%s", local.ssm_path_prefix, "admin", "user") admin_password_key = format("%s/%s/%s", local.ssm_path_prefix, "admin", "password")