Migrate Gallery.Maintenance to JsonConfig (#516)

NuGet · Aug 7, 2018 · 58afb2c · 58afb2c
1 parent cb2e767
commit 58afb2c
Show file tree

Hide file tree

Showing 8 changed files with 57 additions and 22 deletions.
diff --git a/src/Gallery.Maintenance/DeleteExpiredVerificationKeysTask.cs b/src/Gallery.Maintenance/DeleteExpiredVerificationKeysTask.cs
@@ -9,6 +9,7 @@
 using System.Threading.Tasks;
 using Gallery.Maintenance.Models;
 using Microsoft.Extensions.Logging;
+using NuGet.Jobs.Configuration;
 
 namespace Gallery.Maintenance
 {
@@ -37,7 +38,7 @@ public override async Task RunAsync(Job job)
         {
             IEnumerable<PackageVerificationKey> expiredKeys;
 
-            using (var connection = await job.GalleryDatabase.CreateAsync())
+            using (var connection = await job.OpenSqlConnectionAsync<GalleryDbConfiguration>())
             {
                 expiredKeys = await connection.QueryWithRetryAsync<PackageVerificationKey>(
                     SelectQuery,
@@ -59,7 +60,7 @@ public override async Task RunAsync(Job job)
 
             if (expectedRowCount > 0)
             {
-                using (var connection = await job.GalleryDatabase.CreateAsync())
+                using (var connection = await job.OpenSqlConnectionAsync<GalleryDbConfiguration>())
                 {
                     using (var transaction = connection.BeginTransaction())
                     {

diff --git a/src/Gallery.Maintenance/Gallery.Maintenance.csproj b/src/Gallery.Maintenance/Gallery.Maintenance.csproj
@@ -53,6 +53,9 @@
       <SubType>Designer</SubType>
     </None>
     <None Include="Scripts\*" />
+    <None Include="Settings\dev.json" />
+    <None Include="Settings\int.json" />
+    <None Include="Settings\prod.json" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\NuGet.Jobs.Common\NuGet.Jobs.Common.csproj">
@@ -67,9 +70,6 @@
     <PackageReference Include="Newtonsoft.Json">
       <Version>9.0.1</Version>
     </PackageReference>
-    <PackageReference Include="NuGet.Services.Sql">
-      <Version>2.27.0</Version>
-    </PackageReference>
     <PackageReference Include="System.Net.Http">
       <Version>4.3.3</Version>
     </PackageReference>

diff --git a/src/Gallery.Maintenance/Gallery.Maintenance.nuspec b/src/Gallery.Maintenance/Gallery.Maintenance.nuspec
@@ -18,5 +18,7 @@
     <file src="Scripts\PreDeploy.ps1" />
     <file src="Scripts\PostDeploy.ps1" />
     <file src="Scripts\nssm.exe" />
+
+    <file src="Settings\*.json" target="bin" />
   </files>
 </package>
diff --git a/src/Gallery.Maintenance/Job.cs b/src/Gallery.Maintenance/Job.cs
@@ -3,33 +3,21 @@
 
 using System;
 using System.Collections.Generic;
-using System.ComponentModel.Design;
-using System.Data;
 using System.Linq;
 using System.Threading.Tasks;
+using Autofac;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using NuGet.Jobs;
-using NuGet.Services.KeyVault;
-using NuGet.Services.Sql;
 
 namespace Gallery.Maintenance
 {
     /// <summary>
     /// Runs all <see cref="MaintenanceTask"/>s against the Gallery database.
     /// </summary>
-    public class Job : JobBase
+    public class Job : JsonConfigurationJob
     {
-
-        public ISqlConnectionFactory GalleryDatabase { get; private set; }
-
-        public override void Init(IServiceContainer serviceContainer, IDictionary<string, string> jobArgsDictionary)
-        {
-            var secretInjector = (ISecretInjector)serviceContainer.GetService(typeof(ISecretInjector));
-            var databaseConnectionString = JobConfigurationManager.GetArgument(jobArgsDictionary, JobArgumentNames.GalleryDatabase);
-
-            GalleryDatabase = new AzureSqlConnectionFactory(databaseConnectionString, secretInjector);
-        }
-
         public override async Task Run()
         {
             var failedTasks = new List<string>();
@@ -88,5 +76,13 @@ public ILogger CreateTypedLogger(Type type)
                 .MakeGenericMethod(type)
                 .Invoke(null, new object[] { LoggerFactory }) as ILogger;
         }
+
+        protected override void ConfigureAutofacServices(ContainerBuilder containerBuilder)
+        {
+        }
+
+        protected override void ConfigureJobServices(IServiceCollection services, IConfigurationRoot configurationRoot)
+        {
+        }
     }
 }
diff --git a/src/Gallery.Maintenance/Scripts/Gallery.Maintenance.cmd b/src/Gallery.Maintenance/Scripts/Gallery.Maintenance.cmd
@@ -7,7 +7,7 @@ cd bin
 
 	title #{Jobs.Gallery.Maintenance.Title}
 
-	start /w Gallery.Maintenance.exe -VaultName "#{Deployment.Azure.KeyVault.VaultName}" -ClientId "#{Deployment.Azure.KeyVault.ClientId}" -CertificateThumbprint "#{Deployment.Azure.KeyVault.CertificateThumbprint}" -GalleryDatabase "#{Jobs.Gallery.Maintenance.GalleryDatabase}" -InstrumentationKey "#{Jobs.Gallery.Maintenance.InstrumentationKey}" -verbose true -Interval #{Jobs.Gallery.Maintenance.Interval} 
+	start /w Gallery.Maintenance.exe -Configuration "#{Jobs.gallery.maintenance.Configuration}"  -InstrumentationKey "#{Jobs.gallery.maintenance.InstrumentationKey}" -Interval #{Jobs.gallery.maintenance.Interval} 
 
 	echo "Finished #{Jobs.Gallery.Maintenance.Title}"
 

diff --git a/src/Gallery.Maintenance/Settings/dev.json b/src/Gallery.Maintenance/Settings/dev.json
@@ -0,0 +1,12 @@
+{
+  "GalleryDb": {
+    "ConnectionString": "Data Source=tcp:#{Deployment.Azure.Sql.GalleryDatabaseAddress};Initial Catalog=nuget-dev-0-v2gallery;User ID=$$Dev-GalleryDBWriter-UserName$$;Password=$$Dev-GalleryDBWriter-Password$$;Encrypt=True;TrustServerCertificate=False;Connection Timeout=30;"
+  },
+
+  "KeyVault_VaultName": "#{Deployment.Azure.KeyVault.VaultName}",
+  "KeyVault_ClientId": "#{Deployment.Azure.KeyVault.ClientId}",
+  "KeyVault_CertificateThumbprint": "#{Deployment.Azure.KeyVault.CertificateThumbprint}",
+  "KeyVault_ValidateCertificate": true,
+  "KeyVault_StoreName": "My",
+  "KeyVault_StoreLocation": "LocalMachine"
+}
diff --git a/src/Gallery.Maintenance/Settings/int.json b/src/Gallery.Maintenance/Settings/int.json
@@ -0,0 +1,12 @@
+{
+  "GalleryDb": {
+    "ConnectionString": "Data Source=tcp:#{Deployment.Azure.Sql.GalleryDatabaseAddress};Initial Catalog=nuget-int-0-v2gallery;User ID=$$Int-GalleryDBWriter-UserName$$;Password=$$Int-GalleryDBWriter-Password$$;Encrypt=True;TrustServerCertificate=False;Connection Timeout=30;"
+  },
+
+  "KeyVault_VaultName": "#{Deployment.Azure.KeyVault.VaultName}",
+  "KeyVault_ClientId": "#{Deployment.Azure.KeyVault.ClientId}",
+  "KeyVault_CertificateThumbprint": "#{Deployment.Azure.KeyVault.CertificateThumbprint}",
+  "KeyVault_ValidateCertificate": true,
+  "KeyVault_StoreName": "My",
+  "KeyVault_StoreLocation": "LocalMachine"
+}
diff --git a/src/Gallery.Maintenance/Settings/prod.json b/src/Gallery.Maintenance/Settings/prod.json
@@ -0,0 +1,12 @@
+{
+  "GalleryDb": {
+    "ConnectionString": "Data Source=tcp:#{Deployment.Azure.Sql.GalleryDatabaseAddress};Initial Catalog=NuGetGallery;User ID=$$Prod-GalleryDBWriter-UserName$$;Password=$$Prod-GalleryDBWriter-Password$$;Encrypt=True;TrustServerCertificate=False;Connection Timeout=30;"
+  },
+
+  "KeyVault_VaultName": "#{Deployment.Azure.KeyVault.VaultName}",
+  "KeyVault_ClientId": "#{Deployment.Azure.KeyVault.ClientId}",
+  "KeyVault_CertificateThumbprint": "#{Deployment.Azure.KeyVault.CertificateThumbprint}",
+  "KeyVault_ValidateCertificate": true,
+  "KeyVault_StoreName": "My",
+  "KeyVault_StoreLocation": "LocalMachine"
+}