Fix error type for non-JSON error responses

renaudhartert-db · renaudhartert-db · commit cbd40f3e7cd1 · 2026-04-13T17:19:42.000Z
When the server returns a plain-text error (e.g. "Invalid Token" with
HTTP 403), parseUnknownError set the error code to "UNKNOWN", which
matched ErrorMapper's errorCodeMapping and short-circuited the status
code mapping. This caused all non-JSON errors to produce Unknown instead
of the correct typed exception (PermissionDenied, Unauthenticated, etc.).

The root cause was that parseUnknownError assumed response.getStatus()
returned "403 Forbidden" but it only returns the reason phrase
("Forbidden"). The split-on-space logic always fell into the default
"UNKNOWN" branch.

The fix removes the error code derivation entirely, leaving errorCode
null so AbstractErrorMapper falls through to the status code mapping.
The error message now uses the raw response body instead of appending
Jackson parse exception details.

Co-authored-by: Isaac
diff --git a/databricks-sdk-java/src/main/java/com/databricks/sdk/core/error/ApiErrors.java b/databricks-sdk-java/src/main/java/com/databricks/sdk/core/error/ApiErrors.java
@@ -116,27 +116,17 @@ private static Optional<ApiErrorBody> parseApiError(Response response) {
     try {
       return Optional.of(MAPPER.readValue(body, ApiErrorBody.class));
     } catch (IOException e) {
-      return Optional.of(parseUnknownError(response, body, e));
+      return Optional.of(parseUnknownError(body));
     }
   }
 
-  private static ApiErrorBody parseUnknownError(Response response, String body, IOException err) {
+  private static ApiErrorBody parseUnknownError(String body) {
     ApiErrorBody errorBody = new ApiErrorBody();
-    String[] statusParts = response.getStatus().split(" ", 2);
-    if (statusParts.length < 2) {
-      errorBody.setErrorCode("UNKNOWN");
-    } else {
-      String errorCode = statusParts[1].replaceAll("^[ .]+|[ .]+$", "");
-      errorBody.setErrorCode(errorCode.replaceAll(" ", "_").toUpperCase());
-    }
-
     Matcher messageMatcher = HTML_ERROR_REGEX.matcher(body);
     if (messageMatcher.find()) {
       errorBody.setMessage(messageMatcher.group(1).replaceAll("^[ .]+|[ .]+$", ""));
     } else {
-      errorBody.setMessage(
-          String.format(
-              "Response from server (%s) %s: %s", response.getStatus(), body, err.getMessage()));
+      errorBody.setMessage(body);
     }
     return errorBody;
   }
diff --git a/databricks-sdk-java/src/test/java/com/databricks/sdk/core/error/PlainTextErrorTest.java b/databricks-sdk-java/src/test/java/com/databricks/sdk/core/error/PlainTextErrorTest.java
@@ -0,0 +1,65 @@
+package com.databricks.sdk.core.error;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import com.databricks.sdk.core.DatabricksError;
+import com.databricks.sdk.core.error.platform.*;
+import com.databricks.sdk.core.http.Request;
+import com.databricks.sdk.core.http.Response;
+import java.util.Collections;
+import org.junit.jupiter.api.Test;
+
+class PlainTextErrorTest {
+
+  @Test
+  void plainTextForbiddenReturnsPermissionDenied() {
+    DatabricksError error = getError(403, "Forbidden", "Invalid Token");
+    assertInstanceOf(PermissionDenied.class, error);
+    assertEquals("Invalid Token", error.getMessage());
+  }
+
+  @Test
+  void plainTextUnauthorizedReturnsUnauthenticated() {
+    DatabricksError error = getError(401, "Unauthorized", "Bad credentials");
+    assertInstanceOf(Unauthenticated.class, error);
+    assertEquals("Bad credentials", error.getMessage());
+  }
+
+  @Test
+  void plainTextNotFoundReturnsNotFound() {
+    DatabricksError error = getError(404, "Not Found", "no such endpoint");
+    assertInstanceOf(NotFound.class, error);
+    assertEquals("no such endpoint", error.getMessage());
+  }
+
+  @Test
+  void htmlErrorExtractsPreContent() {
+    String html = "<html><body><pre>some error message</pre></body></html>";
+    DatabricksError error = getError(403, "Forbidden", html);
+    assertInstanceOf(PermissionDenied.class, error);
+    assertEquals("some error message", error.getMessage());
+  }
+
+  @Test
+  void emptyBodyFallsBackToStatusCode() {
+    Request request = new Request("GET", "https://example.com/api/2.0/clusters/get");
+    Response response = new Response(request, 403, "Forbidden", Collections.emptyMap(), "");
+    DatabricksError error = ApiErrors.getDatabricksError(response);
+    assertInstanceOf(PermissionDenied.class, error);
+  }
+
+  @Test
+  void nullBodyFallsBackToStatusCode() {
+    Request request = new Request("GET", "https://example.com/api/2.0/clusters/get");
+    Response response =
+        new Response(request, 403, "Forbidden", Collections.emptyMap(), (String) null);
+    DatabricksError error = ApiErrors.getDatabricksError(response);
+    assertInstanceOf(PermissionDenied.class, error);
+  }
+
+  private static DatabricksError getError(int statusCode, String status, String body) {
+    Request request = new Request("GET", "https://example.com/api/2.0/clusters/get");
+    Response response = new Response(request, statusCode, status, Collections.emptyMap(), body);
+    return ApiErrors.getDatabricksError(response);
+  }
+}
