From 9c182563ac03b7cfa8e2e43234325fc1e46755e5 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 23 Mar 2026 14:24:01 +0000
Subject: [PATCH 1/3] Initial plan
From 51800136280745a66196accd8042799964bff262 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 23 Mar 2026 14:33:59 +0000
Subject: [PATCH 2/3] chore: upgrade all NuGet packages and fix obsolete API
usages
Co-authored-by: Phelecks <47243363+Phelecks@users.noreply.github.com>
Agent-Logs-Url: https://github.com/Tricksfor-Organization/ColumnEncryptor/sessions/ee17f9a9-1378-4cde-bd1e-55d28086a193
---
Directory.Packages.props | 28 +++++++++----------
.../Services/AzureKeyVaultClient.cs | 4 ++-
.../EntityFrameworkIntegrationTests.cs | 5 ++--
tests/ColumnEncryptor.Tests/HashiCorpTests.cs | 3 +-
4 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/Directory.Packages.props b/Directory.Packages.props
index d2e7270..ed87bd9 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -5,21 +5,21 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
\ No newline at end of file
diff --git a/src/ColumnEncryptor/Services/AzureKeyVaultClient.cs b/src/ColumnEncryptor/Services/AzureKeyVaultClient.cs
index 35893cc..d099d94 100644
--- a/src/ColumnEncryptor/Services/AzureKeyVaultClient.cs
+++ b/src/ColumnEncryptor/Services/AzureKeyVaultClient.cs
@@ -32,7 +32,9 @@ public AzureKeyVaultClient(
TokenCredential credential = azureOptions.AuthMethod switch
{
AzureAuthMethod.DefaultAzureCredential => new DefaultAzureCredential(),
- AzureAuthMethod.ManagedIdentity => new ManagedIdentityCredential(azureOptions.ClientId),
+ AzureAuthMethod.ManagedIdentity => string.IsNullOrEmpty(azureOptions.ClientId)
+ ? new ManagedIdentityCredential(ManagedIdentityId.SystemAssigned)
+ : new ManagedIdentityCredential(ManagedIdentityId.FromUserAssignedClientId(azureOptions.ClientId)),
AzureAuthMethod.ServicePrincipal => new ClientSecretCredential(
azureOptions.TenantId,
azureOptions.ClientId,
diff --git a/tests/ColumnEncryptor.Tests/EntityFrameworkIntegrationTests.cs b/tests/ColumnEncryptor.Tests/EntityFrameworkIntegrationTests.cs
index d08c02d..5c9b9bd 100644
--- a/tests/ColumnEncryptor.Tests/EntityFrameworkIntegrationTests.cs
+++ b/tests/ColumnEncryptor.Tests/EntityFrameworkIntegrationTests.cs
@@ -32,8 +32,7 @@ public class EntityFrameworkIntegrationTests
public async Task OneTimeSetUp()
{
// Start HashiCorp Vault container
- _vaultContainer = new ContainerBuilder()
- .WithImage(VaultImage)
+ _vaultContainer = new ContainerBuilder(VaultImage)
.WithCleanUp(true)
.WithName($"vault-test-{Guid.NewGuid():N}")
// Bind the container's Vault port to a random free host port to avoid collisions
@@ -57,7 +56,7 @@ public async Task OneTimeSetUp()
await WaitForVaultHealthy(_vaultUrl);
// Start SQL Server container
- _sqlContainer = new MsSqlBuilder()
+ _sqlContainer = new MsSqlBuilder("mcr.microsoft.com/mssql/server:2022-CU14-ubuntu-22.04")
.WithPassword(SqlServerPassword)
.WithCleanUp(true)
.WithName($"sql-test-{Guid.NewGuid():N}")
diff --git a/tests/ColumnEncryptor.Tests/HashiCorpTests.cs b/tests/ColumnEncryptor.Tests/HashiCorpTests.cs
index a4baac8..06a1442 100644
--- a/tests/ColumnEncryptor.Tests/HashiCorpTests.cs
+++ b/tests/ColumnEncryptor.Tests/HashiCorpTests.cs
@@ -23,8 +23,7 @@ public class HashiCorpTests
public async Task OneTimeSetUp()
{
// Start HashiCorp Vault container
- _vaultContainer = new ContainerBuilder()
- .WithImage(VaultImage)
+ _vaultContainer = new ContainerBuilder(VaultImage)
.WithCleanUp(true)
.WithName($"vault-test-{Guid.NewGuid():N}")
// Bind the container's Vault port to a random free host port to avoid collisions
From 55ac5035f08966b483c484741dd3e9d6f6ddc8d8 Mon Sep 17 00:00:00 2001
From: Hamed Ansarian
Date: Mon, 23 Mar 2026 15:40:16 +0100
Subject: [PATCH 3/3] Update
src/ColumnEncryptor/Services/AzureKeyVaultClient.cs
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
src/ColumnEncryptor/Services/AzureKeyVaultClient.cs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/ColumnEncryptor/Services/AzureKeyVaultClient.cs b/src/ColumnEncryptor/Services/AzureKeyVaultClient.cs
index d099d94..8b05b35 100644
--- a/src/ColumnEncryptor/Services/AzureKeyVaultClient.cs
+++ b/src/ColumnEncryptor/Services/AzureKeyVaultClient.cs
@@ -32,9 +32,9 @@ public AzureKeyVaultClient(
TokenCredential credential = azureOptions.AuthMethod switch
{
AzureAuthMethod.DefaultAzureCredential => new DefaultAzureCredential(),
- AzureAuthMethod.ManagedIdentity => string.IsNullOrEmpty(azureOptions.ClientId)
+ AzureAuthMethod.ManagedIdentity => string.IsNullOrWhiteSpace(azureOptions.ClientId)
? new ManagedIdentityCredential(ManagedIdentityId.SystemAssigned)
- : new ManagedIdentityCredential(ManagedIdentityId.FromUserAssignedClientId(azureOptions.ClientId)),
+ : new ManagedIdentityCredential(ManagedIdentityId.FromUserAssignedClientId(azureOptions.ClientId.Trim())),
AzureAuthMethod.ServicePrincipal => new ClientSecretCredential(
azureOptions.TenantId,
azureOptions.ClientId,