Fix aad graph endpoint for SQL server and managed instance APIs (Azur…

…e#19712) * Fixed batch test recording issue (Azure#19706) * fix aad graph endpoint Co-authored-by: Vincent Dai <23257217+vidai-msft@users.noreply.github.com> Co-authored-by: Dingmeng Xue <dixue@microsoft.com> Co-authored-by: Yunchi Wang <54880216+wyunchi-ms@users.noreply.github.com>
azure-sdk · Sep 30, 2022 · 71c638a · 71c638a
1 parent 02c9afc
commit 71c638a
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 33 deletions.
diff --git a/src/DevTestLabs/DevTestLabs.Test/ScenarioTests/PolicyTests.cs b/src/DevTestLabs/DevTestLabs.Test/ScenarioTests/PolicyTests.cs
@@ -14,14 +14,13 @@
 
 using Microsoft.WindowsAzure.Commands.ScenarioTest;
 using Xunit;
-using Xunit.Sdk;
 
 namespace Microsoft.Azure.Commands.DevTestLabs.Test.ScenarioTests
 {
     public class PolicyTests : DevTestLabsTestRunner
     {
 
-        public PolicyTests(TestOutputHelper output) : base(output)
+        public PolicyTests(Xunit.Abstractions.ITestOutputHelper output) : base(output)
         {
 
         }

diff --git a/src/Sql/Sql/ChangeLog.md b/src/Sql/Sql/ChangeLog.md
@@ -26,6 +26,7 @@
 * Removed the following aliases: `Enable-AzSqlServerAdvancedThreatProtection`, `Disable-AzSqlServerAdvancedThreatProtection`, `Get-AzSqlServerThreatDetectionSetting`, `Remove-AzSqlServerThreatDetectionSetting`, `Set-AzSqlServerThreatDetectionSetting`, `Get-AzSqlDatabaseThreatDetectionSetting`, `Set-AzSqlDatabaseThreatDetectionSetting` and `Remove-AzSqlDatabaseThreatDetectionSetting`
 * Changed the returned object for the following cmdlets: `Get-AzSqlServerAdvancedThreatProtectionSetting` and `Get-AzSqlDatabaseAdvancedThreatProtectionSetting`
 * Changed the parameters for the following cmdlets: `Update-AzSqlServerAdvancedThreatProtectionSetting` and `Update-AzSqlDatabaseAdvancedThreatProtectionSetting`. Only `Enable` parameter is now supported.
+* Changed endpoint used in SQL Server and SQL Instance from AD Graph to MS Graph
 
 ## Version 3.11.0
 * Removed the warning messages for MSGraph migration [#18856] 

diff --git a/src/Sql/Sql/ManagedInstance/Services/AzureSqlManagedInstanceAdapter.cs b/src/Sql/Sql/ManagedInstance/Services/AzureSqlManagedInstanceAdapter.cs
@@ -61,7 +61,7 @@ public MicrosoftGraphClient MicrosoftGraphClient
             {
                 if (_microsoftGraphClient == null)
                 {
-                    _microsoftGraphClient = AzureSession.Instance.ClientFactory.CreateArmClient<MicrosoftGraphClient>(Context, AzureEnvironment.Endpoint.Graph);
+                    _microsoftGraphClient = AzureSession.Instance.ClientFactory.CreateArmClient<MicrosoftGraphClient>(Context, AzureEnvironment.ExtendedEndpoint.MicrosoftGraphUrl);
                     _microsoftGraphClient.TenantID = Context.Tenant.Id;
                 }
                 return _microsoftGraphClient;

diff --git a/src/Sql/Sql/Server/Services/AzureSqlServerAdapter.cs b/src/Sql/Sql/Server/Services/AzureSqlServerAdapter.cs
@@ -60,7 +60,7 @@ public MicrosoftGraphClient MicrosoftGraphClient
             {
                 if (_microsoftGraphClient == null)
                 {
-                    _microsoftGraphClient = AzureSession.Instance.ClientFactory.CreateArmClient<MicrosoftGraphClient>(Context, AzureEnvironment.Endpoint.Graph);
+                    _microsoftGraphClient = AzureSession.Instance.ClientFactory.CreateArmClient<MicrosoftGraphClient>(Context, AzureEnvironment.ExtendedEndpoint.MicrosoftGraphUrl);
                     _microsoftGraphClient.TenantID = Context.Tenant.Id;
                 }
                 return _microsoftGraphClient;

diff --git a/tools/TestFx/TestEnvironment.cs b/tools/TestFx/TestEnvironment.cs
@@ -110,7 +110,6 @@ public TestEnvironment(string connectionString)
 
             InitTokenDictionary();
             SetupHttpRecorderMode();
-            RecorderModeSettings();
         }
 
         private void InitTestEndPoints()
@@ -186,31 +185,6 @@ private void SetupHttpRecorderMode()
             }
         }
 
-        private void RecorderModeSettings()
-        {
-            if (HttpMockServer.Mode == HttpRecorderMode.Record)
-            {
-                //Restore/Add Subscription Id in MockServer from supplied connection string
-                if (HttpMockServer.Variables.ContainsCaseInsensitiveKey(ConnectionStringKeys.SubscriptionIdKey))
-                {
-                    HttpMockServer.Variables.UpdateDictionary(ConnectionStringKeys.SubscriptionIdKey, SubscriptionId);
-                }
-                else
-                {
-                    HttpMockServer.Variables.Add(ConnectionStringKeys.SubscriptionIdKey, SubscriptionId);
-                }
-
-                // If User has provided Access Token in RawToken/GraphToken Key-Value, we don't need to authenticate
-                // We currently only check for RawToken and do not check if GraphToken is provided
-                if (string.IsNullOrEmpty(ConnectionString.GetValue(ConnectionStringKeys.RawTokenKey)))
-                {
-                    Login();
-                }
-
-                VerifyAuthTokens();
-            }
-        }
-
         private void Login()
         {
             string userPassword = ConnectionString.GetValue(ConnectionStringKeys.PasswordKey);
@@ -413,9 +387,30 @@ private void VerifyGraphToken()
             }
         }
 
-        internal void SetRecordedEnvironmentVariables()
+        internal void SetEnvironmentVariables()
         {
-            if (HttpMockServer.Mode == HttpRecorderMode.Playback)
+            if (HttpMockServer.Mode == HttpRecorderMode.Record)
+            {
+                //Restore/Add Subscription Id in MockServer from supplied connection string
+                if (HttpMockServer.Variables.ContainsCaseInsensitiveKey(ConnectionStringKeys.SubscriptionIdKey))
+                {
+                    HttpMockServer.Variables.UpdateDictionary(ConnectionStringKeys.SubscriptionIdKey, SubscriptionId);
+                }
+                else
+                {
+                    HttpMockServer.Variables.Add(ConnectionStringKeys.SubscriptionIdKey, SubscriptionId);
+                }
+
+                // If User has provided Access Token in RawToken/GraphToken Key-Value, we don't need to authenticate
+                // We currently only check for RawToken and do not check if GraphToken is provided
+                if (string.IsNullOrEmpty(ConnectionString.GetValue(ConnectionStringKeys.RawTokenKey)))
+                {
+                    Login();
+                }
+
+                VerifyAuthTokens();
+            }
+            else if (HttpMockServer.Mode == HttpRecorderMode.Playback)
             {
                 //Get Subscription Id from MockServer. Otherwise, assign zero guid
                 if (HttpMockServer.Variables.ContainsCaseInsensitiveKey(ConnectionStringKeys.SubscriptionIdKey))

diff --git a/tools/TestFx/TestEnvironmentFactory.cs b/tools/TestFx/TestEnvironmentFactory.cs
@@ -30,7 +30,7 @@ static TestEnvironmentFactory()
 
         internal static TestEnvironment BuildTestFxEnvironment()
         {
-            _environment.SetRecordedEnvironmentVariables();
+            _environment.SetEnvironmentVariables();
             return _environment;
         }