git.iko.soy/typeable/bloodhound
on master help sign in
Loosen IndexAliasesSummary
10666e6Michael Xavier
src/Database/Bloodhound/Types.hs+1−1
compare with master
unifiedsplit
@@ -3069,7 +3069,7 @@ instance FromJSON IndexAliasesSummary where
3069 parseJSON = withObject "IndexAliasesSummary" parse
3069 parseJSON = withObject "IndexAliasesSummary" parse
3070 where parse o = IndexAliasesSummary . mconcat <$> mapM (uncurry go) (HM.toList o)
3070 where parse o = IndexAliasesSummary . mconcat <$> mapM (uncurry go) (HM.toList o)
3071 go ixn = withObject "index aliases" $ \ia -> do
3071 go ixn = withObject "index aliases" $ \ia -> do
3072− aliases <- ia .: "aliases"
3072+ aliases <- ia .:? "aliases" .!= mempty
3073 forM (HM.toList aliases) $ \(aName, v) -> do
3073 forM (HM.toList aliases) $ \(aName, v) -> do
3074 let indexAlias = IndexAlias (IndexName ixn) (IndexAliasName (IndexName aName))
3074 let indexAlias = IndexAlias (IndexName ixn) (IndexAliasName (IndexName aName))
3075 IndexAliasSummary indexAlias <$> parseJSON v
3075 IndexAliasSummary indexAlias <$> parseJSON v
tests/tests.hs+2−2
@@ -1350,7 +1350,7 @@ main = hspec $ do
1350 withTestEnv $ do
1350 withTestEnv $ do
1351 resetIndex
1351 resetIndex
1352 resp <- updateIndexAliases (action :| [])
1352 resp <- updateIndexAliases (action :| [])
1353− liftIO $ NHTS.statusCode (responseStatus resp) `shouldBe` 200
1353+ liftIO $ validateStatus resp 200
1354 let cleanup = withTestEnv (updateIndexAliases (RemoveAlias alias :| []))
1354 let cleanup = withTestEnv (updateIndexAliases (RemoveAlias alias :| []))
1355 (do aliases <- withTestEnv getIndexAliases
1355 (do aliases <- withTestEnv getIndexAliases
1356 let expected = IndexAliasSummary alias create
1356 let expected = IndexAliasSummary alias create
@@ -1371,7 +1371,7 @@ main = hspec $ do
1371 withTestEnv $ do
1371 withTestEnv $ do
1372 resetIndex
1372 resetIndex
1373 resp <- updateIndexAliases (action :| [])
1373 resp <- updateIndexAliases (action :| [])
1374− liftIO $ NHTS.statusCode (responseStatus resp) `shouldBe` 200
1374+ liftIO $ validateStatus resp 200
1375 let cleanup = withTestEnv (updateIndexAliases (RemoveAlias alias :| []))
1375 let cleanup = withTestEnv (updateIndexAliases (RemoveAlias alias :| []))
1376 (do aliases <- withTestEnv getIndexAliases
1376 (do aliases <- withTestEnv getIndexAliases
1377 let expected = IndexAliasSummary alias create
1377 let expected = IndexAliasSummary alias create