Add configurable tenant ID

Author: mattosaurus

src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/Dependencies/SinkDependenciesFactory.cs

@@ -22,7 +22,8 @@ internal static SinkDependencies Create(
                     sinkOptions?.UseAzureManagedIdentity ?? default,
                     new AzureManagedServiceAuthenticator(
                         sinkOptions?.UseAzureManagedIdentity ?? default,
-                        sinkOptions.AzureServiceTokenProviderResource));
+                        sinkOptions.AzureServiceTokenProviderResource,
+                        sinkOptions.AzureTenantId));
             var logEventDataGenerator =
                 new LogEventDataGenerator(columnOptions,
                     new StandardColumnDataGenerator(columnOptions, formatProvider,

src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/MSSqlServerSinkOptions.cs

@@ -71,5 +71,10 @@ internal MSSqlServerSinkOptions(
         /// Azure service token provider to be used for Azure Managed Identities
         /// </summary>
         public string AzureServiceTokenProviderResource { get; set; }
+
+        /// <summary>
+        /// ID of the tenant where the Azure resource exists
+        /// </summary>
+        public string AzureTenantId { get; set; }
     }
 }

src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/Platform/AzureManagedServiceAuthenticator.cs

@@ -8,9 +8,10 @@ internal class AzureManagedServiceAuthenticator : IAzureManagedServiceAuthentica
     {
         private readonly bool _useAzureManagedIdentity;
         private readonly string _azureServiceTokenProviderResource;
+        private readonly string _tenantId;
         private readonly AzureServiceTokenProvider _azureServiceTokenProvider;
 
-        public AzureManagedServiceAuthenticator(bool useAzureManagedIdentity, string azureServiceTokenProviderResource)
+        public AzureManagedServiceAuthenticator(bool useAzureManagedIdentity, string azureServiceTokenProviderResource, string tenantId = null)
         {
             if (useAzureManagedIdentity && string.IsNullOrWhiteSpace(azureServiceTokenProviderResource))
             {
@@ -19,6 +20,7 @@ public AzureManagedServiceAuthenticator(bool useAzureManagedIdentity, string azu
 
             _useAzureManagedIdentity = useAzureManagedIdentity;
             _azureServiceTokenProviderResource = azureServiceTokenProviderResource;
+            _tenantId = tenantId;
             _azureServiceTokenProvider = new AzureServiceTokenProvider();
         }
 
@@ -29,7 +31,7 @@ public Task<string> GetAuthenticationToken()
                 return Task.FromResult((string)null);
             }
 
-            return _azureServiceTokenProvider.GetAccessTokenAsync(_azureServiceTokenProviderResource);
+            return _azureServiceTokenProvider.GetAccessTokenAsync(_azureServiceTokenProviderResource, _tenantId);
         }
     }
 }

src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/Platform/AzureManagedServiceAuthenticatorStub.cs

@@ -11,8 +11,9 @@ internal class AzureManagedServiceAuthenticator : IAzureManagedServiceAuthentica
     {
         private readonly bool _useAzureManagedIdentity;
         private readonly string _azureServiceTokenProviderResource;
+        private readonly string _tenantId;
 
-        public AzureManagedServiceAuthenticator(bool useAzureManagedIdentity, string azureServiceTokenProviderResource)
+        public AzureManagedServiceAuthenticator(bool useAzureManagedIdentity, string azureServiceTokenProviderResource, string tenantId = null)
         {
             if (useAzureManagedIdentity)
             {
@@ -22,6 +23,7 @@ public AzureManagedServiceAuthenticator(bool useAzureManagedIdentity, string azu
 
             _useAzureManagedIdentity = useAzureManagedIdentity;
             _azureServiceTokenProviderResource = azureServiceTokenProviderResource;
+            _tenantId = tenantId;
         }
 
         public Task<string> GetAuthenticationToken() => Task.FromResult((string)null);