Add logic to populate last modified date after resolving artifact

Author: samsnyk

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

@@ -22,7 +22,7 @@ public class MonitoredArtifact {
 
   private final Ignores ignores;
 
-  private final Instant lastModifiedDate;
+  private Instant lastModifiedDate;
 
   public MonitoredArtifact(String path, TestResult testResult, Ignores ignores) {
     this(path, testResult, ignores, null);
@@ -51,6 +51,10 @@ public Optional<Instant> getLastModifiedDate() {
    return Optional.ofNullable(lastModifiedDate);
   }
 
+  public void setLastModifiedDate(Instant lastModifiedDate) {
+   this.lastModifiedDate = lastModifiedDate;
+  }
+
   public MonitoredArtifact write(ArtifactProperties properties) {
     testResult.write(properties);
 

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

@@ -33,13 +33,13 @@ public void validate(MonitoredArtifact artifact) {
   private void validateLastModifiedDelay(MonitoredArtifact artifact) {
     Integer delayDays = settings.getLastModifiedDelayDays().get();
     if (delayDays == null || delayDays <= 0) {
-      LOG.debug("Created delay is disabled ({} days)", delayDays);
+      LOG.debug("Last modifed date delay is disabled ({} days)", delayDays);
       return;
     }
 
     Optional<Instant> lastModifiedDate = artifact.getLastModifiedDate();
     if (lastModifiedDate.isEmpty()) {
-      LOG.debug("Created date not available for {}, skipping created delay check", artifact.getPath());
+      LOG.debug("Last modified date not available for {}, skipping created delay check", artifact.getPath());
       return;
     }
 

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

@@ -70,7 +70,10 @@ public void filterAccess(@Nonnull RepoPath repoPath) {
   }
 
   private Optional<MonitoredArtifact> resolveArtifact(RepoPath repoPath) {
-    return artifactResolver.get(properties(repoPath), () -> runTest(repoPath));
+      Optional<MonitoredArtifact> monitoredArtifact = artifactResolver.get(properties(repoPath), () -> runTest(repoPath));
+    Instant lastModifiedDate = getLastModifiedDate(repoPath);
+    monitoredArtifact.ifPresent(artifact -> artifact.setLastModifiedDate(lastModifiedDate));
+    return monitoredArtifact;
   }
 
   private ArtifactProperties properties(RepoPath repoPath) {
@@ -98,8 +101,6 @@ private void filter(MonitoredArtifact artifact) {
   private @NotNull MonitoredArtifact toMonitoredArtifact(TestResult testResult, @NotNull RepoPath repoPath) {
     Ignores ignores = Ignores.read(new RepositoryArtifactProperties(repoPath, repositories));
     Instant lastModifiedDate = getLastModifiedDate(repoPath);
-
-    LOG.debug("Retrieved last modified date of {} for {}", lastModifiedDate, repoPath);
 
     // Only apply lastModifiedDate to packages from remote repositories.
     if(lastModifiedDateRemoteOnly()) {
@@ -117,7 +118,7 @@ private Instant getLastModifiedDate(RepoPath repoPath) {
       ItemInfo itemInfo = repositories.getItemInfo(repoPath);
       if (itemInfo != null) {
         Instant lastModified = Instant.ofEpochMilli(itemInfo.getLastModified());
-        LOG.debug("Retrieved last modifed date of {}", lastModified.toString());
+        LOG.debug("Retrieved last modified date of {} for {}", lastModified, repoPath);
         return lastModified;
       } else {
         LOG.debug("Unable to retrieve ItemInfo for {}, could not retrieve last modified date", repoPath);