fix(notifications): Ensure empty body on callback when appropriate (#…

…1060) * fix(notifications): Ensure empty body on callback when appropriate * fix(notifications): Fix body conversion to string
spinnaker · Feb 14, 2020 · 9846de9 · 9846de9
1 parent c825fc8
commit 9846de9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/gate-web/src/main/groovy/com/netflix/spinnaker/gate/services/NotificationService.groovy b/gate-web/src/main/groovy/com/netflix/spinnaker/gate/services/NotificationService.groovy
@@ -89,7 +89,7 @@ class NotificationService {
     Response response = okHttpClient.newCall(echoRequest).execute()
 
     // convert retrofit response to Spring format
-    String body = response.body().string()
+    String body = response.body().contentLength() > 0 ? response.body().string() : null
     HttpHeaders headers = new HttpHeaders()
     headers.putAll(response.headers().toMultimap())
     return new ResponseEntity(body, headers, HttpStatus.valueOf(response.code()))

diff --git a/gate-web/src/test/groovy/com/netflix/spinnaker/gate/services/NotificationServiceSpec.groovy b/gate-web/src/test/groovy/com/netflix/spinnaker/gate/services/NotificationServiceSpec.groovy
@@ -70,6 +70,8 @@ class NotificationServiceSpec extends Specification {
       .addHeader("multi-value-header", "value2")
       .build()
 
+    Response expectedEchoResponse = mockEchoResponse(expectedEchoRequest)
+
     when: "a request is received for processing"
     ResponseEntity<String> response = notificationService.processNotificationCallback("someSource", incomingRequest)
 
@@ -85,7 +87,7 @@ class NotificationServiceSpec extends Specification {
       echoRequest.headers() == expectedEchoRequest.headers()
       echoCall
     }
-    1 * echoCall.execute() >> mockEchoResponse(expectedEchoRequest)
+    1 * echoCall.execute() >> expectedEchoResponse
 
     and: "returns the response from echo converted as appropriate"
     response == new ResponseEntity<String>('{ "status": "ok" }', null, HttpStatus.OK)