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

Update Azure Active Directoy, Azure AD, and AAD baseline references to Microsoft Entra ID equivalent #1176

Conversation

ahuynhMITRE
Copy link
Collaborator

@ahuynhMITRE ahuynhMITRE commented Jun 21, 2024

🗣 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

  • This PR has an informative and human-readable title.
  • PR targets the correct parent branch (e.g., main or release-name) for merge.
  • Changes are limited to a single goal - eschew scope creep!
  • Changes are sized such that they do not touch excessive number of files.
  • All future TODOs are captured in issues, which are referenced in code comments.
  • These code changes follow the ScubaGear content style guide.
  • Related issues these changes resolve are linked preferably via closing keywords.
  • All relevant type-of-change labels added.
  • All relevant project fields are set.
  • All relevant repo and/or project documentation updated to reflect these changes.
  • Unit tests added/updated to cover PowerShell and Rego changes.
  • Functional tests added/updated to cover PowerShell and Rego changes.
  • All relevant functional tests passed.
  • All automated checks (e.g., linting, static analysis, unit/smoke tests) passed.

✅ 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

  • Feature branch deleted after merge to clean up repository.
  • Verified that all checks pass on parent branch (e.g., main or release-name) after merge.

@ahuynhMITRE ahuynhMITRE added the baseline-document Issues relating to the text in the baseline documents themselves label Jun 21, 2024
@ahuynhMITRE ahuynhMITRE added this to the Iceberg milestone Jun 21, 2024
@ahuynhMITRE ahuynhMITRE self-assigned this Jun 21, 2024
@ahuynhMITRE ahuynhMITRE linked an issue Jun 21, 2024 that may be closed by this pull request
@ahuynhMITRE
Copy link
Collaborator Author

@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.
https://learn.microsoft.com/en-us/entra/fundamentals/new-name

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.

@buidav
Copy link
Collaborator

buidav commented Jun 24, 2024

@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. https://learn.microsoft.com/en-us/entra/fundamentals/new-name

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.
This is a breaking change that will interrupt current workflows for folks.

Copy link
Collaborator

@mitchelbaker-cisa mitchelbaker-cisa left a 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.

PowerShell/ScubaGear/baselines/entraid.md Outdated Show resolved Hide resolved
PowerShell/ScubaGear/baselines/entraid.md Outdated Show resolved Hide resolved
PowerShell/ScubaGear/baselines/powerplatform.md Outdated Show resolved Hide resolved
PowerShell/ScubaGear/baselines/teams.md Outdated Show resolved Hide resolved
PowerShell/ScubaGear/baselines/teams.md Outdated Show resolved Hide resolved
@buidav
Copy link
Collaborator

buidav commented Jun 28, 2024

@ahuynhMITRE For when you get back. Would recommend reverting the Policy identifiers back to MS.AAD for this PR.
We'll have to make identifiers changes in a separate PR in the future.
Changing the policy identifiers now would be too disruptive of current workflows.

@mitchelbaker-cisa mitchelbaker-cisa changed the title Update Azure Active Directoy, Azure AD, and AAD baseline references from to Microsoft Entra equivalent Update Azure Active Directoy, Azure AD, and AAD baseline references to Microsoft Entra ID equivalent Jun 28, 2024
Copy link
Collaborator

@buidav buidav left a 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).

PowerShell/ScubaGear/baselines/entraid.md Outdated Show resolved Hide resolved
@ahuynhMITRE ahuynhMITRE requested a review from buidav July 10, 2024 20:04
Copy link
Collaborator

@mitchelbaker-cisa mitchelbaker-cisa left a 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.

PowerShell/ScubaGear/baselines/powerplatform.md Outdated Show resolved Hide resolved
PowerShell/ScubaGear/baselines/powerplatform.md Outdated Show resolved Hide resolved
Copy link
Collaborator

@buidav buidav left a 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:
MFA
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.
azure ad

@ahuynhMITRE ahuynhMITRE requested a review from buidav July 12, 2024 18:06
Copy link
Collaborator

@buidav buidav left a 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!

@ahuynhMITRE
Copy link
Collaborator Author

@nanda-katikaneni ready to merge

@nanda-katikaneni nanda-katikaneni merged commit 9e1671e into main Jul 19, 2024
17 checks passed
@nanda-katikaneni nanda-katikaneni deleted the 921-update-aad-baseline-references-from-azure-ad-to-microsoft-entra-id branch July 19, 2024 13:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
baseline-document Issues relating to the text in the baseline documents themselves
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update AAD baseline references from Azure AD to Microsoft Entra ID
4 participants