⚰️ Remove SHM firewall component

alan-turing-institute · May 9, 2024 · 21e48b4 · 21e48b4
1 parent cf4d488
commit 21e48b4
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 388 deletions.
diff --git a/data_safe_haven/commands/deploy.py b/data_safe_haven/commands/deploy.py
@@ -150,11 +150,6 @@ def sre(
         )
         stack.add_option("azure-native:tenantId", config.azure.tenant_id, replace=False)
         # Load SHM stack outputs
-        stack.add_option(
-            "shm-firewall-private-ip-address",
-            shm_stack.output("firewall")["private_ip_address"],
-            replace=True,
-        )
         stack.add_option(
             "shm-monitoring-automation_account_name",
             shm_stack.output("monitoring")["automation_account_name"],

diff --git a/data_safe_haven/infrastructure/programs/declarative_shm.py b/data_safe_haven/infrastructure/programs/declarative_shm.py
@@ -5,7 +5,6 @@
 from data_safe_haven.config import Config
 from data_safe_haven.context import Context
 
-from .shm.firewall import SHMFirewallComponent, SHMFirewallProps
 from .shm.monitoring import SHMMonitoringComponent, SHMMonitoringProps
 from .shm.networking import SHMNetworkingComponent, SHMNetworkingProps
 
@@ -40,20 +39,6 @@ def __call__(self) -> None:
             tags=self.tags,
         )
 
-        # Deploy firewall and routing
-        firewall = SHMFirewallComponent(
-            "shm_firewall",
-            self.stack_name,
-            SHMFirewallProps(
-                dns_zone=networking.dns_zone,
-                location=self.context.location,
-                resource_group_name=networking.resource_group_name,
-                route_table_name=networking.route_table.name,
-                subnet_firewall=networking.subnet_firewall,
-            ),
-            tags=self.tags,
-        )
-
         # Deploy automated monitoring
         monitoring = SHMMonitoringComponent(
             "shm_monitoring",
@@ -69,6 +54,5 @@ def __call__(self) -> None:
         )
 
         # Export values for later use
-        pulumi.export("firewall", firewall.exports)
         pulumi.export("monitoring", monitoring.exports)
         pulumi.export("networking", networking.exports)
diff --git a/data_safe_haven/infrastructure/programs/declarative_sre.py b/data_safe_haven/infrastructure/programs/declarative_sre.py
@@ -147,9 +147,6 @@ def __call__(self) -> None:
                 dns_resource_group_name=dns.resource_group.name,
                 dns_server_ip=dns.ip_address,
                 dns_virtual_network=dns.virtual_network,
-                firewall_ip_address=self.pulumi_opts.require(
-                    "shm-firewall-private-ip-address"
-                ),
                 location=self.context.location,
                 shm_fqdn=self.cfg.shm.fqdn,
                 shm_networking_resource_group_name=self.pulumi_opts.require(