Apply changes from updated black version

data_safe_haven/administration/users/active_directory_users.py

@@ -1,4 +1,5 @@
 """Interact with users in an Azure Active Directory"""
+
 import pathlib
 from collections.abc import Sequence
 from typing import Any

data_safe_haven/administration/users/azure_ad_users.py

@@ -1,4 +1,5 @@
 """Interact with users in an Azure Active Directory"""
+
 from collections.abc import Sequence
 from typing import Any
 

data_safe_haven/cli.py

@@ -1,4 +1,5 @@
 """Command line entrypoint for Data Safe Haven application"""
+
 import pathlib
 from typing import Annotated, Optional
 

data_safe_haven/commands/admin.py

@@ -1,4 +1,5 @@
 """Command-line application for performing administrative tasks"""
+
 import pathlib
 from typing import Annotated
 

data_safe_haven/commands/admin_add_users.py

@@ -1,4 +1,5 @@
 """Add users to a deployed Data Safe Haven"""
+
 import pathlib
 
 from data_safe_haven.administration.users import UserHandler

data_safe_haven/commands/admin_list_users.py

@@ -1,4 +1,5 @@
 """List users from a deployed Data Safe Haven"""
+
 from data_safe_haven.administration.users import UserHandler
 from data_safe_haven.config import Config, ContextSettings
 from data_safe_haven.exceptions import DataSafeHavenError

data_safe_haven/commands/admin_register_users.py

@@ -1,4 +1,5 @@
 """Register existing users with a deployed SRE"""
+
 from data_safe_haven.administration.users import UserHandler
 from data_safe_haven.config import Config, ContextSettings
 from data_safe_haven.exceptions import DataSafeHavenError

data_safe_haven/commands/admin_remove_users.py

@@ -1,4 +1,5 @@
 """Remove existing users from a deployed Data Safe Haven"""
+
 from data_safe_haven.administration.users import UserHandler
 from data_safe_haven.config import Config, ContextSettings
 from data_safe_haven.exceptions import DataSafeHavenError

data_safe_haven/commands/admin_unregister_users.py

@@ -1,4 +1,5 @@
 """Unregister existing users from a deployed SRE"""
+
 from data_safe_haven.administration.users import UserHandler
 from data_safe_haven.config import Config, ContextSettings
 from data_safe_haven.exceptions import DataSafeHavenError

data_safe_haven/commands/config.py

@@ -1,4 +1,5 @@
 """Command group and entrypoints for managing DSH configuration"""
+
 from pathlib import Path
 from typing import Annotated, Optional
 

data_safe_haven/commands/context.py

@@ -1,4 +1,5 @@
 """Command group and entrypoints for managing a DSH context"""
+
 from typing import Annotated, Optional
 
 import typer

data_safe_haven/commands/deploy.py

@@ -1,4 +1,5 @@
 """Command-line application for deploying a Data Safe Haven component, delegating the details to a subcommand"""
+
 from typing import Annotated, Optional
 
 import typer

data_safe_haven/commands/teardown.py

@@ -1,4 +1,5 @@
 """Command-line application for tearing down a Data Safe Haven component, delegating the details to a subcommand"""
+
 from typing import Annotated
 
 import typer

data_safe_haven/config/config.py

@@ -1,4 +1,5 @@
 """Configuration file backed by blob storage"""
+
 from __future__ import annotations
 
 from pathlib import Path

data_safe_haven/config/context_settings.py

@@ -1,4 +1,5 @@
 """Load global and local settings from dotfiles"""
+
 # For postponed evaluation of annotations https://peps.python.org/pep-0563
 from __future__ import (
     annotations,

data_safe_haven/external/api/azure_api.py

@@ -1,4 +1,5 @@
 """Interface to the Azure Python SDK"""
+
 import time
 from collections.abc import Sequence
 from contextlib import suppress
@@ -425,10 +426,10 @@ def ensure_keyvault_self_signed_certificate(
                 enhanced_key_usage=["1.3.6.1.5.5.7.3.1", "1.3.6.1.5.5.7.3.2"],
                 validity_in_months=12,
             )
-            poller: LROPoller[
-                KeyVaultCertificate
-            ] = certificate_client.begin_create_certificate(
-                certificate_name=certificate_name, policy=policy
+            poller: LROPoller[KeyVaultCertificate] = (
+                certificate_client.begin_create_certificate(
+                    certificate_name=certificate_name, policy=policy
+                )
             )
             certificate = poller.result()
             self.logger.info(

data_safe_haven/external/api/azure_cli.py

@@ -1,4 +1,5 @@
 """Interface to the Azure CLI"""
+
 import json
 import subprocess
 from dataclasses import dataclass

data_safe_haven/external/api/graph_api.py

@@ -1,4 +1,5 @@
 """Interface to the Microsoft Graph API"""
+
 import datetime
 import pathlib
 import time

data_safe_haven/external/interface/azure_authenticator.py

@@ -1,4 +1,5 @@
 """Standalone utility class for anything that needs to authenticate against Azure"""
+
 from typing import cast
 
 from azure.core.exceptions import ClientAuthenticationError

data_safe_haven/external/interface/azure_fileshare.py

@@ -1,4 +1,5 @@
 """Helper class for Azure fileshares"""
+
 from contextlib import suppress
 
 from azure.core.exceptions import ResourceNotFoundError

data_safe_haven/infrastructure/common/ip_ranges.py

@@ -1,4 +1,5 @@
 """Calculate SRE IP address ranges for a given SRE index"""
+
 from data_safe_haven.external import AzureIPv4Range
 
 

data_safe_haven/infrastructure/common/transformations.py

@@ -1,4 +1,5 @@
 """Common transformations needed when manipulating Pulumi resources"""
+
 from pulumi import Output
 from pulumi_azure_native import containerinstance, network, resources
 
@@ -42,9 +43,9 @@ def get_ip_address_from_container_group(
 ) -> Output[str]:
     """Get the IP address of a container group"""
     return container_group.ip_address.apply(
-        lambda ip_address: (ip_address.ip if ip_address.ip else "")
-        if ip_address
-        else ""
+        lambda ip_address: (
+            (ip_address.ip if ip_address.ip else "") if ip_address else ""
+        )
     )
 
 
@@ -54,11 +55,17 @@ def get_ip_addresses_from_private_endpoint(
     """Get a list of IP addresses from a private endpoint"""
     if isinstance(endpoint.custom_dns_configs, Output):
         return endpoint.custom_dns_configs.apply(
-            lambda cfgs: sum(
-                [list(cfg.ip_addresses) if cfg.ip_addresses else [] for cfg in cfgs], []
+            lambda cfgs: (
+                sum(
+                    [
+                        list(cfg.ip_addresses) if cfg.ip_addresses else []
+                        for cfg in cfgs
+                    ],
+                    [],
+                )
+                if cfgs
+                else []
             )
-            if cfgs
-            else []
         )
     msg = f"Private endpoint '{endpoint.name}' has no IP addresses."
     raise DataSafeHavenPulumiError(msg)

data_safe_haven/infrastructure/components/composite/automation_dsc_node.py

@@ -1,4 +1,5 @@
 """Register a VM as an Azure Automation DSC node"""
+
 from collections.abc import Mapping, Sequence
 
 from pulumi import ComponentResource, Input, Output, ResourceOptions

data_safe_haven/infrastructure/components/composite/virtual_machine.py

@@ -1,4 +1,5 @@
 """Pulumi component for virtual machines"""
+
 from collections.abc import Mapping
 from typing import Any
 
@@ -183,9 +184,9 @@ def __init__(
                 opts=child_opts,
                 tags=child_tags,
             )
-            network_interface_ip_params[
-                "public_ip_address"
-            ] = network.PublicIPAddressArgs(id=public_ip.id)
+            network_interface_ip_params["public_ip_address"] = (
+                network.PublicIPAddressArgs(id=public_ip.id)
+            )
 
         # Define network card
         network_interface = network.NetworkInterface(

data_safe_haven/infrastructure/components/dynamic/azuread_application.py

@@ -1,4 +1,5 @@
 """Pulumi dynamic component for AzureAD applications."""
+
 from contextlib import suppress
 from typing import Any
 

data_safe_haven/infrastructure/components/dynamic/blob_container_acl.py

@@ -1,4 +1,5 @@
 """Pulumi dynamic component for setting ACLs on an Azure blob container."""
+
 from typing import Any
 
 from pulumi import Input, Output, ResourceOptions

data_safe_haven/infrastructure/components/dynamic/compiled_dsc.py

@@ -1,4 +1,5 @@
 """Pulumi dynamic component for compiled desired state configuration."""
+
 from collections.abc import Sequence
 from typing import Any
 

data_safe_haven/infrastructure/components/dynamic/dsh_resource_provider.py

@@ -1,4 +1,5 @@
 """Pulumi base dynamic component."""
+
 from collections.abc import Sequence
 from typing import Any
 

data_safe_haven/infrastructure/components/dynamic/file_share_file.py

@@ -1,4 +1,5 @@
 """Pulumi dynamic component for files uploaded to an Azure FileShare."""
+
 from contextlib import suppress
 from typing import Any
 

data_safe_haven/infrastructure/components/dynamic/file_upload.py

@@ -1,4 +1,5 @@
 """Pulumi dynamic component for running remote scripts on an Azure VM."""
+
 from typing import Any
 
 from pulumi import Input, Output, ResourceOptions

data_safe_haven/infrastructure/components/dynamic/remote_script.py

@@ -1,4 +1,5 @@
 """Pulumi dynamic component for running remote scripts on an Azure VM."""
+
 from typing import Any
 
 from pulumi import Input, Output, ResourceOptions

data_safe_haven/infrastructure/components/dynamic/ssl_certificate.py

@@ -1,4 +1,5 @@
 """Pulumi dynamic component for SSL certificates uploaded to an Azure KeyVault."""
+
 from contextlib import suppress
 from typing import Any
 

data_safe_haven/infrastructure/components/wrapped/automation_account.py

@@ -1,4 +1,5 @@
 """Wrapper for the Pulumi AutomationAccount component"""
+
 from collections.abc import Mapping, Sequence
 
 import pulumi
@@ -36,11 +37,13 @@ def agentsvc_url(self) -> pulumi.Output[str]:
         Gets the URL of the agentsvc.
         """
         return self.automation_hybrid_service_url.apply(
-            lambda url: url.replace("jrds", "agentsvc").replace(
-                "/automationAccounts/", "/accounts/"
+            lambda url: (
+                url.replace("jrds", "agentsvc").replace(
+                    "/automationAccounts/", "/accounts/"
+                )
+                if url
+                else "UNKNOWN"
             )
-            if url
-            else "UNKNOWN"
         )
 
     @property

data_safe_haven/infrastructure/components/wrapped/log_analytics_workspace.py

@@ -1,4 +1,5 @@
 """Wrapper for the Pulumi Log Analytics Workspace component"""
+
 from collections.abc import Mapping
 
 import pulumi
@@ -49,18 +50,16 @@ def workspace_key(self) -> pulumi.Output[str]:
         """
         Gets the key for this workspace.
         """
-        workspace_keys: pulumi.Output[
-            operationalinsights.GetSharedKeysResult
-        ] = pulumi.Output.all(
-            resource_group_name=self.resource_group_name,
-            workspace_name=self.name,
-        ).apply(
-            lambda kwargs: operationalinsights.get_shared_keys_output(**kwargs)
+        workspace_keys: pulumi.Output[operationalinsights.GetSharedKeysResult] = (
+            pulumi.Output.all(
+                resource_group_name=self.resource_group_name,
+                workspace_name=self.name,
+            ).apply(lambda kwargs: operationalinsights.get_shared_keys_output(**kwargs))
         )
         return pulumi.Output.secret(
             workspace_keys.apply(
-                lambda keys: keys.primary_shared_key
-                if keys.primary_shared_key
-                else "UNKNOWN"
+                lambda keys: (
+                    keys.primary_shared_key if keys.primary_shared_key else "UNKNOWN"
+                )
             )
         )

data_safe_haven/infrastructure/stack_manager.py

@@ -1,4 +1,5 @@
 """Deploy with Pulumi"""
+
 import logging
 import pathlib
 import shutil

data_safe_haven/infrastructure/stacks/declarative_shm.py

@@ -1,4 +1,5 @@
 """Deploy Data Safe Haven Management environment with Pulumi"""
+
 import pulumi
 
 from data_safe_haven.config import Config

data_safe_haven/infrastructure/stacks/declarative_sre.py

@@ -1,4 +1,5 @@
 """Pulumi declarative program"""
+
 import pulumi
 
 from data_safe_haven.config import Config

data_safe_haven/infrastructure/stacks/shm/bastion.py

@@ -1,4 +1,5 @@
 """Pulumi component for SHM monitoring"""
+
 from collections.abc import Mapping
 
 from pulumi import ComponentResource, Input, Output, ResourceOptions

data_safe_haven/infrastructure/stacks/shm/data.py

@@ -1,4 +1,5 @@
 """Pulumi component for SHM state"""
+
 from collections.abc import Mapping, Sequence
 
 import pulumi_random

data_safe_haven/infrastructure/stacks/shm/domain_controllers.py

@@ -1,4 +1,5 @@
 """Pulumi component for SHM domain controllers"""
+
 from collections.abc import Mapping, Sequence
 
 from pulumi import ComponentResource, Input, Output, ResourceOptions

data_safe_haven/infrastructure/stacks/shm/firewall.py

@@ -1,4 +1,5 @@
 """Pulumi component for SHM traffic routing"""
+
 from collections.abc import Mapping
 
 from pulumi import ComponentResource, Input, Output, ResourceOptions
@@ -621,9 +622,11 @@ def __init__(
 
         # Route all connected traffic through the firewall
         private_ip_address = firewall.ip_configurations.apply(
-            lambda cfgs: ""
-            if not cfgs
-            else next(filter(lambda _: _, [cfg.private_ip_address for cfg in cfgs]))
+            lambda cfgs: (
+                ""
+                if not cfgs
+                else next(filter(lambda _: _, [cfg.private_ip_address for cfg in cfgs]))
+            )
         )
         network.Route(
             f"{self._name}_route_via_firewall",

data_safe_haven/infrastructure/stacks/shm/monitoring.py

@@ -1,4 +1,5 @@
 """Pulumi component for SHM monitoring"""
+
 from collections.abc import Mapping
 
 from pulumi import ComponentResource, Input, Output, ResourceOptions

data_safe_haven/infrastructure/stacks/shm/networking.py

@@ -1,4 +1,5 @@
 """Pulumi component for SHM networking"""
+
 from collections.abc import Mapping, Sequence
 
 from pulumi import ComponentResource, Input, Output, ResourceOptions

data_safe_haven/infrastructure/stacks/shm/update_servers.py

@@ -1,4 +1,5 @@
 """Pulumi component for SHM monitoring"""
+
 from collections.abc import Mapping
 
 from pulumi import ComponentResource, Input, Output, ResourceOptions

data_safe_haven/infrastructure/stacks/sre/application_gateway.py

@@ -1,4 +1,5 @@
 """Pulumi component for SRE application gateway"""
+
 from collections.abc import Mapping
 from typing import Any
 

data_safe_haven/infrastructure/stacks/sre/backup.py

@@ -1,4 +1,5 @@
 """Pulumi component for SRE backup"""
+
 from collections.abc import Mapping
 
 from pulumi import ComponentResource, Input, ResourceOptions