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 Entra ID throughout #1869

Merged

Conversation

jemrobinson
Copy link
Member

✅ 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).
  • You have marked this pull request as a draft and added '[WIP]' to the title if needed (if you're not yet ready to merge).

⤴️ Summary

Change from using AzureAD to Entra ID throughout

🌂 Related issues

Closes #1664

🔬 Tests

Not tested

@jemrobinson jemrobinson requested a review from a team as a code owner May 8, 2024 16:44
@jemrobinson
Copy link
Member Author

@craddm @JimMadge I'm not crazy about having a variable called entra_id_tenant_id. Is there any other name that Microsoft use for this?

@craddm
Copy link
Contributor

craddm commented May 9, 2024

@jemrobinson I expect it should just be entra_tenant_id

If an article (a, an, the) or possessive (your, your organization's) precedes (Azure Active Directory (Azure AD), Azure Active Directory, Azure AD, AAD), then replace with Microsoft Entra because it's a feature name. For example:

"an Azure AD tenant" becomes "a Microsoft Entra tenant"
"your organization's Azure AD tenant" becomes "your Microsoft Entra tenant"

https://learn.microsoft.com/en-us/entra/fundamentals/how-to-rename-azure-ad?source=recommendations

See also https://learn.microsoft.com/en-us/entra/fundamentals/how-to-find-tenant

@jemrobinson
Copy link
Member Author

Thanks @craddm! Do you see any other names/variable names that look wrong?

@JimMadge
Copy link
Member

JimMadge commented May 9, 2024

@craddm @JimMadge I'm not crazy about having a variable called entra_id_tenant_id. Is there any other name that Microsoft use for this?

That one becomes "Microsoft Entra Tenant ID".

Copy link
Contributor

@craddm craddm left a comment

Choose a reason for hiding this comment

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

I've highlighted quite a few here - the general rule is if something is a feature, it is just Microsoft Entra <x> rather than Microsoft Entra ID <x>, where if it is the whole product i.e. Azure Active Directory it is Microsoft Entra ID

data_safe_haven/external/api/graph_api.py Outdated Show resolved Hide resolved
data_safe_haven/external/api/graph_api.py Outdated Show resolved Hide resolved
data_safe_haven/external/api/graph_api.py Outdated Show resolved Hide resolved
data_safe_haven/external/api/graph_api.py Outdated Show resolved Hide resolved
data_safe_haven/external/api/graph_api.py Outdated Show resolved Hide resolved
data_safe_haven/external/api/graph_api.py Outdated Show resolved Hide resolved
data_safe_haven/external/api/graph_api.py Outdated Show resolved Hide resolved
data_safe_haven/external/api/graph_api.py Outdated Show resolved Hide resolved
data_safe_haven/external/api/graph_api.py Outdated Show resolved Hide resolved
data_safe_haven/infrastructure/programs/declarative_sre.py Outdated Show resolved Hide resolved
@jemrobinson jemrobinson force-pushed the 1664-change-to-entra-id branch from 60eaa6e to e825812 Compare May 9, 2024 10:47
@jemrobinson jemrobinson force-pushed the 1664-change-to-entra-id branch from f5ffc41 to 0e8809d Compare May 9, 2024 10:53
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.

LGTM

@JimMadge JimMadge requested a review from craddm May 9, 2024 11:02
@jemrobinson jemrobinson force-pushed the 1664-change-to-entra-id branch from af9ebf5 to 3fba250 Compare May 9, 2024 11:05
Copy link
Contributor

@craddm craddm left a comment

Choose a reason for hiding this comment

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

LGTM

@jemrobinson
Copy link
Member Author

Thanks both! This was a really irritating one to write and to review.

@jemrobinson jemrobinson merged commit 9e1ad7e into alan-turing-institute:develop May 9, 2024
11 checks passed
@jemrobinson jemrobinson deleted the 1664-change-to-entra-id branch June 3, 2024 09:37
@jemrobinson jemrobinson restored the 1664-change-to-entra-id branch June 3, 2024 10:38
@jemrobinson jemrobinson deleted the 1664-change-to-entra-id branch June 3, 2024 11:00
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.

Update code to reflect change to Microsoft Entra ID
3 participants