Merge pull request #33 from aviaviavi/no-log-bytes

don't log byte responses

Author: aviaviavi

curl-runnings.cabal

@@ -2,10 +2,10 @@
 --
 -- see: https://github.com/sol/hpack
 --
--- hash: e6387b40a3da0bc0956a40390de8a48fca58d266b6a9865655e5dba0905f0088
+-- hash: 2ef05b4af0ee7565019a5729c09d3a678a43e0cb2357bcd40a77a9b19b3aed2a
 
 name:           curl-runnings
-version:        0.9.0
+version:        0.9.1
 synopsis:       A framework for declaratively writing curl based API tests
 description:    Please see the README on Github at <https://github.com/aviaviavi/curl-runnings#readme>
 category:       Testing

package.yaml

@@ -1,5 +1,5 @@
 name:                curl-runnings
-version:             0.9.0
+version:             0.9.1
 github:              aviaviavi/curl-runnings
 license:             MIT
 author:              Avi Press

src/Testing/CurlRunnings.hs

@@ -9,6 +9,7 @@ module Testing.CurlRunnings
   , decodeFile
   ) where
 
+import           Control.Exception
 import           Control.Monad
 import           Data.Aeson
 import           Data.Aeson.Types
@@ -75,9 +76,28 @@ runCase state curlCase = do
             DEBUG
             ("Request body: " <> (pShow $ fromMaybe emptyObject replacedJSON))
           response <- httpBS request
-          logger state DEBUG (pShow response)
+          -- If the response is just returning bytes, we won't print them
+          let responseHeaderValues = map snd (getResponseHeaders response)
+          if "application/octet-stream" `notElem` responseHeaderValues &&
+             "application/vnd.apple.pkpass" `notElem` responseHeaderValues
+            then catch
+                   (logger state DEBUG (pShow response))
+                   (\(e :: IOException) ->
+                      logger state ERROR ("Error logging response: " <> pShow e))
+              -- TODO: we should log as much info as possible without printing the raw body
+            else logger
+                   state
+                   DEBUG
+                   "Response output supressed (returned content-type was bytes)"
           returnVal <-
-            (return . decode . B.fromStrict $ getResponseBody response) :: IO (Maybe Value)
+            catch
+              ((return . decode . B.fromStrict $ getResponseBody response) :: IO (Maybe Value))
+              (\(e :: IOException) ->
+                 logger
+                   state
+                   ERROR
+                   ("Error decoding response into json: " <> pShow e) >>
+                 return (Just Null))
           let returnCode = getResponseStatusCode response
               receivedHeaders = fromHTTPHeaders $ responseHeaders response
               assertionErrors =