Add default endpoint and custom endpoint support to AMC (Azure#21851)

Author: pakrym

sdk/monitor/Azure.Monitor.Query/api/Azure.Monitor.Query.netstandard2.0.cs

@@ -8,6 +8,8 @@ public LogsBatchQuery() { }
     public partial class LogsQueryClient
     {
         protected LogsQueryClient() { }
+        public LogsQueryClient(Azure.Core.TokenCredential credential) { }
+        public LogsQueryClient(Azure.Core.TokenCredential credential, Azure.Monitor.Query.LogsQueryClientOptions options) { }
         public LogsQueryClient(System.Uri endpoint, Azure.Core.TokenCredential credential) { }
         public LogsQueryClient(System.Uri endpoint, Azure.Core.TokenCredential credential, Azure.Monitor.Query.LogsQueryClientOptions options) { }
         public virtual Azure.Response<Azure.Monitor.Query.Models.LogsQueryResult> Query(string workspace, string query, Azure.Core.DateTimeRange timeRange, Azure.Monitor.Query.LogsQueryOptions options = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -20,6 +22,7 @@ public LogsQueryClient(System.Uri endpoint, Azure.Core.TokenCredential credentia
     public partial class LogsQueryClientOptions : Azure.Core.ClientOptions
     {
         public LogsQueryClientOptions(Azure.Monitor.Query.LogsQueryClientOptions.ServiceVersion version = Azure.Monitor.Query.LogsQueryClientOptions.ServiceVersion.V1) { }
+        public string AuthenticationScope { get { throw null; } set { } }
         public enum ServiceVersion
         {
             V1 = 0,

sdk/monitor/Azure.Monitor.Query/src/LogsQueryClient.cs

@@ -17,12 +17,30 @@ namespace Azure.Monitor.Query
     /// </summary>
     public class LogsQueryClient
     {
+        private static readonly Uri _defaultEndpoint = new Uri("https://api.loganalytics.io");
         private static readonly TimeSpan _networkTimeoutOffset = TimeSpan.FromSeconds(15);
         private readonly QueryRestClient _queryClient;
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
         private readonly RowBinder _rowBinder;
 
+        /// <summary>
+        /// Initializes a new instance of <see cref="LogsQueryClient"/>. Uses the default 'https://api.loganalytics.io' endpoint.
+        /// </summary>
+        /// <param name="credential">The <see cref="TokenCredential"/> instance to use for authentication.</param>
+        public LogsQueryClient(TokenCredential credential) : this(credential, null)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="LogsQueryClient"/>. Uses the default 'https://api.loganalytics.io' endpoint.
+        /// </summary>
+        /// <param name="credential">The <see cref="TokenCredential"/> instance to use for authentication.</param>
+        /// <param name="options">The <see cref="LogsQueryClientOptions"/> instance to use as client configuration.</param>
+        public LogsQueryClient(TokenCredential credential, LogsQueryClientOptions options) : this(_defaultEndpoint, credential, options)
+        {
+        }
+
         /// <summary>
         /// Initializes a new instance of <see cref="LogsQueryClient"/>.
         /// </summary>
@@ -46,7 +64,9 @@ public LogsQueryClient(Uri endpoint, TokenCredential credential, LogsQueryClient
             options ??= new LogsQueryClientOptions();
             endpoint = new Uri(endpoint, options.GetVersionString());
             _clientDiagnostics = new ClientDiagnostics(options);
-            _pipeline = HttpPipelineBuilder.Build(options, new BearerTokenAuthenticationPolicy(credential, "https://api.loganalytics.io//.default"));
+            _pipeline = HttpPipelineBuilder.Build(options, new BearerTokenAuthenticationPolicy(
+                credential,
+                options.AuthenticationScope ?? "https://api.loganalytics.io//.default"));
             _queryClient = new QueryRestClient(_clientDiagnostics, _pipeline, endpoint);
             _rowBinder = new RowBinder();
         }

sdk/monitor/Azure.Monitor.Query/src/LogsQueryClientOptions.cs

@@ -44,6 +44,11 @@ public enum ServiceVersion
             V1
         }
 
+        /// <summary>
+        /// Gets or sets the authentication scope to use for authentication with Azure Active Directory. The default scope would be used if the property is null.
+        /// </summary>
+        public string AuthenticationScope { get; set; }
+
         internal string GetVersionString()
         {
             return _version switch

sdk/monitor/Azure.Monitor.Query/tests/LogsQueryClientClientTests.cs

@@ -2,10 +2,12 @@
 // Licensed under the MIT License.
 
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Azure.Core;
 using Azure.Core.TestFramework;
 using Azure.Monitor.Query.Models;
+using Moq;
 using NUnit.Framework;
 
 namespace Azure.Monitor.Query.Tests
@@ -76,5 +78,54 @@ public async Task QueryBatchHandledInvalidResponse()
             LogsBatchQueryResult batchResult = await client.QueryBatchAsync(batch);
             Assert.NotNull(batchResult.GetResult("0"));
         }
+
+        [Test]
+        public async Task UsesDefaultEndpoint()
+        {
+            string uri = null;
+            var mockTransport = MockTransport.FromMessageCallback(message =>
+            {
+                uri = message.Request.Uri.ToString();
+                var mockResponse = new MockResponse(200);
+                mockResponse.SetContent("{\"tables\":[]}");
+                return mockResponse;
+            });
+
+            var client = new LogsQueryClient(new MockCredential(), new LogsQueryClientOptions()
+            {
+                Transport = mockTransport
+            });
+
+            await client.QueryAsync("", "", DateTimeRange.All);
+            StringAssert.StartsWith("https://api.loganalytics.io", uri);
+        }
+
+        [TestCase(null, "https://api.loganalytics.io//.default")]
+        [TestCase("https://api.loganalytics.gov//.default", "https://api.loganalytics.gov//.default")]
+        public async Task UsesDefaultAuthScope(string scope, string expectedScope)
+        {
+            var mockTransport = MockTransport.FromMessageCallback(message =>
+            {
+                var mockResponse = new MockResponse(200);
+                mockResponse.SetContent("{\"tables\":[]}");
+                return mockResponse;
+            });
+
+            Mock<MockCredential> mock = new() { CallBase = true };
+
+            string[] scopes = null;
+            mock.Setup(m => m.GetTokenAsync(It.IsAny<TokenRequestContext>(), It.IsAny<CancellationToken>()))
+                .Callback<TokenRequestContext, CancellationToken>((c, _) => scopes = c.Scopes)
+                .CallBase();
+
+            var client = new LogsQueryClient(mock.Object, new LogsQueryClientOptions()
+            {
+                Transport = mockTransport,
+                AuthenticationScope = scope
+            });
+
+            await client.QueryAsync("", "", DateTimeRange.All);
+            Assert.AreEqual(new[] { expectedScope }, scopes);
+        }
     }
 }