Merge pull request #52 from Azure/analysis

Add analysis services endpoint suffix to environment
Azure · Sep 13, 2018 · c584435 · c584435
2 parents 5a97580 + 04ce4e7
commit c584435
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 1 deletion.
diff --git a/src/Authentication.Abstractions/AzureEnvironment.cs b/src/Authentication.Abstractions/AzureEnvironment.cs
@@ -53,6 +53,7 @@ static IDictionary<string, AzureEnvironment> InitializeBuiltInEnvironments()
             };
             azureCloud.SetProperty(ExtendedEndpoint.OperationalInsightsEndpoint, AzureEnvironmentConstants.AzureOperationalInsightsEndpoint);
             azureCloud.SetProperty(ExtendedEndpoint.OperationalInsightsEndpointResourceId, AzureEnvironmentConstants.AzureOperationalInsightsEndpointResourceId);
+            azureCloud.SetProperty(ExtendedEndpoint.AnalysisServicesEndpointSuffix, AzureEnvironmentConstants.AzureAnalysisServicesEndpointSuffix);
             var azureChina = new AzureEnvironment
             {
                 Name = EnvironmentName.AzureChinaCloud,
@@ -76,6 +77,8 @@ static IDictionary<string, AzureEnvironment> InitializeBuiltInEnvironments()
                 BatchEndpointResourceId = AzureEnvironmentConstants.ChinaBatchEndpointResourceId,
                 AdTenant = "Common"
             };
+            azureChina.SetProperty(ExtendedEndpoint.AnalysisServicesEndpointSuffix, AzureEnvironmentConstants.ChinaAnalysisServicesEndpointSuffix);
+
             var azureUSGovernment = new AzureEnvironment
             {
                 Name = EnvironmentName.AzureUSGovernment,
@@ -101,6 +104,7 @@ static IDictionary<string, AzureEnvironment> InitializeBuiltInEnvironments()
             };
             azureUSGovernment.SetProperty(ExtendedEndpoint.OperationalInsightsEndpoint, AzureEnvironmentConstants.USGovernmentOperationalInsightsEndpoint);
             azureUSGovernment.SetProperty(ExtendedEndpoint.OperationalInsightsEndpointResourceId, AzureEnvironmentConstants.USGovernmentOperationalInsightsEndpointResourceId);
+            azureUSGovernment.SetProperty(ExtendedEndpoint.AnalysisServicesEndpointSuffix, AzureEnvironmentConstants.USGovernmentAnalysisServicesEndpointSuffix);
             var azureGermany = new AzureEnvironment
             {
                 Name = EnvironmentName.AzureGermanCloud,
@@ -124,6 +128,7 @@ static IDictionary<string, AzureEnvironment> InitializeBuiltInEnvironments()
                 BatchEndpointResourceId = AzureEnvironmentConstants.GermanBatchEndpointResourceId,
                 AdTenant = "Common"
             };
+            azureGermany.SetProperty(ExtendedEndpoint.AnalysisServicesEndpointSuffix, AzureEnvironmentConstants.GermanAnalysisServicesEndpointSuffix);
             var result = new ConcurrentDictionary<string, AzureEnvironment>(StringComparer.InvariantCultureIgnoreCase);
 
             result[EnvironmentName.AzureCloud] = azureCloud;
@@ -296,7 +301,8 @@ public static class Endpoint
         public static class ExtendedEndpoint
         {
             public const string OperationalInsightsEndpointResourceId = "OperationalInsightsEndpointResourceId",
-                OperationalInsightsEndpoint = "OperationalInsightsEndpoint";
+                OperationalInsightsEndpoint = "OperationalInsightsEndpoint",
+                AnalysisServicesEndpointSuffix = "AzureAnalysisServicesEndpointSuffix";
         }
     }
 }
diff --git a/src/Authentication.Abstractions/AzureEnvironmentConstants.cs b/src/Authentication.Abstractions/AzureEnvironmentConstants.cs
@@ -138,9 +138,20 @@ public static class AzureEnvironmentConstants
         /// </summary>
         public const string AzureDataLakeServiceEndpointResourceId = "https://datalake.azure.net";
 
+        /// <summary>
+        /// The token audience for Batch data plane requests
+        /// </summary>
         public const string BatchEndpointResourceId = "https://batch.core.windows.net/";
         public const string ChinaBatchEndpointResourceId = "https://batch.chinacloudapi.cn/";
         public const string USGovernmentBatchEndpointResourceId = "https://batch.core.usgovcloudapi.net/";
         public const string GermanBatchEndpointResourceId = "https://batch.cloudapi.de/";
+
+        /// <summary>
+        /// The domain name suffix for Azure Analysis Services
+        /// </summary>
+        public const string AzureAnalysisServicesEndpointSuffix = "asazure.windows.net";
+        public const string ChinaAnalysisServicesEndpointSuffix = "asazure.chinacloudapi.cn";
+        public const string USGovernmentAnalysisServicesEndpointSuffix = "asazure.usgovcloudapi.net";
+        public const string GermanAnalysisServicesEndpointSuffix = "asazure.cloudapi.de";
     }
 }
diff --git a/src/Authentication.Abstractions/Extensions/AzureEnvironmentExtensions.cs b/src/Authentication.Abstractions/Extensions/AzureEnvironmentExtensions.cs
@@ -271,6 +271,10 @@ public static void SetEndpoint(this IAzureEnvironment environment, string endpoi
                     case AzureEnvironment.ExtendedEndpoint.OperationalInsightsEndpoint:
                         environment.SetProperty(AzureEnvironment.ExtendedEndpoint.OperationalInsightsEndpoint, propertyValue);
                         break;
+                    case AzureEnvironment.ExtendedEndpoint.AnalysisServicesEndpointSuffix:
+                        environment.SetProperty(AzureEnvironment.ExtendedEndpoint.AnalysisServicesEndpointSuffix, propertyValue);
+                        break;
+
                 }
             }
         }

diff --git a/src/Authentication.ResourceManager/Models/PSAzureEnvironment.cs b/src/Authentication.ResourceManager/Models/PSAzureEnvironment.cs
@@ -257,6 +257,21 @@ public string AzureOperationalInsightsEndpoint
             }
         }
 
+        /// <summary>
+        /// The domain name suffix for Azure Analysis Services
+        /// </summary>
+        public string AzureAnalysisServicesEndpointSuffix
+        {
+            get
+            {
+                return this.GetEndpointSuffix(AzureEnvironment.ExtendedEndpoint.AnalysisServicesEndpointSuffix);
+            }
+            set
+            {
+                this.SetEndpoint(AzureEnvironment.ExtendedEndpoint.AnalysisServicesEndpointSuffix, value);
+            }
+        }
+
         public IList<string> VersionProfiles { get; } = new List<string>();
 
         public IDictionary<string, string> ExtendedProperties { get; } = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);