Merge pull request Azure#3405 from cormacpayne/ad-environment-fix

Handle Uri not ending with "/" for ActiveDirectoryEndpoint parameter

Author: markcowl

src/ResourceManager/Profile/Commands.Profile.Test/EnvironmentCmdletTests.cs

@@ -187,19 +187,19 @@ public void CanCreateEnvironmentWithAllProperties()
             {
                 CommandRuntime = commandRuntimeMock.Object,
                 Name = "Katal",
-                ActiveDirectoryEndpoint = "ActiveDirectoryEndpoint",
+                ActiveDirectoryEndpoint = "https://ActiveDirectoryEndpoint",
                 AdTenant = "AdTenant",
                 AzureKeyVaultDnsSuffix = "AzureKeyVaultDnsSuffix",
-                ActiveDirectoryServiceEndpointResourceId = "ActiveDirectoryServiceEndpointResourceId",
-                AzureKeyVaultServiceEndpointResourceId = "AzureKeyVaultServiceEndpointResourceId",
+                ActiveDirectoryServiceEndpointResourceId = "https://ActiveDirectoryServiceEndpointResourceId",
+                AzureKeyVaultServiceEndpointResourceId = "https://AzureKeyVaultServiceEndpointResourceId",
                 EnableAdfsAuthentication = true,
-                GalleryEndpoint = "GalleryEndpoint",
-                GraphEndpoint = "GraphEndpoint",
-                ManagementPortalUrl = "ManagementPortalUrl",
-                PublishSettingsFileUrl = "PublishSettingsFileUrl",
-                ResourceManagerEndpoint = "ResourceManagerEndpoint",
-                ServiceEndpoint = "ServiceEndpoint",
-                StorageEndpoint = "StorageEndpoint",
+                GalleryEndpoint = "https://GalleryEndpoint",
+                GraphEndpoint = "https://GraphEndpoint",
+                ManagementPortalUrl = "https://ManagementPortalUrl",
+                PublishSettingsFileUrl = "https://PublishSettingsFileUrl",
+                ResourceManagerEndpoint = "https://ResourceManagerEndpoint",
+                ServiceEndpoint = "https://ServiceEndpoint",
+                StorageEndpoint = "https://StorageEndpoint",
                 SqlDatabaseDnsSuffix = "SqlDatabaseDnsSuffix",
                 TrafficManagerDnsSuffix = "TrafficManagerDnsSuffix",
                 GraphAudience = "GaraphAudience"
@@ -210,7 +210,7 @@ public void CanCreateEnvironmentWithAllProperties()
             cmdlet.InvokeEndProcessing();
             Assert.Equal(cmdlet.Name, actual.Name);
             Assert.Equal(cmdlet.EnableAdfsAuthentication.ToBool(), actual.EnableAdfsAuthentication);
-            Assert.Equal(cmdlet.ActiveDirectoryEndpoint, actual.ActiveDirectoryAuthority);
+            Assert.Equal(cmdlet.ActiveDirectoryEndpoint + "/", actual.ActiveDirectoryAuthority, StringComparer.OrdinalIgnoreCase);
             Assert.Equal(cmdlet.ActiveDirectoryServiceEndpointResourceId,
                 actual.ActiveDirectoryServiceEndpointResourceId);
             Assert.Equal(cmdlet.AdTenant, actual.AdTenant);

src/ResourceManager/Profile/Commands.Profile/Environment/AddAzureRMEnvironment.cs

@@ -16,6 +16,7 @@
 using Microsoft.Azure.Commands.Profile.Models;
 using Microsoft.Azure.Commands.ResourceManager.Common;
 using Microsoft.WindowsAzure.Commands.Common;
+using Microsoft.WindowsAzure.Commands.Utilities.Common;
 using System.Management.Automation;
 
 namespace Microsoft.Azure.Commands.Profile
@@ -126,7 +127,9 @@ public override void ExecuteCmdlet()
                     newEnvironment.Endpoints[AzureEnvironment.Endpoint.ResourceManager] = ResourceManagerEndpoint;
                     newEnvironment.Endpoints[AzureEnvironment.Endpoint.ManagementPortalUrl] = ManagementPortalUrl;
                     newEnvironment.Endpoints[AzureEnvironment.Endpoint.StorageEndpointSuffix] = StorageEndpoint;
-                    newEnvironment.Endpoints[AzureEnvironment.Endpoint.ActiveDirectory] = ActiveDirectoryEndpoint;
+                    newEnvironment.Endpoints[AzureEnvironment.Endpoint.ActiveDirectory] =
+                        ActiveDirectoryEndpoint != null ? GeneralUtilities.EnsureTrailingSlash(ActiveDirectoryEndpoint) 
+                                                        : ActiveDirectoryEndpoint;
                     newEnvironment.Endpoints[AzureEnvironment.Endpoint.ActiveDirectoryServiceEndpointResourceId] =
                         ActiveDirectoryServiceEndpointResourceId;
                     newEnvironment.Endpoints[AzureEnvironment.Endpoint.Gallery] = GalleryEndpoint;