Merge pull request #1858 from jemrobinson/simplify-provisioning

Simplify SREProvisioningManager
alan-turing-institute · May 7, 2024 · 779bc46 · 779bc46
2 parents c59da3f + 7e1ed05
commit 779bc46
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/data_safe_haven/commands/deploy.py b/data_safe_haven/commands/deploy.py
@@ -196,7 +196,7 @@ def sre(
         # Provision SRE with anything that could not be done in Pulumi
         manager = SREProvisioningManager(
             graph_api_token=graph_api.token,
-            shm_stack=shm_stack,
+            location=context.location,
             sre_name=sre_name,
             sre_stack=stack,
             subscription_name=context.subscription_name,

diff --git a/data_safe_haven/provisioning/sre_provisioning_manager.py b/data_safe_haven/provisioning/sre_provisioning_manager.py
@@ -9,7 +9,8 @@
     AzurePostgreSQLDatabase,
     GraphApi,
 )
-from data_safe_haven.infrastructure import SHMProjectManager, SREProjectManager
+from data_safe_haven.infrastructure import SREProjectManager
+from data_safe_haven.types import AzureLocation, AzureLongName
 from data_safe_haven.utility import LoggingSingleton
 
 
@@ -19,14 +20,14 @@ class SREProvisioningManager:
     def __init__(
         self,
         graph_api_token: str,
-        shm_stack: SHMProjectManager,
+        location: AzureLocation,
         sre_name: str,
         sre_stack: SREProjectManager,
-        subscription_name: str,
+        subscription_name: AzureLongName,
         timezone: str,
     ):
         self._available_vm_skus: dict[str, dict[str, Any]] | None = None
-        self.azure_location = shm_stack.context.location
+        self.location = location
         self.graph_api = GraphApi(auth_token=graph_api_token)
         self.logger = LoggingSingleton()
         self.sre_name = sre_name
@@ -67,9 +68,7 @@ def available_vm_skus(self) -> dict[str, dict[str, Any]]:
         """Load available VM SKUs for this region"""
         if not self._available_vm_skus:
             azure_api = AzureApi(self.subscription_name)
-            self._available_vm_skus = azure_api.list_available_vm_skus(
-                self.azure_location
-            )
+            self._available_vm_skus = azure_api.list_available_vm_skus(self.location)
         return self._available_vm_skus
 
     def create_security_groups(self) -> None: