Skip to content
This repository was archived by the owner on Jul 30, 2024. It is now read-only.

Commit 0e091c6

Browse files
joelverhagenjoelverhagen
committed
Rename extract and validate job to process signature (#381)
Complete NuGet/Engineering#1193
1 parent 291f996 commit 0e091c6

71 files changed

Lines changed: 166 additions & 151 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎NuGet.Jobs.sln‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Gallery.Maintenance", "src\
7373
EndProject
7474
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CopyAzureContainer", "src\CopyAzureContainer\CopyAzureContainer.csproj", "{A07F7D0C-F269-43D5-A812-3ABC47090885}"
7575
EndProject
76-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SnapshotAzureBlob", "SnapshotAzureBlob\SnapshotAzureBlob.csproj", "{ED2D370C-D921-433A-A0B9-A601F936EDD3}"
77-
EndProject
7876
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Validation.Helper", "src\Validation.Helper\Validation.Helper.csproj", "{305FB2C1-01FD-413D-B788-7B85BAD85A41}"
7977
EndProject
8078
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Validation.Helper.Tests", "tests\Validation.Helper.Tests\Validation.Helper.Tests.csproj", "{8336BEBE-EC6A-4E40-A1C9-8C34A507E62D}"
@@ -97,10 +95,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Validation.Common.Tests", "
9795
EndProject
9896
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Validation.PackageSigning.Core", "src\Validation.PackageSigning.Core\Validation.PackageSigning.Core.csproj", "{91C060DA-736F-4DA9-A57F-CB3AC0E6CB10}"
9997
EndProject
100-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Validation.PackageSigning.ExtractAndValidateSignature", "src\Validation.PackageSigning.ExtractAndValidateSignature\Validation.PackageSigning.ExtractAndValidateSignature.csproj", "{DD043977-6BCD-475A-BEE2-8C34309EC622}"
101-
EndProject
102-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Validation.PackageSigning.ExtractAndValidateSignature.Tests", "tests\Validation.PackageSigning.ExtractAndValidateSignature.Tests\Validation.PackageSigning.ExtractAndValidateSignature.Tests.csproj", "{26435822-8938-48C9-96FD-0DCCF8F7CE00}"
103-
EndProject
10498
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Validation.PackageSigning.ValidateCertificate", "src\Validation.PackageSigning.ValidateCertificate\Validation.PackageSigning.ValidateCertificate.csproj", "{A245E448-8AE0-452B-9338-8C0E0B637D72}"
10599
EndProject
106100
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Validation.PackageSigning.ValidateCertificate.Tests", "tests\Validation.PackageSigning.ValidateCertificate.Tests\Validation.PackageSigning.ValidateCertificate.Tests.csproj", "{5ACE7756-F8D0-4D90-9957-872DE4A1381E}"
@@ -115,6 +109,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PackageHash", "src\PackageH
115109
EndProject
116110
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Validation.Common.Job.Tests", "tests\Validation.Common.Job.Tests\Validation.Common.Job.Tests.csproj", "{430F63C7-20C2-4872-AC3E-DDE846E50AA4}"
117111
EndProject
112+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Validation.PackageSigning.ProcessSignature", "src\Validation.PackageSigning.ProcessSignature\Validation.PackageSigning.ProcessSignature.csproj", "{DD043977-6BCD-475A-BEE2-8C34309EC622}"
113+
EndProject
114+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SnapshotAzureBlob", "src\SnapshotAzureBlob\SnapshotAzureBlob.csproj", "{ED2D370C-D921-433A-A0B9-A601F936EDD3}"
115+
EndProject
116+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Validation.PackageSigning.ProcessSignature.Tests", "tests\Validation.PackageSigning.ProcessSignature.Tests\Validation.PackageSigning.ProcessSignature.Tests.csproj", "{26435822-8938-48C9-96FD-0DCCF8F7CE00}"
117+
EndProject
118118
Global
119119
GlobalSection(SolutionConfigurationPlatforms) = preSolution
120120
Debug|Any CPU = Debug|Any CPU
@@ -211,10 +211,6 @@ Global
211211
{A07F7D0C-F269-43D5-A812-3ABC47090885}.Debug|Any CPU.Build.0 = Debug|Any CPU
212212
{A07F7D0C-F269-43D5-A812-3ABC47090885}.Release|Any CPU.ActiveCfg = Release|Any CPU
213213
{A07F7D0C-F269-43D5-A812-3ABC47090885}.Release|Any CPU.Build.0 = Release|Any CPU
214-
{ED2D370C-D921-433A-A0B9-A601F936EDD3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
215-
{ED2D370C-D921-433A-A0B9-A601F936EDD3}.Debug|Any CPU.Build.0 = Debug|Any CPU
216-
{ED2D370C-D921-433A-A0B9-A601F936EDD3}.Release|Any CPU.ActiveCfg = Release|Any CPU
217-
{ED2D370C-D921-433A-A0B9-A601F936EDD3}.Release|Any CPU.Build.0 = Release|Any CPU
218214
{305FB2C1-01FD-413D-B788-7B85BAD85A41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
219215
{305FB2C1-01FD-413D-B788-7B85BAD85A41}.Debug|Any CPU.Build.0 = Debug|Any CPU
220216
{305FB2C1-01FD-413D-B788-7B85BAD85A41}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -259,14 +255,6 @@ Global
259255
{91C060DA-736F-4DA9-A57F-CB3AC0E6CB10}.Debug|Any CPU.Build.0 = Debug|Any CPU
260256
{91C060DA-736F-4DA9-A57F-CB3AC0E6CB10}.Release|Any CPU.ActiveCfg = Release|Any CPU
261257
{91C060DA-736F-4DA9-A57F-CB3AC0E6CB10}.Release|Any CPU.Build.0 = Release|Any CPU
262-
{DD043977-6BCD-475A-BEE2-8C34309EC622}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
263-
{DD043977-6BCD-475A-BEE2-8C34309EC622}.Debug|Any CPU.Build.0 = Debug|Any CPU
264-
{DD043977-6BCD-475A-BEE2-8C34309EC622}.Release|Any CPU.ActiveCfg = Release|Any CPU
265-
{DD043977-6BCD-475A-BEE2-8C34309EC622}.Release|Any CPU.Build.0 = Release|Any CPU
266-
{26435822-8938-48C9-96FD-0DCCF8F7CE00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
267-
{26435822-8938-48C9-96FD-0DCCF8F7CE00}.Debug|Any CPU.Build.0 = Debug|Any CPU
268-
{26435822-8938-48C9-96FD-0DCCF8F7CE00}.Release|Any CPU.ActiveCfg = Release|Any CPU
269-
{26435822-8938-48C9-96FD-0DCCF8F7CE00}.Release|Any CPU.Build.0 = Release|Any CPU
270258
{A245E448-8AE0-452B-9338-8C0E0B637D72}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
271259
{A245E448-8AE0-452B-9338-8C0E0B637D72}.Debug|Any CPU.Build.0 = Debug|Any CPU
272260
{A245E448-8AE0-452B-9338-8C0E0B637D72}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -295,6 +283,18 @@ Global
295283
{430F63C7-20C2-4872-AC3E-DDE846E50AA4}.Debug|Any CPU.Build.0 = Debug|Any CPU
296284
{430F63C7-20C2-4872-AC3E-DDE846E50AA4}.Release|Any CPU.ActiveCfg = Release|Any CPU
297285
{430F63C7-20C2-4872-AC3E-DDE846E50AA4}.Release|Any CPU.Build.0 = Release|Any CPU
286+
{DD043977-6BCD-475A-BEE2-8C34309EC622}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
287+
{DD043977-6BCD-475A-BEE2-8C34309EC622}.Debug|Any CPU.Build.0 = Debug|Any CPU
288+
{DD043977-6BCD-475A-BEE2-8C34309EC622}.Release|Any CPU.ActiveCfg = Release|Any CPU
289+
{DD043977-6BCD-475A-BEE2-8C34309EC622}.Release|Any CPU.Build.0 = Release|Any CPU
290+
{ED2D370C-D921-433A-A0B9-A601F936EDD3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
291+
{ED2D370C-D921-433A-A0B9-A601F936EDD3}.Debug|Any CPU.Build.0 = Debug|Any CPU
292+
{ED2D370C-D921-433A-A0B9-A601F936EDD3}.Release|Any CPU.ActiveCfg = Release|Any CPU
293+
{ED2D370C-D921-433A-A0B9-A601F936EDD3}.Release|Any CPU.Build.0 = Release|Any CPU
294+
{26435822-8938-48C9-96FD-0DCCF8F7CE00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
295+
{26435822-8938-48C9-96FD-0DCCF8F7CE00}.Debug|Any CPU.Build.0 = Debug|Any CPU
296+
{26435822-8938-48C9-96FD-0DCCF8F7CE00}.Release|Any CPU.ActiveCfg = Release|Any CPU
297+
{26435822-8938-48C9-96FD-0DCCF8F7CE00}.Release|Any CPU.Build.0 = Release|Any CPU
298298
EndGlobalSection
299299
GlobalSection(SolutionProperties) = preSolution
300300
HideSolutionNode = FALSE
@@ -322,7 +322,6 @@ Global
322322
{12719498-B87E-4E92-8C2B-30046393CF85} = {BEC3DF4D-9A04-42C8-8B4F-D42750202B4D}
323323
{EFF021CA-1BF4-4C09-BFB8-D314EAAD24D2} = {88725659-D5F8-49F9-9B7E-D87C5B9917D7}
324324
{A07F7D0C-F269-43D5-A812-3ABC47090885} = {FA5644B5-4F08-43F6-86B3-039374312A47}
325-
{ED2D370C-D921-433A-A0B9-A601F936EDD3} = {FA5644B5-4F08-43F6-86B3-039374312A47}
326325
{305FB2C1-01FD-413D-B788-7B85BAD85A41} = {678D7B14-F8BC-4193-99AF-2EE8AA390A02}
327326
{8336BEBE-EC6A-4E40-A1C9-8C34A507E62D} = {6A776396-02B1-475D-A104-26940ADB04AB}
328327
{BC9EA7CE-AD21-4D17-B581-F8ED8CBD7191} = {FA5644B5-4F08-43F6-86B3-039374312A47}
@@ -334,15 +333,16 @@ Global
334333
{A3B0B15D-22D9-4F1F-94C4-B24B28ECF632} = {6A776396-02B1-475D-A104-26940ADB04AB}
335334
{F9690B52-3C92-42A0-B41F-1A6040C2D2EE} = {6A776396-02B1-475D-A104-26940ADB04AB}
336335
{91C060DA-736F-4DA9-A57F-CB3AC0E6CB10} = {678D7B14-F8BC-4193-99AF-2EE8AA390A02}
337-
{DD043977-6BCD-475A-BEE2-8C34309EC622} = {678D7B14-F8BC-4193-99AF-2EE8AA390A02}
338-
{26435822-8938-48C9-96FD-0DCCF8F7CE00} = {6A776396-02B1-475D-A104-26940ADB04AB}
339336
{A245E448-8AE0-452B-9338-8C0E0B637D72} = {678D7B14-F8BC-4193-99AF-2EE8AA390A02}
340337
{5ACE7756-F8D0-4D90-9957-872DE4A1381E} = {6A776396-02B1-475D-A104-26940ADB04AB}
341338
{2C5BE067-ADFD-49E3-BA9F-13A74436E5DB} = {6A776396-02B1-475D-A104-26940ADB04AB}
342339
{B4B7564A-965B-447B-927F-6749E2C08880} = {6A776396-02B1-475D-A104-26940ADB04AB}
343340
{FA87D075-A934-4443-8D0B-5DB32640B6D7} = {678D7B14-F8BC-4193-99AF-2EE8AA390A02}
344341
{40843020-6F0A-48F0-AC28-42FFE3A5C21E} = {FA5644B5-4F08-43F6-86B3-039374312A47}
345342
{430F63C7-20C2-4872-AC3E-DDE846E50AA4} = {6A776396-02B1-475D-A104-26940ADB04AB}
343+
{DD043977-6BCD-475A-BEE2-8C34309EC622} = {678D7B14-F8BC-4193-99AF-2EE8AA390A02}
344+
{ED2D370C-D921-433A-A0B9-A601F936EDD3} = {FA5644B5-4F08-43F6-86B3-039374312A47}
345+
{26435822-8938-48C9-96FD-0DCCF8F7CE00} = {6A776396-02B1-475D-A104-26940ADB04AB}
346346
EndGlobalSection
347347
GlobalSection(ExtensibilityGlobals) = postSolution
348348
SolutionGuid = {284A7AC3-FB43-4F1F-9C9C-2AF0E1F46C2B}

‎build.ps1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ Invoke-BuildStep 'Set version metadata in AssemblyInfo.cs' { `
107107
"$PSScriptRoot\src\NuGetCDNRedirect\Properties\AssemblyInfo.g.cs",
108108
"$PSScriptRoot\src\NuGet.Services.Validation.Orchestrator\Properties\AssemblyInfo.g.cs",
109109
"$PSScriptRoot\src\Stats.CollectAzureChinaCDNLogs\Properties\AssemblyInfo.g.cs",
110-
"$PSScriptRoot\src\Validation.PackageSigning.ExtractAndValidateSignature\Properties\AssemblyInfo.g.cs",
110+
"$PSScriptRoot\src\Validation.PackageSigning.ProcessSignature\Properties\AssemblyInfo.g.cs",
111111
"$PSScriptRoot\src\Validation.PackageSigning.ValidateCertificate\Properties\AssemblyInfo.g.cs"
112112

113113
$versionMetadata | ForEach-Object {
@@ -155,7 +155,7 @@ Invoke-BuildStep 'Creating artifacts' {
155155
"src/NuGetCDNRedirect/NuGetCDNRedirect.csproj", `
156156
"src/NuGet.Services.Validation.Orchestrator/NuGet.Services.Validation.Orchestrator.csproj", `
157157
"src/Stats.CollectAzureChinaCDNLogs/Stats.CollectAzureChinaCDNLogs.csproj", `
158-
"src/Validation.PackageSigning.ExtractAndValidateSignature/Validation.PackageSigning.ExtractAndValidateSignature.csproj", `
158+
"src/Validation.PackageSigning.ProcessSignature/Validation.PackageSigning.ProcessSignature.csproj", `
159159
"src/Validation.PackageSigning.ValidateCertificate/Validation.PackageSigning.ValidateCertificate.csproj"
160160

161161
Foreach ($Project in $Projects) {

‎src/NuGet.Services.Validation.Orchestrator/Job.cs‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
using NuGet.Services.Logging;
2929
using NuGet.Services.ServiceBus;
3030
using NuGet.Services.Validation.Orchestrator.Telemetry;
31-
using NuGet.Services.Validation.PackageCertificates;
32-
using NuGet.Services.Validation.PackageSigning;
31+
using NuGet.Services.Validation.PackageSigning.ProcessSignature;
32+
using NuGet.Services.Validation.PackageSigning.ValidateCertificate;
3333
using NuGet.Services.Validation.Vcs;
3434
using NuGetGallery.Diagnostics;
3535
using NuGetGallery.Services;
@@ -144,8 +144,8 @@ private void ConfigureJobServices(IServiceCollection services, IConfigurationRoo
144144
{
145145
services.Configure<ValidationConfiguration>(configurationRoot.GetSection(ConfigurationSectionName));
146146
services.Configure<VcsConfiguration>(configurationRoot.GetSection(VcsSectionName));
147-
services.Configure<PackageSigningConfiguration>(configurationRoot.GetSection(PackageSigningSectionName));
148-
services.Configure<PackageCertificatesConfiguration>(configurationRoot.GetSection(PackageCertificatesSectionName));
147+
services.Configure<ProcessSignatureConfiguration>(configurationRoot.GetSection(PackageSigningSectionName));
148+
services.Configure<ValidateCertificateConfiguration>(configurationRoot.GetSection(PackageCertificatesSectionName));
149149
services.Configure<OrchestrationRunnerConfiguration>(configurationRoot.GetSection(RunnerConfigurationSectionName));
150150
services.Configure<GalleryDbConfiguration>(configurationRoot.GetSection(GalleryDbConfigurationSectionName));
151151
services.Configure<ValidationDbConfiguration>(configurationRoot.GetSection(ValidationDbConfigurationSectionName));
@@ -186,7 +186,7 @@ private void ConfigureJobServices(IServiceCollection services, IConfigurationRoo
186186
services.AddTransient<IBrokeredMessageSerializer<PackageValidationMessageData>, PackageValidationMessageDataSerializationAdapter>();
187187
services.AddTransient<IPackageCriteriaEvaluator, PackageCriteriaEvaluator>();
188188
services.AddTransient<VcsValidator>();
189-
services.AddTransient<IPackageSignatureVerificationEnqueuer, PackageSignatureVerificationEnqueuer>();
189+
services.AddTransient<IProcessSignatureEnqueuer, ProcessSignatureEnqueuer>();
190190
services.AddTransient<NuGetGallery.ICloudBlobClient>(c =>
191191
{
192192
var configurationAccessor = c.GetRequiredService<IOptionsSnapshot<ValidationConfiguration>>();
@@ -302,15 +302,15 @@ private static IServiceProvider CreateProvider(IServiceCollection services)
302302
.As<IPackageValidationAuditor>();
303303

304304
containerBuilder
305-
.RegisterType<PackageSignatureVerificationEnqueuer>()
305+
.RegisterType<ProcessSignatureEnqueuer>()
306306
.WithParameter(new ResolvedParameter(
307307
(pi, ctx) => pi.ParameterType == typeof(ITopicClient),
308308
(pi, ctx) => ctx.ResolveKeyed<TopicClientWrapper>(PackageVerificationTopicClientBindingKey)))
309309
.WithParameter(new ResolvedParameter(
310310
(pi, ctx) => pi.ParameterType == typeof(IBrokeredMessageSerializer<SignatureValidationMessage>),
311311
(pi, ctx) => ctx.Resolve<SignatureValidationMessageSerializer>()
312312
))
313-
.As<IPackageSignatureVerificationEnqueuer>();
313+
.As<IProcessSignatureEnqueuer>();
314314

315315
containerBuilder
316316
.RegisterType<ScopedMessageHandler<PackageValidationMessageData>>()
@@ -343,16 +343,16 @@ private static void ConfigurePackageSigningValidator(ContainerBuilder builder)
343343
builder
344344
.Register(c =>
345345
{
346-
var configuration = c.Resolve<IOptionsSnapshot<PackageSigningConfiguration>>().Value.ServiceBus;
346+
var configuration = c.Resolve<IOptionsSnapshot<ProcessSignatureConfiguration>>().Value.ServiceBus;
347347

348348
return new TopicClientWrapper(configuration.ConnectionString, configuration.TopicPath);
349349
})
350350
.Keyed<ITopicClient>(PackageSigningBindingKey);
351351

352352
builder
353-
.RegisterType<PackageSignatureVerificationEnqueuer>()
353+
.RegisterType<ProcessSignatureEnqueuer>()
354354
.WithKeyedParameter(typeof(ITopicClient), PackageSigningBindingKey)
355-
.As<IPackageSignatureVerificationEnqueuer>();
355+
.As<IProcessSignatureEnqueuer>();
356356

357357
// Configure the package signing validator.
358358
builder
@@ -375,24 +375,24 @@ private static void ConfigurePackageCertificatesValidator(ContainerBuilder build
375375
builder
376376
.Register(c =>
377377
{
378-
var configuration = c.Resolve<IOptionsSnapshot<PackageCertificatesConfiguration>>().Value.ServiceBus;
378+
var configuration = c.Resolve<IOptionsSnapshot<ValidateCertificateConfiguration>>().Value.ServiceBus;
379379

380380
return new TopicClientWrapper(configuration.ConnectionString, configuration.TopicPath);
381381
})
382382
.Keyed<ITopicClient>(PackageCertificatesBindingKey);
383383

384384
builder
385-
.RegisterType<CertificateVerificationEnqueuer>()
385+
.RegisterType<ValidateCertificateEnqueuer>()
386386
.WithKeyedParameter(typeof(ITopicClient), PackageCertificatesBindingKey)
387-
.As<ICertificateVerificationEnqueuer>();
387+
.As<IValidateCertificateEnqueuer>();
388388

389389
// Configure the certificates validator.
390390
builder
391391
.RegisterType<PackageCertificatesValidator>()
392392
.WithKeyedParameter(typeof(IValidatorStateService), PackageCertificatesBindingKey)
393393
.WithParameter(
394394
(pi, ctx) => pi.ParameterType == typeof(TimeSpan?),
395-
(pi, ctx) => ctx.Resolve<IOptionsSnapshot<PackageCertificatesConfiguration>>().Value.CertificateRevalidationThreshold)
395+
(pi, ctx) => ctx.Resolve<IOptionsSnapshot<ValidateCertificateConfiguration>>().Value.CertificateRevalidationThreshold)
396396
.As<PackageCertificatesValidator>();
397397
}
398398

‎src/NuGet.Services.Validation.Orchestrator/NuGet.Services.Validation.Orchestrator.csproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -63,14 +63,14 @@
6363
<Compile Include="MessageService.cs" />
6464
<Compile Include="OrchestrationRunner.cs" />
6565
<Compile Include="Configuration\OrchestrationRunnerConfiguration.cs" />
66-
<Compile Include="PackageCertificates\CertificateVerificationEnqueuer.cs" />
67-
<Compile Include="PackageCertificates\ICertificateVerificationEnqueuer.cs" />
68-
<Compile Include="PackageCertificates\PackageCertificatesConfiguration.cs" />
69-
<Compile Include="PackageCertificates\PackageCertificatesValidator.cs" />
70-
<Compile Include="PackageSigning\IPackageSignatureVerificationEnqueuer.cs" />
71-
<Compile Include="PackageSigning\PackageSignatureVerificationEnqueuer.cs" />
72-
<Compile Include="PackageSigning\PackageSigningConfiguration.cs" />
73-
<Compile Include="PackageSigning\PackageSigningValidator.cs" />
66+
<Compile Include="PackageSigning\ProcessSignature\IProcessSignatureEnqueuer.cs" />
67+
<Compile Include="PackageSigning\ProcessSignature\PackageSigningValidator.cs" />
68+
<Compile Include="PackageSigning\ProcessSignature\ProcessSignatureConfiguration.cs" />
69+
<Compile Include="PackageSigning\ProcessSignature\ProcessSignatureEnqueuer.cs" />
70+
<Compile Include="PackageSigning\ValidateCertificate\IValidateCertificateEnqueuer.cs" />
71+
<Compile Include="PackageSigning\ValidateCertificate\PackageCertificatesValidator.cs" />
72+
<Compile Include="PackageSigning\ValidateCertificate\ValidateCertificateConfiguration.cs" />
73+
<Compile Include="PackageSigning\ValidateCertificate\ValidateCertificateEnqueuer.cs" />
7474
<Compile Include="PackageStatusProcessor.cs" />
7575
<Compile Include="PackageValidationMessageDataSerializer.cs" />
7676
<Compile Include="Program.cs" />

src/NuGet.Services.Validation.Orchestrator/PackageSigning/IPackageSignatureVerificationEnqueuer.cs renamed to src/NuGet.Services.Validation.Orchestrator/PackageSigning/ProcessSignature/IProcessSignatureEnqueuer.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33

44
using System.Threading.Tasks;
55

6-
namespace NuGet.Services.Validation.PackageSigning
6+
namespace NuGet.Services.Validation.PackageSigning.ProcessSignature
77
{
88
/// <summary>
99
/// Kicks off package signature verification.
1010
/// </summary>
11-
public interface IPackageSignatureVerificationEnqueuer
11+
public interface IProcessSignatureEnqueuer
1212
{
1313
/// <summary>
1414
/// Kicks off the package verification process for the given request. Verification will begin when the

src/NuGet.Services.Validation.Orchestrator/PackageSigning/PackageSigningValidator.cs renamed to src/NuGet.Services.Validation.Orchestrator/PackageSigning/ProcessSignature/PackageSigningValidator.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,18 @@
99
using NuGet.Services.Validation.Orchestrator;
1010
using NuGet.Services.Validation.Orchestrator.Telemetry;
1111

12-
namespace NuGet.Services.Validation.PackageSigning
12+
namespace NuGet.Services.Validation.PackageSigning.ProcessSignature
1313
{
1414
public class PackageSigningValidator : BaseValidator, IValidator
1515
{
1616
private readonly IValidatorStateService _validatorStateService;
17-
private readonly IPackageSignatureVerificationEnqueuer _signatureVerificationEnqueuer;
17+
private readonly IProcessSignatureEnqueuer _signatureVerificationEnqueuer;
1818
private readonly ITelemetryService _telemetryService;
1919
private readonly ILogger<PackageSigningValidator> _logger;
2020

2121
public PackageSigningValidator(
2222
IValidatorStateService validatorStateService,
23-
IPackageSignatureVerificationEnqueuer signatureVerificationEnqueuer,
23+
IProcessSignatureEnqueuer signatureVerificationEnqueuer,
2424
ITelemetryService telemetryService,
2525
ILogger<PackageSigningValidator> logger)
2626
{

src/NuGet.Services.Validation.Orchestrator/PackageSigning/PackageSigningConfiguration.cs renamed to src/NuGet.Services.Validation.Orchestrator/PackageSigning/ProcessSignature/ProcessSignatureConfiguration.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
using System;
55
using NuGet.Jobs.Configuration;
66

7-
namespace NuGet.Services.Validation.PackageSigning
7+
namespace NuGet.Services.Validation.PackageSigning.ProcessSignature
88
{
99
/// <summary>
1010
/// Configuration for initializing the <see cref="PackageSigningValidator"/>.
1111
/// </summary>
12-
public class PackageSigningConfiguration
12+
public class ProcessSignatureConfiguration
1313
{
1414
/// <summary>
1515
/// The Service Bus configuration used to enqueue package signing validations.

0 commit comments

Comments
 (0)