Update Pulumi resource ordering

data_safe_haven/pulumi/common/__init__.py

@@ -0,0 +1,23 @@
+from .enums import NetworkingPriorities
+from .transformations import (
+    get_available_ips_from_subnet,
+    get_id_from_rg,
+    get_id_from_subnet,
+    get_ip_address_from_container_group,
+    get_ip_addresses_from_private_endpoint,
+    get_name_from_rg,
+    get_name_from_subnet,
+    get_name_from_vnet,
+)
+
+__all__ = [
+    "get_available_ips_from_subnet",
+    "get_id_from_rg",
+    "get_id_from_subnet",
+    "get_ip_address_from_container_group",
+    "get_ip_addresses_from_private_endpoint",
+    "get_name_from_rg",
+    "get_name_from_subnet",
+    "get_name_from_vnet",
+    "NetworkingPriorities",
+]

data_safe_haven/pulumi/components/automation_dsc_node.py

@@ -55,7 +55,7 @@ def __init__(
         opts: ResourceOptions | None = None,
     ) -> None:
         super().__init__("dsh:common:AutomationDscNode", name, {}, opts)
-        child_opts = ResourceOptions.merge(ResourceOptions(parent=self), opts)
+        child_opts = ResourceOptions.merge(opts, ResourceOptions(parent=self))
 
         # Upload the primary domain controller DSC
         dsc = automation.DscConfiguration(
@@ -77,10 +77,10 @@ def __init__(
                 ),
             ),
             opts=ResourceOptions.merge(
+                child_opts,
                 ResourceOptions(
                     delete_before_replace=True, replace_on_changes=["source.hash"]
                 ),
-                child_opts,
             ),
         )
         dsc_compiled = CompiledDsc(
@@ -97,7 +97,7 @@ def __init__(
                 required_modules=props.dsc_required_modules,
                 subscription_name=props.subscription_name,
             ),
-            opts=ResourceOptions.merge(ResourceOptions(depends_on=[dsc]), child_opts),
+            opts=ResourceOptions.merge(child_opts, ResourceOptions(depends_on=[dsc])),
         )
         compute.VirtualMachineExtension(
             f"{self._name}_dsc_extension",
@@ -130,7 +130,7 @@ def __init__(
             vm_name=props.vm_name,
             vm_extension_name="Microsoft.Powershell.DSC",
             opts=ResourceOptions.merge(
-                ResourceOptions(depends_on=[dsc_compiled]),
                 child_opts,
+                ResourceOptions(depends_on=[dsc_compiled]),
             ),
         )

data_safe_haven/pulumi/components/shm_bastion.py

@@ -29,7 +29,7 @@ def __init__(
         opts: ResourceOptions | None = None,
     ) -> None:
         super().__init__("dsh:shm:BastionComponent", name, {}, opts)
-        child_opts = ResourceOptions.merge(ResourceOptions(parent=self), opts)
+        child_opts = ResourceOptions.merge(opts, ResourceOptions(parent=self))
 
         # Deploy IP address
         public_ip = network.PublicIPAddress(

data_safe_haven/pulumi/components/shm_data.py

@@ -54,7 +54,7 @@ def __init__(
         opts: ResourceOptions | None = None,
     ) -> None:
         super().__init__("dsh:shm:DataComponent", name, {}, opts)
-        child_opts = ResourceOptions.merge(ResourceOptions(parent=self), opts)
+        child_opts = ResourceOptions.merge(opts, ResourceOptions(parent=self))
 
         # Deploy resource group
         resource_group = resources.ResourceGroup(

data_safe_haven/pulumi/components/shm_domain_controllers.py

@@ -5,7 +5,7 @@
 from pulumi import ComponentResource, Input, Output, ResourceOptions
 from pulumi_azure_native import network, resources
 
-from data_safe_haven.pulumi.common.transformations import get_name_from_subnet
+from data_safe_haven.pulumi.common import get_name_from_subnet
 from data_safe_haven.pulumi.dynamic.remote_powershell import (
     RemoteScript,
     RemoteScriptProps,
@@ -87,7 +87,7 @@ def __init__(
         opts: ResourceOptions | None = None,
     ) -> None:
         super().__init__("dsh:shm:DomainControllersComponent", name, {}, opts)
-        child_opts = ResourceOptions.merge(ResourceOptions(parent=self), opts)
+        child_opts = ResourceOptions.merge(opts, ResourceOptions(parent=self))
         resources_path = pathlib.Path(__file__).parent.parent.parent / "resources"
 
         # Deploy resource group
@@ -157,8 +157,8 @@ def __init__(
                 vm_resource_group_name=resource_group.name,
             ),
             opts=ResourceOptions.merge(
-                ResourceOptions(depends_on=[primary_domain_controller]),
                 child_opts,
+                ResourceOptions(depends_on=[primary_domain_controller]),
             ),
         )
         # Extract the domain SID
@@ -177,13 +177,13 @@ def __init__(
                 vm_resource_group_name=resource_group.name,
             ),
             opts=ResourceOptions.merge(
+                child_opts,
                 ResourceOptions(
                     depends_on=[
                         primary_domain_controller,
                         primary_domain_controller_dsc_node,
                     ]
                 ),
-                child_opts,
             ),
         )
 

data_safe_haven/pulumi/components/shm_firewall.py

@@ -2,7 +2,7 @@
 from pulumi import ComponentResource, Input, Output, ResourceOptions
 from pulumi_azure_native import network
 
-from data_safe_haven.pulumi.common.transformations import get_id_from_subnet
+from data_safe_haven.pulumi.common import get_id_from_subnet
 
 
 class SHMFirewallProps:
@@ -46,7 +46,7 @@ def __init__(
         opts: ResourceOptions | None = None,
     ) -> None:
         super().__init__("dsh:shm:FirewallComponent", name, {}, opts)
-        child_opts = ResourceOptions.merge(ResourceOptions(parent=self), opts)
+        child_opts = ResourceOptions.merge(opts, ResourceOptions(parent=self))
 
         # Important IP addresses
         # https://docs.microsoft.com/en-us/azure/virtual-network/what-is-ip-address-168-63-129-16

data_safe_haven/pulumi/components/shm_monitoring.py

@@ -14,7 +14,7 @@
     replace_separators,
     time_as_string,
 )
-from data_safe_haven.pulumi.common.transformations import get_id_from_subnet
+from data_safe_haven.pulumi.common import get_id_from_subnet
 
 
 class SHMMonitoringProps:
@@ -48,7 +48,7 @@ def __init__(
         opts: ResourceOptions | None = None,
     ) -> None:
         super().__init__("dsh:shm:MonitoringComponent", name, {}, opts)
-        child_opts = ResourceOptions.merge(ResourceOptions(parent=self), opts)
+        child_opts = ResourceOptions.merge(opts, ResourceOptions(parent=self))
 
         # Deploy resource group
         resource_group = resources.ResourceGroup(
@@ -285,8 +285,8 @@ def __init__(
                 ),
             ),
             opts=ResourceOptions.merge(
-                ResourceOptions(ignore_changes=["schedule_info"]),
                 child_opts,
+                ResourceOptions(ignore_changes=["schedule_info"]),
             ),
         )
         # Create Windows VM system update schedule: daily at 02:02
@@ -333,13 +333,13 @@ def __init__(
                 ),
             ),
             opts=ResourceOptions.merge(
+                child_opts,
                 ResourceOptions(
                     ignore_changes=[
                         "schedule_info",  # options are added after deployment
                         "updateConfiguration.windows.included_package_classifications",  # ordering might change
                     ]
                 ),
-                child_opts,
             ),
         )
         # Create Linux VM system update schedule: daily at 02:02
@@ -383,13 +383,13 @@ def __init__(
                 ),
             ),
             opts=ResourceOptions.merge(
+                child_opts,
                 ResourceOptions(
                     ignore_changes=[
                         "schedule_info",  # options are added after deployment
                         "updateConfiguration.linux.included_package_classifications",  # ordering might change
                     ]
                 ),
-                child_opts,
             ),
         )
 

data_safe_haven/pulumi/components/shm_networking.py

@@ -6,7 +6,7 @@
 
 from data_safe_haven.external import AzureIPv4Range
 from data_safe_haven.functions import ordered_private_dns_zones
-from data_safe_haven.pulumi.common.enums import NetworkingPriorities
+from data_safe_haven.pulumi.common import NetworkingPriorities
 
 
 class SHMNetworkingProps:
@@ -47,7 +47,7 @@ def __init__(
         opts: ResourceOptions | None = None,
     ) -> None:
         super().__init__("dsh:shm:NetworkingComponent", name, {}, opts)
-        child_opts = ResourceOptions.merge(ResourceOptions(parent=self), opts)
+        child_opts = ResourceOptions.merge(opts, ResourceOptions(parent=self))
 
         # Deploy resource group
         resource_group = resources.ResourceGroup(
@@ -325,10 +325,10 @@ def __init__(
             route_table_name=f"{stack_name}-route",
             routes=[],
             opts=ResourceOptions.merge(
+                child_opts,
                 ResourceOptions(
                     ignore_changes=["routes"]
                 ),  # allow routes to be created outside this definition
-                child_opts,
             ),
         )
 
@@ -392,10 +392,10 @@ def __init__(
             virtual_network_name=f"{stack_name}-vnet",
             virtual_network_peerings=[],
             opts=ResourceOptions.merge(
+                child_opts,
                 ResourceOptions(
                     ignore_changes=["virtual_network_peerings"]
                 ),  # allow SRE virtual networks to peer to this
-                child_opts,
             ),
         )
 

data_safe_haven/pulumi/components/shm_update_servers.py

@@ -5,7 +5,7 @@
 from pulumi_azure_native import network
 
 from data_safe_haven.functions import b64encode
-from data_safe_haven.pulumi.common.transformations import (
+from data_safe_haven.pulumi.common import (
     get_available_ips_from_subnet,
     get_name_from_subnet,
 )
@@ -53,7 +53,7 @@ def __init__(
         opts: ResourceOptions | None = None,
     ) -> None:
         super().__init__("dsh:shm:UpdateServersComponent", name, {}, opts)
-        child_opts = ResourceOptions.merge(ResourceOptions(parent=self), opts)
+        child_opts = ResourceOptions.merge(opts, ResourceOptions(parent=self))
 
         # Load cloud-init file
         b64cloudinit = self.read_cloudinit()

data_safe_haven/pulumi/components/sre_application_gateway.py

@@ -4,7 +4,7 @@
 from pulumi import ComponentResource, Input, Output, ResourceOptions
 from pulumi_azure_native import managedidentity, network, resources
 
-from data_safe_haven.pulumi.common.transformations import (
+from data_safe_haven.pulumi.common import (
     get_available_ips_from_subnet,
     get_id_from_rg,
     get_id_from_subnet,
@@ -55,7 +55,7 @@ def __init__(
         opts: ResourceOptions | None = None,
     ) -> None:
         super().__init__("dsh:sre:ApplicationGatewayComponent", name, {}, opts)
-        child_opts = ResourceOptions.merge(ResourceOptions(parent=self), opts)
+        child_opts = ResourceOptions.merge(opts, ResourceOptions(parent=self))
 
         # Define public IP address
         public_ip = network.PublicIPAddress(