fix(plugins): Only trigger off new releases (#743)

spinnaker · May 12, 2020 · bdb77d0 · bdb77d0
1 parent 11561ec
commit bdb77d0
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 18 deletions.
diff --git a/...monitor-plugins/src/main/java/com/netflix/spinnaker/igor/plugins/PluginsBuildMonitor.java b/...monitor-plugins/src/main/java/com/netflix/spinnaker/igor/plugins/PluginsBuildMonitor.java
@@ -77,7 +77,7 @@ protected void commitDelta(PluginPollingDelta delta, boolean sendEvents) {
         });
 
     delta.items.stream()
-        .map(it -> Instant.parse(it.pluginRelease.getTimestamp()))
+        .map(it -> Instant.parse(it.pluginRelease.getReleaseDate()))
         .max(Comparator.naturalOrder())
         .ifPresent(cache::setLastPollCycleTimestamp);
   }

diff --git a/...lugins/src/main/java/com/netflix/spinnaker/igor/plugins/front50/PluginReleaseService.java b/...lugins/src/main/java/com/netflix/spinnaker/igor/plugins/front50/PluginReleaseService.java
@@ -21,7 +21,6 @@
 import java.time.Instant;
 import java.time.format.DateTimeParseException;
 import java.util.List;
-import java.util.Optional;
 import java.util.stream.Collectors;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -45,12 +44,12 @@ public List<PluginRelease> getPluginReleasesSince(Instant timestamp) {
         .filter(
             r -> {
               try {
-                return Instant.parse(r.getTimestamp()).isAfter(timestamp);
+                return Instant.parse(r.getReleaseDate()).isAfter(timestamp);
               } catch (DateTimeParseException e) {
                 log.error(
                     "Failed parsing plugin timestamp for '{}': '{}', cannot index plugin",
                     r.getPluginId(),
-                    getTimestamp(r));
+                    r.getReleaseDate());
                 return false;
               }
             })
@@ -76,8 +75,4 @@ private List<PluginRelease> getPluginReleases() {
                                         release.lastModified)))
                 .collect(Collectors.toList()));
   }
-
-  private String getTimestamp(PluginRelease release) {
-    return Optional.ofNullable(release.getLastModified()).orElse(release.getReleaseDate());
-  }
 }
diff --git a/...monitor-plugins/src/main/java/com/netflix/spinnaker/igor/plugins/model/PluginRelease.java b/...monitor-plugins/src/main/java/com/netflix/spinnaker/igor/plugins/model/PluginRelease.java
@@ -16,9 +16,7 @@
  */
 package com.netflix.spinnaker.igor.plugins.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import java.util.List;
-import java.util.Optional;
 
 public class PluginRelease {
   private final String pluginId;
@@ -74,11 +72,6 @@ public String getLastModified() {
     return lastModified;
   }
 
-  @JsonIgnore
-  public String getTimestamp() {
-    return Optional.ofNullable(lastModified).orElse(releaseDate);
-  }
-
   public static class ServiceRequirement {
     private final String service;
     private final String operator;

diff --git a/...rc/test/groovy/com/netflix/spinnaker/igor/plugins/front50/PluginReleaseServiceSpec.groovy b/...rc/test/groovy/com/netflix/spinnaker/igor/plugins/front50/PluginReleaseServiceSpec.groovy
@@ -59,14 +59,14 @@ class PluginReleaseServiceSpec extends Specification {
     clock.instant().plus(2, ChronoUnit.DAYS)   || []
   }
 
-  private PluginInfo.Release release(String version, Instant lastModified) {
+  private PluginInfo.Release release(String version, Instant releaseDate) {
     return new PluginInfo.Release(
       version,
-      clock.instant().toString(),
+      releaseDate.toString(),
       "orca>=0.0.0",
       "http://example.com/file.zip",
       true,
-      lastModified.toString(),
+      clock.instant().toString(),
     )
   }
 }