Update the GalleryCore and NuGet.Services.Validation in orchestrator. (#479)

cristinamanum · web-flow · commit 81f96adfd2d8 · 2018-07-12T08:45:59.000-07:00
* Update the GalleryCore and NuGet.Services.Validation in orchestrator.
diff --git a/src/NuGet.Services.Validation.Orchestrator/Job.cs b/src/NuGet.Services.Validation.Orchestrator/Job.cs
@@ -228,7 +228,7 @@ private void ConfigureJobServices(IServiceCollection services, IConfigurationRoo
                         readAccessGeoRedundant: false);
                 });
             services.AddTransient<NuGetGallery.ICoreFileStorageService, NuGetGallery.CloudBlobCoreFileStorageService>();
-            services.AddTransient<IValidationFileServiceMetadata, PackageValidationFileServiceMetadata>();
+            services.AddTransient<IFileMetadataService, PackageFileMetadataService>();
             services.AddTransient<IValidationFileService, ValidationFileService>();
             services.AddTransient<IFileDownloader, PackageDownloader>();
             services.AddTransient<IStatusProcessor<Package>, EntityStatusProcessor<Package>>();
diff --git a/src/NuGet.Services.Validation.Orchestrator/NuGet.Services.Validation.Orchestrator.csproj b/src/NuGet.Services.Validation.Orchestrator/NuGet.Services.Validation.Orchestrator.csproj
@@ -55,8 +55,6 @@
     <Compile Include="Services\IEntityService.cs" />
     <Compile Include="IMessageService.cs" />
     <Compile Include="IPackageStatusProcessor.cs" />
-    <Compile Include="Services\PackageValidationFileServiceMetadata.cs" />
-    <Compile Include="Services\IValidationFileServiceMetadata.cs" />
     <Compile Include="ValidatingEntitites\IValidatingEntity.cs" />
     <Compile Include="IValidationOutcomeProcessor.cs" />
     <Compile Include="IValidationPackageFileService.cs" />
diff --git a/src/NuGet.Services.Validation.Orchestrator/Services/IValidationFileServiceMetadata.cs b/src/NuGet.Services.Validation.Orchestrator/Services/IValidationFileServiceMetadata.cs
diff --git a/src/NuGet.Services.Validation.Orchestrator/Services/PackageValidationFileServiceMetadata.cs b/src/NuGet.Services.Validation.Orchestrator/Services/PackageValidationFileServiceMetadata.cs
diff --git a/src/NuGet.Services.Validation.Orchestrator/ValidationPackageFileService.cs b/src/NuGet.Services.Validation.Orchestrator/ValidationPackageFileService.cs
@@ -26,21 +26,21 @@ public class ValidationFileService : CorePackageFileService, IValidationFileServ
         private readonly IFileDownloader _fileDownloader;
         private readonly ITelemetryService _telemetryService;
         private readonly ILogger<ValidationFileService> _logger;
-        private IValidationFileServiceMetadata _validationFileServiceMetadata;
+        private IFileMetadataService _fileMetadataService;
 
 
         public ValidationFileService(
             ICoreFileStorageService fileStorageService,
             IFileDownloader fileDownloader,
             ITelemetryService telemetryService,
             ILogger<ValidationFileService> logger,
-            IValidationFileServiceMetadata validationFileServiceMetadata) : base(fileStorageService)
+            IFileMetadataService fileMetadataService) : base(fileStorageService, fileMetadataService)
         {
             _fileStorageService = fileStorageService ?? throw new ArgumentNullException(nameof(fileStorageService));
             _fileDownloader = fileDownloader ?? throw new ArgumentNullException(nameof(fileDownloader));
             _telemetryService = telemetryService ?? throw new ArgumentNullException(nameof(telemetryService));
             _logger = logger ?? throw new ArgumentNullException(nameof(logger));
-            _validationFileServiceMetadata = validationFileServiceMetadata;
+            _fileMetadataService = fileMetadataService ?? throw new ArgumentNullException(nameof(fileMetadataService));
         }
 
         #region Core methods to be to be invoked 
@@ -54,21 +54,21 @@ public static string BuildFileName(PackageValidationSet validationSet, string pa
         public Task<Uri> GetPackageReadUriAsync(PackageValidationSet validationSet)
         {
             var fileName = BuildFileName(validationSet,
-                _validationFileServiceMetadata.FileSavePathTemplate,
-                _validationFileServiceMetadata.FileExtension);
-            return _fileStorageService.GetFileReadUriAsync(_validationFileServiceMetadata.FilePublicFolderName, fileName, endOfAccess: null);
+                _fileMetadataService.FileSavePathTemplate,
+                _fileMetadataService.FileExtension);
+            return _fileStorageService.GetFileReadUriAsync(_fileMetadataService.FileFolderName, fileName, endOfAccess: null);
         }
 
         public Task DeleteValidationPackageFileAsync(PackageValidationSet validationSet)
         {
-            var fileName = BuildFileName(validationSet, _validationFileServiceMetadata.FileSavePathTemplate, _validationFileServiceMetadata.FileExtension);
-            return _fileStorageService.DeleteFileAsync(_validationFileServiceMetadata.ValidationFolderName, fileName);
+            var fileName = BuildFileName(validationSet, _fileMetadataService.FileSavePathTemplate, _fileMetadataService.FileExtension);
+            return _fileStorageService.DeleteFileAsync(_fileMetadataService.ValidationFolderName, fileName);
         }
 
         public Task<bool> DoesPackageFileExistAsync(PackageValidationSet validationSet)
         {
-            var fileName = BuildFileName(validationSet, _validationFileServiceMetadata.FileSavePathTemplate, _validationFileServiceMetadata.FileExtension);
-            return _fileStorageService.FileExistsAsync(_validationFileServiceMetadata.FilePublicFolderName, fileName);
+            var fileName = BuildFileName(validationSet, _fileMetadataService.FileSavePathTemplate, _fileMetadataService.FileExtension);
+            return _fileStorageService.FileExistsAsync(_fileMetadataService.FileFolderName, fileName);
         }
 
         public async Task StorePackageFileInBackupLocationAsync(PackageValidationSet validationSet, Stream packageFile)
@@ -85,14 +85,14 @@ public async Task StorePackageFileInBackupLocationAsync(PackageValidationSet val
 
         public Task<bool> DoesValidationPackageFileExistAsync(PackageValidationSet validationSet)
         {
-            var fileName = BuildFileName(validationSet, _validationFileServiceMetadata.FileSavePathTemplate, _validationFileServiceMetadata.FileExtension);
-            return _fileStorageService.FileExistsAsync(_validationFileServiceMetadata.ValidationFolderName, fileName);
+            var fileName = BuildFileName(validationSet, _fileMetadataService.FileSavePathTemplate, _fileMetadataService.FileExtension);
+            return _fileStorageService.FileExistsAsync(_fileMetadataService.ValidationFolderName, fileName);
         }
 
         public Task DeletePackageFileAsync(PackageValidationSet validationSet)
         {
-            var fileName = BuildFileName(validationSet, _validationFileServiceMetadata.FileSavePathTemplate, _validationFileServiceMetadata.FileExtension);
-            return _fileStorageService.DeleteFileAsync(_validationFileServiceMetadata.FilePublicFolderName, fileName);
+            var fileName = BuildFileName(validationSet, _fileMetadataService.FileSavePathTemplate, _fileMetadataService.FileExtension);
+            return _fileStorageService.DeleteFileAsync(_fileMetadataService.FileFolderName, fileName);
         }
         #endregion
 
@@ -106,14 +106,14 @@ public async Task<Stream> DownloadPackageFileToDiskAsync(PackageValidationSet va
         public Task CopyValidationPackageForValidationSetAsync(PackageValidationSet validationSet)
         {
             var srcFileName = BuildFileName(validationSet,
-                _validationFileServiceMetadata.FileSavePathTemplate,
-                _validationFileServiceMetadata.FileExtension);
+                _fileMetadataService.FileSavePathTemplate,
+                _fileMetadataService.FileExtension);
 
             return CopyFileAsync(
-                _validationFileServiceMetadata.ValidationFolderName,
+                _fileMetadataService.ValidationFolderName,
                 srcFileName,
-                _validationFileServiceMetadata.ValidationFolderName,
-                BuildValidationSetPackageFileName(validationSet, _validationFileServiceMetadata.FileExtension),
+                _fileMetadataService.ValidationFolderName,
+                BuildValidationSetPackageFileName(validationSet, _fileMetadataService.FileExtension),
                 AccessConditionWrapper.GenerateEmptyCondition());
         }
 
@@ -137,26 +137,26 @@ public async Task BackupPackageFileFromValidationSetPackageAsync(PackageValidati
 
         public Task<string> CopyPackageFileForValidationSetAsync(PackageValidationSet validationSet)
         {
-            var srcFileName = BuildFileName(validationSet, _validationFileServiceMetadata.FileSavePathTemplate, _validationFileServiceMetadata.FileExtension);
+            var srcFileName = BuildFileName(validationSet, _fileMetadataService.FileSavePathTemplate, _fileMetadataService.FileExtension);
 
             return CopyFileAsync(
-                _validationFileServiceMetadata.FilePublicFolderName,
+                _fileMetadataService.FileFolderName,
                 srcFileName,
-                _validationFileServiceMetadata.ValidationFolderName,
-                BuildValidationSetPackageFileName(validationSet, _validationFileServiceMetadata.FileExtension),
+                _fileMetadataService.ValidationFolderName,
+                BuildValidationSetPackageFileName(validationSet, _fileMetadataService.FileExtension),
                 AccessConditionWrapper.GenerateEmptyCondition());
         }
 
         public Task CopyValidationPackageToPackageFileAsync(PackageValidationSet validationSet)
         {
             var fileName = BuildFileName(validationSet,
-                _validationFileServiceMetadata.FileSavePathTemplate,
-                _validationFileServiceMetadata.FileExtension);
+                _fileMetadataService.FileSavePathTemplate,
+                _fileMetadataService.FileExtension);
 
             return CopyFileAsync(
-                _validationFileServiceMetadata.ValidationFolderName,
+                _fileMetadataService.ValidationFolderName,
                 fileName,
-                _validationFileServiceMetadata.FilePublicFolderName,
+                _fileMetadataService.FileFolderName,
                 fileName,
                 AccessConditionWrapper.GenerateIfNotExistsCondition());
         }
@@ -166,60 +166,60 @@ public Task CopyValidationSetPackageToPackageFileAsync(
             IAccessCondition destAccessCondition)
         {
             var srcFileName = BuildValidationSetPackageFileName(validationSet,
-                _validationFileServiceMetadata.FileExtension);
+                _fileMetadataService.FileExtension);
 
             var destFileName = BuildFileName(validationSet,
-                _validationFileServiceMetadata.FileSavePathTemplate,
-                _validationFileServiceMetadata.FileExtension);
+                _fileMetadataService.FileSavePathTemplate,
+                _fileMetadataService.FileExtension);
 
             return CopyFileAsync(
-                _validationFileServiceMetadata.ValidationFolderName,
+                _fileMetadataService.ValidationFolderName,
                 srcFileName,
-                _validationFileServiceMetadata.FilePublicFolderName,
+                _fileMetadataService.FileFolderName,
                 destFileName,
                 destAccessCondition);
         }
 
         public Task<bool> DoesValidationSetPackageExistAsync(PackageValidationSet validationSet)
         {
-            var fileName = BuildValidationSetPackageFileName(validationSet, _validationFileServiceMetadata.FileExtension);
+            var fileName = BuildValidationSetPackageFileName(validationSet, _fileMetadataService.FileExtension);
             
-            return _fileStorageService.FileExistsAsync(_validationFileServiceMetadata.ValidationFolderName, fileName);
+            return _fileStorageService.FileExistsAsync(_fileMetadataService.ValidationFolderName, fileName);
         }
 
         public Task DeletePackageForValidationSetAsync(PackageValidationSet validationSet)
         {
-            var fileName = BuildValidationSetPackageFileName(validationSet, _validationFileServiceMetadata.FileExtension);
+            var fileName = BuildValidationSetPackageFileName(validationSet, _fileMetadataService.FileExtension);
 
             _logger.LogInformation(
                 "Deleting package for validation set {ValidationTrackingId} from {FolderName}/{FileName}.",
                 validationSet.ValidationTrackingId,
-                _validationFileServiceMetadata.ValidationFolderName,
+                _fileMetadataService.ValidationFolderName,
                 fileName);
 
-            return _fileStorageService.DeleteFileAsync(_validationFileServiceMetadata.ValidationFolderName, fileName);
+            return _fileStorageService.DeleteFileAsync(_fileMetadataService.ValidationFolderName, fileName);
         }
 
         public Task<Uri> GetPackageForValidationSetReadUriAsync(PackageValidationSet validationSet, DateTimeOffset endOfAccess)
         {
-            var fileName = BuildValidationSetPackageFileName(validationSet, _validationFileServiceMetadata.FileExtension);
+            var fileName = BuildValidationSetPackageFileName(validationSet, _fileMetadataService.FileExtension);
 
-            return _fileStorageService.GetFileReadUriAsync(_validationFileServiceMetadata.ValidationFolderName, fileName, endOfAccess);
+            return _fileStorageService.GetFileReadUriAsync(_fileMetadataService.ValidationFolderName, fileName, endOfAccess);
         }
 
         public Task CopyPackageUrlForValidationSetAsync(PackageValidationSet validationSet, string srcPackageUrl)
         {
-            var destFileName = BuildValidationSetPackageFileName(validationSet, _validationFileServiceMetadata.FileExtension);
+            var destFileName = BuildValidationSetPackageFileName(validationSet, _fileMetadataService.FileExtension);
 
             _logger.LogInformation(
                 "Copying URL {SrcPackageUrl} to {DestFolderName}/{DestFileName}.",
                 srcPackageUrl,
-                _validationFileServiceMetadata.ValidationFolderName,
+                _fileMetadataService.ValidationFolderName,
                 srcPackageUrl);
 
             return _fileStorageService.CopyFileAsync(
                 new Uri(srcPackageUrl),
-                _validationFileServiceMetadata.ValidationFolderName,
+                _fileMetadataService.ValidationFolderName,
                 destFileName,
                 AccessConditionWrapper.GenerateEmptyCondition());
         }
@@ -228,15 +228,15 @@ public async Task<PackageStreamMetadata> UpdatePackageBlobMetadataAsync(PackageV
         {
             var fileName = BuildFileName(
                 validationSet,
-                _validationFileServiceMetadata.FileSavePathTemplate,
-                _validationFileServiceMetadata.FileExtension);
+                _fileMetadataService.FileSavePathTemplate,
+                _fileMetadataService.FileExtension);
 
             PackageStreamMetadata streamMetadata = null;
 
             // This will throw if the ETag changes between read and write operations,
             // so streamMetadata will never be null.
             await _fileStorageService.SetMetadataAsync(
-                _validationFileServiceMetadata.FilePublicFolderName,
+                _fileMetadataService.FileFolderName,
                 fileName,
                 async (lazyStream, metadata) =>
                 {
diff --git a/src/Validation.Common.Job/Validation.Common.Job.csproj b/src/Validation.Common.Job/Validation.Common.Job.csproj
@@ -108,10 +108,10 @@
       <Version>2.26.0-master-34394</Version>
     </PackageReference>
     <PackageReference Include="NuGet.Services.Validation">
-      <Version>2.26.0-master-34394</Version>
+      <Version>2.26.0-master-34584</Version>
     </PackageReference>
     <PackageReference Include="NuGetGallery.Core">
-      <Version>4.4.5-dev-34153</Version>
+      <Version>4.4.5-dev-34648</Version>
     </PackageReference>
     <PackageReference Include="Serilog">
       <Version>2.5.0</Version>
diff --git a/src/Validation.Common.Job/Validation.Common.Job.nuspec b/src/Validation.Common.Job/Validation.Common.Job.nuspec
@@ -21,8 +21,8 @@
       <dependency id="NuGet.Services.ServiceBus" version="2.26.0-master-34394" />
       <dependency id="NuGet.Services.Sql" version="2.26.0-master-34394" />
       <dependency id="NuGet.Services.Storage" version="2.26.0-master-34394" />
-      <dependency id="NuGet.Services.Validation" version="2.26.0-master-34394" />
-      <dependency id="NuGetGallery.Core" version="4.4.5-dev-34153" />
+      <dependency id="NuGet.Services.Validation" version="2.26.0-master-34584" />
+      <dependency id="NuGetGallery.Core" version="4.4.5-dev-34648" />
       <dependency id="Serilog" version="2.5.0" />
       <dependency id="System.Net.Http" version="4.3.3" />
     </dependencies>
diff --git a/tests/NuGet.Services.Validation.Orchestrator.Tests/ValidationPackageFileServiceFacts.cs b/tests/NuGet.Services.Validation.Orchestrator.Tests/ValidationPackageFileServiceFacts.cs
@@ -80,7 +80,7 @@ public ValidationPackageFileServiceFacts()
                 _packageDownloader.Object,
                 _telemetryService.Object,
                 _logger.Object,
-		new PackageValidationFileServiceMetadata());
+                new PackageFileMetadataService());
         }
 
         [Fact]

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ public ValidationPackageFileServiceFacts()`
`80`	`80`	`_packageDownloader.Object,`
`81`	`81`	`_telemetryService.Object,`
`82`	`82`	`_logger.Object,`
`83`		`- new PackageValidationFileServiceMetadata());`
	`83`	`+ new PackageFileMetadataService());`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`[Fact]`