From 53ff0838256345bfb7e6d6513a996721bc84de42 Mon Sep 17 00:00:00 2001 From: j82w Date: Tue, 25 Aug 2015 10:53:27 -0700 Subject: [PATCH 1/2] Fixed ServerActiveDirectoryAdministratorTest. Removed a check for the graph endpoint when setting the Azure SQL Server Active Directory administrator that caused the test to fail. --- .../AzureSqlServerActiveDirectoryAdministratorAdapter.cs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/ResourceManager/Sql/Commands.Sql/ServerActiveDirectoryAdministrator/Services/AzureSqlServerActiveDirectoryAdministratorAdapter.cs b/src/ResourceManager/Sql/Commands.Sql/ServerActiveDirectoryAdministrator/Services/AzureSqlServerActiveDirectoryAdministratorAdapter.cs index 500a365733d5..11e570a0f9b8 100644 --- a/src/ResourceManager/Sql/Commands.Sql/ServerActiveDirectoryAdministrator/Services/AzureSqlServerActiveDirectoryAdministratorAdapter.cs +++ b/src/ResourceManager/Sql/Commands.Sql/ServerActiveDirectoryAdministrator/Services/AzureSqlServerActiveDirectoryAdministratorAdapter.cs @@ -65,10 +65,6 @@ public MicrosoftAzureCommandsResourcesModelsActiveDirectory.ActiveDirectoryClien { if (_activeDirectoryClient == null) { - if (!Profile.Context.Environment.IsEndpointSet(AzureEnvironment.Endpoint.Graph)) - { - throw new ArgumentException(string.Format(Resources.InvalidGraphEndpoint)); - } _activeDirectoryClient = new MicrosoftAzureCommandsResourcesModelsActiveDirectory.ActiveDirectoryClient(Profile.Context); } return this._activeDirectoryClient; From b23decf30a1e4950c183d18000e7212f33e4a2c3 Mon Sep 17 00:00:00 2001 From: j82w Date: Tue, 25 Aug 2015 13:37:24 -0700 Subject: [PATCH 2/2] Set the graph endpoint in the test framework to fix the TestServerActiveDirectoryAdministratorCRUD. --- .../Sql/Commands.Sql.Test/ScenarioTests/SqlEvnSetupHelper.cs | 3 +++ .../AzureSqlServerActiveDirectoryAdministratorAdapter.cs | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/SqlEvnSetupHelper.cs b/src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/SqlEvnSetupHelper.cs index 0af96163993d..4d9a6c10f26e 100644 --- a/src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/SqlEvnSetupHelper.cs +++ b/src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/SqlEvnSetupHelper.cs @@ -89,6 +89,9 @@ public void SetupEnvironment() ProfileClient.Profile.Accounts[testAccount.Id] = testAccount; ProfileClient.SetSubscriptionAsDefault(testSubscription.Name, testSubscription.Account); + var environment = ProfileClient.Profile.Environments[ProfileClient.Profile.DefaultSubscription.Environment]; + environment.Endpoints[AzureEnvironment.Endpoint.Graph] = csmEnvironment.Endpoints.GraphUri.AbsoluteUri; + ProfileClient.Profile.Save(); } } diff --git a/src/ResourceManager/Sql/Commands.Sql/ServerActiveDirectoryAdministrator/Services/AzureSqlServerActiveDirectoryAdministratorAdapter.cs b/src/ResourceManager/Sql/Commands.Sql/ServerActiveDirectoryAdministrator/Services/AzureSqlServerActiveDirectoryAdministratorAdapter.cs index 11e570a0f9b8..500a365733d5 100644 --- a/src/ResourceManager/Sql/Commands.Sql/ServerActiveDirectoryAdministrator/Services/AzureSqlServerActiveDirectoryAdministratorAdapter.cs +++ b/src/ResourceManager/Sql/Commands.Sql/ServerActiveDirectoryAdministrator/Services/AzureSqlServerActiveDirectoryAdministratorAdapter.cs @@ -65,6 +65,10 @@ public MicrosoftAzureCommandsResourcesModelsActiveDirectory.ActiveDirectoryClien { if (_activeDirectoryClient == null) { + if (!Profile.Context.Environment.IsEndpointSet(AzureEnvironment.Endpoint.Graph)) + { + throw new ArgumentException(string.Format(Resources.InvalidGraphEndpoint)); + } _activeDirectoryClient = new MicrosoftAzureCommandsResourcesModelsActiveDirectory.ActiveDirectoryClient(Profile.Context); } return this._activeDirectoryClient;