Skip to content

Commit

Permalink
Update pulumi component properties
Browse files Browse the repository at this point in the history
  • Loading branch information
@JimMadge
JimMadge committed Sep 17, 2024
1 parent cb89697 commit aa46d23
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 44 deletions.
20 changes: 9 additions & 11 deletions data_safe_haven/infrastructure/programs/declarative_sre.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -344,11 +344,20 @@ def __call__(self) -> None:
self.stack_name,
SREDesiredStateProps(
admin_ip_addresses=self.config.sre.admin_ip_addresses,
clamav_mirror_hostname=clamav_mirror.hostname,
database_service_admin_password=data.password_database_service_admin,
dns_private_zones=dns.private_zones,
gitea_hostname=user_services.gitea_server.hostname,
hedgedoc_hostname=user_services.hedgedoc_server.hostname,
ldap_group_filter=ldap_group_filter,
ldap_group_search_base=ldap_group_search_base,
ldap_server_hostname=identity.hostname,
ldap_server_port=identity.server_port,
ldap_user_filter=ldap_user_filter,
ldap_user_search_base=ldap_user_search_base,
location=self.config.azure.location,
resource_group=resource_group,
software_repository_hostname=user_services.software_repositories.hostname,
subnet_desired_state=networking.subnet_desired_state,
subscription_name=self.context.subscription_name,
),
Expand All @@ -361,22 +370,11 @@ def __call__(self) -> None:
SREWorkspacesProps(
admin_password=data.password_workspace_admin,
apt_proxy_server_hostname=apt_proxy_server.hostname,
clamav_mirror_hostname=clamav_mirror.hostname,
data_collection_rule_id=monitoring.data_collection_rule_vms.id,
data_collection_endpoint_id=monitoring.data_collection_endpoint.id,
database_service_admin_password=data.password_database_service_admin,
gitea_hostname=user_services.gitea_server.hostname,
hedgedoc_hostname=user_services.hedgedoc_server.hostname,
ldap_group_filter=ldap_group_filter,
ldap_group_search_base=ldap_group_search_base,
ldap_server_hostname=identity.hostname,
ldap_server_port=identity.server_port,
ldap_user_filter=ldap_user_filter,
ldap_user_search_base=ldap_user_search_base,
location=self.config.azure.location,
maintenance_configuration_id=monitoring.maintenance_configuration.id,
resource_group_name=resource_group.name,
software_repository_hostname=user_services.software_repositories.hostname,
sre_name=self.config.name,
storage_account_desired_state_name=desired_state.storage_account_name,
storage_account_data_private_user_name=data.storage_account_data_private_user_name,
Expand Down
27 changes: 27 additions & 0 deletions data_safe_haven/infrastructure/programs/sre/desired_state.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,23 +43,41 @@ class SREDesiredStateProps:
def __init__(
self,
admin_ip_addresses: Input[Sequence[str]],
clamav_mirror_hostname: Input[str],
database_service_admin_password: Input[str],
dns_private_zones: Input[dict[str, network.PrivateZone]],
gitea_hostname: Input[str],
hedgedoc_hostname: Input[str],
ldap_group_filter: Input[str],
ldap_group_search_base: Input[str],
ldap_server_hostname: Input[str],
ldap_server_port: Input[int],
ldap_user_filter: Input[str],
ldap_user_search_base: Input[str],
location: Input[str],
resource_group: Input[resources.ResourceGroup],
software_repository_hostname: Input[str],
subscription_name: Input[str],
subnet_desired_state: Input[network.GetSubnetResult],
) -> None:
self.admin_ip_addresses = admin_ip_addresses
self.clamav_mirror_hostname = clamav_mirror_hostname
self.database_service_admin_password = database_service_admin_password
self.dns_private_zones = dns_private_zones
self.gitea_hostname = gitea_hostname
self.hedgedoc_hostname = hedgedoc_hostname
self.ldap_group_filter = ldap_group_filter
self.ldap_group_search_base = ldap_group_search_base
self.ldap_server_hostname = ldap_server_hostname
self.ldap_server_port = Output.from_input(ldap_server_port).apply(str)
self.ldap_user_filter = ldap_user_filter
self.ldap_user_search_base = ldap_user_search_base
self.location = location
self.resource_group_id = Output.from_input(resource_group).apply(get_id_from_rg)
self.resource_group_name = Output.from_input(resource_group).apply(
get_name_from_rg
)
self.software_repository_hostname = software_repository_hostname
self.subnet_desired_state_id = Output.from_input(subnet_desired_state).apply(
get_id_from_subnet
)
Expand Down Expand Up @@ -141,8 +159,17 @@ def __init__(
container_name=container_desired_state.name,
resource_group_name=props.resource_group_name,
source=Output.all(
clamav_mirror_hostname=props.clamav_mirror_hostname,
database_service_admin_password=props.database_service_admin_password,
gitea_hostname=props.gitea_hostname,
hedgedoc_hostname=props.hedgedoc_hostname,
ldap_group_filter=props.ldap_group_filter,
ldap_group_search_base=props.ldap_group_search_base,
ldap_server_hostname=props.ldap_server_hostname,
ldap_server_port=props.ldap_server_port,
ldap_user_filter=props.ldap_user_filter,
ldap_user_search_base=props.ldap_user_search_base,
software_repository_hostname=props.software_repository_hostname,
).apply(lambda kwargs: StringAsset(self.ansible_vars_file(**kwargs))),
)
# Set up a private endpoint for the desired state storage account
Expand Down
33 changes: 0 additions & 33 deletions data_safe_haven/infrastructure/programs/sre/workspaces.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,22 +24,11 @@ def __init__(
self,
admin_password: Input[str],
apt_proxy_server_hostname: Input[str],
clamav_mirror_hostname: Input[str],
data_collection_endpoint_id: Input[str],
data_collection_rule_id: Input[str],
database_service_admin_password: Input[str],
gitea_hostname: Input[str],
hedgedoc_hostname: Input[str],
ldap_group_filter: Input[str],
ldap_group_search_base: Input[str],
ldap_server_hostname: Input[str],
ldap_server_port: Input[int],
ldap_user_filter: Input[str],
ldap_user_search_base: Input[str],
location: Input[str],
maintenance_configuration_id: Input[str],
resource_group_name: Input[str],
software_repository_hostname: Input[str],
sre_name: Input[str],
storage_account_desired_state_name: Input[str],
storage_account_data_private_sensitive_name: Input[str],
Expand All @@ -52,22 +41,11 @@ def __init__(
self.admin_password = Output.secret(admin_password)
self.admin_username = "dshadmin"
self.apt_proxy_server_hostname = apt_proxy_server_hostname
self.clamav_mirror_hostname = clamav_mirror_hostname
self.data_collection_rule_id = data_collection_rule_id
self.data_collection_endpoint_id = data_collection_endpoint_id
self.database_service_admin_password = database_service_admin_password
self.gitea_hostname = gitea_hostname
self.hedgedoc_hostname = hedgedoc_hostname
self.ldap_group_filter = ldap_group_filter
self.ldap_group_search_base = ldap_group_search_base
self.ldap_server_hostname = ldap_server_hostname
self.ldap_server_port = Output.from_input(ldap_server_port).apply(str)
self.ldap_user_filter = ldap_user_filter
self.ldap_user_search_base = ldap_user_search_base
self.location = location
self.maintenance_configuration_id = maintenance_configuration_id
self.resource_group_name = resource_group_name
self.software_repository_hostname = software_repository_hostname
self.sre_name = sre_name
self.storage_account_desired_state_name = storage_account_desired_state_name
self.storage_account_data_private_user_name = (
Expand Down Expand Up @@ -116,17 +94,6 @@ def __init__(
# Load cloud-init file
cloudinit = Output.all(
apt_proxy_server_hostname=props.apt_proxy_server_hostname,
clamav_mirror_hostname=props.clamav_mirror_hostname,
database_service_admin_password=props.database_service_admin_password,
gitea_hostname=props.gitea_hostname,
hedgedoc_hostname=props.hedgedoc_hostname,
ldap_group_filter=props.ldap_group_filter,
ldap_group_search_base=props.ldap_group_search_base,
ldap_server_hostname=props.ldap_server_hostname,
ldap_server_port=props.ldap_server_port,
ldap_user_filter=props.ldap_user_filter,
ldap_user_search_base=props.ldap_user_search_base,
software_repository_hostname=props.software_repository_hostname,
storage_account_desired_state_name=props.storage_account_desired_state_name,
storage_account_data_private_user_name=props.storage_account_data_private_user_name,
storage_account_data_private_sensitive_name=props.storage_account_data_private_sensitive_name,
Expand Down

0 comments on commit aa46d23

Please sign in to comment.