Drop validation messages for soft deleted packages (#383)

Fix NuGet/Engineering#1285

Author: joelverhagen

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

@@ -99,6 +99,19 @@ public async Task<bool> HandleAsync(PackageValidationMessageData message)
                     }
                 }
 
+                // Immediately halt validation of a soft deleted package.
+                if (package.PackageStatusKey == PackageStatus.Deleted)
+                {
+                    _logger.LogWarning(
+                        "Package {PackageId} {PackageVersion} (package key {PackageKey}) is soft deleted. Dropping message for validation set {ValidationSetId}.",
+                        message.PackageId,
+                        message.PackageVersion,
+                        package.Key,
+                        message.ValidationTrackingId);
+
+                    return true;
+                }
+
                 var validationSet = await _validationSetProvider.TryGetOrCreateValidationSetAsync(message.ValidationTrackingId, package);
 
                 if (validationSet == null)

tests/NuGet.Services.Validation.Orchestrator.Tests/ValidationMessageHandlerFacts.cs

@@ -106,6 +106,26 @@ public async Task DropsMessageOnDuplicateValidationRequest()
                 .Verify(vsp => vsp.TryGetOrCreateValidationSetAsync(messageData.ValidationTrackingId, package), Times.Once());
         }
 
+        [Fact]
+        public async Task DropsMessageIfPackageIsSoftDeleted()
+        {
+            var messageData = new PackageValidationMessageData("packageId", "1.2.3", Guid.NewGuid());
+            var validationConfiguration = new ValidationConfiguration();
+            var package = new Package { PackageStatusKey = PackageStatus.Deleted };
+
+            CorePackageServiceMock
+                .Setup(ps => ps.FindPackageByIdAndVersionStrict(messageData.PackageId, messageData.PackageVersion))
+                .Returns(package);
+
+            var handler = CreateHandler();
+
+            var result = await handler.HandleAsync(messageData);
+
+            Assert.True(result);
+            CorePackageServiceMock
+                .Verify(ps => ps.FindPackageByIdAndVersionStrict(messageData.PackageId, messageData.PackageVersion), Times.Once);
+        }
+
         private class MessageWithCustomDeliveryCount : IBrokeredMessage
         {
             private readonly IBrokeredMessage _inner;