Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pulumi: Lazy load Guacamole users when performing admin tasks #1568

Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 15 additions & 7 deletions data_safe_haven/administration/users/user_handler.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,9 @@ def __init__(
):
self.active_directory_users = ActiveDirectoryUsers(config)
self.azure_ad_users = AzureADUsers(graph_api)
self.config = config
self.logger = LoggingSingleton()
self.sre_guacamole_users = {
sre_name: GuacamoleUsers(config, sre_name)
for sre_name in config.sres.keys()
}
self.sre_guacamole_users_: dict[str, GuacamoleUsers] = {}

def add(self, users_csv_path: pathlib.Path) -> None:
"""Add AzureAD and Guacamole users
Expand Down Expand Up @@ -73,7 +71,7 @@ def get_usernames(self) -> dict[str, list[str]]:
usernames = {}
usernames["Azure AD"] = self.get_usernames_azure_ad()
usernames["Domain controller"] = self.get_usernames_domain_controller()
for sre_name in self.sre_guacamole_users.keys():
for sre_name in self.config.sres.keys():
usernames[f"SRE {sre_name}"] = self.get_usernames_guacamole(sre_name)
return usernames

Expand All @@ -86,8 +84,18 @@ def get_usernames_domain_controller(self) -> list[str]:
return [user.username for user in self.active_directory_users.list()]

def get_usernames_guacamole(self, sre_name: str) -> list[str]:
"""Load usernames from Guacamole"""
return [user.username for user in self.sre_guacamole_users[sre_name].list()]
"""Lazy-load usernames from Guacamole"""
try:
if sre_name not in self.sre_guacamole_users_.keys():
self.sre_guacamole_users_[sre_name] = GuacamoleUsers(
self.config, sre_name
)
return [
user.username for user in self.sre_guacamole_users_[sre_name].list()
]
except Exception:
self.logger.error(f"Could not load users for SRE '{sre_name}'.")
return []

def list(self) -> None: # noqa: A003
"""List Active Directory, AzureAD and Guacamole users
Expand Down
Loading