Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,21 @@
</PropertyGroup>
<ItemGroup>
<!-- central versions -->
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.1" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.1" />
<PackageVersion Include="Microsoft.Extensions.Options" Version="10.0.1" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.1" />
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="10.0.1" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.1" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.1" />
<PackageVersion Include="Azure.Security.KeyVault.Secrets" Version="4.8.0" />
<PackageVersion Include="Azure.Identity" Version="1.17.1" />
<PackageVersion Include="NUnit" Version="4.4.0" />
<PackageVersion Include="NUnit3TestAdapter" Version="6.1.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.5" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.5" />
<PackageVersion Include="Microsoft.Extensions.Options" Version="10.0.5" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.5" />
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="10.0.5" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.5" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.5" />
<PackageVersion Include="Azure.Security.KeyVault.Secrets" Version="4.9.0" />
<PackageVersion Include="Azure.Identity" Version="1.19.0" />
<PackageVersion Include="NUnit" Version="4.5.1" />
<PackageVersion Include="NUnit3TestAdapter" Version="6.2.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
<PackageVersion Include="NSubstitute" Version="5.3.0" />
<PackageVersion Include="Shouldly" Version="4.3.0" />
<PackageVersion Include="Testcontainers" Version="4.10.0" />
<PackageVersion Include="Testcontainers.MsSql" Version="4.10.0" />
<PackageVersion Include="Testcontainers" Version="4.11.0" />
<PackageVersion Include="Testcontainers.MsSql" Version="4.11.0" />
</ItemGroup>
</Project>
4 changes: 3 additions & 1 deletion src/ColumnEncryptor/Services/AzureKeyVaultClient.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,9 @@ public AzureKeyVaultClient(
TokenCredential credential = azureOptions.AuthMethod switch
{
AzureAuthMethod.DefaultAzureCredential => new DefaultAzureCredential(),
AzureAuthMethod.ManagedIdentity => new ManagedIdentityCredential(azureOptions.ClientId),
AzureAuthMethod.ManagedIdentity => string.IsNullOrWhiteSpace(azureOptions.ClientId)
? new ManagedIdentityCredential(ManagedIdentityId.SystemAssigned)
: new ManagedIdentityCredential(ManagedIdentityId.FromUserAssignedClientId(azureOptions.ClientId.Trim())),
AzureAuthMethod.ServicePrincipal => new ClientSecretCredential(
azureOptions.TenantId,
azureOptions.ClientId,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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}")
Expand Down
3 changes: 1 addition & 2 deletions tests/ColumnEncryptor.Tests/HashiCorpTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading