Updating infrastructure to avoid breakign changes

markcowl · markcowl · commit f1d931b8e48d · 2018-01-17T19:06:37.000-08:00
diff --git a/src/Common/Commands.Common.Authentication.Abstractions/AzureEnvironment.cs b/src/Common/Commands.Common.Authentication.Abstractions/AzureEnvironment.cs
diff --git a/src/Common/Commands.Common.Authentication.Abstractions/AzureEnvironmentConstants.cs b/src/Common/Commands.Common.Authentication.Abstractions/AzureEnvironmentConstants.cs
@@ -118,12 +118,12 @@ public static class AzureEnvironmentConstants
         /// <summary>
         /// The token audience for Log Analytics Queries
         /// </summary>
-        public const string AzureOperationalInsightsServiceEndpointResourceId = "https://api.loganalytics.io";
+        public const string AzureOperationalInsightsEndpointResourceId = "https://api.loganalytics.io";
 
         /// <summary>
         /// The endpoint URI for Log Analytics Queries
         /// </summary>
-        public const string AzureOperationalInsightsServiceEndpoint = "https://api.loganalytics.io/v1";
+        public const string AzureOperationalInsightsEndpoint = "https://api.loganalytics.io/v1";
 
         /// <summary>
         /// The domain name suffix for Azure DataLake services
diff --git a/src/Common/Commands.Common.Authentication.Abstractions/Extensions/AzureEnvironmentExtensions.cs b/src/Common/Commands.Common.Authentication.Abstractions/Extensions/AzureEnvironmentExtensions.cs
@@ -68,14 +68,12 @@ public static bool TryGetEndpointUrl(this IAzureEnvironment environment, string
                 case AzureEnvironment.Endpoint.BatchEndpointResourceId:
                     endpoint = new Uri(environment.BatchEndpointResourceId);
                     break;
-                case AzureEnvironment.Endpoint.AzureOperationalInsightsEndpointResourceId:
-                    endpoint = new Uri(environment.AzureOperationalInsightsEndpointResourceId);
-                    break;
-                case AzureEnvironment.Endpoint.AzureOperationalInsightsEndpoint:
-                    endpoint = new Uri(environment.AzureOperationalInsightsEndpoint);
-                    break;
                 default:
-                    result = false;
+                    result = environment.IsPropertySet(endpointName);
+                    if (result)
+                    {
+                        endpoint = new Uri(environment.GetProperty(endpointName));
+                    }
                     break;
             }
 
@@ -153,13 +151,9 @@ public static bool TryGetEndpointString(this IAzureEnvironment environment, stri
                     case AzureEnvironment.Endpoint.BatchEndpointResourceId:
                         propertyValue = environment.BatchEndpointResourceId;
                         break;
-                    case AzureEnvironment.Endpoint.AzureOperationalInsightsEndpointResourceId:
-                        propertyValue = environment.AzureOperationalInsightsEndpointResourceId;
-                        break;
-                    case AzureEnvironment.Endpoint.AzureOperationalInsightsEndpoint:
-                        propertyValue = environment.AzureOperationalInsightsEndpoint;
-                        break;
                     default:
+                        // get property from the extended properties of the environment
+                        propertyValue = environment.GetProperty(endpointName);
                         break;
                 }
             }
@@ -271,11 +265,11 @@ public static void SetEndpoint(this IAzureEnvironment environment, string endpoi
                     case AzureEnvironment.Endpoint.ServiceManagement:
                         environment.ServiceManagementUrl = propertyValue;
                         break;
-                    case AzureEnvironment.Endpoint.AzureOperationalInsightsEndpointResourceId:
-                        environment.AzureOperationalInsightsEndpointResourceId = propertyValue;
+                    case AzureEnvironment.ExtendedEndpoint.OperationalInsightsEndpointResourceId:
+                        environment.SetProperty(AzureEnvironment.ExtendedEndpoint.OperationalInsightsEndpointResourceId, propertyValue);
                         break;
-                    case AzureEnvironment.Endpoint.AzureOperationalInsightsEndpoint:
-                        environment.AzureOperationalInsightsEndpoint= propertyValue;
+                    case AzureEnvironment.ExtendedEndpoint.OperationalInsightsEndpoint:
+                        environment.SetProperty(AzureEnvironment.ExtendedEndpoint.OperationalInsightsEndpoint, propertyValue);
                         break;
                 }
             }
@@ -300,9 +294,9 @@ public static string GetTokenAudience(this IAzureEnvironment environment, string
             {
                 resource = AzureEnvironment.Endpoint.DataLakeEndpointResourceId;
             }
-            else if (targetEndpoint == AzureEnvironment.Endpoint.AzureOperationalInsightsEndpointResourceId)
+            else if (targetEndpoint == AzureEnvironment.ExtendedEndpoint.OperationalInsightsEndpointResourceId)
             {
-                resource = AzureEnvironment.Endpoint.AzureOperationalInsightsEndpointResourceId;
+                resource = AzureEnvironment.ExtendedEndpoint.OperationalInsightsEndpointResourceId;
             }
 
             return resource;
@@ -482,14 +476,6 @@ public static void CopyFrom(this IAzureEnvironment environment, IAzureEnvironmen
                 {
                     environment.BatchEndpointResourceId = other.BatchEndpointResourceId;
                 }
-                if (other.IsEndpointSet(AzureEnvironment.Endpoint.AzureOperationalInsightsEndpointResourceId))
-                {
-                    environment.AzureOperationalInsightsEndpointResourceId = other.AzureOperationalInsightsEndpointResourceId;
-                }
-                if (other.IsEndpointSet(AzureEnvironment.Endpoint.AzureOperationalInsightsEndpoint))
-                {
-                    environment.AzureOperationalInsightsEndpoint= other.AzureOperationalInsightsEndpoint;
-                }
 
                 environment.VersionProfiles.Clear();
                 foreach (var profile in other.VersionProfiles)
diff --git a/src/Common/Commands.Common.Authentication.Abstractions/Interfaces/IAzureEnvironment.cs b/src/Common/Commands.Common.Authentication.Abstractions/Interfaces/IAzureEnvironment.cs
@@ -122,16 +122,6 @@ public interface IAzureEnvironment : IExtensibleModel
         /// </summary>
         string AzureDataLakeStoreFileSystemEndpointSuffix { get; set; }
 
-        /// <summary>
-        /// The token audience required for communicating with the Azure Log Analytics query service in this environment
-        /// </summary>
-        string AzureOperationalInsightsEndpointResourceId { get; set; }
-
-        /// <summary>
-        /// The endpoint to use when communicating with the Azure Log Analytics query service in this environment
-        /// </summary>
-        string AzureOperationalInsightsEndpoint { get; set; }
-
         /// <summary>
         /// The default Active Directory Tenant
         /// </summary>
diff --git a/src/ResourceManager/Common/Commands.Common.Authentication.ResourceManager/Models/PSAzureEnvironment.cs b/src/ResourceManager/Common/Commands.Common.Authentication.ResourceManager/Models/PSAzureEnvironment.cs
@@ -230,12 +230,32 @@ public bool OnPremise
         /// <summary>
         /// The token audience required for communicating with the Azure Log Analytics query service in this environment
         /// </summary>
-        public string AzureOperationalInsightsEndpointResourceId { get; set; }
+        public string AzureOperationalInsightsEndpointResourceId
+        {
+            get
+            {
+                return this.GetEndpoint(AzureEnvironment.ExtendedEndpoint.OperationalInsightsEndpointResourceId);
+            }
+            set
+            {
+                this.SetEndpoint(AzureEnvironment.ExtendedEndpoint.OperationalInsightsEndpointResourceId, value);
+            }
+        }
 
         /// <summary>
         /// The endpoint to use when communicating with the Azure Log Analytics query service in this environment
         /// </summary>
-        public string AzureOperationalInsightsEndpoint { get; set; }
+        public string AzureOperationalInsightsEndpoint
+        {
+            get
+            {
+                return this.GetEndpoint(AzureEnvironment.ExtendedEndpoint.OperationalInsightsEndpoint);
+            }
+            set
+            {
+                this.SetEndpoint(AzureEnvironment.ExtendedEndpoint.OperationalInsightsEndpoint, value);
+            }
+        }
 
         public IList<string> VersionProfiles { get; } = new List<string>();
 
diff --git a/src/ResourceManager/OperationalInsights/Commands.OperationalInsights/Query/InvokeOperationalInsightsQuery.cs b/src/ResourceManager/OperationalInsights/Commands.OperationalInsights/Query/InvokeOperationalInsightsQuery.cs
@@ -63,7 +63,7 @@ internal OperationalInsightsDataClient OperationalInsightsDataClient
                     }
                     else
                     {
-                        clientCredentials = AzureSession.Instance.AuthenticationFactory.GetServiceClientCredentials(DefaultContext, "AzureOperationalInsightsEndpointResourceId");
+                        clientCredentials = AzureSession.Instance.AuthenticationFactory.GetServiceClientCredentials(DefaultContext, AzureEnvironment.ExtendedEndpoint.OperationalInsightsEndpoint);
                     }
 
                     this._operationalInsightsDataClient =
@@ -74,7 +74,7 @@ internal OperationalInsightsDataClient OperationalInsightsDataClient
 
                     Uri targetUri= null;
                     DefaultContext.Environment.TryGetEndpointUrl(
-                        AzureEnvironment.Endpoint.AzureOperationalInsightsEndpoint, out targetUri);
+                        AzureEnvironment.ExtendedEndpoint.OperationalInsightsEndpoint, out targetUri);
                     if (targetUri == null)
                     {
                         throw new Exception("Operational Insights is not supported in this Azure Environment");
diff --git a/src/ResourceManager/Profile/Commands.Profile/Environment/AddAzureRMEnvironment.cs b/src/ResourceManager/Profile/Commands.Profile/Environment/AddAzureRMEnvironment.cs
@@ -300,9 +300,9 @@ public override void ExecuteCmdlet()
                                     nameof(DataLakeAudience));
                                 SetEndpointIfBound(newEnvironment, AzureEnvironment.Endpoint.BatchEndpointResourceId,
                                     nameof(BatchEndpointResourceId));
-                                SetEndpointIfBound(newEnvironment, AzureEnvironment.Endpoint.AzureOperationalInsightsEndpointResourceId,
+                                SetEndpointIfBound(newEnvironment, AzureEnvironment.ExtendedEndpoint.OperationalInsightsEndpointResourceId,
                                     nameof(AzureOperationalInsightsEndpointResourceId));
-                                SetEndpointIfBound(newEnvironment, AzureEnvironment.Endpoint.AzureOperationalInsightsEndpoint,
+                                SetEndpointIfBound(newEnvironment, AzureEnvironment.ExtendedEndpoint.OperationalInsightsEndpoint,
                                     nameof(AzureOperationalInsightsEndpoint));
                                 WriteObject(new PSAzureEnvironment(profileClient.AddOrSetEnvironment(newEnvironment)));
                             }
diff --git a/src/ResourceManager/Profile/Commands.Profile/Environment/SetAzureRMEnvironment.cs b/src/ResourceManager/Profile/Commands.Profile/Environment/SetAzureRMEnvironment.cs
@@ -301,9 +301,9 @@ public override void ExecuteCmdlet()
                                     nameof(DataLakeAudience));
                                 SetEndpointIfBound(newEnvironment, AzureEnvironment.Endpoint.BatchEndpointResourceId,
                                     nameof(BatchEndpointResourceId));
-                                SetEndpointIfProvided(newEnvironment, AzureEnvironment.Endpoint.AzureOperationalInsightsEndpointResourceId,
+                                SetEndpointIfBound(newEnvironment, AzureEnvironment.ExtendedEndpoint.OperationalInsightsEndpointResourceId,
                                     nameof(AzureOperationalInsightsEndpointResourceId));
-                                SetEndpointIfProvided(newEnvironment, AzureEnvironment.Endpoint.AzureOperationalInsightsEndpoint,
+                                SetEndpointIfBound(newEnvironment, AzureEnvironment.ExtendedEndpoint.OperationalInsightsEndpoint,
                                     nameof(AzureOperationalInsightsEndpoint));
                                 WriteObject(new PSAzureEnvironment(profileClient.AddOrSetEnvironment(newEnvironment)));
                             }

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ internal OperationalInsightsDataClient OperationalInsightsDataClient`
`63`	`63`	`}`
`64`	`64`	`else`
`65`	`65`	`{`
`66`		`- clientCredentials = AzureSession.Instance.AuthenticationFactory.GetServiceClientCredentials(DefaultContext, "AzureOperationalInsightsEndpointResourceId");`
	`66`	`+ clientCredentials = AzureSession.Instance.AuthenticationFactory.GetServiceClientCredentials(DefaultContext, AzureEnvironment.ExtendedEndpoint.OperationalInsightsEndpoint);`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`this._operationalInsightsDataClient =`
`@@ -74,7 +74,7 @@ internal OperationalInsightsDataClient OperationalInsightsDataClient`
`74`	`74`
`75`	`75`	`Uri targetUri= null;`
`76`	`76`	`DefaultContext.Environment.TryGetEndpointUrl(`
`77`		`- AzureEnvironment.Endpoint.AzureOperationalInsightsEndpoint, out targetUri);`
	`77`	`+ AzureEnvironment.ExtendedEndpoint.OperationalInsightsEndpoint, out targetUri);`
`78`	`78`	`if (targetUri == null)`
`79`	`79`	`{`
`80`	`80`	`throw new Exception("Operational Insights is not supported in this Azure Environment");`