From 76e60181e878aa89df0098d79842eaada73c5a9d Mon Sep 17 00:00:00 2001 From: "John \"Preston\" Mille" Date: Wed, 15 Nov 2023 11:42:56 +0000 Subject: [PATCH] Given the secret ID is always passed via parameter, using Parameter name --- ecs_composex/rds_resources_settings.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/ecs_composex/rds_resources_settings.py b/ecs_composex/rds_resources_settings.py index cc5cf370..3359131a 100644 --- a/ecs_composex/rds_resources_settings.py +++ b/ecs_composex/rds_resources_settings.py @@ -235,6 +235,7 @@ def generate_secret_string( """ from troposphere.secretsmanager import Secret + param_name = secret_import.data["Ref"] secret, already_set = set_get_resource( family.template, Secret( @@ -244,32 +245,32 @@ def generate_secret_string( "${ENGINE}://${USERNAME}:${PASSWORD}@${HOST}:${PORT}/${DBNAME}", ENGINE=Sub( "{{resolve:secretsmanager:" - + f"${{{secret_import.title}}}" + + f"${{{param_name}}}" + ":SecretString:engine}}", ), USERNAME=Sub( "{{resolve:secretsmanager:" - + f"${{{secret_import.title}}}" + + f"${{{param_name}}}" + ":SecretString:username}}", ), PASSWORD=Sub( "{{resolve:secretsmanager:" - + f"${{{secret_import.title}}}" + + f"${{{param_name}}}" + ":SecretString:password}}", ), HOST=Sub( "{{resolve:secretsmanager:" - + f"${{{secret_import.title}}}" + + f"${{{param_name}}}" + ":SecretString:host}}", ), PORT=Sub( "{{resolve:secretsmanager:" - + f"${{{secret_import.title}}}" + + f"${{{param_name}}}" + ":SecretString:port}}", ), DBNAME=Sub( "{{resolve:secretsmanager:" - + f"${{{secret_import.title}}}" + + f"${{{param_name}}}" + ":SecretString:dbname}}", ), ),