Update MontioredArtifact to not take an optional parameter. Change ScannerModule to use local date. Add unit test for created date delay

Author: samsnyk

core/src/main/java/io/snyk/plugins/artifactory/model/MonitoredArtifact.java

@@ -22,13 +22,13 @@ public class MonitoredArtifact {
 
   private final Ignores ignores;
 
-  private final Optional<Instant> createdDate;
+  private final Instant createdDate;
 
   public MonitoredArtifact(String path, TestResult testResult, Ignores ignores) {
-    this(path, testResult, ignores, Optional.empty());
+    this(path, testResult, ignores, null);
   }
 
-  public MonitoredArtifact(String path, TestResult testResult, Ignores ignores, Optional<Instant> createdDate) {
+  public MonitoredArtifact(String path, TestResult testResult, Ignores ignores, Instant createdDate) {
     this.path = path;
     this.testResult = testResult;
     this.ignores = ignores;
@@ -48,7 +48,7 @@ public Ignores getIgnores() {
   }
 
   public Optional<Instant> getCreatedDate() {
-    return createdDate;
+   return Optional.ofNullable(createdDate);
   }
 
   public MonitoredArtifact write(ArtifactProperties properties) {

core/src/main/java/io/snyk/plugins/artifactory/model/ValidationSettings.java

@@ -13,13 +13,13 @@ public class ValidationSettings {
 
   private final Optional<Severity> vulnSeverityThreshold;
   private final Optional<Severity> licenseSeverityThreshold;
-  private final int createdDelayDays;
+  private final Optional<int> createdDelayDays;
 
   public ValidationSettings() {
-    this(Optional.of(Severity.HIGH), Optional.of(Severity.HIGH), 0);
+    this(Optional.of(Severity.HIGH), Optional.of(Severity.HIGH), Optional.of(0));
   }
 
-  private ValidationSettings(Optional<Severity> vulnSeverityThreshold, Optional<Severity> licenseSeverityThreshold, int createdDelayDays) {
+  private ValidationSettings(Optional<Severity> vulnSeverityThreshold, Optional<Severity> licenseSeverityThreshold, Optional<int> createdDelayDays) {
     this.vulnSeverityThreshold = vulnSeverityThreshold;
     this.licenseSeverityThreshold = licenseSeverityThreshold;
     this.createdDelayDays = createdDelayDays;
@@ -33,7 +33,7 @@ public ValidationSettings withLicenseSeverityThreshold(Optional<Severity> thresh
     return new ValidationSettings(vulnSeverityThreshold, threshold, createdDelayDays);
   }
 
-  public ValidationSettings withCreatedDelayDays(int days) {
+  public ValidationSettings withCreatedDelayDays(Optional<int> days) {
     return new ValidationSettings(vulnSeverityThreshold, licenseSeverityThreshold, days);
   }
 
@@ -45,7 +45,7 @@ public Optional<Severity> getLicenseSeverityThreshold() {
     return licenseSeverityThreshold;
   }
 
-  public int getCreatedDelayDays() {
+  public Optional<int> getCreatedDelayDays() {
     return createdDelayDays;
   }
 

core/src/main/java/io/snyk/plugins/artifactory/scanner/ScannerModule.java

@@ -21,7 +21,7 @@
 import javax.annotation.Nonnull;
 import java.time.Duration;
 import java.time.Instant;
-import java.util.Date;
+import java.util.LocalDate;
 import java.util.Optional;
 
 import static java.util.Objects.requireNonNull;
@@ -105,13 +105,13 @@ private Optional<Instant> getCreatedDate(RepoPath repoPath) {
     try {
       ItemInfo itemInfo = repositories.getItemInfo(repoPath);
       if (itemInfo != null) {
-        Date created = new Date(itemInfo.getCreated());
+        LocalDate created = Instant.ofEpochMilli(createdDate).atZone(ZoneId.systemDefault()).toLocalDate();
         if (created != null) {
-          return Optional.of(created.toInstant());
+          return Optional.of(created.atStartOfDay(ZoneId.systemDefault()).toInstant(););
         }
       }
     } catch (Exception e) {
-      LOG.debug("Could not retrieve created date for {}: {}", repoPath, e.getMessage());
+      LOG.debug("Could not retrieve created date for {}: {}", repoPath, e);
     }
     return Optional.empty();
   }

core/src/test/java/io/snyk/plugins/artifactory/scanner/PackageValidatorTest.java

@@ -6,6 +6,7 @@
 import org.junit.jupiter.api.Test;
 
 import java.net.URI;
+import java.time.Instant;
 import java.util.Optional;
 import java.util.stream.Stream;
 
@@ -141,4 +142,29 @@ void validate_includesSnykDetailsUrlInCancelException() {
       .isExactlyInstanceOf(CancelException.class)
       .hasMessageContaining("https://snyk.io/package/details");
   }
+
+  @Test
+  void validate_includesCreatedDateDelay() {
+    int createdDelayDays = 14
+    ValidationSettings settings = new ValidationSettings()
+    .withCreatedDelayDays(createdDelayDays)
+    .withVulnSeverityThreshold(Optional.empty())
+    .withLicenseSeverityThreshold(Optional.empty());
+
+    PackageValidator validator = new PackageValidator(settings);
+    
+    MonitoredArtifact artifact = new MonitoredArtifact("",
+      new TestResult(
+        IssueSummary.from(Stream.of(Severity.LOW)),
+        IssueSummary.from(Stream.empty()),
+        URI.create("https://snyk.io/package/details")
+      ),
+      new Ignores()
+      Instant.now()
+    );
+
+    assertThatThrownBy(() -> validator.validate(artifact))
+    .isExactlyInstanceOf(CancelException.class)
+    .hasMessageContaining(format("Artifact was created 0 days ago, which is less than the configured delay of %d days", createdDelayDays))
+  }
 }