hw-kafka-avro 6.0.1 → 6.0.2

raw patch · 2 files changed

+13/−6 lines, 2 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

• hw-kafka-avro.cabal +1/−1
• src/Kafka/Avro/SchemaRegistry.hs +12/−5

@@ -1,7 +1,7 @@ cabal-version:  2.4  name:                   hw-kafka-avro-version:                6.0.1+version:                6.0.2 synopsis:               Avro support for Kafka infrastructure description:            Avro support for Kafka infrastructure. category:               Services

@@ -7,6 +7,7 @@ module Kafka.Avro.SchemaRegistry ( schemaRegistry, loadSchema, sendSchema , schemaRegistry_+, schemaRegistryWithHeaders , loadSubjectSchema , getGlobalConfig, getSubjectConfig , getVersions, isCompatible@@ -20,7 +21,7 @@ import           Control.Arrow           (first) import           Control.Exception       (throwIO, SomeException (SomeException)) import           Control.Exception.Safe (try, MonadCatch)-import           Control.Lens            (view, (&), (.~), (^.))+import           Control.Lens            (view, (&), (.~), (^.), (%~)) import           Control.Monad           (void) import           Control.Monad.IO.Class  (MonadIO, liftIO) import           Control.Monad.Trans.Except (ExceptT (ExceptT), except, runExceptT, withExceptT)@@ -44,6 +45,7 @@ import           GHC.Exception           (SomeException, displayException, fromException) import           GHC.Generics            (Generic) import           Network.HTTP.Client     (HttpException (..), HttpExceptionContent (..), Manager, defaultManagerSettings, newManager, responseStatus)+import           Network.HTTP.Types.Header (Header) import           Network.HTTP.Types.Status (notFound404) import qualified Network.Wreq            as Wreq @@ -67,6 +69,7 @@   , srReverseCache :: Cache (Subject, SchemaName) SchemaId   , srBaseUrl      :: String   , srAuth         :: Maybe Wreq.Auth+  , srExtraHeaders :: [Header]   }  data SchemaRegistryError = SchemaRegistryConnectError String@@ -81,13 +84,16 @@ schemaRegistry = schemaRegistry_ Nothing  schemaRegistry_ :: MonadIO m => Maybe Wreq.Auth -> String -> m SchemaRegistry-schemaRegistry_ auth url = liftIO $+schemaRegistry_ auth = schemaRegistryWithHeaders auth []++schemaRegistryWithHeaders :: MonadIO m => Maybe Wreq.Auth -> [Header] -> String -> m SchemaRegistry+schemaRegistryWithHeaders auth headers url = liftIO $     SchemaRegistry     <$> newCache Nothing     <*> newCache Nothing     <*> pure url     <*> pure auth-+    <*> pure headers  loadSchema :: MonadIO m => SchemaRegistry -> SchemaId -> m (Either SchemaRegistryError Schema) loadSchema sr sid = do@@ -197,7 +203,8 @@     accept       = ["application/vnd.schemaregistry.v1+json", "application/vnd.schemaregistry+json", "application/json"]     acceptHeader = Wreq.header "Accept" .~ accept     authHeader   = Wreq.auth .~ srAuth sr-  in Wreq.defaults & acceptHeader & authHeader+    extraHeaders = Wreq.headers %~ (++ srExtraHeaders sr)+  in Wreq.defaults & acceptHeader & authHeader & extraHeaders  getSchemaById :: SchemaRegistry -> SchemaId -> IO (Either SchemaRegistryError RegisteredSchema) getSchemaById sr sid@(SchemaId i) = runExceptT $ do@@ -249,7 +256,7 @@   _ -> wrapError exception  tryWith :: MonadCatch m => (SomeException -> e) -> m a -> ExceptT e m a-tryWith wrapException = withExceptT wrapException . ExceptT . try +tryWith wrapException = withExceptT wrapException . ExceptT . try  --------------------------------------------------------------------- fullTypeName :: Schema -> SchemaName