Fixed some profile tests after introduction of AzureOperationalInsights profile entries

Author: Chris Suich

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

@@ -107,6 +107,9 @@ public PSAzureEnvironment(PSObject other)
             SqlDatabaseDnsSuffix = other.GetProperty<string>(nameof(SqlDatabaseDnsSuffix));
             StorageEndpointSuffix = other.GetProperty<string>(nameof(StorageEndpointSuffix));
             TrafficManagerDnsSuffix = other.GetProperty<string>(nameof(TrafficManagerDnsSuffix));
+            AzureOperationalInsightsEndpointResourceId =
+                other.GetProperty<string>(nameof(AzureOperationalInsightsEndpointResourceId));
+            AzureOperationalInsightsEndpoint = other.GetProperty<string>(nameof(AzureOperationalInsightsEndpoint));
             VersionProfiles.Populate(nameof(VersionProfiles), other);
             this.PopulateExtensions(other);
         }

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

@@ -743,6 +743,8 @@ public void SavingProfileWorks()
       ""BatchEndpointResourceId"": null,
       ""AzureDataLakeAnalyticsCatalogAndJobEndpointSuffix"": null,
       ""AzureDataLakeStoreFileSystemEndpointSuffix"": null,
+      ""AzureOperationalInsightsEndpointResourceId"": null,
+      ""AzureOperationalInsightsEndpoint"": null,
       ""AdTenant"": null,
       ""VersionProfiles"": [],
       ""ExtendedProperties"": {}
@@ -770,8 +772,8 @@ public void SavingProfileWorks()
         ""State"": ""Enabled"",
         ""ExtendedProperties"": {
           ""Account"": ""[email protected]"",
-          ""Tenants"": ""3c0ff8a7-e8bb-40e8-ae66-271343379af6"",
-          ""Environment"": ""testCloud""
+          ""Environment"": ""testCloud"",
+          ""Tenants"": ""3c0ff8a7-e8bb-40e8-ae66-271343379af6""
         }
       },
       ""Environment"": {
@@ -795,6 +797,8 @@ public void SavingProfileWorks()
         ""BatchEndpointResourceId"": null,
         ""AzureDataLakeAnalyticsCatalogAndJobEndpointSuffix"": null,
         ""AzureDataLakeStoreFileSystemEndpointSuffix"": null,
+        ""AzureOperationalInsightsEndpointResourceId"": null,
+        ""AzureOperationalInsightsEndpoint"": null,
         ""AdTenant"": null,
         ""VersionProfiles"": [],
         ""ExtendedProperties"": {}

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

@@ -376,7 +376,9 @@ public void CanCreateEnvironmentWithAllProperties()
                 TrafficManagerDnsSuffix = "TrafficManagerDnsSuffix",
                 GraphAudience = "GaraphAudience",
                 BatchEndpointResourceId = "BatchResourceId",
-                DataLakeAudience = "DataLakeAudience"
+                DataLakeAudience = "DataLakeAudience",
+                AzureOperationalInsightsEndpointResourceId = "AzureOperationalInsightsEndpointResourceId",
+                AzureOperationalInsightsEndpoint = "https://AzureOperationalInsights",
             };
 
             var dict = new Dictionary<string, object>();
@@ -398,6 +400,8 @@ public void CanCreateEnvironmentWithAllProperties()
             dict["GraphAudience"] = "GaraphAudience";
             dict["BatchEndpointResourceId"] = "BatchResourceId";
             dict["DataLakeAudience"] = "DataLakeAudience";
+            dict["AzureOperationalInsightsEndpointResourceId"] = "AzureOperationalInsightsEndpointResourceId";
+            dict["AzureOperationalInsightsEndpoint"] = "https://AzureOperationalInsights";
             cmdlet.SetBoundParameters(dict);
 
             cmdlet.InvokeBeginProcessing();
@@ -423,6 +427,8 @@ public void CanCreateEnvironmentWithAllProperties()
             Assert.Equal(cmdlet.GraphAudience, actual.GraphEndpointResourceId);
             Assert.Equal(cmdlet.BatchEndpointResourceId, actual.BatchEndpointResourceId);
             Assert.Equal(cmdlet.DataLakeAudience, actual.DataLakeEndpointResourceId);
+            Assert.Equal(cmdlet.AzureOperationalInsightsEndpointResourceId, actual.AzureOperationalInsightsEndpointResourceId);
+            Assert.Equal(cmdlet.AzureOperationalInsightsEndpoint, actual.AzureOperationalInsightsEndpoint);
             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

@@ -57,6 +57,8 @@ public void CanConvertNullEnvironments()
             Assert.Null(environment.StorageEndpointSuffix);
             Assert.Null(environment.TrafficManagerDnsSuffix);
             Assert.Null(environment.BatchEndpointResourceId);
+            Assert.Null(environment.AzureOperationalInsightsEndpointResourceId);
+            Assert.Null(environment.AzureOperationalInsightsEndpoint);
         }
 
         [Theory]
@@ -66,19 +68,22 @@ 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", "https://datalake.azure.net")]
+            ".trafficmanager.windows.net", "https://batch.core.windows.net", "https://datalake.azure.net",
+            "https://api.loganalytics.io", "https://api.loganalytics.io/v1")]
         [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 dataLakeResource)
+            string sqlSuffix, string storageSuffix, string trafficManagerSuffix, string batchResource, string dataLakeResource,
+            string azureOperationalInsightsEndpointResourceId, string azureOperationalInsightsEndpoint)
         {
             AzureEnvironment azEnvironment = CreateEnvironment(name, onPremise, activeDirectory,
                 serviceResource, adTenant, dataLakeJobs, dataLakeFiles, kvDnsSuffix,
                 kvResource, gallery, graph, graphResource, portal, publishSettings,
                 resourceManager, serviceManagement, sqlSuffix, storageSuffix,
-                trafficManagerSuffix, batchResource, dataLakeResource);
+                trafficManagerSuffix, batchResource, dataLakeResource,
+                azureOperationalInsightsEndpointResourceId, azureOperationalInsightsEndpoint);
             var environment = (PSAzureEnvironment)azEnvironment;
             Assert.NotNull(environment);
             CheckEndpoint(AzureEnvironment.Endpoint.ActiveDirectory, azEnvironment,
@@ -119,6 +124,10 @@ public void CanConvertValidEnvironments(string name, bool onPremise, string acti
                 environment.TrafficManagerDnsSuffix);
             CheckEndpoint(AzureEnvironment.Endpoint.BatchEndpointResourceId, azEnvironment,
                 environment.BatchEndpointResourceId);
+            CheckEndpoint(AzureEnvironment.Endpoint.AzureOperationalInsightsEndpointResourceId, azEnvironment,
+                environment.AzureOperationalInsightsEndpointResourceId);
+            CheckEndpoint(AzureEnvironment.Endpoint.AzureOperationalInsightsEndpoint, azEnvironment,
+                environment.AzureOperationalInsightsEndpoint);
             Assert.Equal(azEnvironment.Name, environment.Name);
             Assert.Equal(azEnvironment.OnPremise, environment.EnableAdfsAuthentication);
         }
@@ -152,6 +161,8 @@ public void CanConvertNullPSEnvironments()
             Assert.False(environment.IsEndpointSet(AzureEnvironment.Endpoint.StorageEndpointSuffix));
             Assert.False(environment.IsEndpointSet(AzureEnvironment.Endpoint.TrafficManagerDnsSuffix));
             Assert.False(environment.IsEndpointSet(AzureEnvironment.Endpoint.BatchEndpointResourceId));
+            Assert.False(environment.IsEndpointSet(AzureEnvironment.Endpoint.AzureOperationalInsightsEndpointResourceId));
+            Assert.False(environment.IsEndpointSet(AzureEnvironment.Endpoint.AzureOperationalInsightsEndpoint));
         }
         [Theory]
         [InlineData("TestAll", true, "https://login.microsoftonline.com", "https://management.core.windows.net/",
@@ -160,13 +171,15 @@ 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", "https://datalake.azure.net")]
+            ".trafficmanager.windows.net", "https://batch.core.windows.net", "https://datalake.azure.net",
+            "https://api.loganalytics.io", "https://api.loganalytics.io/v1")]
         [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 dataLakeResource)
+            string sqlSuffix, string storageSuffix, string trafficManagerSuffix, string batchResource, string dataLakeResource,
+            string azureOperationalInsightsEndpointResourceId, string azureOperationalInsightsEndpoint)
         {
             PSAzureEnvironment environment = new PSAzureEnvironment
             {
@@ -190,7 +203,9 @@ public void CanConvertValidPSEnvironments(string name, bool onPremise, string ac
                 SqlDatabaseDnsSuffix = sqlSuffix,
                 StorageEndpointSuffix = storageSuffix,
                 TrafficManagerDnsSuffix = trafficManagerSuffix,
-                BatchEndpointResourceId = batchResource
+                BatchEndpointResourceId = batchResource,
+                AzureOperationalInsightsEndpointResourceId = azureOperationalInsightsEndpointResourceId,
+                AzureOperationalInsightsEndpoint = azureOperationalInsightsEndpoint,
             };
             var azEnvironment = (AzureEnvironment)environment;
             Assert.NotNull(environment);
@@ -232,6 +247,10 @@ public void CanConvertValidPSEnvironments(string name, bool onPremise, string ac
                 environment.TrafficManagerDnsSuffix);
             CheckEndpoint(AzureEnvironment.Endpoint.BatchEndpointResourceId, azEnvironment,
                 environment.BatchEndpointResourceId);
+            CheckEndpoint(AzureEnvironment.Endpoint.AzureOperationalInsightsEndpointResourceId, azEnvironment,
+                environment.AzureOperationalInsightsEndpointResourceId);
+            CheckEndpoint(AzureEnvironment.Endpoint.AzureOperationalInsightsEndpoint, azEnvironment,
+                environment.AzureOperationalInsightsEndpoint);
             Assert.Equal(azEnvironment.Name, environment.Name);
             Assert.Equal(azEnvironment.OnPremise, environment.EnableAdfsAuthentication);
         }
@@ -241,7 +260,8 @@ 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 dataLakeResource)
+            string sqlSuffix, string storageSuffix, string trafficManagerSuffix, string batchResource, string dataLakeResource,
+            string azureOperationalInsightsEndpointResourceId, string azureOperationalInsightsEndpoint)
         {
             var environment = new AzureEnvironment() { Name = name, OnPremise = onPremise };
             SetEndpoint(AzureEnvironment.Endpoint.ActiveDirectory, environment, activeDirectory);
@@ -282,6 +302,10 @@ private AzureEnvironment CreateEnvironment(string name, bool onPremise, string a
                 trafficManagerSuffix);
             CheckEndpoint(AzureEnvironment.Endpoint.BatchEndpointResourceId, environment,
                 batchResource);
+            CheckEndpoint(AzureEnvironment.Endpoint.AzureOperationalInsightsEndpointResourceId, environment,
+                azureOperationalInsightsEndpointResourceId);
+            CheckEndpoint(AzureEnvironment.Endpoint.AzureOperationalInsightsEndpoint, environment,
+                azureOperationalInsightsEndpoint);
             return environment;
 
         }