Rename class

alan-turing-institute · Sep 19, 2024 · 9e6b1b9 · 9e6b1b9
1 parent d62c0cc
commit 9e6b1b9
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/data_safe_haven/infrastructure/components/__init__.py b/data_safe_haven/infrastructure/components/__init__.py
@@ -21,8 +21,8 @@
     SSLCertificateProps,
 )
 from .wrapped import (
-    NFSV3StorageAccount,
     WrappedLogAnalyticsWorkspace,
+    WrappedNFSV3StorageAccount,
 )
 
 __all__ = [
@@ -39,7 +39,7 @@
     "MicrosoftSQLDatabaseProps",
     "NFSV3BlobContainerComponent",
     "NFSV3BlobContainerProps",
-    "NFSV3StorageAccount",
+    "WrappedNFSV3StorageAccount",
     "PostgresqlDatabaseComponent",
     "PostgresqlDatabaseProps",
     "SSLCertificate",

diff --git a/data_safe_haven/infrastructure/components/wrapped/__init__.py b/data_safe_haven/infrastructure/components/wrapped/__init__.py
@@ -1,7 +1,7 @@
 from .log_analytics_workspace import WrappedLogAnalyticsWorkspace
-from .nfsv3_storage_account import NFSV3StorageAccount
+from .nfsv3_storage_account import WrappedNFSV3StorageAccount
 
 __all__ = [
-    "NFSV3StorageAccount",
+    "WrappedNFSV3StorageAccount",
     "WrappedLogAnalyticsWorkspace",
 ]
diff --git a/data_safe_haven/infrastructure/components/wrapped/nfsv3_storage_account.py b/data_safe_haven/infrastructure/components/wrapped/nfsv3_storage_account.py
@@ -6,7 +6,7 @@
 from data_safe_haven.external import AzureIPv4Range
 
 
-class NFSV3StorageAccount(storage.StorageAccount):
+class WrappedNFSV3StorageAccount(storage.StorageAccount):
     encryption_args = storage.EncryptionArgs(
         key_source=storage.KeySource.MICROSOFT_STORAGE,
         services=storage.EncryptionServicesArgs(

diff --git a/data_safe_haven/infrastructure/programs/sre/data.py b/data_safe_haven/infrastructure/programs/sre/data.py
@@ -31,9 +31,9 @@
 from data_safe_haven.infrastructure.components import (
     NFSV3BlobContainerComponent,
     NFSV3BlobContainerProps,
-    NFSV3StorageAccount,
     SSLCertificate,
     SSLCertificateProps,
+    WrappedNFSV3StorageAccount,
 )
 from data_safe_haven.types import AzureDnsZoneNames
 
@@ -460,7 +460,7 @@ def __init__(
         # Deploy sensitive data blob storage account
         # - This holds the /mnt/input and /mnt/output containers that are mounted by workspaces
         # - Azure blobs have worse NFS support but can be accessed with Azure Storage Explorer
-        storage_account_data_private_sensitive = NFSV3StorageAccount(
+        storage_account_data_private_sensitive = WrappedNFSV3StorageAccount(
             f"{self._name}_storage_account_data_private_sensitive",
             # Storage account names have a maximum of 24 characters
             account_name=alphanumeric(

diff --git a/data_safe_haven/infrastructure/programs/sre/desired_state.py b/data_safe_haven/infrastructure/programs/sre/desired_state.py
@@ -31,7 +31,7 @@
 from data_safe_haven.infrastructure.components import (
     NFSV3BlobContainerComponent,
     NFSV3BlobContainerProps,
-    NFSV3StorageAccount,
+    WrappedNFSV3StorageAccount,
 )
 from data_safe_haven.resources import resources_path
 from data_safe_haven.types import AzureDnsZoneNames
@@ -102,7 +102,7 @@ def __init__(
         # Deploy desired state storage account
         # - This holds the /var/local/ansible container that is mounted by workspaces
         # - Azure blobs have worse NFS support but can be accessed with Azure Storage Explorer
-        storage_account = NFSV3StorageAccount(
+        storage_account = WrappedNFSV3StorageAccount(
             f"{self._name}_storage_account",
             account_name=alphanumeric(
                 f"{''.join(truncate_tokens(stack_name.split('-'), 11))}desiredstate{sha256hash(self._name)}"