🤖 🔨

Author: benrr101

eng/pipelines/common/templates/steps/update-config-file-step.yml

@@ -188,8 +188,6 @@ steps:
 
           $p.DNSCachingConnString="${{parameters.DNSCachingConnString }}"
 
-          $p.SupportsFileStream="${{parameters.SupportsFileStream }}"
-
           $p.LocalDbAppName="${{parameters.LocalDbAppName }}"
 
           $p.TCPConnectionStringAASSGX="${{parameters.TCPConnectionStringAASSGX }}"
@@ -200,6 +198,7 @@ steps:
 
           $p.UseManagedSNIOnWindows=[System.Convert]::ToBoolean("${{parameters.UseManagedSNIOnWindows }}")
           $p.SupportsIntegratedSecurity=[System.Convert]::ToBoolean("${{parameters.SupportsIntegratedSecurity }}")
+          $p.SupportsFileStream=[System.Convert]::ToBoolean("${{parameters.SupportsFileStream }}")
           $p.ManagedIdentitySupported=[System.Convert]::ToBoolean("${{parameters.ManagedIdentitySupported }}")
           $p.IsAzureSynapse=[System.Convert]::ToBoolean("${{parameters.IsAzureSynapse }}")
           $p.IsDNSCachingSupportedTR=[System.Convert]::ToBoolean("${{parameters.IsDNSCachingSupportedTR }}")

src/Microsoft.Data.SqlClient/tests/UnitTests/ConfigTests.cs

@@ -0,0 +1,89 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.IO;
+using Microsoft.Data.SqlClient.TestUtilities;
+using Xunit;
+
+namespace Microsoft.Data.SqlClient.Tests
+{
+    public class ConfigTests
+    {
+        [Fact]
+        public void Load_WithJsoncAndCaseDifferences_PopulatesPublicFields()
+        {
+            string configPath = Path.GetTempFileName();
+
+            try
+            {
+                File.WriteAllText(
+                    configPath,
+                    """
+                    {
+                      // Verify JSONC comments and trailing commas are accepted.
+                      "TCPConnectionString": "Server=tcp:localhost;Database=Northwind;",
+                      "SupportsFileStream": true,
+                      "IsAzureSynapse": true,
+                      "WorkloadIdentityFederationServiceConnectionId": "service-connection-id",
+                      "KerberosDomainuser": "domain-user",
+                    }
+                    """);
+
+                Config config = Config.Load(configPath);
+
+                Assert.Equal("Server=tcp:localhost;Database=Northwind;", config.TCPConnectionString);
+                Assert.True(config.SupportsFileStream);
+                Assert.True(config.IsAzureSynapse);
+                Assert.Equal("service-connection-id", config.WorkloadIdentityFederationServiceConnectionId);
+                Assert.Equal("domain-user", config.KerberosDomainUser);
+            }
+            finally
+            {
+                File.Delete(configPath);
+            }
+        }
+
+        [Fact]
+        public void UpdateConfig_RoundTripsPipelineConfigFields()
+        {
+            string configPath = Path.GetTempFileName();
+
+            try
+            {
+                Config expected = new()
+                {
+                    TCPConnectionString = "Server=tcp:localhost;Database=Northwind;",
+                    SupportsFileStream = true,
+                    IsAzureSynapse = true,
+                    WorkloadIdentityFederationServiceConnectionId = "service-connection-id",
+                    KerberosDomainUser = "domain-user",
+                };
+
+                Config.UpdateConfig(expected, configPath);
+
+                string writtenConfig = File.ReadAllText(configPath);
+                Assert.Contains("\"SupportsFileStream\":true", writtenConfig, StringComparison.Ordinal);
+                Assert.Contains("\"IsAzureSynapse\":true", writtenConfig, StringComparison.Ordinal);
+                Assert.Contains(
+                    "\"WorkloadIdentityFederationServiceConnectionId\":\"service-connection-id\"",
+                    writtenConfig,
+                    StringComparison.Ordinal);
+
+                Config actual = Config.Load(configPath);
+                Assert.Equal(expected.TCPConnectionString, actual.TCPConnectionString);
+                Assert.Equal(expected.SupportsFileStream, actual.SupportsFileStream);
+                Assert.Equal(expected.IsAzureSynapse, actual.IsAzureSynapse);
+                Assert.Equal(
+                    expected.WorkloadIdentityFederationServiceConnectionId,
+                    actual.WorkloadIdentityFederationServiceConnectionId);
+                Assert.Equal(expected.KerberosDomainUser, actual.KerberosDomainUser);
+            }
+            finally
+            {
+                File.Delete(configPath);
+            }
+        }
+    }
+}

src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft.Data.SqlClient.UnitTests.csproj

@@ -40,6 +40,7 @@
   <!-- Test target reference -->
   <ItemGroup>
     <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj" />
+    <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/Microsoft.Data.SqlClient.TestUtilities.csproj" />
   </ItemGroup>
 
   <!-- References for netframework -->

src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/Config.cs

@@ -15,6 +15,8 @@ public class Config
         private static readonly JsonSerializerOptions JsonSerializerOptions = new()
         {
             AllowTrailingCommas = true,
+            IncludeFields = true,
+            PropertyNameCaseInsensitive = true,
             ReadCommentHandling = JsonCommentHandling.Skip,
         };
 
@@ -32,6 +34,7 @@ public class Config
         public string? AzureKeyVaultURL = null;
         public string? AzureKeyVaultTenantId = null;
         public bool SupportsIntegratedSecurity = false;
+        public bool SupportsFileStream = false;
         public string? LocalDbAppName = null;
         public string? LocalDbSharedInstanceName = null;
         public string? FileStreamDirectory = null;
@@ -42,8 +45,10 @@ public class Config
         public bool IsDNSCachingSupportedCR = false;  // this is for the control ring
         public bool IsDNSCachingSupportedTR = false;  // this is for the tenant ring
         public string? EnclaveAzureDatabaseConnString = null;
+        public bool IsAzureSynapse = false;
         public bool ManagedIdentitySupported = true;
         public string? UserManagedIdentityClientId = null;
+        public string? WorkloadIdentityFederationServiceConnectionId = null;
         public string? PowerShellPath = null;
         public string? AliasName = null;
         public string? KerberosDomainPassword = null;
@@ -78,7 +83,7 @@ public static Config Load()
 
         public static void UpdateConfig(Config updatedConfig, string configPath = @"config.jsonc")
         {
-            string config = JsonSerializer.Serialize(updatedConfig);
+            string config = JsonSerializer.Serialize(updatedConfig, JsonSerializerOptions);
             File.WriteAllText(configPath, config);
         }
 

src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/config.default.jsonc

@@ -20,6 +20,7 @@
     "AzureKeyVaultURL": "",
     "AzureKeyVaultTenantId": "",
     "SupportsIntegratedSecurity": true,
+    "SupportsFileStream": false,
     "LocalDbAppName": "",
     "LocalDbSharedInstanceName": "",
     "FileStreamDirectory": "",
@@ -30,12 +31,13 @@
     "IsDNSCachingSupportedCR": false,
     "IsDNSCachingSupportedTR": false,
     "EnclaveAzureDatabaseConnString": "",
+    "IsAzureSynapse": false,
     "ManagedIdentitySupported": true,
     "UserManagedIdentityClientId": "",
     "PowerShellPath": "",
     "AliasName": "",
     "WorkloadIdentityFederationServiceConnectionId": "",
     "KerberosDomainPassword": "",
-    "KerberosDomainuser": "",
+    "KerberosDomainUser": "",
     "IsManagedInstance": false
 }