Merge pull request #556 from NuGet/dev

loic-sharma · web-flow · commit ea79312809c8 · 2018-09-19T16:13:32.000-07:00
[ReleasePrep][2018.09.19]RI of dev into master
diff --git a/src/NuGet.Services.Validation.Orchestrator/NuGet.Services.Validation.Orchestrator.csproj b/src/NuGet.Services.Validation.Orchestrator/NuGet.Services.Validation.Orchestrator.csproj
@@ -134,7 +134,7 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="AnglicanGeek.MarkdownMailer.StrongName">
+    <PackageReference Include="NuGet.StrongName.AnglicanGeek.MarkdownMailer">
       <Version>1.2.0</Version>
     </PackageReference>
     <PackageReference Include="NuGet.Services.Validation.Issues">
diff --git a/src/NuGet.Services.Validation.Orchestrator/PackageSigning/ValidateCertificate/PackageCertificatesValidator.cs b/src/NuGet.Services.Validation.Orchestrator/PackageSigning/ValidateCertificate/PackageCertificatesValidator.cs
@@ -186,7 +186,7 @@ private async Task<ValidatorStatus> StartInternalAsync(IValidationRequest reques
 
             // If any of the author signature's certificates are known to be revoked, invalidate any the signatures.
             // A revoked certificate is assumed to remain revoked forever.
-            var isRevalidationRequest = await _validatorStateService.IsRevalidationRequestAsync(request);
+            var isRevalidationRequest = await _validatorStateService.IsRevalidationRequestAsync(request, ValidatingType.Package);
 
             if (ShouldInvalidateSignature(signature, isRevalidationRequest))
             {
diff --git a/src/NuGet.Services.Validation.Orchestrator/ValidatingEntitites/IValidatingEntity.cs b/src/NuGet.Services.Validation.Orchestrator/ValidatingEntitites/IValidatingEntity.cs
@@ -28,5 +28,10 @@ public interface IValidatingEntity<T> where T : class, IEntity
         /// The time when the entity was created in Gallery.
         /// </summary>
         DateTime Created { get; }
+
+        /// <summary>
+        /// The ValidatingType.
+        /// </summary>
+        ValidatingType ValidatingType { get; }
     }
 }
diff --git a/src/NuGet.Services.Validation.Orchestrator/ValidatingEntitites/PackageValidatingEntity.cs b/src/NuGet.Services.Validation.Orchestrator/ValidatingEntitites/PackageValidatingEntity.cs
@@ -20,5 +20,7 @@ public PackageValidatingEntity(Package entity)
         public PackageStatus Status => EntityRecord.PackageStatusKey;
 
         public DateTime Created => EntityRecord.Created;
+
+        public ValidatingType ValidatingType => ValidatingType.Package;
     }
 }
diff --git a/src/NuGet.Services.Validation.Orchestrator/ValidatingEntitites/SymbolPackageValidatingEntity.cs b/src/NuGet.Services.Validation.Orchestrator/ValidatingEntitites/SymbolPackageValidatingEntity.cs
@@ -20,5 +20,7 @@ public SymbolPackageValidatingEntity(SymbolPackage entity)
         public PackageStatus Status => EntityRecord.StatusKey;
 
         public DateTime Created => EntityRecord.Created;
+
+        public ValidatingType ValidatingType => ValidatingType.SymbolPackage;
     }
 }
diff --git a/src/NuGet.Services.Validation.Orchestrator/ValidationStorageService.cs b/src/NuGet.Services.Validation.Orchestrator/ValidationStorageService.cs
@@ -211,14 +211,15 @@ public async Task<bool> OtherRecentValidationSetForPackageExists<T>(
                 .PackageValidationSets
                 .AnyAsync(pvs => pvs.PackageKey == validatingEntity.Key
                     && pvs.Created > cutoffTimestamp
-                    && pvs.ValidationTrackingId != currentValidationSetTrackingId);
+                    && pvs.ValidationTrackingId != currentValidationSetTrackingId
+                    && pvs.ValidatingType == validatingEntity.ValidatingType);
         }
 
         public async Task<int> GetValidationSetCountAsync<T>(IValidatingEntity<T> validatingEntity) where T : class, IEntity
         {
             return await _validationContext
                 .PackageValidationSets
-                .CountAsync(x => x.PackageKey == validatingEntity.Key);
+                .CountAsync(x => x.PackageKey == validatingEntity.Key && x.ValidatingType == validatingEntity.ValidatingType);
         }
 
         private void AddValidationIssues(PackageValidation packageValidation, IReadOnlyList<IValidationIssue> validationIssues)
diff --git a/src/Search.GenerateAuxiliaryData/Scripts/Search.GenerateAuxiliaryData.Asia.cmd b/src/Search.GenerateAuxiliaryData/Scripts/Search.GenerateAuxiliaryData.Asia.cmd
@@ -5,12 +5,12 @@ REM This script is the same as Search.GenerateAuxillaryData.cmd. However, this c
 cd bin
 
 :Top
-	echo "Starting job - #{Jobs.search.generateauxiliarydata.Title}"
+    echo "Starting job - #{Jobs.Asia.search.generateauxiliarydata.Title}"
 
-	title #{Jobs.search.generateauxiliarydata.Title}
+    title #{Jobs.Asia.search.generateauxiliarydata.Title}
 
-    start /w search.generateauxiliarydata.exe -Configuration "#{Jobs.search.generateauxiliarydata.Configuration}" -verbose true -Sleep #{Jobs.search.generateauxiliarydata.Sleep} -InstrumentationKey "#{Jobs.search.generateauxiliarydata.ApplicationInsightsInstrumentationKey}"
-	
-	echo "Finished #{Jobs.search.generateauxiliarydata.Title}"
+    start /w search.generateauxiliarydata.exe -Configuration "#{Jobs.Asia.search.generateauxiliarydata.Configuration}" -verbose true -Sleep #{Jobs.search.generateauxiliarydata.Sleep} -InstrumentationKey "#{Jobs.search.generateauxiliarydata.ApplicationInsightsInstrumentationKey}"
 
-	goto Top
+    echo "Finished #{Jobs.Asia.search.generateauxiliarydata.Title}"
+
+    goto Top
diff --git a/src/Search.GenerateAuxiliaryData/Scripts/Search.GenerateAuxiliaryData.SouthEastAsia.cmd b/src/Search.GenerateAuxiliaryData/Scripts/Search.GenerateAuxiliaryData.SouthEastAsia.cmd
@@ -0,0 +1,16 @@
+@echo OFF
+
+REM This script is the same as Search.GenerateAuxillaryData.cmd. However, this copy is required until "Jobs.ServiceNames" deployment config is consolidated.
+
+cd bin
+
+:Top
+    echo "Starting job - #{Jobs.SouthEastAsia.search.generateauxiliarydata.Title}"
+
+    title #{Jobs.SouthEastAsia.search.generateauxiliarydata.Title}
+
+    start /w search.generateauxiliarydata.exe -Configuration "#{Jobs.SouthEastAsia.search.generateauxiliarydata.Configuration}" -verbose true -Sleep #{Jobs.search.generateauxiliarydata.Sleep} -InstrumentationKey "#{Jobs.search.generateauxiliarydata.ApplicationInsightsInstrumentationKey}"
+
+    echo "Finished #{Jobs.SouthEastAsia.search.generateauxiliarydata.Title}"
+
+    goto Top
diff --git a/src/Search.GenerateAuxiliaryData/Scripts/Search.GenerateAuxiliaryData.USSC.cmd b/src/Search.GenerateAuxiliaryData/Scripts/Search.GenerateAuxiliaryData.USSC.cmd
@@ -0,0 +1,16 @@
+@echo OFF
+
+REM This script is the same as Search.GenerateAuxillaryData.cmd. However, this copy is required until "Jobs.ServiceNames" deployment config is consolidated.
+
+cd bin
+
+:Top
+    echo "Starting job - #{Jobs.USSC.search.generateauxiliarydata.Title}"
+
+    title #{Jobs.USSC.search.generateauxiliarydata.Title}
+
+    start /w search.generateauxiliarydata.exe -Configuration "#{Jobs.USSC.search.generateauxiliarydata.Configuration}" -verbose true -Sleep #{Jobs.search.generateauxiliarydata.Sleep} -InstrumentationKey "#{Jobs.search.generateauxiliarydata.ApplicationInsightsInstrumentationKey}"
+
+    echo "Finished #{Jobs.USSC.search.generateauxiliarydata.Title}"
+
+    goto Top
diff --git a/src/Search.GenerateAuxiliaryData/Scripts/Search.GenerateAuxiliaryData.cmd b/src/Search.GenerateAuxiliaryData/Scripts/Search.GenerateAuxiliaryData.cmd
@@ -3,12 +3,12 @@
 cd bin
 
 :Top
-	echo "Starting job - #{Jobs.search.generateauxiliarydata.Title}"
+    echo "Starting job - #{Jobs.search.generateauxiliarydata.Title}"
 
-	title #{Jobs.search.generateauxiliarydata.Title}
+    title #{Jobs.search.generateauxiliarydata.Title}
 
     start /w search.generateauxiliarydata.exe -Configuration "#{Jobs.search.generateauxiliarydata.Configuration}" -verbose true -Sleep #{Jobs.search.generateauxiliarydata.Sleep} -InstrumentationKey "#{Jobs.search.generateauxiliarydata.ApplicationInsightsInstrumentationKey}"
-	
-	echo "Finished #{Jobs.search.generateauxiliarydata.Title}"
 
-	goto Top
+    echo "Finished #{Jobs.search.generateauxiliarydata.Title}"
+
+    goto Top
diff --git a/src/Search.GenerateAuxiliaryData/Search.GenerateAuxiliaryData.nuspec b/src/Search.GenerateAuxiliaryData/Search.GenerateAuxiliaryData.nuspec
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package >
   <metadata>
-    <id>Search.GenerateAuxiliaryData.$branch$</id>
+    <id>Search.GenerateAuxiliaryData</id>
     <version>$version$</version>
     <title>Search.GenerateAuxiliaryData</title>
     <authors>.NET Foundation</authors>
@@ -13,6 +13,8 @@
     <file src="bin\$configuration$\*.*" target="bin"/>
     <file src="Scripts\Search.GenerateAuxiliaryData.cmd" />
     <file src="Scripts\Search.GenerateAuxiliaryData.Asia.cmd" />
+    <file src="Scripts\Search.GenerateAuxiliaryData.SouthEastAsia.cmd" />
+    <file src="Scripts\Search.GenerateAuxiliaryData.USSC.cmd" />
     <file src="Scripts\Functions.ps1" />
     <file src="Scripts\PreDeploy.ps1" />
     <file src="Scripts\PostDeploy.ps1" />
diff --git a/src/Search.GenerateAuxiliaryData/Settings/dev-southeastasia.json b/src/Search.GenerateAuxiliaryData/Settings/dev-southeastasia.json
@@ -0,0 +1,22 @@
+{
+  "Initialization": {
+    "AzureCdnCloudStorageAccount": "DefaultEndpointsProtocol=https;AccountName=nugetdevlegacy;AccountKey=$$Dev-NuGetDevLegacyStorage-Key$$",
+    "AzureCdnCloudStorageContainerName": "nuget-cdnstats",
+    "PrimaryDestination": "DefaultEndpointsProtocol=https;AccountName=nugetdevsea;AccountKey=$$Dev-NuGetDevSeaStorage-Key$$"
+  },
+
+  "GalleryDb": {
+    "ConnectionString": "Data Source=tcp:#{Deployment.Azure.Sql.GalleryDatabaseAddress};Initial Catalog=nuget-dev-0-v2gallery;Persist Security Info=False;Connect Timeout=30;Encrypt=True;TrustServerCertificate=False;Application Name=Search.GenerateAuxData.Asia;AadTenant=#{Deployment.Azure.ActiveDirectory.Tenant};AadClientId=#{Deployment.Azure.ActiveDirectory.GalleryDbReader.ClientId};AadCertificate=$$dev-gallerydb-reader$$"
+  },
+
+  "StatisticsDb": {
+    "ConnectionString": "Data Source=tcp:#{Deployment.Azure.Sql.StatisticsDatabaseAddress};Initial Catalog=nuget-dev-statistics;Persist Security Info=False;Connect Timeout=30;Encrypt=True;TrustServerCertificate=False;Application Name=Search.GenerateAuxData.Asia;AadTenant=#{Deployment.Azure.ActiveDirectory.Tenant};AadClientId=#{Deployment.Azure.ActiveDirectory.StatisticsDbReader.ClientId};AadCertificate=$$dev-statisticsdb-reader$$"
+  },
+
+  "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/Search.GenerateAuxiliaryData/Settings/dev-ussc.json b/src/Search.GenerateAuxiliaryData/Settings/dev-ussc.json
@@ -0,0 +1,22 @@
+{
+  "Initialization": {
+    "AzureCdnCloudStorageAccount": "DefaultEndpointsProtocol=https;AccountName=nugetdevlegacy;AccountKey=$$Dev-NuGetDevLegacyStorage-Key$$",
+    "AzureCdnCloudStorageContainerName": "nuget-cdnstats",
+    "PrimaryDestination": "DefaultEndpointsProtocol=https;AccountName=nugetdevussc;AccountKey=$$Dev-NuGetDevUsscStorage-Key$$"
+  },
+
+  "GalleryDb": {
+    "ConnectionString": "Data Source=tcp:#{Deployment.Azure.Sql.GalleryDatabaseAddress};Initial Catalog=nuget-dev-0-v2gallery;Persist Security Info=False;Connect Timeout=30;Encrypt=True;TrustServerCertificate=False;Application Name=Search.GenerateAuxData;AadTenant=#{Deployment.Azure.ActiveDirectory.Tenant};AadClientId=#{Deployment.Azure.ActiveDirectory.GalleryDbReader.ClientId};AadCertificate=$$dev-gallerydb-reader$$"
+  },
+
+  "StatisticsDb": {
+    "ConnectionString": "Data Source=tcp:#{Deployment.Azure.Sql.StatisticsDatabaseAddress};Initial Catalog=nuget-dev-statistics;Persist Security Info=False;Connect Timeout=30;Encrypt=True;TrustServerCertificate=False;Application Name=Search.GenerateAuxData;AadTenant=#{Deployment.Azure.ActiveDirectory.Tenant};AadClientId=#{Deployment.Azure.ActiveDirectory.StatisticsDbReader.ClientId};AadCertificate=$$dev-statisticsdb-reader$$"
+  },
+
+  "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/Search.GenerateAuxiliaryData/Settings/int-ussc.json b/src/Search.GenerateAuxiliaryData/Settings/int-ussc.json
@@ -0,0 +1,22 @@
+{
+  "Initialization": {
+    "AzureCdnCloudStorageAccount": "DefaultEndpointsProtocol=https;AccountName=nugetint0;AccountKey=$$Int-NuGetInt0Storage-Key$$",
+    "AzureCdnCloudStorageContainerName": "nuget-cdnstats",
+    "PrimaryDestination": "DefaultEndpointsProtocol=https;AccountName=nugetintussc;AccountKey=$$Int-NuGetIntUsscStorage-Key$$"
+  },
+
+  "GalleryDb": {
+    "ConnectionString": "Data Source=tcp:#{Deployment.Azure.Sql.GalleryDatabaseAddress};Initial Catalog=nuget-int-0-v2gallery;User ID=$$Int-GalleryDBReadOnly-UserName$$;Password=$$Int-GalleryDBReadOnly-Password$$;Encrypt=True;TrustServerCertificate=False;Connection Timeout=30;"
+  },
+
+  "StatisticsDb": {
+    "ConnectionString": "Data Source=tcp:#{Deployment.Azure.Sql.StatisticsDatabaseAddress};Initial Catalog=nuget-int-statistics;User ID=$$Int-StatisticsDBReadOnly-UserName$$;Password=$$Int-StatisticsDBReadOnly-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/Search.GenerateAuxiliaryData/Settings/prod-southeastasia.json b/src/Search.GenerateAuxiliaryData/Settings/prod-southeastasia.json
@@ -0,0 +1,22 @@
+{
+  "Initialization": {
+    "AzureCdnCloudStorageAccount": "DefaultEndpointsProtocol=https;AccountName=nugetgallery;AccountKey=$$Prod-NuGetGalleryStorage-Key$$",
+    "AzureCdnCloudStorageContainerName": "nuget-cdnstats",
+    "PrimaryDestination": "DefaultEndpointsProtocol=https;AccountName=nugetprodsea;AccountKey=$$Prod-NuGetProdSeaStorage-Key$$"
+  },
+
+  "GalleryDb": {
+    "ConnectionString": "Data Source=tcp:#{Deployment.Azure.Sql.GalleryDatabaseAddress};Initial Catalog=NuGetGallery;User ID=$$Prod-GalleryDBReadOnly-UserName$$;Password=$$Prod-GalleryDBReadOnly-Password$$;Encrypt=True;TrustServerCertificate=False;Connection Timeout=30;"
+  },
+
+  "StatisticsDb": {
+    "ConnectionString": "Data Source=tcp:#{Deployment.Azure.Sql.StatisticsDatabaseAddress};Initial Catalog=nuget-prod-statistics;User ID=$$Prod-StatisticsDBReadOnly-UserName$$;Password=$$Prod-StatisticsDBReadOnly-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/Search.GenerateAuxiliaryData/Settings/prod-ussc.json b/src/Search.GenerateAuxiliaryData/Settings/prod-ussc.json
@@ -0,0 +1,22 @@
+{
+  "Initialization": {
+    "AzureCdnCloudStorageAccount": "DefaultEndpointsProtocol=https;AccountName=nugetgallery;AccountKey=$$Prod-NuGetGalleryStorage-Key$$",
+    "AzureCdnCloudStorageContainerName": "nuget-cdnstats",
+    "PrimaryDestination": "DefaultEndpointsProtocol=https;AccountName=nugetprodussc;AccountKey=$$Prod-NuGetProdUsscStorage-Key$$"
+  },
+
+  "GalleryDb": {
+    "ConnectionString": "Data Source=tcp:#{Deployment.Azure.Sql.GalleryDatabaseAddress};Initial Catalog=NuGetGallery;User ID=$$Prod-GalleryDBReadOnly-UserName$$;Password=$$Prod-GalleryDBReadOnly-Password$$;Encrypt=True;TrustServerCertificate=False;Connection Timeout=30;"
+  },
+
+  "StatisticsDb": {
+    "ConnectionString": "Data Source=tcp:#{Deployment.Azure.Sql.StatisticsDatabaseAddress};Initial Catalog=nuget-prod-statistics;User ID=$$Prod-StatisticsDBReadOnly-UserName$$;Password=$$Prod-StatisticsDBReadOnly-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/Validation.Common.Job/Storage/IValidatorStateService.cs b/src/Validation.Common.Job/Storage/IValidatorStateService.cs
@@ -31,17 +31,9 @@ public interface IValidatorStateService
         /// a different validation request.
         /// </summary>
         /// <param name="request">The package validation request.</param>
+        /// <param name="validatingType">The <see cref="ValidatingType"/>.</param>
         /// <returns>Whether the <see cref="TValidator"/> has already validated this request's package in a different validation request.</returns>
-        Task<bool> IsRevalidationRequestAsync(IValidationRequest request);
-
-        /// <summary>
-        /// Check if the request intends to revalidate a package that has already been validated by <see cref="TValidator"/> by
-        /// a different validation request.
-        /// </summary>
-        /// <param name="packageKey">The package key for the validation request.</param>
-        /// <param name="validationId">The validation id for the validation request.</param>
-        /// <returns>Whether the <see cref="TValidator"/> has already validated this request's package in a different validation request.</returns>
-        Task<bool> IsRevalidationRequestAsync(int packageKey, Guid validationId);
+        Task<bool> IsRevalidationRequestAsync(IValidationRequest request, ValidatingType validatingType);
 
         /// <summary>
         /// Persist the status of a new validation request.
diff --git a/src/Validation.Common.Job/Storage/ValidatorStateService.cs b/src/Validation.Common.Job/Storage/ValidatorStateService.cs
@@ -68,17 +68,18 @@ public Task<ValidatorStatus> GetStatusAsync(Guid validationId)
                 .FirstOrDefaultAsync();
         }
 
-        public Task<bool> IsRevalidationRequestAsync(IValidationRequest request)
+        public Task<bool> IsRevalidationRequestAsync(IValidationRequest request, ValidatingType validatingType)
         {
-            return IsRevalidationRequestAsync(request.PackageKey, request.ValidationId);
+            return IsRevalidationRequestAsync(request.PackageKey, request.ValidationId, validatingType);
         }
 
-        public Task<bool> IsRevalidationRequestAsync(int packageKey, Guid validationId)
+        private Task<bool> IsRevalidationRequestAsync(int packageKey, Guid validationId, ValidatingType validatingType)
         {
             return _validationContext
                 .ValidatorStatuses
                 .Where(s => s.PackageKey == packageKey)
                 .Where(s => s.ValidatorName == _validatorName)
+                .Where(s => s.ValidatingType == validatingType)
                 .Where(s => s.ValidationId != validationId)
                 .AnyAsync();
         }
diff --git a/tests/NuGet.Services.Validation.Orchestrator.Tests/NuGet.Services.Validation.Orchestrator.Tests.csproj b/tests/NuGet.Services.Validation.Orchestrator.Tests/NuGet.Services.Validation.Orchestrator.Tests.csproj
@@ -55,6 +55,7 @@
     <Compile Include="PackageSigning\ProcessSignature\PackageSignatureProcessorFacts.cs" />
     <Compile Include="PackageStatusProcessorFacts.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Symbol\SymbolPackageValidatingEntityFacts.cs" />
     <Compile Include="Symbol\SymbolMessageEnqueuerFacts.cs" />
     <Compile Include="Symbol\SymbolEntityServiceFacts.cs" />
     <Compile Include="Symbol\SymbolScanValidatorFacts.cs" />
diff --git a/tests/NuGet.Services.Validation.Orchestrator.Tests/PackageValidatingEntityFacts.cs b/tests/NuGet.Services.Validation.Orchestrator.Tests/PackageValidatingEntityFacts.cs
@@ -28,6 +28,7 @@ public void PropertiesValidation()
             Assert.Equal(PackageKey, validatingEntity.Key);
             Assert.Equal(PackageId, validatingEntity.EntityRecord.PackageRegistration.Id);
             Assert.Equal(PackageNormalizedVersion, validatingEntity.EntityRecord.NormalizedVersion);
+            Assert.Equal(ValidatingType.Package, validatingEntity.ValidatingType);
         }
 
         private static Package CreatePackage()
diff --git a/tests/NuGet.Services.Validation.Orchestrator.Tests/Symbol/SymbolPackageValidatingEntityFacts.cs b/tests/NuGet.Services.Validation.Orchestrator.Tests/Symbol/SymbolPackageValidatingEntityFacts.cs
@@ -0,0 +1,57 @@
+﻿// 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.
+
+using System;
+using NuGetGallery;
+using NuGet.Services.Validation.Orchestrator;
+using Xunit;
+
+namespace NuGet.Services.Validation
+{
+    public class SymbolPackageValidatingEntityFacts
+    {
+        private const int PackageKey = 1001;
+        private const int SymbolPackageKey = 1002;
+        private const string PackageId = "NuGet.Versioning";
+        private const string PackageNormalizedVersion = "1.0.0";
+        private static DateTime PackageCreated = new DateTime(2018, 4, 4, 4, 4, 4);
+        private static DateTime SymbolPackageCreated = new DateTime(2018, 5, 4, 4, 4, 4);
+
+        [Fact]
+        public void PropertiesValidation()
+        {
+            // Arrange
+            var symbolPackage = CreateSymbolPackage();
+
+            // Act & Assert
+            var validatingEntity = new SymbolPackageValidatingEntity(symbolPackage);
+
+            Assert.Equal(SymbolPackageCreated, validatingEntity.Created);
+            Assert.Equal(SymbolPackageKey, validatingEntity.Key);
+            Assert.Equal(ValidatingType.SymbolPackage, validatingEntity.ValidatingType);
+            Assert.Equal(PackageStatus.Available, validatingEntity.Status);
+        }
+
+        private static SymbolPackage CreateSymbolPackage()
+        {
+            var package =  new Package()
+            {
+                NormalizedVersion = PackageNormalizedVersion,
+                PackageRegistration = new PackageRegistration()
+                {
+                    Id = PackageId
+                },
+                Key = PackageKey,
+                Created = PackageCreated
+            };
+
+            return new SymbolPackage()
+            {
+                Created = SymbolPackageCreated,
+                Key = SymbolPackageKey,
+                StatusKey = PackageStatus.Available
+            };
+
+        }
+    }
+}
diff --git a/tests/NuGet.Services.Validation.Orchestrator.Tests/ValidatorStateServiceFacts.cs b/tests/NuGet.Services.Validation.Orchestrator.Tests/ValidatorStateServiceFacts.cs
diff --git a/tests/Validation.PackageSigning.ValidateCertificate.Tests/CertificateVerificationResultFacts.cs b/tests/Validation.PackageSigning.ValidateCertificate.Tests/CertificateVerificationResultFacts.cs

Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,7 @@ private async Task<ValidatorStatus> StartInternalAsync(IValidationRequest reques`
`186`	`186`
`187`	`187`	`// If any of the author signature's certificates are known to be revoked, invalidate any the signatures.`
`188`	`188`	`// A revoked certificate is assumed to remain revoked forever.`
`189`		`- var isRevalidationRequest = await _validatorStateService.IsRevalidationRequestAsync(request);`
	`189`	`+ var isRevalidationRequest = await _validatorStateService.IsRevalidationRequestAsync(request, ValidatingType.Package);`
`190`	`190`
`191`	`191`	`if (ShouldInvalidateSignature(signature, isRevalidationRequest))`
`192`	`192`	`{`
Original file line number	Diff line number	Diff line change
`@@ -28,5 +28,10 @@ public interface IValidatingEntity<T> where T : class, IEntity`
`28`	`28`	`/// The time when the entity was created in Gallery.`
`29`	`29`	`/// </summary>`
`30`	`30`	`DateTime Created { get; }`
	`31`	`+`
	`32`	`+ /// <summary>`
	`33`	`+ /// The ValidatingType.`
	`34`	`+ /// </summary>`
	`35`	`+ ValidatingType ValidatingType { get; }`
`31`	`36`	`}`
`32`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,5 +20,7 @@ public PackageValidatingEntity(Package entity)`
`20`	`20`	`public PackageStatus Status => EntityRecord.PackageStatusKey;`
`21`	`21`
`22`	`22`	`public DateTime Created => EntityRecord.Created;`
	`23`	`+`
	`24`	`+ public ValidatingType ValidatingType => ValidatingType.Package;`
`23`	`25`	`}`
`24`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,5 +20,7 @@ public SymbolPackageValidatingEntity(SymbolPackage entity)`
`20`	`20`	`public PackageStatus Status => EntityRecord.StatusKey;`
`21`	`21`
`22`	`22`	`public DateTime Created => EntityRecord.Created;`
	`23`	`+`
	`24`	`+ public ValidatingType ValidatingType => ValidatingType.SymbolPackage;`
`23`	`25`	`}`
`24`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -211,14 +211,15 @@ public async Task<bool> OtherRecentValidationSetForPackageExists<T>(`
`211`	`211`	`.PackageValidationSets`
`212`	`212`	`.AnyAsync(pvs => pvs.PackageKey == validatingEntity.Key`
`213`	`213`	`&& pvs.Created > cutoffTimestamp`
`214`		`- && pvs.ValidationTrackingId != currentValidationSetTrackingId);`
	`214`	`+ && pvs.ValidationTrackingId != currentValidationSetTrackingId`
	`215`	`+ && pvs.ValidatingType == validatingEntity.ValidatingType);`
`215`	`216`	`}`
`216`	`217`
`217`	`218`	`public async Task<int> GetValidationSetCountAsync<T>(IValidatingEntity<T> validatingEntity) where T : class, IEntity`
`218`	`219`	`{`
`219`	`220`	`return await _validationContext`
`220`	`221`	`.PackageValidationSets`
`221`		`- .CountAsync(x => x.PackageKey == validatingEntity.Key);`
	`222`	`+ .CountAsync(x => x.PackageKey == validatingEntity.Key && x.ValidatingType == validatingEntity.ValidatingType);`
`222`	`223`	`}`
`223`	`224`
`224`	`225`	`private void AddValidationIssues(PackageValidation packageValidation, IReadOnlyList<IValidationIssue> validationIssues)`