Merge pull request #694 from NuGet/dev

Orchestrator extracts license file to flatcontainer (#687)

Author: zhhyu

src/NuGet.Jobs.Common/JsonConfigurationJob.cs

@@ -76,7 +76,7 @@ private IConfigurationRoot GetConfigurationRoot(string configurationFilename, ou
 
             var builder = new ConfigurationBuilder()
                 .SetBasePath(Environment.CurrentDirectory)
-                .AddJsonFile(configurationFilename, optional: false, reloadOnChange: true);
+                .AddJsonFile(configurationFilename, optional: false, reloadOnChange: false);
 
             var uninjectedConfiguration = builder.Build();
 

src/NuGet.Jobs.Common/NuGet.Jobs.Common.csproj

@@ -105,13 +105,13 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="NuGet.Services.Configuration">
-      <Version>2.39.0</Version>
+      <Version>2.40.0</Version>
     </PackageReference>
     <PackageReference Include="NuGet.Services.Logging">
-      <Version>2.39.0</Version>
+      <Version>2.40.0</Version>
     </PackageReference>
     <PackageReference Include="NuGet.Services.Sql">
-      <Version>2.39.0</Version>
+      <Version>2.40.0</Version>
     </PackageReference>
     <PackageReference Include="System.Net.Http">
       <Version>4.3.3</Version>

src/NuGet.Services.Revalidate/NuGet.Services.Revalidate.csproj

@@ -123,7 +123,7 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="NuGet.Services.Status">
-      <Version>2.39.0</Version>
+      <Version>2.40.0</Version>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

src/NuGet.Services.Validation.Orchestrator/Configuration/FlatContainerConfiguration.cs

@@ -0,0 +1,10 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+namespace NuGet.Services.Validation.Orchestrator
+{
+    public class FlatContainerConfiguration
+    {
+        public string ConnectionString { get; set; }
+    }
+}

src/NuGet.Services.Validation.Orchestrator/EntityStatusProcessor.cs

@@ -61,9 +61,9 @@ public class Job : JobBase
         private const string GalleryDbConfigurationSectionName = "GalleryDb";
         private const string ValidationDbConfigurationSectionName = "ValidationDb";
         private const string ServiceBusConfigurationSectionName = "ServiceBus";
-        private const string SmtpConfigurationSectionName = "Smtp";
         private const string EmailConfigurationSectionName = "Email";
         private const string PackageDownloadTimeoutName = "PackageDownloadTimeout";
+        private const string FlatContainerConfigurationSectionName = "FlatContainer";
 
         private const string EmailBindingKey = EmailConfigurationSectionName;
         private const string PackageVerificationTopicClientBindingKey = "PackageVerificationTopicClient";
@@ -74,6 +74,7 @@ public class Job : JobBase
         private const string ScanBindingKey = "Scan";
         private const string ValidationStorageBindingKey = "ValidationStorage";
         private const string OrchestratorBindingKey = "Orchestrator";
+        private const string CoreLicenseFileServiceBindingKey = "CoreLicenseFileService";
 
         private const string SymbolsValidatorSectionName = "SymbolsValidator";
         private const string SymbolsValidationBindingKey = SymbolsValidatorSectionName;
@@ -124,7 +125,7 @@ private IConfigurationRoot GetConfigurationRoot(string configurationFilename, bo
             Logger.LogInformation("Using the {ConfigurationFilename} configuration file", configurationFilename);
             var builder = new ConfigurationBuilder()
                 .SetBasePath(Environment.CurrentDirectory)
-                .AddJsonFile(configurationFilename, optional: false, reloadOnChange: true);
+                .AddJsonFile(configurationFilename, optional: false, reloadOnChange: false);
 
             var uninjectedConfiguration = builder.Build();
 
@@ -193,6 +194,7 @@ private void ConfigureJobServices(IServiceCollection services, IConfigurationRoo
             services.Configure<ScanAndSignConfiguration>(configurationRoot.GetSection(ScanAndSignSectionName));
             services.Configure<SymbolScanOnlyConfiguration>(configurationRoot.GetSection(SymbolScanOnlySectionName));
             services.Configure<ScanAndSignEnqueuerConfiguration>(configurationRoot.GetSection(ScanAndSignSectionName));
+            services.Configure<FlatContainerConfiguration>(configurationRoot.GetSection(FlatContainerConfigurationSectionName));
 
             services.Configure<SymbolsValidationConfiguration>(configurationRoot.GetSection(SymbolsValidatorSectionName));
             services.Configure<SymbolsIngesterConfiguration>(configurationRoot.GetSection(SymbolsIngesterSectionName));
@@ -243,7 +245,7 @@ private void ConfigureJobServices(IServiceCollection services, IConfigurationRoo
                 });
             services.AddTransient<ICoreFileStorageService, CloudBlobCoreFileStorageService>();
             services.AddTransient<IFileDownloader, PackageDownloader>();
-            services.AddTransient<IStatusProcessor<Package>, EntityStatusProcessor<Package>>();
+            services.AddTransient<IStatusProcessor<Package>, PackageStatusProcessor>();
             services.AddTransient<IValidationSetProvider<Package>, ValidationSetProvider<Package>>();
             services.AddTransient<IValidationSetProcessor, ValidationSetProcessor>();
             services.AddTransient<IBrokeredMessageSerializer<SignatureValidationMessage>, SignatureValidationMessageSerializer>();
@@ -348,7 +350,7 @@ private static IServiceProvider CreateProvider(IServiceCollection services, ICon
                     ConfigurePackageSigningValidators(containerBuilder);
                     ConfigurePackageCertificatesValidator(containerBuilder);
                     ConfigureScanAndSignProcessor(containerBuilder);
-                    ConfigureScanValidator(containerBuilder);
+                    ConfigureFlatContainer(containerBuilder);
                     break;
                 case ValidatingType.SymbolPackage:
                     ConfigureSymbolScanValidator(containerBuilder);
@@ -492,19 +494,31 @@ private static void ConfigureSymbolScanValidator(ContainerBuilder builder)
                 .AsSelf();
         }
 
-        private static void ConfigureScanValidator(ContainerBuilder builder)
+        private static void ConfigureFlatContainer(ContainerBuilder builder)
         {
             builder
-                .RegisterType<ValidatorStateService>()
-                .WithParameter(
-                    (pi, ctx) => pi.ParameterType == typeof(string),
-                    (pi, ctx) => ValidatorName.ScanOnly)
-                .Keyed<IValidatorStateService>(ScanBindingKey);
+                .Register<CloudBlobClientWrapper>(c =>
+                {
+                    var configurationAccessor = c.Resolve<IOptionsSnapshot<FlatContainerConfiguration>>();
+                    return new CloudBlobClientWrapper(
+                        configurationAccessor.Value.ConnectionString,
+                        readAccessGeoRedundant: false);
+                })
+                .Keyed<ICloudBlobClient>(CoreLicenseFileServiceBindingKey);
 
             builder
-                .RegisterType<ScanValidator>()
-                .WithKeyedParameter(typeof(IValidatorStateService), ScanBindingKey)
-                .AsSelf();
+                .RegisterType<CloudBlobCoreFileStorageService>()
+                .WithKeyedParameter(typeof(ICloudBlobClient), CoreLicenseFileServiceBindingKey)
+                .Keyed<ICoreFileStorageService>(CoreLicenseFileServiceBindingKey);
+
+            builder
+                .RegisterType<OrchestratorContentFileMetadataService>()
+                .As<IContentFileMetadataService>();
+
+            builder
+                .RegisterType<CoreLicenseFileService>()
+                .WithKeyedParameter(typeof(ICoreFileStorageService), CoreLicenseFileServiceBindingKey)
+                .As<ICoreLicenseFileService>();
         }
 
         private static void ConfigureOrchestratorMessageHandler(IServiceCollection services, IConfigurationRoot configurationRoot)

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

@@ -45,19 +45,22 @@
   <ItemGroup>
     <Compile Include="BaseValidator.cs" />
     <Compile Include="Configuration\ConfigurationValidator.cs" />
+    <Compile Include="Configuration\FlatContainerConfiguration.cs" />
     <Compile Include="Configuration\TopologicalSort.cs" />
     <Compile Include="ContainerBuilderExtensions.cs" />
     <Compile Include="Configuration\CoreMessageServiceConfiguration.cs" />
     <Compile Include="Configuration\EmailConfiguration.cs" />
+    <Compile Include="EntityStatusProcessor.cs" />
     <Compile Include="Error.cs" />
+    <Compile Include="PackageStatusProcessor.cs" />
     <Compile Include="Services\MessageServiceConfiguration.cs" />
+    <Compile Include="Services\OrchestratorContentFileMetadataService.cs" />
     <Compile Include="Services\SymbolsMessageService.cs" />
     <Compile Include="SymbolsStatusProcessor.cs" />
     <Compile Include="Symbols\ISymbolsIngesterMessageEnqueuer.cs" />
     <Compile Include="Symbols\SymbolScanOnlyConfiguration.cs" />
     <Compile Include="Symbols\SymbolCriteriaEvaluator.cs" />
     <Compile Include="Symbols\SymbolScanValidator.cs" />
-    <Compile Include="PackageSigning\Scan\ScanValidator.cs" />
     <Compile Include="Services\IEntityService.cs" />
     <Compile Include="Services\IMessageService.cs" />
     <Compile Include="IPackageStatusProcessor.cs" />
@@ -92,7 +95,6 @@
     <Compile Include="PackageSigning\ValidateCertificate\ValidateCertificateConfiguration.cs" />
     <Compile Include="PackageSigning\ValidateCertificate\ValidateCertificateEnqueuer.cs" />
     <Compile Include="PackageSigning\ProcessSignature\PackageSignatureValidator.cs" />
-    <Compile Include="PackageStatusProcessor.cs" />
     <Compile Include="PackageValidationMessageDataSerializer.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -160,7 +162,7 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="NuGet.Services.Messaging.Email">
-      <Version>2.39.0</Version>
+      <Version>2.40.0</Version>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />