Update to Microsoft.Data.SqlClient v3.0.0 (#33)

CHANGELOG.md

@@ -2,8 +2,13 @@
 
 ## v0.10.0-beta
 
+### Updates
+
+* Updated [Microsoft.Data.SqlClient](https://www.nuget.org/packages/Microsoft.Data.SqlClient) to v3.0.0 - contributed by [@usemam](https://github.com/usemam)
+
 ### Breaking changes
 
+* Removed manual Azure Managed Identity configuration (it's configured in the MSSQL connection string now) - contributed by [@usemam](https://github.com/usemam)
 * Fixed backwards purge history threshold check ([#39](https://github.com/microsoft/durabletask-mssql/pull/39)) - contributed by [Jaah](https://github.com/Jaah)
 
 ## v0.9.1-beta

src/DurableTask.SqlServer.AzureFunctions/SqlDurabilityOptions.cs

@@ -24,18 +24,6 @@ class SqlDurabilityOptions
         [JsonProperty("taskEventBatchSize")]
         public int TaskEventBatchSize { get; set; } = 10;
 
-        [JsonProperty("azureManagedIdentityAuthorityHost")]
-        public string? AzureManagedIdentityAuthorityHost { get; set; }
-
-        [JsonProperty("azureManagedIdentityTenantId")]
-        public string? AzureManagedIdentityTenantId { get; set; }
-
-        [JsonProperty("azureManagedIdentityEnabled")]
-        public bool AzureManagedIdentityEnabled { get; set; }
-
-        [JsonProperty("azureManagedIdentityResource")]
-        public string? AzureManagedIdentityResource { get; set; }
-
         internal ILoggerFactory LoggerFactory { get; set; } = NullLoggerFactory.Instance;
 
         internal SqlOrchestrationServiceSettings GetOrchestrationServiceSettings(
@@ -81,25 +69,6 @@ internal SqlOrchestrationServiceSettings GetOrchestrationServiceSettings(
                 settings.MaxActiveOrchestrations = extensionOptions.MaxConcurrentOrchestratorFunctions.Value;
             }
 
-            if (this.AzureManagedIdentityEnabled)
-            {
-                settings.ManagedIdentitySettings = new ManagedIdentitySettings
-                {
-                    UseAzureManagedIdentity = this.AzureManagedIdentityEnabled,
-                    TenantId = this.AzureManagedIdentityTenantId,
-                };
-
-                if (!string.IsNullOrEmpty(this.AzureManagedIdentityAuthorityHost))
-                {
-                    settings.ManagedIdentitySettings.AuthorityHost = new Uri(this.AzureManagedIdentityAuthorityHost);
-                }
-
-                if (!string.IsNullOrEmpty(this.AzureManagedIdentityResource))
-                {
-                    settings.ManagedIdentitySettings.Resource = new Uri(this.AzureManagedIdentityResource);
-                }
-            }
-
             return settings;
         }
     }

src/DurableTask.SqlServer/DurableTask.SqlServer.csproj

@@ -21,8 +21,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Azure.Identity" Version="1.4.0" />
     <PackageReference Include="Microsoft.Azure.DurableTask.Core" Version="2.5.5" />
+    <PackageReference Include="Microsoft.Data.SqlClient" Version="3.0.0" />
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="3.1.*" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.*" />
     <PackageReference Include="Microsoft.SqlServer.SqlManagementObjects" Version="161.46041.41" />

src/DurableTask.SqlServer/SqlDbManager.cs

@@ -19,12 +19,12 @@ namespace DurableTask.SqlServer
 
     class SqlDbManager
     {
-        readonly SqlConnectionFactory connectionFactory;
+        readonly SqlOrchestrationServiceSettings settings;
         readonly LogHelper traceHelper;
 
-        public SqlDbManager(SqlConnectionFactory connectionFactory, LogHelper traceHelper)
+        public SqlDbManager(SqlOrchestrationServiceSettings settings, LogHelper traceHelper)
         {
-            this.connectionFactory = connectionFactory ?? throw new ArgumentNullException(nameof(connectionFactory));
+            this.settings = settings ?? throw new ArgumentNullException(nameof(settings));
             this.traceHelper = traceHelper ?? throw new ArgumentNullException(nameof(traceHelper));
         }
 
@@ -133,7 +133,7 @@ public async Task DeleteSchemaAsync()
 
         async Task<DatabaseLock> AcquireDatabaseLockAsync()
         {
-            SqlConnection connection = await this.connectionFactory.CreateConnection();
+            SqlConnection connection = this.settings.CreateConnection();
             await connection.OpenAsync();
 
             // It's possible that more than one worker may attempt to execute this creation logic at the same
@@ -187,7 +187,7 @@ async Task ExecuteSqlScriptAsync(string scriptName, DatabaseLock dbLock)
             string schemaCommands = await GetScriptTextAsync(scriptName);
 
             // Reference: https://stackoverflow.com/questions/650098/how-to-execute-an-sql-script-file-using-c-sharp
-            using SqlConnection scriptRunnerConnection = await this.connectionFactory.CreateConnection();
+            using SqlConnection scriptRunnerConnection = this.settings.CreateConnection();
             var serverConnection = new ServerConnection(scriptRunnerConnection);
 
             Stopwatch latencyStopwatch = Stopwatch.StartNew();

src/DurableTask.SqlServer/SqlOrchestrationService.cs

@@ -30,7 +30,6 @@ public class SqlOrchestrationService : OrchestrationServiceBase
             minimumInterval: TimeSpan.FromMilliseconds(50),
             maximumInterval: TimeSpan.FromSeconds(3)); // TODO: Configurable
 
-        readonly SqlConnectionFactory connectionFactory;
         readonly SqlOrchestrationServiceSettings settings;
         readonly LogHelper traceHelper;
         readonly SqlDbManager dbManager;
@@ -41,10 +40,7 @@ public SqlOrchestrationService(SqlOrchestrationServiceSettings? settings)
         {
             this.settings = ValidateSettings(settings) ?? throw new ArgumentNullException(nameof(settings));
             this.traceHelper = new LogHelper(this.settings.LoggerFactory.CreateLogger("DurableTask.SqlServer"));
-            this.connectionFactory = new SqlConnectionFactory(
-                this.settings.TaskHubConnectionString,
-                this.settings.ManagedIdentitySettings);
-            this.dbManager = new SqlDbManager(this.connectionFactory, this.traceHelper);
+            this.dbManager = new SqlDbManager(this.settings, this.traceHelper);
             this.lockedByValue = $"{this.settings.AppName},{Process.GetCurrentProcess().Id}";
             this.userId = new SqlConnectionStringBuilder(this.settings.TaskHubConnectionString).UserID ?? string.Empty;
         }
@@ -83,7 +79,7 @@ async Task<SqlConnection> GetAndOpenConnectionAsync(CancellationToken cancelToke
                 cancelToken = this.ShutdownToken;
             }
 
-            SqlConnection connection = await this.connectionFactory.CreateConnection();
+            SqlConnection connection = this.settings.CreateConnection();
             await connection.OpenAsync(cancelToken);
             return connection;
         }

src/DurableTask.SqlServer/SqlOrchestrationServiceSettings.cs

@@ -91,10 +91,6 @@ public SqlOrchestrationServiceSettings(string connectionString, string? taskHubN
         [JsonIgnore]
         public ILoggerFactory LoggerFactory { get; set; } = NullLoggerFactory.Instance;
 
-        /// <summary>
-        /// Gets or sets managed identity settings used to connect to a database.
-        /// </summary>
-        [JsonProperty("managedIdentitySettings")]
-        public ManagedIdentitySettings? ManagedIdentitySettings { get; set; }
+        internal SqlConnection CreateConnection() => new SqlConnection(this.TaskHubConnectionString);
     }
 }