Finalize tests

Author: maschnetwork

examples/src/main/java/com/amazonaws/lambda/durable/examples/CallbackExample.java

@@ -36,18 +36,23 @@ public String handleRequest(ApprovalRequest input, DurableContext context) {
         });
 
         // Step 2: Create callback for external approval
-        // Configure with 5min timeout
+        // Use timeout from input if provided, otherwise default to 5 minutes
+        var timeout = input.timeoutSeconds() != null 
+            ? Duration.ofSeconds(input.timeoutSeconds())
+            : Duration.ofMinutes(5);
+        
         var config = CallbackConfig.builder()
-                .timeout(Duration.ofMinutes(5))
+                .timeout(timeout)
                 .build();
 
         var callback = context.createCallback("approval", String.class, config);
 
         // Step 2.5: Log AWS CLI command to complete the callback
         context.step("log-callback-command", Void.class, () -> {
             var callbackId = callback.callbackId();
+            // The result must be base64-encoded JSON
             var command = String.format(
-                "aws lambda send-durable-execution-callback-success --callback-id %s --payload '{\"result\":\"approved\"}'",
+                "aws lambda send-durable-execution-callback-success --callback-id %s --result $(echo -n '\"approved\"' | base64)",
                 callbackId
             );
             context.getLogger().info("To complete this callback, run: {}", command);
@@ -67,4 +72,9 @@ public String handleRequest(ApprovalRequest input, DurableContext context) {
 }
 
 /** Input for the approval workflow. */
-record ApprovalRequest(String description, double amount) {}
+record ApprovalRequest(String description, double amount, Integer timeoutSeconds) {
+    // Convenience constructor for default timeout
+    public ApprovalRequest(String description, double amount) {
+        this(description, amount, null);
+    }
+}

examples/src/test/java/com/amazonaws/lambda/durable/examples/CloudBasedIntegrationTest.java

@@ -11,6 +11,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.EnabledIf;
 import software.amazon.awssdk.auth.credentials.DefaultCredentialsProvider;
+import software.amazon.awssdk.services.lambda.model.OperationStatus;
 import software.amazon.awssdk.services.sts.StsClient;
 
 @EnabledIf("isEnabled")
@@ -260,4 +261,66 @@ void testCallbackExample() throws Exception {
         assertNotNull(execution.getOperation("log-callback-command"));
         assertNotNull(execution.getOperation("process-approval"));
     }
+
+    @Test
+    void testCallbackExampleWithFailure() throws Exception {
+        var runner = CloudDurableTestRunner.create(
+                arn("callback-example"), ApprovalRequest.class, String.class);
+
+        // Start async execution
+        var execution = runner.startAsync(new ApprovalRequest("Purchase order", 5000.0));
+
+        // Wait for callback to appear
+        execution.pollUntil(exec -> exec.hasCallback("approval"));
+
+        // Get callback ID
+        var callbackId = execution.getCallbackId("approval");
+        assertNotNull(callbackId);
+
+        // Fail the callback using AWS SDK
+        var lambda = software.amazon.awssdk.services.lambda.LambdaClient.create();
+        lambda.sendDurableExecutionCallbackFailure(req -> req
+                .callbackId(callbackId)
+                .error(err -> err
+                        .errorType("ApprovalRejected")
+                        .errorMessage("Approval rejected by manager")));
+
+        // Wait for execution to complete
+        var result = execution.pollUntilComplete();
+        assertEquals(ExecutionStatus.FAILED, result.getStatus());
+
+        // Verify the callback operation shows failure
+        var approvalOp = execution.getOperation("approval");
+        assertNotNull(approvalOp);
+        var callbackDetails = approvalOp.getCallbackDetails();
+        assertNotNull(callbackDetails);
+        assertNotNull(callbackDetails.error());
+        // Error message is redacted in the response, just verify error exists
+        assertTrue(callbackDetails.error().toString().contains("ErrorObject"));
+    }
+
+    @Test
+    void testCallbackExampleWithTimeout() throws Exception {
+        var runner = CloudDurableTestRunner.create(
+                arn("callback-example"), ApprovalRequest.class, String.class);
+
+        // Start async execution with 10 second timeout
+        var execution = runner.startAsync(new ApprovalRequest("Purchase order", 5000.0, 10));
+
+        // Wait for callback to appear
+        execution.pollUntil(exec -> exec.hasCallback("approval"));
+
+        // Get callback ID but don't complete it - let it timeout
+        var callbackId = execution.getCallbackId("approval");
+        assertNotNull(callbackId);
+
+        // Wait for execution to complete (should timeout after 10 seconds)
+        var result = execution.pollUntilComplete();
+        assertEquals(ExecutionStatus.FAILED, result.getStatus());
+
+        // Verify the callback operation shows timeout status
+        var approvalOp = execution.getOperation("approval");
+        assertNotNull(approvalOp);
+        assertEquals(OperationStatus.TIMED_OUT, approvalOp.getStatus());
+    }
 }

sdk/src/main/java/com/amazonaws/lambda/durable/exception/CallbackFailedException.java

@@ -8,10 +8,20 @@
 /** Exception thrown when a callback fails due to an error from the external system. */
 public class CallbackFailedException extends DurableExecutionException {
     public CallbackFailedException(ErrorObject error) {
-        super(error.errorType() + ": " + error.errorMessage());
+        super(buildMessage(error));
     }
 
     public CallbackFailedException(String message) {
         super(message);
     }
+
+    private static String buildMessage(ErrorObject error) {
+        var errorType = error.errorType();
+        var errorMessage = error.errorMessage();
+        
+        if (errorType != null && !errorType.isEmpty()) {
+            return errorType + ": " + errorMessage;
+        }
+        return errorMessage;
+    }
 }