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.

Sign up for GitHub

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

Release v5.2.1 #2356

Draft
wants to merge 6 commits into
base: latest
Choose a base branch
from
Draft

Release v5.2.1 #2356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d5f47e3
:alien: Update guacamole-user-sync to version that fixes the user syn…
jemrobinson Jan 10, 2025
31d60b8
:memo: Clarify source of release branch
jemrobinson Jan 10, 2025
7b1a50b
Retrieve SRE sub name and use that when connecting to guac database
craddm Jan 8, 2025
fa8146e
:memo: Add step to merge release back into develop branch
jemrobinson Jan 10, 2025
eef264d
Merge pull request #2354 from alan-turing-institute/hotfix-guac-datab…
jemrobinson Jan 10, 2025
515f99f
Merge pull request #2352 from alan-turing-institute/hotfix-update-gua…
jemrobinson Jan 10, 2025
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
3 changes: 3 additions & 0 deletions .github/ISSUE_TEMPLATE/release_checklist.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ Refer to the [Deployment](https://data-safe-haven.readthedocs.io/en/latest/deplo

- [ ] Consult the `data-safe-haven/VERSIONING.md` guide and determine the version number of the new release. Record it in the title of this issue
- [ ] Create a release branch called e.g. `release-v0.0.1`
- If this is a hotfix release then this branch should be based off `latest`
- In all other cases it should be based off `develop`
- [ ] Draft a changelog for the release similar to our [previous releases](https://github.com/alan-turing-institute/data-safe-haven/releases)

### For patch releases only
Expand Down Expand Up @@ -50,6 +52,7 @@ Refer to the [Deployment](https://data-safe-haven.readthedocs.io/en/latest/deplo
- [ ] Ensure docs for the latest version are built and deployed on ReadTheDocs
- [ ] Push a build to PyPI
- [ ] Announce release on communications channels
- [ ] Create a PR from `latest` into `develop` to ensure that release-specific changes are not lost

## :deciduous_tree: Deployment problems

Expand Down
7 changes: 5 additions & 2 deletions data_safe_haven/administration/users/guacamole_users.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,10 @@ def __init__(
pulumi_config=pulumi_config,
)
# Read the SRE database secret from key vault
azure_sdk = AzureSdk(context.subscription_name)
azure_sdk = AzureSdk(subscription_name=context.subscription_name)
sre_subscription_name = azure_sdk.get_subscription_name(
config.azure.subscription_id
)
connection_db_server_password = azure_sdk.get_keyvault_secret(
sre_stack.output("data")["key_vault_name"],
sre_stack.output("data")["password_user_database_admin_secret"],
Expand All @@ -33,7 +36,7 @@ def __init__(
connection_db_server_password,
sre_stack.output("remote_desktop")["connection_db_server_name"],
sre_stack.output("remote_desktop")["resource_group_name"],
context.subscription_name,
sre_subscription_name,
)
self.users_: Sequence[ResearchUser] | None = None
self.postgres_script_path: pathlib.Path = (
Expand Down
2 changes: 1 addition & 1 deletion data_safe_haven/infrastructure/programs/sre/remote_desktop.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ def __init__(
),
),
containerinstance.ContainerArgs(
image="ghcr.io/alan-turing-institute/guacamole-user-sync:v0.6.0",
image="ghcr.io/alan-turing-institute/guacamole-user-sync:v0.7.0",
name="guacamole-user-sync"[:63],
environment_variables=[
containerinstance.EnvironmentVariableArgs(
Expand Down
Loading