Merge pull request #688 from NuGet/dev

[ReleasePrep][2018.11.29]RI of dev into master
NuGet · Nov 30, 2018 · 07249a1 · 07249a1
2 parents cf9c69b + ea7d93c
commit 07249a1
Show file tree

Hide file tree

Showing 130 changed files with 460 additions and 5,189 deletions.
diff --git a/NuGet.Jobs.sln b/NuGet.Jobs.sln
@@ -55,10 +55,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Stats.RollUpDownloadFacts",
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Validation", "Validation", "{678D7B14-F8BC-4193-99AF-2EE8AA390A02}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Validation.Common", "src\Validation.Common\Validation.Common.csproj", "{2539DDF3-0CC5-4A03-B5F9-39B47744A7BD}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Validation.Runner", "src\Validation.Runner\Validation.Runner.csproj", "{1EB7FF94-9B4A-4008-8F8E-5F867C0B00DE}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Gallery", "Gallery", "{88725659-D5F8-49F9-9B7E-D87C5B9917D7}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Gallery.CredentialExpiration", "src\Gallery.CredentialExpiration\Gallery.CredentialExpiration.csproj", "{FA8C7905-985F-4919-AAA9-4B9A252F4977}"
@@ -71,10 +67,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Gallery.Maintenance", "src\
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CopyAzureContainer", "src\CopyAzureContainer\CopyAzureContainer.csproj", "{A07F7D0C-F269-43D5-A812-3ABC47090885}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Validation.Helper", "src\Validation.Helper\Validation.Helper.csproj", "{305FB2C1-01FD-413D-B788-7B85BAD85A41}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Validation.Helper.Tests", "tests\Validation.Helper.Tests\Validation.Helper.Tests.csproj", "{8336BEBE-EC6A-4E40-A1C9-8C34A507E62D}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NuGetCDNRedirect", "src\NuGetCDNRedirect\NuGetCDNRedirect.csproj", "{BC9EA7CE-AD21-4D17-B581-F8ED8CBD7191}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests.Search.GenerateAuxiliaryData", "tests\Tests.Search.GenerateAuxiliaryData\Tests.Search.GenerateAuxiliaryData.csproj", "{BA59047E-846A-472C-8587-73719DDB29CE}"
@@ -89,8 +81,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NuGet.Services.Validation.O
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NuGet.Services.Validation.Orchestrator.Tests", "tests\NuGet.Services.Validation.Orchestrator.Tests\NuGet.Services.Validation.Orchestrator.Tests.csproj", "{A3B0B15D-22D9-4F1F-94C4-B24B28ECF632}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Validation.Common.Tests", "tests\Validation.Common.Tests\Validation.Common.Tests.csproj", "{F9690B52-3C92-42A0-B41F-1A6040C2D2EE}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Validation.PackageSigning.Core", "src\Validation.PackageSigning.Core\Validation.PackageSigning.Core.csproj", "{91C060DA-736F-4DA9-A57F-CB3AC0E6CB10}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Validation.PackageSigning.ValidateCertificate", "src\Validation.PackageSigning.ValidateCertificate\Validation.PackageSigning.ValidateCertificate.csproj", "{A245E448-8AE0-452B-9338-8C0E0B637D72}"
@@ -219,14 +209,6 @@ Global
 		{3E0A20C8-C6D2-4762-955D-C7BF35C2C9A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3E0A20C8-C6D2-4762-955D-C7BF35C2C9A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3E0A20C8-C6D2-4762-955D-C7BF35C2C9A7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2539DDF3-0CC5-4A03-B5F9-39B47744A7BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2539DDF3-0CC5-4A03-B5F9-39B47744A7BD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2539DDF3-0CC5-4A03-B5F9-39B47744A7BD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2539DDF3-0CC5-4A03-B5F9-39B47744A7BD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1EB7FF94-9B4A-4008-8F8E-5F867C0B00DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1EB7FF94-9B4A-4008-8F8E-5F867C0B00DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1EB7FF94-9B4A-4008-8F8E-5F867C0B00DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1EB7FF94-9B4A-4008-8F8E-5F867C0B00DE}.Release|Any CPU.Build.0 = Release|Any CPU
 		{FA8C7905-985F-4919-AAA9-4B9A252F4977}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{FA8C7905-985F-4919-AAA9-4B9A252F4977}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FA8C7905-985F-4919-AAA9-4B9A252F4977}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -243,14 +225,6 @@ Global
 		{A07F7D0C-F269-43D5-A812-3ABC47090885}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A07F7D0C-F269-43D5-A812-3ABC47090885}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A07F7D0C-F269-43D5-A812-3ABC47090885}.Release|Any CPU.Build.0 = Release|Any CPU
-		{305FB2C1-01FD-413D-B788-7B85BAD85A41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{305FB2C1-01FD-413D-B788-7B85BAD85A41}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{305FB2C1-01FD-413D-B788-7B85BAD85A41}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{305FB2C1-01FD-413D-B788-7B85BAD85A41}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8336BEBE-EC6A-4E40-A1C9-8C34A507E62D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8336BEBE-EC6A-4E40-A1C9-8C34A507E62D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8336BEBE-EC6A-4E40-A1C9-8C34A507E62D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8336BEBE-EC6A-4E40-A1C9-8C34A507E62D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BC9EA7CE-AD21-4D17-B581-F8ED8CBD7191}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BC9EA7CE-AD21-4D17-B581-F8ED8CBD7191}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BC9EA7CE-AD21-4D17-B581-F8ED8CBD7191}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -279,10 +253,6 @@ Global
 		{A3B0B15D-22D9-4F1F-94C4-B24B28ECF632}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A3B0B15D-22D9-4F1F-94C4-B24B28ECF632}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A3B0B15D-22D9-4F1F-94C4-B24B28ECF632}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F9690B52-3C92-42A0-B41F-1A6040C2D2EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F9690B52-3C92-42A0-B41F-1A6040C2D2EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F9690B52-3C92-42A0-B41F-1A6040C2D2EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F9690B52-3C92-42A0-B41F-1A6040C2D2EE}.Release|Any CPU.Build.0 = Release|Any CPU
 		{91C060DA-736F-4DA9-A57F-CB3AC0E6CB10}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{91C060DA-736F-4DA9-A57F-CB3AC0E6CB10}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{91C060DA-736F-4DA9-A57F-CB3AC0E6CB10}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -419,22 +389,17 @@ Global
 		{B5C01B7A-933D-483E-AF07-6AA266B0EB49} = {B9D03824-A9CA-43AC-86D6-8BB399B9A228}
 		{CF7645A4-B4C0-4827-B6B0-AE42108071C6} = {57F34E9A-3A98-4E48-BF76-D49CB9CB3323}
 		{3E0A20C8-C6D2-4762-955D-C7BF35C2C9A7} = {B9D03824-A9CA-43AC-86D6-8BB399B9A228}
-		{2539DDF3-0CC5-4A03-B5F9-39B47744A7BD} = {678D7B14-F8BC-4193-99AF-2EE8AA390A02}
-		{1EB7FF94-9B4A-4008-8F8E-5F867C0B00DE} = {678D7B14-F8BC-4193-99AF-2EE8AA390A02}
 		{FA8C7905-985F-4919-AAA9-4B9A252F4977} = {88725659-D5F8-49F9-9B7E-D87C5B9917D7}
 		{12719498-B87E-4E92-8C2B-30046393CF85} = {BEC3DF4D-9A04-42C8-8B4F-D42750202B4D}
 		{EFF021CA-1BF4-4C09-BFB8-D314EAAD24D2} = {88725659-D5F8-49F9-9B7E-D87C5B9917D7}
 		{A07F7D0C-F269-43D5-A812-3ABC47090885} = {FA5644B5-4F08-43F6-86B3-039374312A47}
-		{305FB2C1-01FD-413D-B788-7B85BAD85A41} = {678D7B14-F8BC-4193-99AF-2EE8AA390A02}
-		{8336BEBE-EC6A-4E40-A1C9-8C34A507E62D} = {6A776396-02B1-475D-A104-26940ADB04AB}
 		{BC9EA7CE-AD21-4D17-B581-F8ED8CBD7191} = {FA5644B5-4F08-43F6-86B3-039374312A47}
 		{BA59047E-846A-472C-8587-73719DDB29CE} = {6A776396-02B1-475D-A104-26940ADB04AB}
 		{147A757D-864B-4C74-B8CF-14DFF9793605} = {6A776396-02B1-475D-A104-26940ADB04AB}
 		{FC0CEF12-D501-46D1-B1BF-D4134BD8D478} = {B9D03824-A9CA-43AC-86D6-8BB399B9A228}
 		{0C887292-C5AB-4107-946C-A53B18A38D22} = {6A776396-02B1-475D-A104-26940ADB04AB}
 		{E6D094FB-9068-4578-B176-116F97E7506B} = {678D7B14-F8BC-4193-99AF-2EE8AA390A02}
 		{A3B0B15D-22D9-4F1F-94C4-B24B28ECF632} = {6A776396-02B1-475D-A104-26940ADB04AB}
-		{F9690B52-3C92-42A0-B41F-1A6040C2D2EE} = {6A776396-02B1-475D-A104-26940ADB04AB}
 		{91C060DA-736F-4DA9-A57F-CB3AC0E6CB10} = {678D7B14-F8BC-4193-99AF-2EE8AA390A02}
 		{A245E448-8AE0-452B-9338-8C0E0B637D72} = {678D7B14-F8BC-4193-99AF-2EE8AA390A02}
 		{5ACE7756-F8D0-4D90-9957-872DE4A1381E} = {6A776396-02B1-475D-A104-26940ADB04AB}

diff --git a/build.ps1 b/build.ps1
@@ -87,7 +87,6 @@ Invoke-BuildStep 'Clearing artifacts' { Clear-Artifacts } `
 
 Invoke-BuildStep 'Set version metadata in AssemblyInfo.cs' { `
         $versionMetadata =
-            "$PSScriptRoot\src\Validation.Helper\Properties\AssemblyInfo.g.cs",
             "$PSScriptRoot\src\CopyAzureContainer\Properties\AssemblyInfo.g.cs",
             "$PSScriptRoot\src\NuGetCDNRedirect\Properties\AssemblyInfo.g.cs",
             "$PSScriptRoot\src\NuGet.Services.Validation.Orchestrator\Properties\AssemblyInfo.g.cs",
@@ -96,7 +95,6 @@ Invoke-BuildStep 'Set version metadata in AssemblyInfo.cs' { `
             "$PSScriptRoot\src\Validation.PackageSigning.ProcessSignature\Properties\AssemblyInfo.g.cs",
             "$PSScriptRoot\src\Validation.PackageSigning.ValidateCertificate\Properties\AssemblyInfo.g.cs",
             "$PSScriptRoot\src\Validation.PackageSigning.RevalidateCertificate\Properties\AssemblyInfo.g.cs",
-            "$PSScriptRoot\src\NuGet.Jobs.Common\Properties\AssemblyInfo.g.cs",
             "$PSScriptRoot\src\Validation.Common.Job\Properties\AssemblyInfo.g.cs",
             "$PSScriptRoot\src\Validation.ScanAndSign.Core\Properties\AssemblyInfo.g.cs",
             "$PSScriptRoot\src\PackageLagMonitor\Properties\AssemblyInfo.g.cs",
@@ -150,9 +148,7 @@ Invoke-BuildStep 'Creating artifacts' {
             "src/ArchivePackages/ArchivePackages.csproj", `
             "src/Search.GenerateAuxiliaryData/Search.GenerateAuxiliaryData.csproj", `
             "src/Stats.RollUpDownloadFacts/Stats.RollUpDownloadFacts.csproj", `
-            "src/Validation.Runner/Validation.Runner.csproj", `
             "src/NuGet.SupportRequests.Notifications/NuGet.SupportRequests.Notifications.csproj", `
-            "src/Validation.Helper/Validation.Helper.csproj", `
             "src/CopyAzureContainer/CopyAzureContainer.csproj", `
             "src/NuGetCDNRedirect/NuGetCDNRedirect.csproj", `
             "src/NuGet.Services.Validation.Orchestrator/NuGet.Services.Validation.Orchestrator.csproj", `

diff --git a/src/NuGet.Jobs.Common/Configuration/JobArgumentNames.cs b/src/NuGet.Jobs.Common/Configuration/JobArgumentNames.cs
@@ -99,12 +99,6 @@ public static class JobArgumentNames
         public const string PackageUrlTemplate = "PackageUrlTemplate";
         public const string BatchSize = "BatchSize";
 
-        // Arguments specific to VCS validation task
-        public const string VcsValidatorServiceUrl = "VcsValidatorServiceUrl";
-        public const string VcsValidatorCallbackUrl = "VcsValidatorCallbackUrl";
-        public const string VcsContactAlias = "VcsContactAlias";
-        public const string VcsValidatorSubmitterAlias = "VcsValidatorAlias";
-
         // Key Vault
         public const string VaultName = "VaultName";
         public const string ClientId = "ClientId";

diff --git a/...tion.Orchestrator/Vcs/IPackageCriteria.cs → ...Orchestrator/Criteria/IPackageCriteria.cs b/...tion.Orchestrator/Vcs/IPackageCriteria.cs → ...Orchestrator/Criteria/IPackageCriteria.cs
@@ -3,7 +3,7 @@
 
 using System.Collections.Generic;
 
-namespace NuGet.Services.Validation.Vcs
+namespace NuGet.Services.Validation
 {
     /// <summary>
     /// Generic criteria used to include or exclude packages from a process.

diff --git a/...estrator/Vcs/IPackageCriteriaEvaluator.cs → ...tor/Criteria/IPackageCriteriaEvaluator.cs b/...estrator/Vcs/IPackageCriteriaEvaluator.cs → ...tor/Criteria/IPackageCriteriaEvaluator.cs
@@ -3,7 +3,7 @@
 
 using NuGet.Services.Entities;
 
-namespace NuGet.Services.Validation.Vcs
+namespace NuGet.Services.Validation
 {
     /// <summary>
     /// Evaluates whether a given entity matches some criteria.

diff --git a/...ation.Orchestrator/Vcs/PackageCriteria.cs → ....Orchestrator/Criteria/PackageCriteria.cs b/...ation.Orchestrator/Vcs/PackageCriteria.cs → ....Orchestrator/Criteria/PackageCriteria.cs
@@ -3,7 +3,7 @@
 
 using System.Collections.Generic;
 
-namespace NuGet.Services.Validation.Vcs
+namespace NuGet.Services.Validation
 {
     public class PackageCriteria : ICriteria
     {

diff --git a/...hestrator/Vcs/PackageCriteriaEvaluator.cs → ...ator/Criteria/PackageCriteriaEvaluator.cs b/...hestrator/Vcs/PackageCriteriaEvaluator.cs → ...ator/Criteria/PackageCriteriaEvaluator.cs
@@ -6,7 +6,7 @@
 using System.Text.RegularExpressions;
 using NuGet.Services.Entities;
 
-namespace NuGet.Services.Validation.Vcs
+namespace NuGet.Services.Validation
 {
     public class PackageCriteriaEvaluator : ICriteriaEvaluator<Package>
     {

diff --git a/src/NuGet.Services.Validation.Orchestrator/Error.cs b/src/NuGet.Services.Validation.Orchestrator/Error.cs
@@ -9,9 +9,6 @@ public static class Error
     {
         public static EventId ConfigurationReadFailure = new EventId(1, "Failed to process configuration");
         public static EventId ConfigurationValidationFailure = new EventId(2, "Configuration is invalid");
-        public static EventId VcsValidationAlreadyStarted = new EventId(3, "VCS validation already started");
-        public static EventId VcsValidationFailureAuditFound = new EventId(4, "VCS validation failure audit found");
-        public static EventId VcsValidationUnexpectedAuditFound = new EventId(5, "VCS validation unexpected audit found");
         public static EventId OrchestratorOnMessageException = new EventId(6, "Failed to process orchestrator message");
         public static EventId UpdatingPackageDbStatusFailed = new EventId(7, "Failed to update package status in DB");
 

diff --git a/src/NuGet.Services.Validation.Orchestrator/Job.cs b/src/NuGet.Services.Validation.Orchestrator/Job.cs
@@ -17,31 +17,28 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
-using Microsoft.WindowsAzure.Storage;
 using NuGet.Jobs;
 using NuGet.Jobs.Configuration;
 using NuGet.Jobs.Validation;
-using NuGet.Jobs.Validation.Common;
 using NuGet.Jobs.Validation.PackageSigning.Messages;
 using NuGet.Jobs.Validation.ScanAndSign;
 using NuGet.Jobs.Validation.Storage;
-using NuGet.Services.Validation.Symbols;
 using NuGet.Jobs.Validation.Symbols.Core;
 using NuGet.Services.Configuration;
+using NuGet.Services.Entities;
 using NuGet.Services.KeyVault;
 using NuGet.Services.Logging;
+using NuGet.Services.Messaging;
+using NuGet.Services.Messaging.Email;
 using NuGet.Services.ServiceBus;
 using NuGet.Services.Sql;
 using NuGet.Services.Validation.Orchestrator.PackageSigning.ScanAndSign;
 using NuGet.Services.Validation.Orchestrator.Telemetry;
 using NuGet.Services.Validation.PackageSigning.ProcessSignature;
 using NuGet.Services.Validation.PackageSigning.ValidateCertificate;
-using NuGet.Services.Validation.Vcs;
-using NuGet.Services.Messaging.Email;
+using NuGet.Services.Validation.Symbols;
 using NuGetGallery;
 using NuGetGallery.Diagnostics;
-using NuGet.Services.Entities;
-using NuGet.Services.Messaging;
 
 namespace NuGet.Services.Validation.Orchestrator
 {
@@ -56,7 +53,6 @@ public class Job : JobBase
         private const string ValidateArgument = "Validate";
 
         private const string ConfigurationSectionName = "Configuration";
-        private const string VcsSectionName = "Vcs";
         private const string PackageSigningSectionName = "PackageSigning";
         private const string PackageCertificatesSectionName = "PackageCertificates";
         private const string ScanAndSignSectionName = "ScanAndSign";
@@ -70,7 +66,6 @@ public class Job : JobBase
         private const string PackageDownloadTimeoutName = "PackageDownloadTimeout";
 
         private const string EmailBindingKey = EmailConfigurationSectionName;
-        private const string VcsBindingKey = VcsSectionName;
         private const string PackageVerificationTopicClientBindingKey = "PackageVerificationTopicClient";
         private const string PackageSignatureBindingKey = PackageSigningSectionName;
         private const string PackageCertificatesBindingKey = PackageCertificatesSectionName;
@@ -188,7 +183,6 @@ private DbConnection CreateDbConnection<T>(IServiceProvider serviceProvider) whe
         private void ConfigureJobServices(IServiceCollection services, IConfigurationRoot configurationRoot)
         {
             services.Configure<ValidationConfiguration>(configurationRoot.GetSection(ConfigurationSectionName));
-            services.Configure<VcsConfiguration>(configurationRoot.GetSection(VcsSectionName));
             services.Configure<ProcessSignatureConfiguration>(configurationRoot.GetSection(PackageSigningSectionName));
             services.Configure<ValidateCertificateConfiguration>(configurationRoot.GetSection(PackageCertificatesSectionName));
             services.Configure<OrchestrationRunnerConfiguration>(configurationRoot.GetSection(RunnerConfigurationSectionName));
@@ -239,7 +233,6 @@ private void ConfigureJobServices(IServiceCollection services, IConfigurationRoo
             services.AddTransient<IServiceBusMessageSerializer, ServiceBusMessageSerializer>();
             services.AddTransient<IBrokeredMessageSerializer<PackageValidationMessageData>, PackageValidationMessageDataSerializationAdapter>();
             services.AddTransient<ICriteriaEvaluator<Package>, PackageCriteriaEvaluator>();
-            services.AddTransient<VcsValidator>();
             services.AddTransient<IProcessSignatureEnqueuer, ProcessSignatureEnqueuer>();
             services.AddTransient<ICloudBlobClient>(c =>
                 {
@@ -298,17 +291,6 @@ private static IServiceProvider CreateProvider(IServiceCollection services, ICon
             var containerBuilder = new ContainerBuilder();
             containerBuilder.Populate(services);
 
-            /// Initialize dependencies for the <see cref="VcsValidator"/>. There is some additional complexity here
-            /// because the implementations require ambiguous types (such as a <see cref="string"/> and a
-            /// <see cref="CloudStorageAccount"/> which there may be more than one configuration of).
-            containerBuilder
-                .Register(c =>
-                {
-                    var vcsConfiguration = c.Resolve<IOptionsSnapshot<VcsConfiguration>>();
-                    var cloudStorageAccount = CloudStorageAccount.Parse(vcsConfiguration.Value.DataStorageAccount);
-                    return cloudStorageAccount;
-                })
-                .Keyed<CloudStorageAccount>(VcsBindingKey);
             containerBuilder
                 .Register(c =>
                 {
@@ -317,23 +299,7 @@ private static IServiceProvider CreateProvider(IServiceCollection services, ICon
                     return topicClient;
                 })
                 .Keyed<TopicClientWrapper>(PackageVerificationTopicClientBindingKey);
-
-            containerBuilder
-                .RegisterType<PackageValidationService>()
-                .WithKeyedParameter(typeof(CloudStorageAccount), VcsBindingKey)
-                .WithParameter(new ResolvedParameter(
-                    (pi, ctx) => pi.ParameterType == typeof(string),
-                    (pi, ctx) => ctx.Resolve<IOptionsSnapshot<VcsConfiguration>>().Value.ContainerName))
-                .As<IPackageValidationService>();
-
-            containerBuilder
-                .RegisterType<PackageValidationAuditor>()
-                .WithKeyedParameter(typeof(CloudStorageAccount), VcsBindingKey)
-                .WithParameter(new ResolvedParameter(
-                    (pi, ctx) => pi.ParameterType == typeof(string),
-                    (pi, ctx) => ctx.Resolve<IOptionsSnapshot<VcsConfiguration>>().Value.ContainerName))
-                .As<IPackageValidationAuditor>();
-
+
             containerBuilder
                 .RegisterType<ProcessSignatureEnqueuer>()
                 .WithParameter(new ResolvedParameter(