feat(runtime): fail without retries on ConnectorInputException (#3844)

* feat(runtime): fail without retries on ConncectorInputException * skip retry for all ConnectorInputExceptions
camunda · Jan 15, 2025 · 348b88d · 348b88d
1 parent dfd774f
commit 348b88d
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 5 deletions.
diff --git a/...me-core/src/main/java/io/camunda/connector/runtime/core/outbound/ConnectorJobHandler.java b/...me-core/src/main/java/io/camunda/connector/runtime/core/outbound/ConnectorJobHandler.java
@@ -25,6 +25,7 @@
 import io.camunda.client.api.worker.JobClient;
 import io.camunda.client.api.worker.JobHandler;
 import io.camunda.connector.api.error.ConnectorException;
+import io.camunda.connector.api.error.ConnectorInputException;
 import io.camunda.connector.api.error.ConnectorRetryException;
 import io.camunda.connector.api.outbound.OutboundConnectorFunction;
 import io.camunda.connector.api.secret.SecretProvider;
@@ -211,11 +212,18 @@ public void handle(final JobClient client, final ActivatedJob job) {
     } catch (Exception ex) {
       LOGGER.debug(
           "Exception while processing job: {} for tenant: {}", job.getKey(), job.getTenantId(), ex);
+
       String errorCode = null;
+      int retries = job.getRetries() - 1;
+
       if (ex instanceof ConnectorException connectorException) {
         errorCode = connectorException.getErrorCode();
       }
-      result = handleSDKException(job, ex, job.getRetries() - 1, errorCode, retryBackoff);
+      if (ex instanceof ConnectorInputException
+          || ex.getCause() instanceof ConnectorInputException) {
+        retries = 0;
+      }
+      result = handleSDKException(job, ex, retries, errorCode, retryBackoff);
     }
 
     try {

diff --git a/...ore/src/test/java/io/camunda/connector/runtime/core/outbound/ConnectorJobHandlerTest.java b/...ore/src/test/java/io/camunda/connector/runtime/core/outbound/ConnectorJobHandlerTest.java
@@ -37,6 +37,7 @@
 import io.camunda.client.api.worker.JobClient;
 import io.camunda.connector.api.error.ConnectorException;
 import io.camunda.connector.api.error.ConnectorExceptionBuilder;
+import io.camunda.connector.api.error.ConnectorInputException;
 import io.camunda.connector.api.error.ConnectorRetryExceptionBuilder;
 import io.camunda.connector.api.outbound.OutboundConnectorFunction;
 import io.camunda.connector.runtime.core.ConnectorHelper;
@@ -46,13 +47,12 @@
 import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Stream;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.EmptySource;
-import org.junit.jupiter.params.provider.NullSource;
-import org.junit.jupiter.params.provider.ValueSource;
+import org.junit.jupiter.params.provider.*;
 import org.mockito.ArgumentCaptor;
 
 class ConnectorJobHandlerTest {
@@ -506,6 +506,34 @@ void shouldTruncateBpmnErrorMessage() {
       assertThat(result.getErrorMessage().length())
           .isLessThanOrEqualTo(ConnectorJobHandler.MAX_ERROR_MESSAGE_LENGTH);
     }
+
+    @ParameterizedTest
+    @MethodSource("provideInputExceptions")
+    void shouldNotRetry_OnConnectorInputException(Exception exception) {
+      // given
+      var jobHandler =
+          newConnectorJobHandler(
+              context -> {
+                throw exception;
+              });
+
+      // when
+      var result = JobBuilder.create().withRetries(3).executeAndCaptureResult(jobHandler, false);
+
+      // then
+      assertThat(result.getErrorMessage()).isEqualTo("expected Connector Input Exception");
+      assertThat(result.getRetries()).isEqualTo(0);
+    }
+
+    private static Stream<RuntimeException> provideInputExceptions() {
+      return Stream.of(
+          new ConnectorExceptionBuilder()
+              .message("expected Connector Input Exception")
+              .cause(new ConnectorInputException(new Exception()))
+              .build(),
+          new ConnectorInputException(
+              "expected Connector Input Exception", new RuntimeException("cause")));
+    }
   }
 
   @Nested
@@ -934,7 +962,7 @@ void shouldCreateBpmnError_UsingExceptionCodeAsFirstCondition() {
     }
 
     @Test
-    void shouldCreateJobErrpr_UsingExceptionCodeAsSecondConditionAfterResponseProperty()
+    void shouldCreateJobError_UsingExceptionCodeAsSecondConditionAfterResponseProperty()
         throws JsonProcessingException {
       // given
       var errorExpression =