From 5713c147713826411700603c9b0abca4357a3a3b Mon Sep 17 00:00:00 2001 From: James Robinson Date: Wed, 23 Oct 2024 15:21:23 +0100 Subject: [PATCH 1/2] :loud_sound: Standardise logging --- data_safe_haven/commands/sre.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/data_safe_haven/commands/sre.py b/data_safe_haven/commands/sre.py index d1f32ea278..0a0c0135f2 100644 --- a/data_safe_haven/commands/sre.py +++ b/data_safe_haven/commands/sre.py @@ -92,7 +92,7 @@ def deploy( ) logger.info( f"SRE will be deployed to subscription '[green]{sre_subscription_name}[/]'" - f" ('[bold]{sre_config.azure.subscription_id}[/]')" + f" ({sre_config.azure.subscription_id}[/])" ) # Set Entra options application = graph_api.get_application_by_name(context.entra_application_name) @@ -136,7 +136,13 @@ def deploy( replace=True, ) logger.info(f"SRE will be registered in SHM '[green]{shm_config.shm.fqdn}[/]'") - logger.info(f"SHM subscription '[green]{shm_config.azure.subscription_id}[/]'") + shm_subscription_name = azure_sdk.get_subscription_name( + shm_config.azure.subscription_id + ) + logger.info( + f"SHM is deployed to subscription '[green]{shm_subscription_name}[/]'" + f" ({shm_config.azure.subscription_id}[/])" + ) # Deploy Azure infrastructure with Pulumi try: From e8eb8def972de3b0ec8a7e40a70e3f92ab22c279 Mon Sep 17 00:00:00 2001 From: James Robinson Date: Wed, 23 Oct 2024 20:00:57 +0100 Subject: [PATCH 2/2] :bug: Fix rogue closing tags --- data_safe_haven/commands/sre.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data_safe_haven/commands/sre.py b/data_safe_haven/commands/sre.py index 0a0c0135f2..f03f0cc53e 100644 --- a/data_safe_haven/commands/sre.py +++ b/data_safe_haven/commands/sre.py @@ -92,7 +92,7 @@ def deploy( ) logger.info( f"SRE will be deployed to subscription '[green]{sre_subscription_name}[/]'" - f" ({sre_config.azure.subscription_id}[/])" + f" ({sre_config.azure.subscription_id})" ) # Set Entra options application = graph_api.get_application_by_name(context.entra_application_name) @@ -141,7 +141,7 @@ def deploy( ) logger.info( f"SHM is deployed to subscription '[green]{shm_subscription_name}[/]'" - f" ({shm_config.azure.subscription_id}[/])" + f" ({shm_config.azure.subscription_id})" ) # Deploy Azure infrastructure with Pulumi