Shrink Gallery secret caching to 6 hours and update dependencies. (#7873)

zhhyu · web-flow · commit 9c88a6d66c84 · 2020-03-18T16:56:30.000-07:00
* Shrink to 6 hours and update dependencies

* Remove comment
diff --git a/src/AccountDeleter/AccountDeleter.csproj b/src/AccountDeleter/AccountDeleter.csproj
@@ -107,7 +107,7 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="NuGet.Services.Validation.Common.Job">
-      <Version>4.3.0-dev-3453620</Version>
+      <Version>4.3.0-dev-3555917</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/AccountDeleter/Job.cs b/src/AccountDeleter/Job.cs
@@ -30,7 +30,7 @@
 
 namespace NuGetGallery.AccountDeleter
 {
-    public class Job : SubcriptionProcessorJob<AccountDeleteMessage>
+    public class Job : SubscriptionProcessorJob<AccountDeleteMessage>
     {
         private const string AccountDeleteConfigurationSectionName = "AccountDeleteSettings";
         private const string DebugArgumentName = "Debug";
diff --git a/src/DatabaseMigrationTools/DatabaseMigrationTools.csproj b/src/DatabaseMigrationTools/DatabaseMigrationTools.csproj
@@ -64,7 +64,7 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="NuGet.Services.Validation">
-      <Version>2.70.0</Version>
+      <Version>2.71.0</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/GitHubVulnerabilities2Db/GitHubVulnerabilities2Db.csproj b/src/GitHubVulnerabilities2Db/GitHubVulnerabilities2Db.csproj
@@ -86,10 +86,10 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="NuGet.Jobs.Common">
-      <Version>4.3.0-dev-3453620</Version>
+      <Version>4.3.0-dev-3555917</Version>
     </PackageReference>
     <PackageReference Include="NuGet.Services.Cursor">
-      <Version>2.70.0</Version>
+      <Version>2.71.0</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/NuGet.Services.DatabaseMigration/NuGet.Services.DatabaseMigration.csproj b/src/NuGet.Services.DatabaseMigration/NuGet.Services.DatabaseMigration.csproj
@@ -77,7 +77,7 @@
       <Version>4.8.0</Version>
     </PackageReference>
     <PackageReference Include="NuGet.Jobs.Common">
-      <Version>4.3.0-dev-3453620</Version>
+      <Version>4.3.0-dev-3555917</Version>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/src/NuGetGallery.Core/NuGetGallery.Core.csproj b/src/NuGetGallery.Core/NuGetGallery.Core.csproj
@@ -242,16 +242,16 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="NuGet.Services.FeatureFlags">
-      <Version>2.70.0</Version>
+      <Version>2.71.0</Version>
     </PackageReference>
     <PackageReference Include="NuGet.Services.Messaging.Email">
-      <Version>2.70.0</Version>
+      <Version>2.71.0</Version>
     </PackageReference>
     <PackageReference Include="NuGet.Services.Validation">
-      <Version>2.70.0</Version>
+      <Version>2.71.0</Version>
     </PackageReference>
     <PackageReference Include="NuGet.Services.Validation.Issues">
-      <Version>2.70.0</Version>
+      <Version>2.71.0</Version>
     </PackageReference>
     <PackageReference Include="NuGet.StrongName.AnglicanGeek.MarkdownMailer">
       <Version>1.2.0</Version>
diff --git a/src/NuGetGallery.Services/Configuration/ConfigurationService.cs b/src/NuGetGallery.Services/Configuration/ConfigurationService.cs
@@ -31,7 +31,8 @@ public class ConfigurationService : IGalleryConfigurationService, IConfiguration
         private readonly Lazy<FeatureConfiguration> _lazyFeatureConfiguration;
         private readonly Lazy<IServiceBusConfiguration> _lazyServiceBusConfiguration;
         private readonly Lazy<IPackageDeleteConfiguration> _lazyPackageDeleteConfiguration;
-        private readonly HashSet<string> _NotInjectedSettingNames = new HashSet<string>(StringComparer.OrdinalIgnoreCase) {
+
+        private static readonly HashSet<string> NotInjectedSettingNames = new HashSet<string>(StringComparer.OrdinalIgnoreCase) {
             SettingPrefix + "SqlServer",
             SettingPrefix + "SqlServerReadOnlyReplica",
             SettingPrefix + "SupportRequestSqlServer",
@@ -140,7 +141,7 @@ public async Task<string> ReadSettingAsync(string settingName)
         {
             var value = ReadRawSetting(settingName);
 
-            if (!string.IsNullOrEmpty(value) && !_NotInjectedSettingNames.Contains(settingName))
+            if (!string.IsNullOrEmpty(value) && !NotInjectedSettingNames.Contains(settingName))
             {
                 value = await SecretInjector.InjectAsync(value);
             }
diff --git a/src/NuGetGallery.Services/Configuration/SecretReader/SecretReaderFactory.cs b/src/NuGetGallery.Services/Configuration/SecretReader/SecretReaderFactory.cs
@@ -17,6 +17,8 @@ public class SecretReaderFactory : ISecretReaderFactory
         internal const string CertificateThumbprintConfigurationKey = "CertificateThumbprint";
         internal const string CertificateStoreLocation = "StoreLocation";
         internal const string CertificateStoreName = "StoreName";
+
+        private const int SecretCachingRefreshInterval = 60 * 60 * 6;
         private IGalleryConfigurationService _configurationService;
 
         public SecretReaderFactory(IGalleryConfigurationService configurationService)
@@ -71,7 +73,7 @@ public ISecretReader CreateSecretReader()
                 secretReader = new EmptySecretReader();
             }
 
-            return new CachingSecretReader(secretReader);
+            return new CachingSecretReader(secretReader, refreshIntervalSec: SecretCachingRefreshInterval);
         }
 
         private bool GetOptionalKeyVaultBoolSettingValue(string settingName, bool defaultValue)
diff --git a/src/NuGetGallery.Services/NuGetGallery.Services.csproj b/src/NuGetGallery.Services/NuGetGallery.Services.csproj
@@ -294,10 +294,10 @@
       <Version>5.0.0-preview1.5665</Version>
     </PackageReference>
     <PackageReference Include="NuGet.Services.Configuration">
-      <Version>2.70.0</Version>
+      <Version>2.71.0</Version>
     </PackageReference>
     <PackageReference Include="NuGet.Services.Logging">
-      <Version>2.70.0</Version>
+      <Version>2.71.0</Version>
     </PackageReference>
     <PackageReference Include="NuGet.StrongName.WebBackgrounder">
       <Version>0.2.0</Version>
diff --git a/src/NuGetGallery/NuGetGallery.csproj b/src/NuGetGallery/NuGetGallery.csproj
@@ -2297,13 +2297,13 @@
       <Version>5.0.0-preview1.5665</Version>
     </PackageReference>
     <PackageReference Include="NuGet.Services.Licenses">
-      <Version>2.70.0</Version>
+      <Version>2.71.0</Version>
     </PackageReference>
     <PackageReference Include="NuGet.Services.Owin">
-      <Version>2.70.0</Version>
+      <Version>2.71.0</Version>
     </PackageReference>
     <PackageReference Include="NuGet.Services.Sql">
-      <Version>2.70.0</Version>
+      <Version>2.71.0</Version>
     </PackageReference>
     <PackageReference Include="Owin">
       <Version>1.0.0</Version>

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@`
`30`	`30`
`31`	`31`	`namespace NuGetGallery.AccountDeleter`
`32`	`32`	`{`
`33`		`- public class Job : SubcriptionProcessorJob<AccountDeleteMessage>`
	`33`	`+ public class Job : SubscriptionProcessorJob<AccountDeleteMessage>`
`34`	`34`	`{`
`35`	`35`	`private const string AccountDeleteConfigurationSectionName = "AccountDeleteSettings";`
`36`	`36`	`private const string DebugArgumentName = "Debug";`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,8 @@ public class ConfigurationService : IGalleryConfigurationService, IConfiguration`
`31`	`31`	`private readonly Lazy<FeatureConfiguration> _lazyFeatureConfiguration;`
`32`	`32`	`private readonly Lazy<IServiceBusConfiguration> _lazyServiceBusConfiguration;`
`33`	`33`	`private readonly Lazy<IPackageDeleteConfiguration> _lazyPackageDeleteConfiguration;`
`34`		`- private readonly HashSet<string> _NotInjectedSettingNames = new HashSet<string>(StringComparer.OrdinalIgnoreCase) {`
	`34`	`+`
	`35`	`+ private static readonly HashSet<string> NotInjectedSettingNames = new HashSet<string>(StringComparer.OrdinalIgnoreCase) {`
`35`	`36`	`SettingPrefix + "SqlServer",`
`36`	`37`	`SettingPrefix + "SqlServerReadOnlyReplica",`
`37`	`38`	`SettingPrefix + "SupportRequestSqlServer",`
`@@ -140,7 +141,7 @@ public async Task<string> ReadSettingAsync(string settingName)`
`140`	`141`	`{`
`141`	`142`	`var value = ReadRawSetting(settingName);`
`142`	`143`
`143`		`- if (!string.IsNullOrEmpty(value) && !_NotInjectedSettingNames.Contains(settingName))`
	`144`	`+ if (!string.IsNullOrEmpty(value) && !NotInjectedSettingNames.Contains(settingName))`
`144`	`145`	`{`
`145`	`146`	`value = await SecretInjector.InjectAsync(value);`
`146`	`147`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,8 @@ public class SecretReaderFactory : ISecretReaderFactory`
`17`	`17`	`internal const string CertificateThumbprintConfigurationKey = "CertificateThumbprint";`
`18`	`18`	`internal const string CertificateStoreLocation = "StoreLocation";`
`19`	`19`	`internal const string CertificateStoreName = "StoreName";`
	`20`	`+`
	`21`	`+ private const int SecretCachingRefreshInterval = 60 * 60 * 6;`
`20`	`22`	`private IGalleryConfigurationService _configurationService;`
`21`	`23`
`22`	`24`	`public SecretReaderFactory(IGalleryConfigurationService configurationService)`
`@@ -71,7 +73,7 @@ public ISecretReader CreateSecretReader()`
`71`	`73`	`secretReader = new EmptySecretReader();`
`72`	`74`	`}`
`73`	`75`
`74`		`- return new CachingSecretReader(secretReader);`
	`76`	`+ return new CachingSecretReader(secretReader, refreshIntervalSec: SecretCachingRefreshInterval);`
`75`	`77`	`}`
`76`	`78`
`77`	`79`	`private bool GetOptionalKeyVaultBoolSettingValue(string settingName, bool defaultValue)`