Skip to content

Commit ac8c451

Browse files
erdembayarerdembayar
authored
Merge pull request #9654 from NuGet/agr-kv-update2
Transition from Microsoft.Azure.KeyVault to Azure.Security.KeyVault
2 parents 4e52525 + cc81bf4 commit ac8c451

File tree

8 files changed

+42
-15
lines changed

8 files changed

+42
-15
lines changed

‎NuGet.config

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<package pattern="Antlr" />
1919
<package pattern="Autofac" />
2020
<package pattern="Autofac.*" />
21+
<package pattern="Azure.*" />
2122
<package pattern="Castle.Core" />
2223
<package pattern="CommonMark.NET" />
2324
<package pattern="CsvHelper" />

‎src/DatabaseMigrationTools/DatabaseMigrationTools.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
<PrivateAssets>all</PrivateAssets>
6666
</PackageReference>
6767
<PackageReference Include="NuGet.Services.Validation">
68-
<Version>2.109.0</Version>
68+
<Version>2.111.0</Version>
6969
</PackageReference>
7070
</ItemGroup>
7171
<ItemGroup>

‎src/GitHubVulnerabilities2Db/GitHubVulnerabilities2Db.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
<Version>4.3.0-dev-8079991</Version>
9292
</PackageReference>
9393
<PackageReference Include="NuGet.Services.Cursor">
94-
<Version>2.109.0</Version>
94+
<Version>2.111.0</Version>
9595
</PackageReference>
9696
</ItemGroup>
9797
<ItemGroup>

‎src/NuGetGallery.Core/NuGetGallery.Core.csproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
<Version>6.4.2</Version>
5252
</PackageReference>
5353
<PackageReference Include="NuGet.Services.FeatureFlags">
54-
<Version>2.109.0</Version>
54+
<Version>2.111.0</Version>
5555
</PackageReference>
5656
<PackageReference Include="WindowsAzure.Storage">
5757
<Version>9.3.3</Version>
@@ -60,13 +60,13 @@
6060

6161
<ItemGroup Condition="'$(TargetFramework)' == 'net472'">
6262
<PackageReference Include="NuGet.Services.Messaging.Email">
63-
<Version>2.109.0</Version>
63+
<Version>2.111.0</Version>
6464
</PackageReference>
6565
<PackageReference Include="NuGet.Services.Validation">
66-
<Version>2.109.0</Version>
66+
<Version>2.111.0</Version>
6767
</PackageReference>
6868
<PackageReference Include="NuGet.Services.Validation.Issues">
69-
<Version>2.109.0</Version>
69+
<Version>2.111.0</Version>
7070
</PackageReference>
7171
<PackageReference Include="NuGet.StrongName.elmah.corelibrary">
7272
<Version>1.2.2</Version>

‎src/NuGetGallery.Services/Configuration/SecretReader/SecretReaderFactory.cs

+5-3
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ public class SecretReaderFactory : ISecretReaderFactory
1313
internal const string KeyVaultConfigurationPrefix = "KeyVault.";
1414
internal const string UseManagedIdentityConfigurationKey = "UseManagedIdentity";
1515
internal const string VaultNameConfigurationKey = "VaultName";
16+
internal const string TenantIdConfigurationKey = "TenantId";
1617
internal const string ClientIdConfigurationKey = "ClientId";
1718
internal const string CertificateThumbprintConfigurationKey = "CertificateThumbprint";
1819
internal const string CertificateStoreLocation = "StoreLocation";
@@ -50,20 +51,21 @@ public ISecretReader CreateSecretReader()
5051
if (!string.IsNullOrEmpty(vaultName))
5152
{
5253
var useManagedIdentity = GetOptionalKeyVaultBoolSettingValue(UseManagedIdentityConfigurationKey, defaultValue: false);
54+
var clientId = _configurationService.ReadRawSetting(ResolveKeyVaultSettingName(ClientIdConfigurationKey));
5355

5456
KeyVaultConfiguration keyVaultConfiguration;
5557
if (useManagedIdentity)
5658
{
57-
keyVaultConfiguration = new KeyVaultConfiguration(vaultName);
59+
keyVaultConfiguration = new KeyVaultConfiguration(vaultName, clientId);
5860
}
5961
else
6062
{
61-
var clientId = _configurationService.ReadRawSetting(ResolveKeyVaultSettingName(ClientIdConfigurationKey));
63+
var tenantId = _configurationService.ReadRawSetting(ResolveKeyVaultSettingName(TenantIdConfigurationKey));
6264
var certificateThumbprint = _configurationService.ReadRawSetting(ResolveKeyVaultSettingName(CertificateThumbprintConfigurationKey));
6365
var storeName = GetOptionalKeyVaultEnumSettingValue(CertificateStoreName, StoreName.My);
6466
var storeLocation = GetOptionalKeyVaultEnumSettingValue(CertificateStoreLocation, StoreLocation.LocalMachine);
6567
var certificate = CertificateUtility.FindCertificateByThumbprint(storeName, storeLocation, certificateThumbprint, validationRequired: true);
66-
keyVaultConfiguration = new KeyVaultConfiguration(vaultName, clientId, certificate);
68+
keyVaultConfiguration = new KeyVaultConfiguration(vaultName, tenantId, clientId, certificate);
6769
}
6870

6971
secretReader = new KeyVaultReader(keyVaultConfiguration);

‎src/NuGetGallery.Services/NuGetGallery.Services.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,10 @@
8888
<Version>6.6.1</Version>
8989
</PackageReference>
9090
<PackageReference Include="NuGet.Services.Configuration">
91-
<Version>2.109.0</Version>
91+
<Version>2.111.0</Version>
9292
</PackageReference>
9393
<PackageReference Include="NuGet.Services.Logging">
94-
<Version>2.109.0</Version>
94+
<Version>2.111.0</Version>
9595
</PackageReference>
9696
<PackageReference Include="NuGet.StrongName.WebBackgrounder">
9797
<Version>0.2.0</Version>

‎src/NuGetGallery/NuGetGallery.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -2256,13 +2256,13 @@
22562256
<Version>1.4.0</Version>
22572257
</PackageReference>
22582258
<PackageReference Include="NuGet.Services.Licenses">
2259-
<Version>2.109.0</Version>
2259+
<Version>2.111.0</Version>
22602260
</PackageReference>
22612261
<PackageReference Include="NuGet.Services.Owin">
2262-
<Version>2.109.0</Version>
2262+
<Version>2.111.0</Version>
22632263
</PackageReference>
22642264
<PackageReference Include="NuGet.Services.Sql">
2265-
<Version>2.109.0</Version>
2265+
<Version>2.111.0</Version>
22662266
</PackageReference>
22672267
<PackageReference Include="Owin">
22682268
<Version>1.0.0</Version>

‎src/NuGetGallery/Web.config

+25-1
Original file line numberDiff line numberDiff line change
@@ -584,6 +584,30 @@
584584
</system.diagnostics>
585585
<runtime>
586586
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
587+
<dependentAssembly>
588+
<assemblyIdentity name="System.ValueTuple" publicKeyToken="CC7B13FFCD2DDD51" culture="neutral"/>
589+
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0"/>
590+
</dependentAssembly>
591+
<dependentAssembly>
592+
<assemblyIdentity name="System.Text.Json" publicKeyToken="CC7B13FFCD2DDD51" culture="neutral"/>
593+
<bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2"/>
594+
</dependentAssembly>
595+
<dependentAssembly>
596+
<assemblyIdentity name="System.Text.Encodings.Web" publicKeyToken="CC7B13FFCD2DDD51" culture="neutral"/>
597+
<bindingRedirect oldVersion="0.0.0.0-4.0.5.1" newVersion="4.0.5.1"/>
598+
</dependentAssembly>
599+
<dependentAssembly>
600+
<assemblyIdentity name="Microsoft.Identity.Client" publicKeyToken="0A613F4DD989E8AE" culture="neutral"/>
601+
<bindingRedirect oldVersion="0.0.0.0-4.46.0.0" newVersion="4.46.0.0"/>
602+
</dependentAssembly>
603+
<dependentAssembly>
604+
<assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="CC7B13FFCD2DDD51" culture="neutral"/>
605+
<bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0"/>
606+
</dependentAssembly>
607+
<dependentAssembly>
608+
<assemblyIdentity name="Azure.Core" publicKeyToken="92742159E12E44C8" culture="neutral"/>
609+
<bindingRedirect oldVersion="0.0.0.0-1.25.0.0" newVersion="1.25.0.0"/>
610+
</dependentAssembly>
587611
<dependentAssembly>
588612
<assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="CC7B13FFCD2DDD51" culture="neutral"/>
589613
<bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1"/>
@@ -718,4 +742,4 @@
718742
</dependentAssembly>
719743
</assemblyBinding>
720744
</runtime>
721-
</configuration>
745+
</configuration>

0 commit comments

Comments
 (0)