feat(plugins): Add pluginEventType to PluginEvent (#972)

spinnaker · Jul 9, 2020 · 4297d02 · 4297d02
1 parent d49ab9e
commit 4297d02
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 13 deletions.
diff --git a/echo-model/src/main/java/com/netflix/spinnaker/echo/model/Trigger.java b/echo-model/src/main/java/com/netflix/spinnaker/echo/model/Trigger.java
@@ -160,6 +160,7 @@ public String toString() {
   List<String> expectedArtifactIds;
 
   // Configuration for plugin triggers
+  String pluginEventType;
   String pluginId;
   String description;
   String provider;

diff --git a/...in/java/com/netflix/spinnaker/echo/pipelinetriggers/eventhandlers/PluginEventHandler.java b/...in/java/com/netflix/spinnaker/echo/pipelinetriggers/eventhandlers/PluginEventHandler.java
@@ -24,6 +24,7 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Optional;
 import java.util.function.Function;
 import java.util.function.Predicate;
 import org.springframework.stereotype.Component;
@@ -49,19 +50,26 @@ protected Predicate<Trigger> matchTriggerFor(PluginEvent event) {
 
   @Override
   protected Function<Trigger, Trigger> buildTrigger(PluginEvent event) {
-    return trigger ->
-        trigger
-            .toBuilder()
-            .pluginId(event.getContent().getPluginId())
-            .description(event.getContent().getDescription())
-            .provider(event.getContent().getProvider())
-            .version(event.getContent().getVersion())
-            .releaseDate(event.getContent().getReleaseDate())
-            .requires(event.getContent().getRequires())
-            .parsedRequires(event.getContent().getParsedRequires())
-            .binaryUrl(event.getContent().getBinaryUrl())
-            .sha512sum(event.getContent().getSha512sum())
-            .build();
+    return trigger -> {
+      String pluginEventType =
+          Optional.ofNullable(event.getDetails().getAttributes())
+              .map(attributes -> attributes.get("pluginEventType"))
+              .orElse("PUBLISHED");
+
+      return trigger
+          .toBuilder()
+          .pluginEventType(pluginEventType)
+          .pluginId(event.getContent().getPluginId())
+          .description(event.getContent().getDescription())
+          .provider(event.getContent().getProvider())
+          .version(event.getContent().getVersion())
+          .releaseDate(event.getContent().getReleaseDate())
+          .requires(event.getContent().getRequires())
+          .parsedRequires(event.getContent().getParsedRequires())
+          .binaryUrl(event.getContent().getBinaryUrl())
+          .sha512sum(event.getContent().getSha512sum())
+          .build();
+    };
   }
 
   @Override