[ADL] - Fixing AzureEnvironment to use DataLake audience

src/Common/Commands.Common.Authentication.Abstractions/AzureEnvironment.cs

@@ -77,6 +77,7 @@ public class AzureEnvironment : IAzureEnvironment
                     AzureKeyVaultServiceEndpointResourceId = AzureEnvironmentConstants.ChinaKeyVaultServiceEndpointResourceId,
                     AzureDataLakeAnalyticsCatalogAndJobEndpointSuffix = null,
                     AzureDataLakeStoreFileSystemEndpointSuffix = null,
+                    DataLakeEndpointResourceId = null,
                     GraphEndpointResourceId = AzureEnvironmentConstants.ChinaGraphEndpoint,
                     BatchEndpointResourceId = AzureEnvironmentConstants.ChinaBatchEndpointResourceId,
                     AdTenant = "Common"
@@ -102,6 +103,7 @@ public class AzureEnvironment : IAzureEnvironment
                     AzureKeyVaultServiceEndpointResourceId = AzureEnvironmentConstants.USGovernmentKeyVaultServiceEndpointResourceId,
                     AzureDataLakeAnalyticsCatalogAndJobEndpointSuffix = null,
                     AzureDataLakeStoreFileSystemEndpointSuffix = null,
+                    DataLakeEndpointResourceId = null,
                     GraphEndpointResourceId = AzureEnvironmentConstants.USGovernmentGraphEndpoint,
                     BatchEndpointResourceId = AzureEnvironmentConstants.USGovernmentBatchEndpointResourceId,
                     AdTenant = "Common"
@@ -127,6 +129,7 @@ public class AzureEnvironment : IAzureEnvironment
                     AzureKeyVaultServiceEndpointResourceId = AzureEnvironmentConstants.GermanAzureKeyVaultServiceEndpointResourceId,
                     AzureDataLakeAnalyticsCatalogAndJobEndpointSuffix = null,
                     AzureDataLakeStoreFileSystemEndpointSuffix = null,
+                    DataLakeEndpointResourceId = null,
                     GraphEndpointResourceId = AzureEnvironmentConstants.GermanGraphEndpoint,
                     BatchEndpointResourceId = AzureEnvironmentConstants.GermanBatchEndpointResourceId,
                     AdTenant = "Common"

src/Common/Commands.Common.Authentication.Abstractions/Extensions/AzureEnvironmentExtensions.cs

@@ -120,6 +120,9 @@ public static bool TryGetEndpointString(this IAzureEnvironment environment, stri
                     case AzureEnvironment.Endpoint.AzureDataLakeStoreFileSystemEndpointSuffix:
                         propertyValue = environment.AzureDataLakeStoreFileSystemEndpointSuffix;
                         break;
+                    case AzureEnvironment.Endpoint.DataLakeEndpointResourceId:
+                        propertyValue = environment.DataLakeEndpointResourceId;
+                        break;
                     case AzureEnvironment.Endpoint.ActiveDirectory:
                         propertyValue = environment.ActiveDirectoryAuthority;
                         break;
@@ -444,6 +447,10 @@ public static void CopyFrom(this IAzureEnvironment environment, IAzureEnvironmen
                     environment.AzureDataLakeAnalyticsCatalogAndJobEndpointSuffix =
                          other.AzureDataLakeAnalyticsCatalogAndJobEndpointSuffix;
                 }
+                if (other.IsEndpointSet(AzureEnvironment.Endpoint.DataLakeEndpointResourceId))
+                {
+                    environment.DataLakeEndpointResourceId = other.DataLakeEndpointResourceId;
+                }
                 if (other.IsEndpointSet(AzureEnvironment.Endpoint.AzureKeyVaultServiceEndpointResourceId))
                 {
                     environment.AzureKeyVaultServiceEndpointResourceId =
@@ -540,6 +547,10 @@ public static void Update(this IAzureEnvironment environment, IAzureEnvironment
                     environment.AzureKeyVaultServiceEndpointResourceId =
                          other.AzureKeyVaultServiceEndpointResourceId;
                 }
+                if (other.IsEndpointSet(AzureEnvironment.Endpoint.DataLakeEndpointResourceId))
+                {
+                    environment.DataLakeEndpointResourceId = other.DataLakeEndpointResourceId;
+                }
 
                 foreach (var profile in other.VersionProfiles)
                 {

src/ResourceManager/Common/Commands.Common.Authentication.ResourceManager/Models/PSAzureEnvironment.cs

@@ -93,10 +93,10 @@ public PSAzureEnvironment(PSObject other)
             AdTenant = other.GetProperty<string>(nameof(AdTenant));
             AzureDataLakeAnalyticsCatalogAndJobEndpointSuffix = other.GetProperty<string>(nameof(AzureDataLakeAnalyticsCatalogAndJobEndpointSuffix));
             AzureDataLakeStoreFileSystemEndpointSuffix = other.GetProperty<string>(nameof(AzureDataLakeStoreFileSystemEndpointSuffix));
+            DataLakeEndpointResourceId = other.GetProperty<string>(nameof(DataLakeEndpointResourceId));
             AzureKeyVaultDnsSuffix = other.GetProperty<string>(nameof(AzureKeyVaultDnsSuffix));
             AzureKeyVaultServiceEndpointResourceId = other.GetProperty<string>(nameof(AzureKeyVaultServiceEndpointResourceId));
             BatchEndpointResourceId = other.GetProperty<string>(nameof(BatchEndpointResourceId));
-            DataLakeEndpointResourceId = other.GetProperty<string>(nameof(DataLakeEndpointResourceId));
             GalleryUrl = other.GetProperty<string>(nameof(GalleryUrl));
             GraphEndpointResourceId = other.GetProperty<string>(nameof(GraphEndpointResourceId));
             GraphUrl = other.GetProperty<string>(nameof(GraphUrl));
@@ -259,6 +259,7 @@ public override bool Equals(object obj)
                        && SqlDatabaseDnsSuffix == other.SqlDatabaseDnsSuffix
                        && AzureDataLakeAnalyticsCatalogAndJobEndpointSuffix == other.AzureDataLakeAnalyticsCatalogAndJobEndpointSuffix
                        && AzureDataLakeStoreFileSystemEndpointSuffix == other.AzureDataLakeStoreFileSystemEndpointSuffix
+                       && DataLakeEndpointResourceId == other.DataLakeEndpointResourceId
                        && TrafficManagerDnsSuffix == other.TrafficManagerDnsSuffix
                        && BatchEndpointResourceId == other.BatchEndpointResourceId;
             }

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

@@ -371,7 +371,8 @@ public void CanCreateEnvironmentWithAllProperties()
                 SqlDatabaseDnsSuffix = "SqlDatabaseDnsSuffix",
                 TrafficManagerDnsSuffix = "TrafficManagerDnsSuffix",
                 GraphAudience = "GaraphAudience",
-                BatchEndpointResourceId = "BatchResourceId"
+                BatchEndpointResourceId = "BatchResourceId",
+                DataLakeAudience = "DataLakeAudience"
             };
 
             var dict = new Dictionary<string, object>();
@@ -392,6 +393,7 @@ public void CanCreateEnvironmentWithAllProperties()
             dict["TrafficManagerDnsSuffix"] = "TrafficManagerDnsSuffix";
             dict["GraphAudience"] = "GaraphAudience";
             dict["BatchEndpointResourceId"] = "BatchResourceId";
+            dict["DataLakeAudience"] = "DataLakeAudience";
             cmdlet.SetBoundParameters(dict);
 
             cmdlet.InvokeBeginProcessing();
@@ -416,6 +418,7 @@ public void CanCreateEnvironmentWithAllProperties()
             Assert.Equal(cmdlet.TrafficManagerDnsSuffix, actual.TrafficManagerDnsSuffix);
             Assert.Equal(cmdlet.GraphAudience, actual.GraphEndpointResourceId);
             Assert.Equal(cmdlet.BatchEndpointResourceId, actual.BatchEndpointResourceId);
+            Assert.Equal(cmdlet.DataLakeAudience, actual.DataLakeEndpointResourceId);
             commandRuntimeMock.Verify(f => f.WriteObject(It.IsAny<PSAzureEnvironment>()), Times.Once());
             IAzureEnvironment env = AzureRmProfileProvider.Instance.Profile.GetEnvironment("KaTaL");
             Assert.Equal(env.Name, cmdlet.Name);

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

@@ -41,6 +41,7 @@ public void CanConvertNullEnvironments()
             Assert.Null(environment.AdTenant);
             Assert.Null(environment.AzureDataLakeAnalyticsCatalogAndJobEndpointSuffix);
             Assert.Null(environment.AzureDataLakeStoreFileSystemEndpointSuffix);
+            Assert.Null(environment.DataLakeEndpointResourceId);
             Assert.Null(environment.AzureKeyVaultDnsSuffix);
             Assert.Null(environment.AzureKeyVaultServiceEndpointResourceId);
             Assert.False(environment.EnableAdfsAuthentication);
@@ -65,19 +66,19 @@ public void CanConvertNullEnvironments()
             "https://graph.windows.net", "https://graph.windows.net/", "https://manage.windowsazure.com",
             "https://manage.windowsazure.com/publishsettings", "https://management.azure.com",
             "https://management.core.windows.net", ".sql.azure.com", ".core.windows.net",
-            ".trafficmanager.windows.net", "https://batch.core.windows.net")]
+            ".trafficmanager.windows.net", "https://batch.core.windows.net", "https://datalake.azure.net")]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void CanConvertValidEnvironments(string name, bool onPremise, string activeDirectory, string serviceResource,
             string adTenant, string dataLakeJobs, string dataLakeFiles, string kvDnsSuffix,
             string kvResource, string gallery, string graph, string graphResource, string portal,
             string publishSettings, string resourceManager, string serviceManagement,
-            string sqlSuffix, string storageSuffix, string trafficManagerSuffix, string batchResource)
+            string sqlSuffix, string storageSuffix, string trafficManagerSuffix, string batchResource, string dataLakeResource)
         {
             AzureEnvironment azEnvironment = CreateEnvironment(name, onPremise, activeDirectory,
                 serviceResource, adTenant, dataLakeJobs, dataLakeFiles, kvDnsSuffix,
                 kvResource, gallery, graph, graphResource, portal, publishSettings,
                 resourceManager, serviceManagement, sqlSuffix, storageSuffix,
-                trafficManagerSuffix, batchResource);
+                trafficManagerSuffix, batchResource, dataLakeResource);
             var environment = (PSAzureEnvironment)azEnvironment;
             Assert.NotNull(environment);
             CheckEndpoint(AzureEnvironment.Endpoint.ActiveDirectory, azEnvironment,
@@ -90,6 +91,8 @@ public void CanConvertValidEnvironments(string name, bool onPremise, string acti
                 environment.AzureDataLakeAnalyticsCatalogAndJobEndpointSuffix);
             CheckEndpoint(AzureEnvironment.Endpoint.AzureDataLakeStoreFileSystemEndpointSuffix, azEnvironment,
                 environment.AzureDataLakeStoreFileSystemEndpointSuffix);
+            CheckEndpoint(AzureEnvironment.Endpoint.DataLakeEndpointResourceId, azEnvironment,
+                environment.DataLakeEndpointResourceId);
             CheckEndpoint(AzureEnvironment.Endpoint.AzureKeyVaultDnsSuffix, azEnvironment,
                 environment.AzureKeyVaultDnsSuffix);
             CheckEndpoint(AzureEnvironment.Endpoint.AzureKeyVaultServiceEndpointResourceId, azEnvironment,
@@ -133,6 +136,7 @@ public void CanConvertNullPSEnvironments()
             Assert.False(environment.IsEndpointSet(AzureEnvironment.Endpoint.AdTenant));
             Assert.False(environment.IsEndpointSet(AzureEnvironment.Endpoint.AzureDataLakeAnalyticsCatalogAndJobEndpointSuffix));
             Assert.False(environment.IsEndpointSet(AzureEnvironment.Endpoint.AzureDataLakeStoreFileSystemEndpointSuffix));
+            Assert.False(environment.IsEndpointSet(AzureEnvironment.Endpoint.DataLakeEndpointResourceId));
             Assert.False(environment.IsEndpointSet(AzureEnvironment.Endpoint.AzureKeyVaultDnsSuffix));
             Assert.False(environment.IsEndpointSet(AzureEnvironment.Endpoint.AzureKeyVaultServiceEndpointResourceId));
             Assert.False(environment.OnPremise);
@@ -156,13 +160,13 @@ public void CanConvertNullPSEnvironments()
             "https://graph.windows.net", "https://graph.windows.net/", "https://manage.windowsazure.com",
             "https://manage.windowsazure.com/publishsettings", "https://management.azure.com",
             "https://management.core.windows.net", ".sql.azure.com", ".core.windows.net",
-            ".trafficmanager.windows.net", "https://batch.core.windows.net")]
+            ".trafficmanager.windows.net", "https://batch.core.windows.net", "https://datalake.azure.net")]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void CanConvertValidPSEnvironments(string name, bool onPremise, string activeDirectory, string serviceResource,
             string adTenant, string dataLakeJobs, string dataLakeFiles, string kvDnsSuffix,
             string kvResource, string gallery, string graph, string graphResource, string portal,
             string publishSettings, string resourceManager, string serviceManagement,
-            string sqlSuffix, string storageSuffix, string trafficManagerSuffix, string batchResource)
+            string sqlSuffix, string storageSuffix, string trafficManagerSuffix, string batchResource, string dataLakeResource)
         {
             PSAzureEnvironment environment = new PSAzureEnvironment
             {
@@ -173,6 +177,7 @@ public void CanConvertValidPSEnvironments(string name, bool onPremise, string ac
                 AdTenant = adTenant,
                 AzureDataLakeAnalyticsCatalogAndJobEndpointSuffix = dataLakeJobs,
                 AzureDataLakeStoreFileSystemEndpointSuffix = dataLakeFiles,
+                DataLakeEndpointResourceId = dataLakeResource,
                 AzureKeyVaultDnsSuffix = kvDnsSuffix,
                 AzureKeyVaultServiceEndpointResourceId = kvResource,
                 GalleryUrl = gallery,
@@ -199,6 +204,8 @@ public void CanConvertValidPSEnvironments(string name, bool onPremise, string ac
                 environment.AzureDataLakeAnalyticsCatalogAndJobEndpointSuffix);
             CheckEndpoint(AzureEnvironment.Endpoint.AzureDataLakeStoreFileSystemEndpointSuffix, azEnvironment,
                 environment.AzureDataLakeStoreFileSystemEndpointSuffix);
+            CheckEndpoint(AzureEnvironment.Endpoint.DataLakeEndpointResourceId, azEnvironment,
+                environment.DataLakeEndpointResourceId);
             CheckEndpoint(AzureEnvironment.Endpoint.AzureKeyVaultDnsSuffix, azEnvironment,
                 environment.AzureKeyVaultDnsSuffix);
             CheckEndpoint(AzureEnvironment.Endpoint.AzureKeyVaultServiceEndpointResourceId, azEnvironment,
@@ -234,7 +241,7 @@ private AzureEnvironment CreateEnvironment(string name, bool onPremise, string a
             string adTenant, string dataLakeJobs, string dataLakeFiles, string kvDnsSuffix,
             string kvResource, string gallery, string graph, string graphResource, string portal,
             string publishSettings, string resourceManager, string serviceManagement,
-            string sqlSuffix, string storageSuffix, string trafficManagerSuffix, string batchResource)
+            string sqlSuffix, string storageSuffix, string trafficManagerSuffix, string batchResource, string dataLakeResource)
         {
             var environment = new AzureEnvironment() { Name = name, OnPremise = onPremise };
             SetEndpoint(AzureEnvironment.Endpoint.ActiveDirectory, environment, activeDirectory);
@@ -248,6 +255,9 @@ private AzureEnvironment CreateEnvironment(string name, bool onPremise, string a
             CheckEndpoint(AzureEnvironment.Endpoint.AzureDataLakeStoreFileSystemEndpointSuffix,
                 environment,
                 dataLakeFiles);
+            CheckEndpoint(AzureEnvironment.Endpoint.DataLakeEndpointResourceId,
+                environment,
+                dataLakeResource);
             CheckEndpoint(AzureEnvironment.Endpoint.AzureKeyVaultDnsSuffix, environment,
                 kvDnsSuffix);
             CheckEndpoint(AzureEnvironment.Endpoint.AzureKeyVaultServiceEndpointResourceId,