-
Notifications
You must be signed in to change notification settings - Fork 240
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
Update Azure Active Directoy, Azure AD, and AAD baseline references to Microsoft Entra ID equivalent #1176
Update Azure Active Directoy, Azure AD, and AAD baseline references to Microsoft Entra ID equivalent #1176
Conversation
Microsoft documentation notes that "Acronym usage isn't encouraged, but if you must replace AAD with an acronym due to space limitations, use ME-ID."
@buidav & @mitchelbaker-cisa for the unique IDs i originally changed MS.AAD to MS.ENTRAID but looking at Microsoft's documentation their prefered acronym replacement for AAD is ME-ID... Link listed below. open to changing it to ENTRAID to match the markdown file name and also not sure if the "-" breaks our automation for pulling unique IDs. |
We will have to think about the strategy and bumping major versions for i.e v1 to v2 for ScubaGear itself when changing the IDs now. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good, although we'll need to investigate into the policy identifier changes further.
Co-authored-by: mitchelbaker-cisa <[email protected]>
Co-authored-by: mitchelbaker-cisa <[email protected]>
Co-authored-by: David Bui <[email protected]>
Co-authored-by: mitchelbaker-cisa <[email protected]>
Co-authored-by: mitchelbaker-cisa <[email protected]>
Co-authored-by: mitchelbaker-cisa <[email protected]>
@ahuynhMITRE For when you get back. Would recommend reverting the Policy identifiers back to |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
One additional change for the 3.4
instructions. It says Azure AD MFA
but the documentation has switched to Entra ID
and the title is now slightly different How to migrate MFA and SSPR policy settings to the Authentication methods policy for Microsoft Entra ID
#### MS.AAD.3.4v1 Instructions
1. Go through the process of [migrating from the legacy Azure AD MFA and Self-Service Password Reset (SSPR) administration pages to the new unified Authentication Methods policy page](https://learn.microsoft.com/en-us/entra/identity/authentication/how-to-authentication-methods-manage).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good, two small suggestions.
Co-authored-by: mitchelbaker-cisa <[email protected]>
Co-authored-by: mitchelbaker-cisa <[email protected]>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
2 final items to take care of.
Item 1:
The image for different types of MFA in policy group 3 no longer exists in the repo for some reason.
Here's a link to the image way back. Need to reupload it to this branch to the images
folder to fix the image link. https://github.com/cisagov/ScubaGear/blob/v1.2.0/images/aad-mfa.png
Item 2:
There are 2 more instances of Azure AD
to replace in the 2.1 note.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good! Good work Andrew!
@nanda-katikaneni ready to merge |
🗣 Description
Updated Azure Activie Directoy, Azure AD, AAD references in the markdown files including unique IDs and references in other baselines to match the renaming of the M365 product.
💭 Motivation and context
This change is required in order to be up to date with how Microsoft references their products. Microsoft renamed Azure Active Directory (Azure AD) to Microsoft Entra ID to communicate the multicloud, multiplatform functionality of the products, alleviate confusion with Windows Server Active Directory, and unify the Microsoft Entra product family.
Closes issue #888
linked to #921
🧪 Testing
check each instance of Azure Active Directoy, Azure AD, and AAD mentioned in the baselines are correctly replaced with their Microsoft Entra equivalent
✅ Pre-approval checklist
✅ Pre-merge checklist
PR passed smoke test check.
Feature branch has been rebased against changes from parent branch, as needed
Use
Rebase branch
button below or use this reference to rebase from the command line.Resolved all merge conflicts on branch
Notified merge coordinator that PR is ready for merge via comment mention
✅ Post-merge checklist