Update servercommon to 2.68.0 and Jobs.Common dependencies with updat…

…e d servercommon (#740)
NuGet · Feb 10, 2020 · f91f67b · f91f67b
1 parent 2342616
commit f91f67b
Show file tree

Hide file tree

Showing 13 changed files with 54 additions and 27 deletions.
diff --git a/src/Catalog/NuGet.Services.Metadata.Catalog.csproj b/src/Catalog/NuGet.Services.Metadata.Catalog.csproj
@@ -292,7 +292,7 @@
       <Version>4.4.5-dev-3213233</Version>
     </PackageReference>
     <PackageReference Include="NuGet.Services.Sql">
-      <Version>2.66.0</Version>
+      <Version>2.68.0</Version>
     </PackageReference>
     <PackageReference Include="NuGet.StrongName.json-ld.net">
       <Version>1.0.6</Version>
@@ -309,7 +309,7 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="NuGet.Services.Logging">
-      <Version>2.66.0</Version>
+      <Version>2.68.0</Version>
     </PackageReference>
     <PackageReference Include="WindowsAzure.Storage">
       <Version>9.3.3</Version>

diff --git a/src/Ng/Arguments.cs b/src/Ng/Arguments.cs
@@ -166,6 +166,8 @@ public static class Arguments
 
         #region KeyVault
         public const string VaultName = "vaultName";
+        public const string UseManagedIdentity = "useManagedIdentity";
+
         public const string ClientId = "clientId";
 
         public const string StoreName = "storeName";

diff --git a/src/Ng/CommandHelpers.cs b/src/Ng/CommandHelpers.cs
@@ -69,14 +69,23 @@ private static ISecretInjector GetSecretInjector(IDictionary<string, string> arg
             }
             else
             {
-                var clientId = arguments.GetOrThrow<string>(Arguments.ClientId);
-                var certificateThumbprint = arguments.GetOrThrow<string>(Arguments.CertificateThumbprint);
-                var storeName = arguments.GetOrDefault(Arguments.StoreName, StoreName.My);
-                var storeLocation = arguments.GetOrDefault(Arguments.StoreLocation, StoreLocation.LocalMachine);
-                var shouldValidateCert = arguments.GetOrDefault(Arguments.ValidateCertificate, true);
-
-                var keyVaultCertificate = CertificateUtility.FindCertificateByThumbprint(storeName, storeLocation, certificateThumbprint, shouldValidateCert);
-                var keyVaultConfig = new KeyVaultConfiguration(vaultName, clientId, keyVaultCertificate);
+                var useManagedIdentity = arguments.GetOrDefault<bool>(Arguments.UseManagedIdentity);
+                KeyVaultConfiguration keyVaultConfig;
+                if (useManagedIdentity)
+                {
+                    keyVaultConfig = new KeyVaultConfiguration(vaultName);
+                }
+                else
+                {
+                    var clientId = arguments.GetOrThrow<string>(Arguments.ClientId);
+                    var certificateThumbprint = arguments.GetOrThrow<string>(Arguments.CertificateThumbprint);
+                    var storeName = arguments.GetOrDefault(Arguments.StoreName, StoreName.My);
+                    var storeLocation = arguments.GetOrDefault(Arguments.StoreLocation, StoreLocation.LocalMachine);
+                    var shouldValidateCert = arguments.GetOrDefault(Arguments.ValidateCertificate, true);
+
+                    var keyVaultCertificate = CertificateUtility.FindCertificateByThumbprint(storeName, storeLocation, certificateThumbprint, shouldValidateCert);
+                    keyVaultConfig = new KeyVaultConfiguration(vaultName, clientId, keyVaultCertificate);
+                }
 
                 secretReader = new CachingSecretReader(new KeyVaultReader(keyVaultConfig),
                     arguments.GetOrDefault(Arguments.RefreshIntervalSec, CachingSecretReader.DefaultRefreshIntervalSec));

diff --git a/src/Ng/Jobs/Catalog2DnxJob.cs b/src/Ng/Jobs/Catalog2DnxJob.cs
@@ -43,8 +43,9 @@ public override string GetUsage()
                    + $"-{Arguments.StorageContainer} <azure-container> "
                    + $"-{Arguments.StoragePath} <path> "
                    + $"[-{Arguments.VaultName} <keyvault-name> "
-                   + $"-{Arguments.ClientId} <keyvault-client-id> "
-                   + $"-{Arguments.CertificateThumbprint} <keyvault-certificate-thumbprint> "
+                   + $"-{Arguments.UseManagedIdentity} true|false "
+                   + $"-{Arguments.ClientId} <keyvault-client-id> Should not be set if {Arguments.UseManagedIdentity} is true"
+                   + $"-{Arguments.CertificateThumbprint} <keyvault-certificate-thumbprint> Should not be set if {Arguments.UseManagedIdentity} is true"
                    + $"[-{Arguments.ValidateCertificate} true|false]]] "
                    + $"[-{Arguments.Verbose} true|false] "
                    + $"[-{Arguments.Interval} <seconds>]"

diff --git a/src/Ng/Jobs/Catalog2RegistrationJob.cs b/src/Ng/Jobs/Catalog2RegistrationJob.cs
@@ -43,8 +43,9 @@ public override string GetUsage()
                    + $"-{Arguments.StorageContainer} <azure-container> "
                    + $"-{Arguments.StoragePath} <path> "
                    + $"[-{Arguments.VaultName} <keyvault-name> "
-                   + $"-{Arguments.ClientId} <keyvault-client-id> "
-                   + $"-{Arguments.CertificateThumbprint} <keyvault-certificate-thumbprint> "
+                   + $"-{Arguments.UseManagedIdentity} true|false "
+                   + $"-{Arguments.ClientId} <keyvault-client-id> Should not be set if {Arguments.UseManagedIdentity} is true"
+                   + $"-{Arguments.CertificateThumbprint} <keyvault-certificate-thumbprint> Should not be set if {Arguments.UseManagedIdentity} is true"
                    + $"[-{Arguments.ValidateCertificate} true|false]]] "
                    + $"[-{Arguments.Verbose} true|false] "
                    + $"[-{Arguments.Interval} <seconds>]"

diff --git a/src/Ng/Jobs/Db2CatalogJob.cs b/src/Ng/Jobs/Db2CatalogJob.cs
@@ -59,8 +59,9 @@ public override string GetUsage()
                    + $"-{Arguments.StorageContainer} <azure-container> "
                    + $"-{Arguments.StoragePath} <path> "
                    + $"[-{Arguments.VaultName} <keyvault-name> "
-                   + $"-{Arguments.ClientId} <keyvault-client-id> "
-                   + $"-{Arguments.CertificateThumbprint} <keyvault-certificate-thumbprint> "
+                   + $"-{Arguments.UseManagedIdentity} true|false "
+                   + $"-{Arguments.ClientId} <keyvault-client-id> Should not be set if {Arguments.UseManagedIdentity} is true"
+                   + $"-{Arguments.CertificateThumbprint} <keyvault-certificate-thumbprint> Should not be set if {Arguments.UseManagedIdentity} is true"
                    + $"[-{Arguments.ValidateCertificate} true|false]]] "
                    + $"-{Arguments.StorageTypeAuditing} file|azure "
                    + $"[-{Arguments.StoragePathAuditing} <path>]"

diff --git a/src/Ng/Jobs/NgJob.cs b/src/Ng/Jobs/NgJob.cs
@@ -47,8 +47,9 @@ public static string GetUsageBase()
         {
             return "Usage: ng [" + string.Join("|", NgJobFactory.JobMap.Keys) + "] "
                    + $"[-{Arguments.VaultName} <keyvault-name> "
-                   + $"-{Arguments.ClientId} <keyvault-client-id> "
-                   + $"-{Arguments.CertificateThumbprint} <keyvault-certificate-thumbprint> "
+                   + $"-{Arguments.UseManagedIdentity} true|false "
+                   + $"-{Arguments.ClientId} <keyvault-client-id> Should not be set if {Arguments.UseManagedIdentity} is true"
+                   + $"-{Arguments.CertificateThumbprint} <keyvault-certificate-thumbprint> Should not be set if {Arguments.UseManagedIdentity} is true"
                    + $"[-{Arguments.ValidateCertificate} true|false]]";
         }
 

diff --git a/src/Ng/Ng.csproj b/src/Ng/Ng.csproj
@@ -164,16 +164,16 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="NuGet.Services.Configuration">
-      <Version>2.66.0</Version>
+      <Version>2.68.0</Version>
     </PackageReference>
     <PackageReference Include="NuGet.Services.Logging">
-      <Version>2.66.0</Version>
+      <Version>2.68.0</Version>
     </PackageReference>
     <PackageReference Include="NuGet.Services.Sql">
-      <Version>2.66.0</Version>
+      <Version>2.68.0</Version>
     </PackageReference>
     <PackageReference Include="NuGet.Services.Storage">
-      <Version>2.66.0</Version>
+      <Version>2.68.0</Version>
     </PackageReference>
     <PackageReference Include="Serilog.Sinks.File">
       <Version>4.0.0</Version>

diff --git a/...et.Services.Metadata.Catalog.Monitoring/NuGet.Services.Metadata.Catalog.Monitoring.csproj b/...et.Services.Metadata.Catalog.Monitoring/NuGet.Services.Metadata.Catalog.Monitoring.csproj
@@ -172,7 +172,7 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="NuGet.Services.Storage">
-      <Version>2.66.0</Version>
+      <Version>2.68.0</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>

diff --git a/src/NuGet.Services.SearchService/Web.config b/src/NuGet.Services.SearchService/Web.config
@@ -23,6 +23,18 @@
   </system.webServer>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="NuGet.Services.ServiceBus" publicKeyToken="31BF3856AD364E35" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-2.68.0.0" newVersion="2.68.0.0"/>
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="NuGet.Services.Contracts" publicKeyToken="31BF3856AD364E35" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-2.68.0.0" newVersion="2.68.0.0"/>
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.IdentityModel.Clients.ActiveDirectory" publicKeyToken="31BF3856AD364E35" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-5.2.6.0" newVersion="5.2.6.0"/>
+      </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.WindowsAzure.Storage" publicKeyToken="31BF3856AD364E35" culture="neutral"/>
         <bindingRedirect oldVersion="0.0.0.0-9.3.2.0" newVersion="9.3.2.0"/>

diff --git a/src/NuGet.Services.V3/NuGet.Services.V3.csproj b/src/NuGet.Services.V3/NuGet.Services.V3.csproj
@@ -72,7 +72,7 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="NuGet.Services.Validation.Common.Job">
-      <Version>4.3.0-dev-3391439</Version>
+      <Version>4.3.0-dev-3453620</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/CatalogTests/CatalogTests.csproj b/tests/CatalogTests/CatalogTests.csproj
@@ -337,7 +337,7 @@
       <Version>4.10.1</Version>
     </PackageReference>
     <PackageReference Include="NuGet.Services.Logging">
-      <Version>2.66.0</Version>
+      <Version>2.68.0</Version>
     </PackageReference>
     <PackageReference Include="xunit">
       <Version>2.4.1</Version>

diff --git a/tests/NgTests/NgTests.csproj b/tests/NgTests/NgTests.csproj
@@ -190,10 +190,10 @@
       <Version>4.10.1</Version>
     </PackageReference>
     <PackageReference Include="NuGet.Services.Configuration">
-      <Version>2.66.0</Version>
+      <Version>2.68.0</Version>
     </PackageReference>
     <PackageReference Include="NuGet.Services.Logging">
-      <Version>2.66.0</Version>
+      <Version>2.68.0</Version>
     </PackageReference>
     <PackageReference Include="xunit">
       <Version>2.4.1</Version>