Move SQL Server and SQL Instance from AAD Client to MSGraph Client (#18944)

amolagar5 · BethanyZhou · web-flow · commit 0ec5b3f53135 · 2022-07-18T09:16:29.000+08:00
* Move SQL Server and SQL Instance from ActiveDirectoryClient to MicrosoftGraphClient

* Update src/Sql/Sql/ChangeLog.md

Co-authored-by: Beisi Zhou &lt;zhoubeisi@gmail.com&gt;
diff --git a/src/Sql/Sql/ChangeLog.md b/src/Sql/Sql/ChangeLog.md
@@ -19,6 +19,7 @@
 -->
 ## Upcoming Release
 * Removed the warning messages for MSGraph migration [#18856] 
+* Moved SQL Server and SQL Instance from ActiveDirectoryClient to MicrosoftGraphClient
 
 ## Version 3.10.0
 * Added `GeoZone` option to `BackupStorageRedundancy` parameter to `New-AzSqlDatabase`, `Set-AzSqlDatabase`, `New-AzSqlDatabaseCopy`, `New-AzSqlDatabaseSecondary`, and `Restore-AzSqlDatabase` to enable create, update, copy, geo secondary and PITR support for GeoZone hyperscale databases
diff --git a/src/Sql/Sql/ManagedInstance/Services/AzureSqlManagedInstanceAdapter.cs b/src/Sql/Sql/ManagedInstance/Services/AzureSqlManagedInstanceAdapter.cs
@@ -17,19 +17,18 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Runtime.InteropServices;
-using System.Security;
-using System.Security.Permissions;
 using Microsoft.Azure.Commands.ResourceManager.Common.Tags;
 using Microsoft.Azure.Commands.Common.Authentication.Abstractions;
 using Microsoft.Azure.Commands.Sql.Common;
 using Microsoft.WindowsAzure.Commands.Common;
 using Microsoft.Azure.Management.Internal.Resources.Utilities.Models;
 using Microsoft.Azure.Management.Sql.Models;
-using Microsoft.Azure.Graph.RBAC.Version1_6.ActiveDirectory;
-using Microsoft.Azure.Graph.RBAC.Version1_6.Models;
+using Microsoft.Azure.Commands.Common.MSGraph.Version1_0;
+using Microsoft.Azure.Commands.Common.MSGraph.Version1_0.Groups.Models;
+using Microsoft.Azure.Commands.Common.Authentication;
+using Microsoft.Azure.Commands.Common.MSGraph.Version1_0.Applications.Models;
+
 using Microsoft.Rest.Azure.OData;
-using ServicePrincipal = Microsoft.Azure.Graph.RBAC.Version1_6.Models.ServicePrincipal;
 
 namespace Microsoft.Azure.Commands.Sql.ManagedInstance.Adapter
 {
@@ -49,30 +48,25 @@ public class AzureSqlManagedInstanceAdapter
         public IAzureContext Context { get; set; }
 
         /// <summary>
-        /// A private instance of ActiveDirectoryClient
+        /// A private instance of MicrosoftGraphClient
         /// </summary>
-        private ActiveDirectoryClient _activeDirectoryClient;
+        private MicrosoftGraphClient _microsoftGraphClient;
 
         /// <summary>
-        /// Gets or sets the Azure ActiveDirectoryClient instance
+        /// Gets or sets the Azure MicrosoftGraphClient instance
         /// </summary>
-        public ActiveDirectoryClient ActiveDirectoryClient
+        public MicrosoftGraphClient MicrosoftGraphClient
         {
             get
             {
-                if (_activeDirectoryClient == null)
+                if (_microsoftGraphClient == null)
                 {
-                    _activeDirectoryClient = new ActiveDirectoryClient(Context);
-                    if (!Context.Environment.IsEndpointSet(AzureEnvironment.Endpoint.Graph))
-                    {
-                        throw new ArgumentException(string.Format(Microsoft.Azure.Commands.Sql.Properties.Resources.InvalidGraphEndpoint));
-                    }
-                    _activeDirectoryClient = new ActiveDirectoryClient(Context);
+                    _microsoftGraphClient = AzureSession.Instance.ClientFactory.CreateArmClient<MicrosoftGraphClient>(Context, AzureEnvironment.Endpoint.Graph);
+                    _microsoftGraphClient.TenantID = Context.Tenant.Id;
                 }
-                return this._activeDirectoryClient;
+                return _microsoftGraphClient;
             }
-
-            set { this._activeDirectoryClient = value; }
+            set { _microsoftGraphClient = value; }
         }
 
         /// <summary>
@@ -317,18 +311,18 @@ protected ManagedInstanceExternalAdministrator GetActiveDirectoryInformation(Man
             Guid tenantId = GetTenantId();
 
             // Check for a Azure Active Directory group. Recommended to always use group.
-            IEnumerable<PSADGroup> groupList = null;
-            PSADGroup group = null;
+            IEnumerable<MicrosoftGraphGroup> groupList = null;
+            MicrosoftGraphGroup group = null;
 
-            var filter = new ADObjectFilterOptions()
+            var filter = new MicrosoftObjectFilterOptions()
             {
                 Id = (objectId != null && objectId != Guid.Empty) ? objectId.ToString() : null,
                 SearchString = displayName,
                 Paging = true,
             };
 
             // Get a list of groups from Azure Active Directory
-            groupList = ActiveDirectoryClient.FilterGroups(filter).Where(gr => string.Equals(gr.DisplayName, displayName, StringComparison.OrdinalIgnoreCase));
+            groupList = MicrosoftGraphClient.FilterGroups(filter).Where(gr => string.Equals(gr.DisplayName, displayName, StringComparison.OrdinalIgnoreCase));
 
             if (groupList != null && groupList.Count() > 1)
             {
@@ -348,19 +342,19 @@ protected ManagedInstanceExternalAdministrator GetActiveDirectoryInformation(Man
             }
 
             // Lookup for serviceprincipals
-            ODataQuery<ServicePrincipal> odataQueryFilter;
+            ODataQuery<MicrosoftGraphServicePrincipal> odataQueryFilter;
 
             if ((objectId != null && objectId != Guid.Empty))
             {
                 var applicationIdString = objectId.ToString();
-                odataQueryFilter = new Rest.Azure.OData.ODataQuery<ServicePrincipal>(a => a.AppId == applicationIdString);
+                odataQueryFilter = new Rest.Azure.OData.ODataQuery<MicrosoftGraphServicePrincipal>(a => a.AppId == applicationIdString);
             }
             else
             {
-                odataQueryFilter = new Rest.Azure.OData.ODataQuery<ServicePrincipal>(a => a.DisplayName == displayName);
+                odataQueryFilter = new Rest.Azure.OData.ODataQuery<MicrosoftGraphServicePrincipal>(a => a.DisplayName == displayName);
             }
 
-            var servicePrincipalList = ActiveDirectoryClient.FilterServicePrincipals(odataQueryFilter);
+            var servicePrincipalList = MicrosoftGraphClient.FilterServicePrincipals(odataQueryFilter);
 
             if (servicePrincipalList != null && servicePrincipalList.Count() > 1)
             {
@@ -370,7 +364,7 @@ protected ManagedInstanceExternalAdministrator GetActiveDirectoryInformation(Man
             else if (servicePrincipalList != null && servicePrincipalList.Count() == 1)
             {
                 // Only one user was found. Get the user display name and object id
-                PSADServicePrincipal app = servicePrincipalList.First();
+                MicrosoftGraphServicePrincipal app = servicePrincipalList.First();
 
                 if (displayName != null && string.CompareOrdinal(displayName, app.DisplayName) != 0)
                 {
@@ -385,7 +379,7 @@ protected ManagedInstanceExternalAdministrator GetActiveDirectoryInformation(Man
                 return new ManagedInstanceExternalAdministrator()
                 {
                     Login = displayName,
-                    Sid = app.ApplicationId,
+                    Sid = new Guid(app.AppId),
                     TenantId = tenantId,
                     PrincipalType = "Application",
                     AzureADOnlyAuthentication = adOnlyAuth
@@ -397,50 +391,50 @@ protected ManagedInstanceExternalAdministrator GetActiveDirectoryInformation(Man
                 return new ManagedInstanceExternalAdministrator()
                 {
                     Login = group.DisplayName,
-                    Sid = group.Id,
+                    Sid = new Guid(group.Id),
                     TenantId = tenantId,
                     PrincipalType = "Group",
                     AzureADOnlyAuthentication = adOnlyAuth
                 };
             }
 
             // No group or service principal was found. Check for a user
-            filter = new ADObjectFilterOptions()
+            filter = new MicrosoftObjectFilterOptions()
             {
                 Id = (objectId != null && objectId != Guid.Empty) ? objectId.ToString() : null,
                 SearchString = displayName,
                 Paging = true,
             };
 
             // Get a list of user from Azure Active Directory
-            var userList = ActiveDirectoryClient.FilterUsers(filter).Where(gr => string.Equals(gr.DisplayName, displayName, StringComparison.OrdinalIgnoreCase));
+            var userList = MicrosoftGraphClient.FilterUsers(filter).Where(gr => string.Equals(gr.DisplayName, displayName, StringComparison.OrdinalIgnoreCase));
 
             // No user was found. Check if the display name is a UPN
             if (userList == null || userList.Count() == 0)
             {
                 // Check if the display name is the UPN
-                filter = new ADObjectFilterOptions()
+                filter = new MicrosoftObjectFilterOptions()
                 {
                     Id = (objectId != null && objectId != Guid.Empty) ? objectId.ToString() : null,
                     UPN = displayName,
                     Paging = true,
                 };
 
-                userList = ActiveDirectoryClient.FilterUsers(filter).Where(gr => string.Equals(gr.UserPrincipalName, displayName, StringComparison.OrdinalIgnoreCase));
+                userList = MicrosoftGraphClient.FilterUsers(filter).Where(gr => string.Equals(gr.UserPrincipalName, displayName, StringComparison.OrdinalIgnoreCase));
             }
 
             // No user was found. Check if the display name is a guest user. 
             if (userList == null || userList.Count() == 0)
             {
                 // Check if the display name is the UPN
-                filter = new ADObjectFilterOptions()
+                filter = new MicrosoftObjectFilterOptions()
                 {
                     Id = (objectId != null && objectId != Guid.Empty) ? objectId.ToString() : null,
                     Mail = displayName,
                     Paging = true,
                 };
 
-                userList = ActiveDirectoryClient.FilterUsers(filter);
+                userList = MicrosoftGraphClient.FilterUsers(filter);
             }
 
             // No user was found
@@ -461,7 +455,7 @@ protected ManagedInstanceExternalAdministrator GetActiveDirectoryInformation(Man
                 return new ManagedInstanceExternalAdministrator()
                 {
                     Login = displayName,
-                    Sid = obj.Id,
+                    Sid = new Guid(obj.Id),
                     TenantId = tenantId,
                     PrincipalType = "User",
                     AzureADOnlyAuthentication = adOnlyAuth
diff --git a/src/Sql/Sql/ManagedInstance/Services/AzureSqlManagedInstanceCommunicator.cs b/src/Sql/Sql/ManagedInstance/Services/AzureSqlManagedInstanceCommunicator.cs
@@ -14,12 +14,8 @@
 
 using Microsoft.Azure.Commands.Common.Authentication;
 using Microsoft.Azure.Commands.Common.Authentication.Abstractions;
-using Microsoft.Azure.Commands.Common.Authentication.Models;
-using Microsoft.Azure.Commands.Sql.Common;
 using Microsoft.Azure.Management.Internal.Resources;
 using Microsoft.Azure.Management.Sql;
-using Microsoft.Azure.Management.Sql.Models;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 
diff --git a/src/Sql/Sql/Server/Services/AzureSqlServerAdapter.cs b/src/Sql/Sql/Server/Services/AzureSqlServerAdapter.cs
