Change method of sanitising SRE names

[craddm]

✅ 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

Drops the json_safe function, which is only used to generate SRE filenames without non-alphanumeric characters. The SRE names from the config files are now used, with those names already being sanitised as SafeStrings containing only alphanumeric characters, hyphens, and underscores, all of which can be included in filenames.

This prevents issues with mismatches between the config filename and the SRE name in the config.

🌂 Related issues

Closes #2278

🔬 Tests

Tested locally

[jemrobinson]

LGTM

[JimMadge]

Can this be a patch release, or will it break existing deployments?

[craddm]

I guess it might break them, since the expected config names will now be different (although this should be fixable by reuploading the config).

[jemrobinson]

If you can write a workaround (download config, upgrade, upload config) then I think this can still be a point release.

[github-actions]

Coverage report

Click to see where and how coverage changed

File	Statements	Missing	Coverage	Coverage (new stmts)	Lines missing
data_safe_haven/config
sre_config.py
data_safe_haven/functions
strings.py
data_safe_haven/types
annotated_types.py
data_safe_haven/validators
typer.py
validators.py
Project Total

This report was generated by python-coverage-comment-action

[JimMadge]

Looks good, just want to be careful we aren't reintroducing the same or a similar problem here.

[JimMadge]

Looks good.

I pushed a commit to swap the * in regexes with + so that blank strings are not allowed.
Not sure if it would cause errors but I don't think we expect to allow that.
We could also modify the annotated types to give them a minimum length.