From 89609af2f0c79c0a75d22b2c79de6e266e7ba8c0 Mon Sep 17 00:00:00 2001 From: James Robinson Date: Wed, 24 Jan 2024 08:58:12 +0000 Subject: [PATCH 1/2] :bug: Ensure correct storage account is created --- data_safe_haven/context/context.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data_safe_haven/context/context.py b/data_safe_haven/context/context.py index 22d8df3757..001bde9c38 100644 --- a/data_safe_haven/context/context.py +++ b/data_safe_haven/context/context.py @@ -60,7 +60,7 @@ def create(self) -> None: storage_account_name=storage_account.name, ) _ = self.azure_api.ensure_storage_blob_container( - container_name=self.context.storage_container_name, + container_name=ConfigSectionPulumi.storage_container_name, resource_group_name=resource_group.name, storage_account_name=storage_account.name, ) From a4c4464197452004ef0f3cc2ef01076d16353618 Mon Sep 17 00:00:00 2001 From: James Robinson Date: Wed, 24 Jan 2024 08:59:37 +0000 Subject: [PATCH 2/2] :truck: Simplify imports --- data_safe_haven/config/__init__.py | 4 +++- data_safe_haven/context/context.py | 3 +-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/data_safe_haven/config/__init__.py b/data_safe_haven/config/__init__.py index 23e3c4641d..1c35121931 100644 --- a/data_safe_haven/config/__init__.py +++ b/data_safe_haven/config/__init__.py @@ -1,8 +1,10 @@ -from .config import Config +from .config import Config, ConfigSectionPulumi, ConfigSectionTags from .context_settings import Context, ContextSettings __all__ = [ "Config", + "ConfigSectionPulumi", + "ConfigSectionTags", "Context", "ContextSettings", ] diff --git a/data_safe_haven/context/context.py b/data_safe_haven/context/context.py index 001bde9c38..c2fc60e979 100644 --- a/data_safe_haven/context/context.py +++ b/data_safe_haven/context/context.py @@ -1,5 +1,4 @@ -from data_safe_haven.config.config import ConfigSectionPulumi, ConfigSectionTags -from data_safe_haven.config.context_settings import Context +from data_safe_haven.config import ConfigSectionPulumi, ConfigSectionTags, Context from data_safe_haven.exceptions import DataSafeHavenAzureError from data_safe_haven.external import AzureApi