From 1c035276e0114c96f3290d077a68884c0da87ba3 Mon Sep 17 00:00:00 2001 From: Sudhakar Guvvalapall Date: Wed, 23 Aug 2023 20:17:53 +0530 Subject: [PATCH 1/2] OP-19325: Bugfix for Automated trigger Pipelines. (#7) --- .../pipelinetriggers/eventhandlers/BaseTriggerEventHandler.java | 2 +- .../echo/pipelinetriggers/eventhandlers/ManualEventHandler.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/echo-pipelinetriggers/src/main/java/com/netflix/spinnaker/echo/pipelinetriggers/eventhandlers/BaseTriggerEventHandler.java b/echo-pipelinetriggers/src/main/java/com/netflix/spinnaker/echo/pipelinetriggers/eventhandlers/BaseTriggerEventHandler.java index 3f3ce0830..0708ac404 100644 --- a/echo-pipelinetriggers/src/main/java/com/netflix/spinnaker/echo/pipelinetriggers/eventhandlers/BaseTriggerEventHandler.java +++ b/echo-pipelinetriggers/src/main/java/com/netflix/spinnaker/echo/pipelinetriggers/eventhandlers/BaseTriggerEventHandler.java @@ -69,7 +69,7 @@ public List 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(); } diff --git a/echo-pipelinetriggers/src/main/java/com/netflix/spinnaker/echo/pipelinetriggers/eventhandlers/ManualEventHandler.java b/echo-pipelinetriggers/src/main/java/com/netflix/spinnaker/echo/pipelinetriggers/eventhandlers/ManualEventHandler.java index 3c79957e5..462e570f2 100644 --- a/echo-pipelinetriggers/src/main/java/com/netflix/spinnaker/echo/pipelinetriggers/eventhandlers/ManualEventHandler.java +++ b/echo-pipelinetriggers/src/main/java/com/netflix/spinnaker/echo/pipelinetriggers/eventhandlers/ManualEventHandler.java @@ -108,7 +108,7 @@ public List 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 pipelines = new ArrayList<>(); From 754d64b457e3249240002375b51157a86bf138af Mon Sep 17 00:00:00 2001 From: Aman Agrawal <9412470@gmail.com> Date: Tue, 10 Oct 2023 13:33:12 +0530 Subject: [PATCH 2/2] Fixed Webhook Issue - OP-21224 (#22) --- .../eventhandlers/BaseTriggerEventHandler.java | 8 ++++---- .../eventhandlers/ManualEventHandler.java | 11 ++--------- .../eventhandlers/TriggerEventHandler.java | 2 +- 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/echo-pipelinetriggers/src/main/java/com/netflix/spinnaker/echo/pipelinetriggers/eventhandlers/BaseTriggerEventHandler.java b/echo-pipelinetriggers/src/main/java/com/netflix/spinnaker/echo/pipelinetriggers/eventhandlers/BaseTriggerEventHandler.java index 0708ac404..0d4505280 100644 --- a/echo-pipelinetriggers/src/main/java/com/netflix/spinnaker/echo/pipelinetriggers/eventhandlers/BaseTriggerEventHandler.java +++ b/echo-pipelinetriggers/src/main/java/com/netflix/spinnaker/echo/pipelinetriggers/eventhandlers/BaseTriggerEventHandler.java @@ -74,9 +74,9 @@ public List getMatchingPipelines(T event, PipelineCache pipelineCache) } Map> triggers = pipelineCache.getEnabledTriggersSync(); - List pipelines = new ArrayList<>(); if (successfulTriggerEvent) { + log.debug("successfulTriggerEvent - BaseTriggerEventHandler"); pipelines = supportedTriggerTypes().stream() .flatMap( @@ -92,9 +92,8 @@ public List 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 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/echo-pipelinetriggers/src/main/java/com/netflix/spinnaker/echo/pipelinetriggers/eventhandlers/ManualEventHandler.java b/echo-pipelinetriggers/src/main/java/com/netflix/spinnaker/echo/pipelinetriggers/eventhandlers/ManualEventHandler.java index 462e570f2..3ebdf3e7a 100644 --- a/echo-pipelinetriggers/src/main/java/com/netflix/spinnaker/echo/pipelinetriggers/eventhandlers/ManualEventHandler.java +++ b/echo-pipelinetriggers/src/main/java/com/netflix/spinnaker/echo/pipelinetriggers/eventhandlers/ManualEventHandler.java @@ -112,15 +112,8 @@ public List getMatchingPipelines(ManualEvent event, PipelineCache pipe return Collections.emptyList(); } List 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/echo-pipelinetriggers/src/main/java/com/netflix/spinnaker/echo/pipelinetriggers/eventhandlers/TriggerEventHandler.java b/echo-pipelinetriggers/src/main/java/com/netflix/spinnaker/echo/pipelinetriggers/eventhandlers/TriggerEventHandler.java index c425cf9f8..6279e6eb5 100644 --- a/echo-pipelinetriggers/src/main/java/com/netflix/spinnaker/echo/pipelinetriggers/eventhandlers/TriggerEventHandler.java +++ b/echo-pipelinetriggers/src/main/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; } }