discard entity bytes when not consuming them in another way (#812)

src/main/scala/org/broadinstitute/dsde/firecloud/dataaccess/HttpGoogleServicesDAO.scala

@@ -230,7 +230,10 @@ class HttpGoogleServicesDAO(implicit val system: ActorSystem, implicit val mater
     userAuthedRequest(metadataRequest)(AccessToken(authToken)).map { response =>
       response.status match {
         case OK => xmlApiResponseToObject(response, bucketName, objectKey)
-        case _ => throw new FireCloudExceptionWithErrorReport(ErrorReport(response.status, response.status.reason))
+        case _ => {
+          response.discardEntityBytes()
+          throw new FireCloudExceptionWithErrorReport(ErrorReport(response.status, response.status.reason))
+        }
       }
     }
   }
@@ -256,6 +259,9 @@ class HttpGoogleServicesDAO(implicit val system: ActorSystem, implicit val mater
       h.lowercaseName -> h.value
     }.toMap
 
+    //we're done with the response and we don't care about the body, so we should discard the bytes now
+    response.discardEntityBytes()
+
     // exists in xml api, same value as json api
     val generation: String = headerMap("x-goog-generation")
     val size: String = headerMap("x-goog-stored-content-length") // present in x-goog-stored-content-length vs. content-length

src/main/scala/org/broadinstitute/dsde/firecloud/utils/RestJsonClient.scala

@@ -121,6 +121,8 @@ trait RestJsonClient extends FireCloudRequestBuilding with PerformanceLogging {
           }
         case f => {
           FCErrorReport(response).map { errorReport =>
+            //we never consume the response body in this case, so we must discard the bytes here
+            response.discardEntityBytes()
             throw new FireCloudExceptionWithErrorReport(errorReport)
           }
         }