Merge v5.0.0 release back into develop #2151

jemrobinson · 2024-08-20T17:50:07Z

✅ 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

n/a

⤴️ Summary

Merge changes from latest release back into the develop branch

🌂 Related issues

n/a

🔬 Tests

n/a

Merge v4.2.2 from 'latest' into 'release-v5.0.0'

… Without this, unstrippable whitespace characters are masked by unused ANSI codes.

…I-formatted text

Fix clamonacc service timeout

…ists

…xus-allowlists

…mole

As these is not security related.

🤦

Fix Guacamole copy/paste configuration

Co-authored-by: Matt Craddock <[email protected]>

Add security checklist

…methods Update allowed authentication methods

Release v5.0.0

github-actions · 2024-08-20T17:56:20Z

Coverage report

Click to see where and how coverage changed

File	Statements	Missing	Coverage	Coverage (new stmts)	Lines missing
data_safe_haven
version.py
data_safe_haven/commands
sre.py
data_safe_haven/config
context.py
data_safe_haven/external/api
graph_api.py					1058-1072
data_safe_haven/external/interface
pulumi_account.py
data_safe_haven/infrastructure
project_manager.py					163-164
data_safe_haven/infrastructure/programs
imperative_shm.py					160
Project Total

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

craddm

LGTM

JimMadge and others added 30 commits August 7, 2024 14:23

Update SECURITY.md

d4c057b

Wait for clamd.ctl to be created

175fa1a

Merge branch 'release-v5.0.0' into latest-v4.2.2

9f773e2

⚰️ Remove web.archive.org exception which is no longer needed

2d7731d

add pip to allowlist so that basic python smoke tests run

793f704

Add scipy, which is required for scikit-learn

1588f1a

Merge pull request #2109 from alan-turing-institute/latest-v4.2.2

faf88da

Merge v4.2.2 from 'latest' into 'release-v5.0.0'

Update pypi allowlist to include all relevant dependencies

4bc79fb

Remove duplicate entry

407d77e

Add additional required dependency

413f7e1

update R smoke tests to use pacakges that are on the allowlist

0923aa6

Restart clamd when configuration is updated

dcb3d25

Correct socket file name

47451c6

📝 Warn that VMs must support premium SSDs

c165b95

📝 Better wording for software packages option

66a7628

✨ Strip ANSI formatting from Pulumi strings before logging as errors.…

2593ac9

… Without this, unstrippable whitespace characters are masked by unused ANSI codes.

⚰️ Drop unused from_ansi function

608e887

Remove unnecessary handler

5d71852

✅ Add test for strip_ansi

13ec31d

♻️ Replace log_message function with direct calls to logger using ANS…

0a771f4

…I-formatted text

Merge pull request #2108 from alan-turing-institute/clamd.ctl

1161541

Fix clamonacc service timeout

Merge branch 'alan-turing-institute:develop' into update-nexus-allowl…

a34151b

…ists

⚰️ Remove from_ansi test

346cb1f

Merge remote-tracking branch 'upstream/release-v5.0.0' into update-ne…

8036bb1

…xus-allowlists

🚚 Move icons to /usr/local/share

14e0f06

🔧 Add quotes to ansible directives

3dcd2ca

📝 Simplify shortcut name

2f53652

🔧 Change backticks to colons

f375ca2

📝 Simplify introduction

3cc66ce

📝 Simplify definitions

62605cc

jemrobinson and others added 23 commits August 20, 2024 13:22

📝 Update suggested Entra authentication methods

f8f5ee4

🔧 Only allow app-based authentication methods for signing in to Guaca…

cf3bb99

…mole

Update egress section

84f65b6

Remove software ingress checks

305a6c7

As these is not security related.

Update package proxy checks

b0b1fa0

Correct role name

0de23e8

Correct role name

384108d

Correct references

ea948ee

📝 Add user-setup instructions for TOTP apps

bdefefb

Update figures

55e597b

Correct case of Guac copy/paste configuration

63cb50b

Run lint:fmt

fc114a6

Correct splitlines call

88ba3b2

Update allowed package example

4960d79

Add images

0d0e772

🤦

Remove reference to old allow lists

81899de

Merge pull request #2149 from alan-turing-institute/copy_paste_string

d8aaa84

Fix Guacamole copy/paste configuration

Correct image path

b178ddc

Remove check for copy/paste between workspaces

fb74805

Apply suggestions from code review

1c01e66

Co-authored-by: Matt Craddock <[email protected]>

Merge pull request #2141 from alan-turing-institute/security_checklist

f1eeb7f

Add security checklist

Merge pull request #2147 from jemrobinson/2145-update-authentication-…

e38537d

…methods Update allowed authentication methods

Merge pull request #2106 from alan-turing-institute/release-v5.0.0

3003ca4

Release v5.0.0

jemrobinson requested review from a team as code owners August 20, 2024 17:50

jemrobinson requested review from craddm and JimMadge August 20, 2024 17:50

craddm approved these changes Aug 21, 2024

View reviewed changes

jemrobinson merged commit 742b885 into develop Aug 22, 2024
24 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge v5.0.0 release back into develop #2151

Merge v5.0.0 release back into develop #2151

jemrobinson commented Aug 20, 2024

github-actions bot commented Aug 20, 2024 •

edited

Loading

craddm left a comment

Merge v5.0.0 release back into develop #2151

Merge v5.0.0 release back into develop #2151

Conversation

jemrobinson commented Aug 20, 2024

✅ Checklist

🚦 Depends on

⤴️ Summary

🌂 Related issues

🔬 Tests

github-actions bot commented Aug 20, 2024 • edited Loading

Coverage report

craddm left a comment

Choose a reason for hiding this comment

github-actions bot commented Aug 20, 2024 •

edited

Loading