fix: EsError for OpenSearch

bloodhound.cabal

@@ -1,11 +1,11 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.34.7.
+-- This file has been generated from package.yaml by hpack version 0.36.1.
 --
 -- see: https://github.com/sol/hpack
 
 name:           bloodhound
-version:        0.21.0.0
+version:        0.22.0.0
 synopsis:       Elasticsearch client library for Haskell
 description:    Elasticsearch made awesome for Haskell hackers
 category:       Database, Search
@@ -47,6 +47,7 @@ library
       Database.Bloodhound.Internal.Client.Doc
       Database.Bloodhound.Internal.Count
       Database.Bloodhound.Internal.PointInTime
+      X
       Paths_bloodhound
   hs-source-dirs:
       src

changelog.md

@@ -1,3 +1,8 @@
+0.22.0.0
+========
+- @blackheaven
+  - Fix `EsError` for OpenSearch
+
 0.21.0.0
 ========
 - @blackheaven

package.yaml

@@ -1,5 +1,5 @@
 name: bloodhound
-version: "0.21.0.0"
+version: "0.22.0.0"
 synopsis: Elasticsearch client library for Haskell
 description: Elasticsearch made awesome for Haskell hackers
 category: Database, Search

src/Database/Bloodhound/Internal/Client/BHRequest.hs

@@ -261,15 +261,15 @@ instance (FromJSON a) => FromJSON (EsResultFound a) where
 --    problem. If you can't parse the expected response, its a good idea to
 --    try parsing this.
 data EsError = EsError
-  { errorStatus :: Int,
+  { errorStatus :: Maybe Int,
     errorMessage :: Text
   }
   deriving (Eq, Show)
 
 instance FromJSON EsError where
   parseJSON (Object v) =
     EsError
-      <$> v .: "status"
+      <$> v .:? "status"
       <*> (v .: "error" <|> (v .: "error" >>= (.: "reason")))
   parseJSON _ = empty
 

tests/Test/Import.hs

@@ -46,7 +46,7 @@ grabFirst :: Either EsError (SearchResult a) -> Either EsError a
 grabFirst r =
   case fmap (hitSource . head . hits . searchHits) r of
     (Left e) -> Left e
-    (Right Nothing) -> Left (EsError 500 "Source was missing")
+    (Right Nothing) -> Left (EsError (Just 500) "Source was missing")
     (Right (Just x)) -> Right x
 
 when' :: Monad m => m Bool -> m () -> m ()

tests/Test/SourceFiltering.hs

@@ -13,7 +13,7 @@ spec =
       withTestEnv $
         searchExpectSource
           NoSource
-          (Left (EsError 500 "Source was missing"))
+          (Left (EsError (Just 500) "Source was missing"))
 
     it "includes a source" $
       withTestEnv $

tests/tests.hs

@@ -52,7 +52,7 @@ main = hspec $ do
       withTestEnv $ do
         res <- getDocument @() (IndexName "bogus") (DocId "bogus_as_well")
         errorResp <- parseEsResponse res
-        liftIO (errorResp `shouldBe` Left (EsError 404 "no such index [bogus]"))
+        liftIO (errorResp `shouldBe` Left (EsError (Just 404) "no such index [bogus]"))
 
   describe "Monoid (SearchHits a)" $
     prop "abides the monoid laws" $