Skip to content
This repository was archived by the owner on Aug 3, 2024. It is now read-only.

Commit e3b7906

Browse files
committed
Address PR comments
1 parent c44da56 commit e3b7906

4 files changed

Lines changed: 20 additions & 32 deletions

File tree

src/NuGet.Services.KeyVault/KeyVaultConfiguration.cs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,14 @@ public class KeyVaultConfiguration
1818
/// <summary>
1919
/// The constructor for keyvault configuration when using managed identities
2020
/// </summary>
21-
public KeyVaultConfiguration(string vaultName, string clientId = null)
21+
public KeyVaultConfiguration(string vaultName)
22+
: this(vaultName, clientId : null)
23+
{ }
24+
25+
/// <summary>
26+
/// The constructor for keyvault configuration when using managed identities
27+
/// </summary>
28+
public KeyVaultConfiguration(string vaultName, string clientId)
2229
{
2330
if (string.IsNullOrWhiteSpace(vaultName))
2431
{

src/NuGet.Services.KeyVault/KeyVaultConfigurationExtensions.cs

Lines changed: 0 additions & 20 deletions
This file was deleted.

src/NuGet.Services.KeyVault/KeyVaultReader.cs

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
using Azure.Identity;
88
using Azure.Security.KeyVault.Secrets;
99
using Microsoft.Extensions.Logging;
10+
using AzureSecurityKeyVaultSecret = Azure.Security.KeyVault.Secrets.KeyVaultSecret;
1011

1112
namespace NuGet.Services.KeyVault
1213
{
@@ -39,9 +40,8 @@ public async Task<string> GetSecretAsync(string secretName)
3940

4041
public async Task<string> GetSecretAsync(string secretName, ILogger logger)
4142
{
42-
var response = await _keyVaultClient.Value.GetSecretAsync(secretName);
43-
var secret = response.Value;
44-
return secret.Value;
43+
AzureSecurityKeyVaultSecret response = await _keyVaultClient.Value.GetSecretAsync(secretName);
44+
return response.Value;
4545
}
4646

4747
public async Task<ISecret> GetSecretObjectAsync(string secretName)
@@ -51,9 +51,8 @@ public async Task<ISecret> GetSecretObjectAsync(string secretName)
5151

5252
public async Task<ISecret> GetSecretObjectAsync(string secretName, ILogger logger)
5353
{
54-
var response = await _keyVaultClient.Value.GetSecretAsync(secretName);
55-
var secret = response.Value;
56-
return new KeyVaultSecret(secretName, secret.Value, secret.Properties.ExpiresOn);
54+
AzureSecurityKeyVaultSecret response = await _keyVaultClient.Value.GetSecretAsync(secretName);
55+
return new KeyVaultSecret(secretName, response.Value, response.Properties.ExpiresOn);
5756
}
5857

5958
private SecretClient InitializeClient()
@@ -75,8 +74,13 @@ private SecretClient InitializeClient()
7574
{
7675
credential = new ClientCertificateCredential(_configuration.TenantId, _configuration.ClientId, _configuration.Certificate);
7776
}
78-
return new SecretClient(_configuration.GetKeyVaultUri(), credential);
77+
return new SecretClient(GetKeyVaultUri(_configuration), credential);
7978
}
80-
}
8179

80+
private Uri GetKeyVaultUri(KeyVaultConfiguration keyVaultConfiguration)
81+
{
82+
var uriString = $"https://{keyVaultConfiguration.VaultName}.vault.azure.net/";
83+
return new Uri(uriString);
84+
}
85+
}
8286
}

src/NuGet.Services.KeyVault/NuGet.Services.KeyVault.csproj

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@
88
<ItemGroup>
99
<PackageReference Include="Azure.Identity" Version="1.8.0" />
1010
<PackageReference Include="Azure.Security.KeyVault.Secrets" Version="4.4.0" />
11-
<PackageReference Include="Microsoft.Azure.Services.AppAuthentication">
12-
<Version>1.4.0</Version>
13-
</PackageReference>
1411
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions">
1512
<Version>2.2.0</Version>
1613
</PackageReference>

0 commit comments

Comments
 (0)