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

Microsoft Entra ID name update #560

Merged
merged 39 commits into from
Jan 19, 2024
Merged

Microsoft Entra ID name update #560

merged 39 commits into from
Jan 19, 2024

Conversation

danycontre
Copy link
Collaborator

Overview/Summary

Replace this with a brief description of what this Pull Request fixes, changes, etc.

This PR fixes/adds/changes/removes

  1. Updating Azure AD to Microsoft Entra ID
  2. Updating AAD to EntraID
  3. Updating Azure AD Domain Services to Microsoft Entra Domain Services

Breaking Changes

  1. Replace me
  2. Replace me

Testing Evidence

Replace this with any testing evidence to show that your Pull Request works/fixes as described and planned (include screenshots, if appropriate).

As part of this Pull Request I have

  • Read the Contribution Guide and ensured this PR is compliant with the guide
  • Ensured the resource API versions in .bicep file/s I am adding/editing are using the latest API version possible
  • Checked for duplicate Pull Requests
  • Associated it with relevant GitHub Issues
  • (AVD LZA Team Only) Associated it with relevant ADO Items
  • Ensured my code/branch is up-to-date with the latest changes in the main branch
  • Performed testing and provided evidence.
  • Updated relevant and associated documentation (e.g. Contribution Guide, Module READMEs, Docs etc.)

@danycontre danycontre changed the title updates Microsoft Entra ID name update Jan 3, 2024
Copy link
Member

@ckittel ckittel left a comment

Choose a reason for hiding this comment

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

Just a quick observation, for the CARML modules, unless you've done other editing in the modules to make them custom, I'd say revert those specific changes and let this be an "upstream" problem that is presumably fixed with a future release of their modules. Just adjust your own code, not their modules. Future of CARML is weird anyhow with AVM coming up -- but that's a whole other topic :)

@danycontre
Copy link
Collaborator Author

Just a quick observation, for the CARML modules, unless you've done other editing in the modules to make them custom, I'd say revert those specific changes and let this be an "upstream" problem that is presumably fixed with a future release of their modules. Just adjust your own code, not their modules. Future of CARML is weird anyhow with AVM coming up -- but that's a whole other topic :)

Agree, we will be updating CARML modules to AVM soon, but to your point, yes, we made local edits to the CARML modules, so they work in our use case.

Copy link
Member

@ckittel ckittel left a comment

Choose a reason for hiding this comment

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

Just a few tidy-ups. Nice work!

carml/1.3.0/Microsoft.Storage/storageAccounts/deploy.bicep Outdated Show resolved Hide resolved
carml/1.3.0/Microsoft.Storage/storageAccounts/deploy.bicep Outdated Show resolved Hide resolved
carml/1.3.0/Microsoft.Storage/storageAccounts/readme.md Outdated Show resolved Hide resolved
carml/1.3.0/Microsoft.Storage/storageAccounts/readme.md Outdated Show resolved Hide resolved
workload/bicep/deploy-baseline.bicep Outdated Show resolved Hide resolved
workload/terraform/greenfield/AADDSscenario/readme.md Outdated Show resolved Hide resolved
workload/terraform/greenfield/AADscenario/rbac.tf Outdated Show resolved Hide resolved
workload/terraform/greenfield/readme.md Outdated Show resolved Hide resolved
| [AAD scenarios](./AADscenario/readme.md) | This folder contains scenario root modules that deploy AVD with Microsoft Entra ID join session host. |
| [AAD Zero Trust scenarios](./zerotrust/readme.md) | This folder contains scenario root modules that deploy AVD with Microsoft Entra ID join session host following zero trust principles. |
| [EntraID scenarios](./AADscenario/readme.md) | This folder contains scenario root modules that deploy AVD with Microsoft Entra ID join session host. |
| [EntraID Zero Trust scenarios](./zerotrust/readme.md) | This folder contains scenario root modules that deploy AVD with Microsoft Entra ID join session host following zero trust principles. |
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
| [EntraID Zero Trust scenarios](./zerotrust/readme.md) | This folder contains scenario root modules that deploy AVD with Microsoft Entra ID join session host following zero trust principles. |
| [Zero Trust scenarios](./zerotrust/readme.md) | This folder contains scenario root modules that deploy AVD with Microsoft Entra ID join session host following zero trust principles. |

Comment on lines +16 to 17
# Grant users access to Microsoft Entra ID-joined VMs
#https://learn.microsoft.com/en-us/azure/virtual-desktop/deploy-azure-ad-joined-vm#assign-user-access-to-host-pools
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
# Grant users access to Microsoft Entra ID-joined VMs
#https://learn.microsoft.com/en-us/azure/virtual-desktop/deploy-azure-ad-joined-vm#assign-user-access-to-host-pools
# Grant users access to Microsoft Entra ID-joined virtual machines
# https://learn.microsoft.com/azure/virtual-desktop/azure-ad-joined-session-hosts#assign-user-access-to-host-pools

danycontre and others added 19 commits January 17, 2024 13:29
@danycontre danycontre merged commit 8c2dd5b into main Jan 19, 2024
1 check passed
@danycontre danycontre deleted the entraid-name-update branch January 19, 2024 16:54
@danycontre
Copy link
Collaborator Author

Updated code merged.

cc: @moisesjgomez @ckittel @swathibhat1

petersonjdNIH pushed a commit to ARPA-H/avdaccelerator-nih that referenced this pull request Aug 26, 2024
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.

2 participants