fix: fixed how wrapped KsqlTopicAuthorizationException error messages…

… are displayed
confluentinc · Aug 22, 2019 · fc893d7 · fc893d7
1 parent abe410a
commit fc893d7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/ksql-rest-app/src/main/java/io/confluent/ksql/rest/server/resources/Errors.java b/ksql-rest-app/src/main/java/io/confluent/ksql/rest/server/resources/Errors.java
@@ -72,10 +72,10 @@ public static Response accessDenied(final String msg) {
         .build();
   }
 
-  public static Response accessDeniedFromKafka(final Exception error) {
+  public static Response accessDeniedFromKafka(final Throwable t) {
     return Response
         .status(FORBIDDEN)
-        .entity(new KsqlErrorMessage(ERROR_CODE_FORBIDDEN_KAFKA_ACCESS, error.getMessage()))
+        .entity(new KsqlErrorMessage(ERROR_CODE_FORBIDDEN_KAFKA_ACCESS, t))
         .build();
   }
 

diff --git a/ksql-rest-app/src/test/java/io/confluent/ksql/rest/server/resources/KsqlResourceTest.java b/ksql-rest-app/src/test/java/io/confluent/ksql/rest/server/resources/KsqlResourceTest.java
@@ -663,7 +663,7 @@ public void shouldReturnForbiddenKafkaAccessIfKsqlTopicAuthorizationException()
   @Test
   public void shouldReturnForbiddenKafkaAccessIfRootCauseKsqlTopicAuthorizationException() {
     // Given:
-    doThrow(new KsqlException("", new KsqlTopicAuthorizationException(
+    doThrow(new KsqlException("Could not delete the corresponding kafka topic: topic", new KsqlTopicAuthorizationException(
         AclOperation.DELETE,
         Collections.singleton("topic")))).when(topicAccessValidator).validate(any(), any(), any());
 
@@ -676,6 +676,9 @@ public void shouldReturnForbiddenKafkaAccessIfRootCauseKsqlTopicAuthorizationExc
     // Then:
     assertThat(result, is(instanceOf(KsqlErrorMessage.class)));
     assertThat(result.getErrorCode(), is(Errors.ERROR_CODE_FORBIDDEN_KAFKA_ACCESS));
+    assertThat(result.getMessage(), is(
+        "Could not delete the corresponding kafka topic: topic\n" +
+              "Caused by: Authorization denied to Delete on topic(s): [topic]"));
   }
 
   @Test