From a7809bf701c1e8a0a171664b17387bce0ff7d4f8 Mon Sep 17 00:00:00 2001 From: Matt Craddock <5796417+craddm@users.noreply.github.com> Date: Wed, 25 Sep 2024 10:27:58 +0000 Subject: [PATCH] Use new entra_group_exists check and raise error if not found --- data_safe_haven/config/shm_config.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/data_safe_haven/config/shm_config.py b/data_safe_haven/config/shm_config.py index 18af10d78b..7a30b74b1f 100644 --- a/data_safe_haven/config/shm_config.py +++ b/data_safe_haven/config/shm_config.py @@ -28,14 +28,13 @@ def from_args( ) -> SHMConfig: """Construct an SHMConfig from arguments.""" azure_sdk = AzureSdk(subscription_name=context.subscription_name) - try: + if azure_sdk.entra_directory.entra_group_exists(context.admin_group_name): admin_group_id = azure_sdk.entra_directory.get_id_from_groupname( context.admin_group_name ) - except DataSafeHavenMicrosoftGraphError as exc: - msg = f"Failed to get ID for group '{context.admin_group_name}'" - raise DataSafeHavenMicrosoftGraphError(msg) from exc - + else: + msg = f"Admin group '{context.admin_group_name}' not found. Check the group name." + raise DataSafeHavenMicrosoftGraphError(msg) return SHMConfig.model_construct( azure=ConfigSectionAzure.model_construct( location=location,