Merge pull request #11 from OpsMx/Bugix/OP-21224,OP-19325-Jenkins_Web…

…hook_triggers Bugix/OP-21224,OP-19325: jenkins webhook triggers
OpsMx · Aug 7, 2024 · 3838b46 · 3838b46
2 parents 1f43f05 + 754d64b
commit 3838b46
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 16 deletions.
diff --git a/...va/com/netflix/spinnaker/echo/pipelinetriggers/eventhandlers/BaseTriggerEventHandler.java b/...va/com/netflix/spinnaker/echo/pipelinetriggers/eventhandlers/BaseTriggerEventHandler.java
@@ -69,14 +69,14 @@ public List<Pipeline> getMatchingPipelines(T event, PipelineCache pipelineCache)
     log.debug("Start of the get matching Pipelines - BaseTriggerEventHandler");
     boolean unstableTriggerEvent = isUnstableTriggerEvent(event);
     boolean successfulTriggerEvent = isSuccessfulTriggerEvent(event);
-    if (!unstableTriggerEvent || !successfulTriggerEvent) {
+    if (!unstableTriggerEvent && !successfulTriggerEvent) {
       return Collections.emptyList();
     }
 
     Map<String, List<Trigger>> triggers = pipelineCache.getEnabledTriggersSync();
-
     List<Pipeline> pipelines = new ArrayList<>();
     if (successfulTriggerEvent) {
+      log.debug("successfulTriggerEvent - BaseTriggerEventHandler");
       pipelines =
           supportedTriggerTypes().stream()
               .flatMap(
@@ -92,9 +92,8 @@ public List<Pipeline> getMatchingPipelines(T event, PipelineCache pipelineCache)
               .map(Optional::get)
               .distinct()
               .collect(Collectors.toList());
-    }
-
-    if (unstableTriggerEvent) {
+    } else if (unstableTriggerEvent) {
+      log.debug("unstableTriggerEvent - BaseTriggerEventHandler");
       pipelines =
           (Optional.ofNullable(triggers.get(JENKINS_TRIGGER_TYPE))
                   .orElse(Collections.emptyList())
@@ -108,6 +107,7 @@ public List<Pipeline> getMatchingPipelines(T event, PipelineCache pipelineCache)
               .distinct()
               .collect(Collectors.toList());
     }
+    log.debug("pipelinesData" + pipelines);
     log.debug("End of the get matching Pipelines - BaseTriggerEventHandler");
     return pipelines;
   }

diff --git a/...in/java/com/netflix/spinnaker/echo/pipelinetriggers/eventhandlers/ManualEventHandler.java b/...in/java/com/netflix/spinnaker/echo/pipelinetriggers/eventhandlers/ManualEventHandler.java
@@ -108,19 +108,12 @@ public List<Pipeline> getMatchingPipelines(ManualEvent event, PipelineCache pipe
     log.debug("Start of the get matching Pipelines - ManualTriggerEventHandler");
     boolean unstableTriggerEvent = isUnstableTriggerEvent(event);
     boolean successfulTriggerEvent = isSuccessfulTriggerEvent(event);
-    if (!unstableTriggerEvent || !successfulTriggerEvent) {
+    if (!unstableTriggerEvent && !successfulTriggerEvent) {
       return Collections.emptyList();
     }
     List<Pipeline> pipelines = new ArrayList<>();
-    if (successfulTriggerEvent) {
-      pipelines =
-          pipelineCache.getPipelinesSync().stream()
-              .map(p -> withMatchingTrigger(event, p))
-              .filter(Optional::isPresent)
-              .map(Optional::get)
-              .collect(Collectors.toList());
-    }
-    if (unstableTriggerEvent && isJenkinsBuildTriggerAndUnstableBuild(event)) {
+    if (successfulTriggerEvent
+        || (unstableTriggerEvent && isJenkinsBuildTriggerAndUnstableBuild(event))) {
       pipelines =
           pipelineCache.getPipelinesSync().stream()
               .map(p -> withMatchingTrigger(event, p))

diff --git a/...n/java/com/netflix/spinnaker/echo/pipelinetriggers/eventhandlers/TriggerEventHandler.java b/...n/java/com/netflix/spinnaker/echo/pipelinetriggers/eventhandlers/TriggerEventHandler.java
@@ -73,6 +73,6 @@ default boolean isSuccessfulTriggerEvent(T event) {
   }
 
   default boolean isUnstableTriggerEvent(T event) {
-    return true;
+    return false;
   }
 }