Merge develop changes in 5.0.1rc1 #2246

JimMadge · 2024-10-21T13:48:30Z

✅ Checklist

You have given your pull request a meaningful title (e.g. Enable foobar integration rather than 515 foobar).
You are targeting the appropriate branch. If you're not certain which one this is, it should be develop.
Your branch is up-to-date with the target branch (it probably was when you started, but it may have changed since then).

🚦 Depends on

⤴️ Summary

🌂 Related issues

🔬 Tests

These are already provided by templates.

…rors

Use correct paths to shared, input, and output drives on desktop

…rors

Catch config upload validation errors

Add list of supported regions

…_items Remove desktop files for gitea/hedgedoc

Remove ANSI escape sequences from logfile

Bumps the production-dependencies group with 10 updates: | Package | From | To | | --- | --- | --- | | [azure-identity](https://github.com/Azure/azure-sdk-for-python) | `1.18.0` | `1.19.0` | | [azure-storage-file-share](https://github.com/Azure/azure-sdk-for-python) | `12.18.0` | `12.19.0` | | [pulumi-azure-native](https://github.com/pulumi/pulumi-azure-native) | `2.64.3` | `2.66.0` | | [pulumi-azuread](https://github.com/pulumi/pulumi-azuread) | `5.53.4` | `6.0.0` | | [pulumi](https://github.com/pulumi/pulumi) | `3.135.1` | `3.136.1` | | [sphinx](https://github.com/sphinx-doc/sphinx) | `8.0.2` | `8.1.3` | | [ansible](https://github.com/ansible-community/ansible-build-data) | `10.4.0` | `10.5.0` | | [black](https://github.com/psf/black) | `24.8.0` | `24.10.0` | | [pandas-stubs](https://github.com/pandas-dev/pandas-stubs) | `2.2.2.240909` | `2.2.3.241009` | | [coverage](https://github.com/nedbat/coveragepy) | `7.6.1` | `7.6.3` | Updates `azure-identity` from 1.18.0 to 1.19.0 - [Release notes](https://github.com/Azure/azure-sdk-for-python/releases) - [Changelog](https://github.com/Azure/azure-sdk-for-python/blob/main/doc/esrp_release.md) - [Commits](Azure/azure-sdk-for-python@azure-identity_1.18.0...azure-identity_1.19.0) Updates `azure-storage-file-share` from 12.18.0 to 12.19.0 - [Release notes](https://github.com/Azure/azure-sdk-for-python/releases) - [Changelog](https://github.com/Azure/azure-sdk-for-python/blob/main/doc/esrp_release.md) - [Commits](Azure/azure-sdk-for-python@azure-storage-file-share_12.18.0...azure-storage-file-share_12.19.0) Updates `pulumi-azure-native` from 2.64.3 to 2.66.0 - [Release notes](https://github.com/pulumi/pulumi-azure-native/releases) - [Changelog](https://github.com/pulumi/pulumi-azure-native/blob/master/CHANGELOG_OLD.md) - [Commits](pulumi/pulumi-azure-native@v2.64.3...v2.66.0) Updates `pulumi-azuread` from 5.53.4 to 6.0.0 - [Release notes](https://github.com/pulumi/pulumi-azuread/releases) - [Changelog](https://github.com/pulumi/pulumi-azuread/blob/master/CHANGELOG_OLD.md) - [Commits](pulumi/pulumi-azuread@v5.53.4...v6.0.0) Updates `pulumi` from 3.135.1 to 3.136.1 - [Release notes](https://github.com/pulumi/pulumi/releases) - [Changelog](https://github.com/pulumi/pulumi/blob/master/CHANGELOG.md) - [Commits](pulumi/pulumi@v3.135.1...v3.136.1) Updates `sphinx` from 8.0.2 to 8.1.3 - [Release notes](https://github.com/sphinx-doc/sphinx/releases) - [Changelog](https://github.com/sphinx-doc/sphinx/blob/master/CHANGES.rst) - [Commits](sphinx-doc/sphinx@v8.0.2...v8.1.3) Updates `ansible` from 10.4.0 to 10.5.0 - [Changelog](https://github.com/ansible-community/ansible-build-data/blob/main/docs/release-process.md) - [Commits](ansible-community/ansible-build-data@10.4.0...10.5.0) Updates `black` from 24.8.0 to 24.10.0 - [Release notes](https://github.com/psf/black/releases) - [Changelog](https://github.com/psf/black/blob/main/CHANGES.md) - [Commits](psf/black@24.8.0...24.10.0) Updates `pandas-stubs` from 2.2.2.240909 to 2.2.3.241009 - [Changelog](https://github.com/pandas-dev/pandas-stubs/blob/main/docs/release_procedure.md) - [Commits](pandas-dev/pandas-stubs@v2.2.2.240909...v2.2.3.241009) Updates `coverage` from 7.6.1 to 7.6.3 - [Release notes](https://github.com/nedbat/coveragepy/releases) - [Changelog](https://github.com/nedbat/coveragepy/blob/master/CHANGES.rst) - [Commits](nedbat/coveragepy@7.6.1...7.6.3) --- updated-dependencies: - dependency-name: azure-identity dependency-type: direct:production update-type: version-update:semver-minor dependency-group: production-dependencies - dependency-name: azure-storage-file-share dependency-type: direct:production update-type: version-update:semver-minor dependency-group: production-dependencies - dependency-name: pulumi-azure-native dependency-type: direct:production update-type: version-update:semver-minor dependency-group: production-dependencies - dependency-name: pulumi-azuread dependency-type: direct:production update-type: version-update:semver-major dependency-group: production-dependencies - dependency-name: pulumi dependency-type: direct:production update-type: version-update:semver-minor dependency-group: production-dependencies - dependency-name: sphinx dependency-type: direct:production update-type: version-update:semver-minor dependency-group: production-dependencies - dependency-name: ansible dependency-type: direct:production update-type: version-update:semver-minor dependency-group: production-dependencies - dependency-name: black dependency-type: direct:production update-type: version-update:semver-minor dependency-group: production-dependencies - dependency-name: pandas-stubs dependency-type: direct:production update-type: version-update:semver-patch dependency-group: production-dependencies - dependency-name: coverage dependency-type: direct:production update-type: version-update:semver-patch dependency-group: production-dependencies ... Signed-off-by: dependabot[bot] <[email protected]>

Bumps [lycheeverse/lychee-action](https://github.com/lycheeverse/lychee-action) from 1.10.0 to 2.0.1. - [Release notes](https://github.com/lycheeverse/lychee-action/releases) - [Commits](lycheeverse/lychee-action@v1.10.0...v2.0.1) --- updated-dependencies: - dependency-name: lycheeverse/lychee-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]>

…_actions/lycheeverse/lychee-action-2.0.1 Bump lycheeverse/lychee-action from 1.10.0 to 2.0.1

…oduction-dependencies-e8acc93306 Bump the production-dependencies group with 10 updates

Simplify code for checking config availability and SRE deployment status

Add internet

Bumps [lycheeverse/lychee-action](https://github.com/lycheeverse/lychee-action) from 2.0.1 to 2.0.2. - [Release notes](https://github.com/lycheeverse/lychee-action/releases) - [Commits](lycheeverse/lychee-action@v2.0.1...v2.0.2) --- updated-dependencies: - dependency-name: lycheeverse/lychee-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>

…_actions/lycheeverse/lychee-action-2.0.2 Bump lycheeverse/lychee-action from 2.0.1 to 2.0.2

github-actions · 2024-10-21T13:56:41Z

Coverage report

Click to see where and how coverage changed

File	Statements	Missing	Coverage	Coverage (new stmts)	Lines missing
data_safe_haven/commands
config.py
data_safe_haven/config
config_sections.py
data_safe_haven/infrastructure/programs/sre
networking.py					71-76
data_safe_haven/logging
plain_file_handler.py
data_safe_haven/types
enums.py
data_safe_haven/validators
validators.py
Project Total

_{This report was generated by python-coverage-comment-action}

jemrobinson

I realise that all of these PRs have been individually reviewed, but some things struck me as possibly worth revisiting before we merge into the RC branch.

.hatch/requirements-test.txt

data_safe_haven/config/config_sections.py

data_safe_haven/config/sre_config.py

data_safe_haven/validators/validators.py

docs/source/deployment/deploy_sre.md

jemrobinson

LGTM

craddm and others added 30 commits September 27, 2024 16:06

Catch validation errors on config upload

c59dc04

Provide more readable error message for config validation errors

1178622

Merge branch 'alan-turing-institute:develop' into config-upload-errors

25096d9

Fix linting

1f89c0a

Update desktop icon URLs for shared, input, and output drives

d498e07

Merge branch 'alan-turing-institute:develop' into icon-paths

a249069

Remove desktop files for gitea/hedgedoc

c5ce29f

These are already provided by templates.

Merge remote-tracking branch 'upstream/develop' into config-upload-er…

a88a5d8

…rors

Merge pull request #2227 from craddm/icon-paths

f275f5d

Use correct paths to shared, input, and output drives on desktop

Add fixture for config with missing field

ae63b04

add test for error from missing config field

b2bf1ff

make working test of validation error

dbdb22c

Add test of log messages from config validation errors

877c41a

lint:fmt

c67912e

Use replace method to create config with missing field

a1ad35a

Merge remote-tracking branch 'upstream/develop' into config-upload-er…

0aad910

…rors

Add list of supported SRE regions

35736db

Add lychee exception

11817fb

Correct removal of text from example SRE config

934ec49

Merge pull request #2211 from craddm/config-upload-errors

567d30e

Catch config upload validation errors

Add strip ansi method

5835a3c

Add test

fdb6da3

Add test for alternative escape char formats

1f3e751

Correct indentation

42d46c1

Merge pull request #2230 from alan-turing-institute/supported_regions

2b9c619

Add list of supported regions

Merge pull request #2226 from alan-turing-institute/duplicate_desktop…

0f9d353

…_items Remove desktop files for gitea/hedgedoc

Merge pull request #2231 from alan-turing-institute/ansi_logfile

eede40f

Remove ANSI escape sequences from logfile

User simpler of checking if SRE is deployed

96223c8

Add option for 'internet' in place of IP

c2782f8

Add tests for IP validator

4f506b2

JimMadge and others added 20 commits October 10, 2024 14:42

Change user addresses to list or service tag

01b1c14

Add comma

0b05ebc

Handle ip list or service tag in component resource

705488e

Merge branch 'alan-turing-institute:develop' into simplify-available

3d519e3

Add documentation of the command to management page

507081a

Fix linting

5927b6f

fix more linting

c1ad179

[dependabot skip] 🔧 Update Python requirements files

cf74c77

Merge pull request #2236 from alan-turing-institute/dependabot/github…

e101078

…_actions/lycheeverse/lychee-action-2.0.1 Bump lycheeverse/lychee-action from 1.10.0 to 2.0.1

Add tests for Internet tag for user IPs

acb2fcf

Merge pull request #2235 from alan-turing-institute/dependabot/pip/pr…

41c4d5b

…oduction-dependencies-e8acc93306 Bump the production-dependencies group with 10 updates

Merge remote-tracking branch 'origin/develop' into internet

2b996da

Fix linting

5068e5a

Merge pull request #2234 from craddm/simplify-available

ea23e1b

Simplify code for checking config availability and SRE deployment status

Merge pull request #2233 from alan-turing-institute/internet

727f43d

Add internet

Merge pull request #2245 from alan-turing-institute/dependabot/github…

d56249d

…_actions/lycheeverse/lychee-action-2.0.2 Bump lycheeverse/lychee-action from 2.0.1 to 2.0.2

Merge remote-tracking branch 'origin/develop' into develop_changes

fb4148f

JimMadge requested review from a team as code owners October 21, 2024 13:48

jemrobinson requested changes Oct 21, 2024

View reviewed changes

Rerun pip-compile

1f559b0

JimMadge requested a review from jemrobinson October 21, 2024 14:59

JimMadge mentioned this pull request Oct 21, 2024

Allow 'Internet' for data providers IP #2247

Draft

3 tasks

jemrobinson approved these changes Oct 22, 2024

View reviewed changes

JimMadge merged commit 649ebf4 into release-v5.0.1rc1 Oct 22, 2024
11 checks passed

JimMadge deleted the develop_changes branch October 22, 2024 09:54

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge develop changes in 5.0.1rc1 #2246

Merge develop changes in 5.0.1rc1 #2246

JimMadge commented Oct 21, 2024 •

edited

Loading

github-actions bot commented Oct 21, 2024

jemrobinson left a comment

jemrobinson left a comment

Merge develop changes in 5.0.1rc1 #2246

Merge develop changes in 5.0.1rc1 #2246

Conversation

JimMadge commented Oct 21, 2024 • edited Loading

✅ Checklist

🚦 Depends on

⤴️ Summary

🌂 Related issues

🔬 Tests

github-actions bot commented Oct 21, 2024

Coverage report

jemrobinson left a comment

Choose a reason for hiding this comment

jemrobinson left a comment

Choose a reason for hiding this comment

JimMadge commented Oct 21, 2024 •

edited

Loading