Skip to content

Add support for configuring Microsoft Graph endpoints

Stan Hu requested to merge sh-azure-endpoint-config into master

What does this MR do?

Previously Microsoft Graph only worked for the default Azure deployment. However, there are currently three other national clouds supported in Azure (https://docs.microsoft.com/en-us/graph/deployments).

This commit upgrades MailRoom to v0.0.20 to pull in https://github.com/tpitale/mail_room/pull/140 to make it possible to configure endpoints for alternative Azure deployments.

This update also adds support for the azureAdEndpoint and graphEndpoint configuration settings for incoming e-mail and Service Desk.

Related CNG change: gitlab-org/build/CNG!931 (merged)

Related Omnibus change: gitlab-org/omnibus-gitlab!5978 (merged)

Related issues

Upstream issue: https://github.com/tpitale/mail_room/issues/139

Test plan

  1. Sign up for a Microsoft 365 Government account: https://www.microsoft.com/en-us/microsoft-365/government/eligibility-validation
  2. Sign up for Azure Government account: https://azure.microsoft.com/en-us/global-infrastructure/government/#why-azure
  3. Configure MailRoom with Microsoft Graph: https://docs.gitlab.com/charts/charts/gitlab/mailroom/#microsoft-graph.
  4. Specify azureAdEndpoint as https://login.microsoftonline.us and graphEndpoint as https://graph.microsoft.us.

Checklist

See Definition of done.

For anything in this list which will not be completed, please provide a reason in the MR discussion.

Required

  • Merge Request Title and Description are up to date, accurate, and descriptive
  • MR targeting the appropriate branch
  • MR has a green pipeline on GitLab.com

Expected (please provide an explanation if not completing)

  • Test plan indicating conditions for success has been posted and passes
  • Documentation created/updated
  • Tests added
  • Integration tests added to GitLab QA
  • Equivalent MR/issue for omnibus-gitlab opened
Edited by Jason Plum

Merge request reports