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

Use SHM name instead of description for Entra app #2243

Merged

Conversation

craddm
Copy link
Contributor

@craddm craddm commented Oct 18, 2024

✅ 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

Uses the SHM/context name as part of the name of the Entra application, instead of the description.

This ensures the application will have a consistent name.

🌂 Related issues

Closes #2242

🔬 Tests

Tested locally

@craddm craddm marked this pull request as ready for review October 18, 2024 12:35
@craddm craddm requested a review from a team as a code owner October 18, 2024 12:36
Copy link
Member

@jemrobinson jemrobinson left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Nice catch.

@jemrobinson
Copy link
Member

N.B. Should this target 5.0.1-rc1 instead of develop? Sounds like a bugfix we will want in the patch release.

@craddm craddm changed the base branch from develop to release-v5.0.1rc1 October 18, 2024 12:39
@craddm craddm requested a review from a team as a code owner October 18, 2024 12:39
@craddm
Copy link
Contributor Author

craddm commented Oct 18, 2024

N.B. Should this target 5.0.1-rc1 instead of develop? Sounds like a bugfix we will want in the patch release.

Could do; but depends if we're merging develop into 5.0.1-rc1, as this is up-to-date with develop rather than based on 5.0.1-rc1

@jemrobinson
Copy link
Member

@craddm : Sorry, for this to work you should probably grab that single commit and apply it on top of release-v5.0.1rc1.

Copy link
Member

@JimMadge JimMadge left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you check for other places where the description is used?

It isn't ideal that it lives in the context but I think we should ensure changing it doesn't produce any destructive operations.

Copy link

Coverage report

Click to see where and how coverage changed

FileStatementsMissingCoverageCoverage
(new stmts)
Lines missing
  data_safe_haven/config
  context.py
Project Total  

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

@craddm
Copy link
Contributor Author

craddm commented Oct 18, 2024

Could you check for other places where the description is used?

It isn't ideal that it lives in the context but I think we should ensure changing it doesn't produce any destructive operations.

I haven't spotted anywhere else - every other use I've found is just for information (e.g. printing messages to console)

@JimMadge JimMadge merged commit 1c42202 into alan-turing-institute:release-v5.0.1rc1 Oct 21, 2024
10 of 11 checks passed
@craddm craddm deleted the use-shm-name-in-entra branch October 21, 2024 11:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Entra application uses description rather than name of SHM
3 participants