Unwrap Failsafe target exception

Signed-off-by: Paolo Di Tommaso <paolo.ditommaso@gmail.com>
seqeralabs · Dec 1, 2024 · 6fb214a · 6fb214a
1 parent 2fd351d
commit 6fb214a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/main/groovy/io/seqera/wave/util/Retryable.groovy b/src/main/groovy/io/seqera/wave/util/Retryable.groovy
@@ -24,6 +24,7 @@ import java.util.function.Consumer
 import java.util.function.Predicate
 
 import dev.failsafe.Failsafe
+import dev.failsafe.FailsafeException
 import dev.failsafe.RetryPolicy
 import dev.failsafe.RetryPolicyBuilder
 import dev.failsafe.event.EventListener
@@ -137,7 +138,11 @@ class Retryable<R> {
 
     R apply(CheckedSupplier<R> action) {
         final policy = retryPolicy()
-        return Failsafe.with(policy).get(action)
+        try {
+            return Failsafe.with(policy).get(action)
+        } catch (FailsafeException e) {
+            throw e.cause
+        }
     }
 
     static <T> Retryable<T> of(Config config) {

diff --git a/src/test/groovy/io/seqera/wave/util/RetryableTest.groovy b/src/test/groovy/io/seqera/wave/util/RetryableTest.groovy
@@ -22,9 +22,7 @@ import spock.lang.Specification
 
 import java.time.Duration
 
-import dev.failsafe.FailsafeException
 import groovy.util.logging.Slf4j
-
 /**
  *
  * @author Paolo Di Tommaso <paolo.ditommaso@gmail.com>
@@ -65,8 +63,8 @@ class RetryableTest extends Specification {
         when:
         retryable.apply(()-> {throw new IOException("Oops failed!")})
         then:
-        def e = thrown(FailsafeException)
-        e.cause instanceof IOException
+        def e = thrown(IOException)
+        e.message == 'Oops failed!'
     }
 
     def 'should validate config' () {