Merge pull request #38 from ambarltd/utils

Use ambar-hs-utils

benchmarks/Benchmarks.hs

@@ -22,8 +22,8 @@ import Ambar.Emulator.Queue.Partition (Record(..), Position(..))
 import qualified Ambar.Emulator.Queue.Partition as P
 import Ambar.Emulator.Queue.Partition.File (FilePartition)
 import qualified Ambar.Emulator.Queue.Partition.File as F
-import Utils.Some (Some(..))
-import Utils.Warden as Warden
+import Util.Some (Some(..))
+import Util.Warden as Warden
 
 main :: IO ()
 main =

cabal.project

@@ -1,2 +1,7 @@
 with-compiler: ghc-9.10.1
 packages: .
+
+source-repository-package
+    type: git
+    location: https://github.com/ambarltd/ambar-hs-utils
+    tag: 55334ab4af375ac19f4bbbd1a20071998f9b2306

emulator.cabal

@@ -24,6 +24,7 @@ executable emulator
     other-modules:
     build-depends:
         base
+        , ambar-hs-utils
         , directory
         , emulator-lib
         , filepath
@@ -60,17 +61,9 @@ library emulator-lib
         Ambar.Transport.File
         Database.MySQL
         Database.MicrosoftSQLServer
-        Utils.Async
-        Utils.Delay
-        Utils.Directory
-        Utils.Exception
-        Utils.Logger
-        Utils.Prettyprinter
-        Utils.STM
-        Utils.Some
-        Utils.Warden
     build-depends:
         base
+        , ambar-hs-utils
         , aeson
         , aeson-pretty
         , async
@@ -124,15 +117,12 @@ test-suite emulator-tests
         Test.Connector.PostgreSQL
         Test.Connector.MicrosoftSQLServer
         Test.Emulator
-        Test.OnDemand
         Test.Transport
-        Test.Warden
-        Test.Utils.OnDemand
-        Test.Utils.Docker
-        Test.Utils.SQL
+        Test.Util.SQL
     type:    exitcode-stdio-1.0
     build-depends:
         base
+        , ambar-hs-utils
         , emulator-lib
         , aeson
         , async
@@ -166,6 +156,7 @@ benchmark emulator-bench
   main-is: benchmarks/Benchmarks.hs
   build-depends:
         base
+        , ambar-hs-utils
         , emulator-lib
         , async
         , bytestring

src/Ambar/Emulator.hs

@@ -37,11 +37,11 @@ import Ambar.Emulator.Config
   , DataDestination(..)
   , Destination(..)
   )
-import Utils.Delay (every, seconds)
-import Utils.Directory (writeAtomically)
-import Utils.Logger (SimpleLogger, annotate, logInfo, logDebugAction)
-import Utils.Some (Some(..))
-import Utils.STM (atomicallyNamed)
+import Util.Delay (every, seconds)
+import Util.Directory (writeAtomically)
+import Util.Logger (SimpleLogger, annotate, logInfo, logDebugAction)
+import Util.Some (Some(..))
+import Util.STM (atomicallyNamed)
 
 emulate :: SimpleLogger -> EmulatorConfig -> EnvironmentConfig -> IO ()
 emulate logger_ config env = do

src/Ambar/Emulator/Connector.hs

@@ -4,7 +4,7 @@ import Control.Concurrent.STM (STM)
 import Control.Exception (Exception)
 
 import Ambar.Emulator.Queue.Topic (Producer, Partitioner, Encoder)
-import Utils.Logger (SimpleLogger)
+import Util.Logger (SimpleLogger)
 
 class Connector a where
   type ConnectorState a = b | b -> a

src/Ambar/Emulator/Connector/File.hs

@@ -65,10 +65,10 @@ import Ambar.Emulator.Queue.Partition.File
 import Ambar.Emulator.Queue.Topic (modPartitioner)
 import Ambar.Emulator.Queue.Topic (Producer)
 import qualified Ambar.Emulator.Queue.Topic as Topic
-import Utils.Async (withAsyncThrow)
-import Utils.Logger (SimpleLogger, fatal, logInfo)
-import Utils.Delay (Duration, delay, millis)
-import Utils.Prettyprinter (prettyJSON, renderPretty, commaSeparated)
+import Util.Async (withAsyncThrow)
+import Util.Logger (SimpleLogger, fatal, logInfo)
+import Util.Delay (Duration, delay, millis)
+import Util.Prettyprinter (prettyJSON, renderPretty, commaSeparated)
 
 _POLLING_INTERVAL :: Duration
 _POLLING_INTERVAL = millis 50

src/Ambar/Emulator/Connector/MicrosoftSQLServer.hs

@@ -47,10 +47,10 @@ import Ambar.Emulator.Queue.Topic (Producer, hashPartitioner)
 import Ambar.Record (Record(..), Value(..), Type(..), Bytes(..), TimeStamp(..))
 import qualified Ambar.Record.Encoding as Encoding
 
-import Utils.Delay (Duration, millis, seconds)
-import Utils.Async (withAsyncThrow)
-import Utils.Logger (SimpleLogger, logDebug, logInfo)
-import Utils.Prettyprinter (renderPretty, sepBy, commaSeparated, prettyJSON)
+import Util.Delay (Duration, millis, seconds)
+import Util.Async (withAsyncThrow)
+import Util.Logger (SimpleLogger, logDebug, logInfo)
+import Util.Prettyprinter (renderPretty, sepBy, commaSeparated, prettyJSON)
 
 _POLLING_INTERVAL :: Duration
 _POLLING_INTERVAL = millis 50

src/Ambar/Emulator/Connector/MySQL.hs

@@ -45,10 +45,10 @@ import Database.MySQL
   , withConnection
   )
 import qualified Database.MySQL as M
-import Utils.Delay (Duration, millis, seconds)
-import Utils.Async (withAsyncThrow)
-import Utils.Logger (SimpleLogger, logDebug, logInfo)
-import Utils.Prettyprinter (renderPretty, sepBy, commaSeparated, prettyJSON)
+import Util.Delay (Duration, millis, seconds)
+import Util.Async (withAsyncThrow)
+import Util.Logger (SimpleLogger, logDebug, logInfo)
+import Util.Prettyprinter (renderPretty, sepBy, commaSeparated, prettyJSON)
 
 _POLLING_INTERVAL :: Duration
 _POLLING_INTERVAL = millis 50

src/Ambar/Emulator/Connector/Poll.hs

@@ -25,7 +25,7 @@ import GHC.Generics (Generic)
 import Prettyprinter (Pretty, pretty)
 
 import qualified Ambar.Emulator.Queue.Topic as Topic
-import Utils.Delay (Duration, delay, fromDiffTime, toDiffTime)
+import Util.Delay (Duration, delay, fromDiffTime, toDiffTime)
 
 -- | List of ID ranges to exclude
 newtype Boundaries = Boundaries [(EntryId, EntryId)]

src/Ambar/Emulator/Connector/Postgres.hs

@@ -26,7 +26,7 @@ import qualified Database.PostgreSQL.Simple.Transaction as P
 import qualified Database.PostgreSQL.Simple.FromField as P
 import qualified Database.PostgreSQL.Simple.FromRow as P
 import GHC.Generics (Generic)
-import Utils.Prettyprinter (renderPretty, sepBy, commaSeparated, prettyJSON)
+import Util.Prettyprinter (renderPretty, sepBy, commaSeparated, prettyJSON)
 import Prettyprinter (pretty, (<+>))
 import qualified Prettyprinter as Pretty
 
@@ -36,9 +36,9 @@ import Ambar.Emulator.Connector.Poll (BoundaryTracker, Boundaries(..), EntryId(.
 import Ambar.Emulator.Queue.Topic (Producer, hashPartitioner)
 import Ambar.Record (Record(..), Value(..), Bytes(..), TimeStamp(..))
 import qualified Ambar.Record.Encoding as Encoding
-import Utils.Async (withAsyncThrow)
-import Utils.Delay (Duration, millis, seconds)
-import Utils.Logger (SimpleLogger, logDebug, logInfo)
+import Util.Async (withAsyncThrow)
+import Util.Delay (Duration, millis, seconds)
+import Util.Logger (SimpleLogger, logDebug, logInfo)
 
 _POLLING_INTERVAL :: Duration
 _POLLING_INTERVAL = millis 50

src/Ambar/Emulator/Projector.hs

@@ -31,10 +31,10 @@ import Ambar.Emulator.Connector.Postgres (PostgreSQL(..))
 import Ambar.Emulator.Connector.MySQL (MySQL(..))
 import Ambar.Transport (Transport)
 import qualified Ambar.Transport as Transport
-import Utils.Some (Some)
-import Utils.Logger (SimpleLogger, logFatal, logWarn, logInfo, fatal, annotate)
-import Utils.Delay (Duration, delay, millis, seconds)
-import Utils.Prettyprinter (prettyJSON, renderPretty)
+import Util.Some (Some)
+import Util.Logger (SimpleLogger, logFatal, logWarn, logInfo, fatal, annotate)
+import Util.Delay (Duration, delay, millis, seconds)
+import Util.Prettyprinter (prettyJSON, renderPretty)
 import Prettyprinter (pretty, fillSep, (<+>))
 
 data Projection = Projection

src/Ambar/Emulator/Queue.hs

@@ -35,12 +35,12 @@ import Ambar.Emulator.Queue.Topic
 import qualified Ambar.Emulator.Queue.Topic as T
 import qualified Ambar.Emulator.Queue.Partition.File as FilePartition
 import Ambar.Emulator.Queue.Partition.File (FilePartition)
-import Utils.Async (withAsyncThrow)
-import Utils.Delay (every, seconds)
-import Utils.Directory (writeAtomically)
-import Utils.Some (Some(..))
-import Utils.Warden (Warden)
-import qualified Utils.Warden as Warden
+import Util.Async (withAsyncThrow)
+import Util.Delay (every, seconds)
+import Util.Directory (writeAtomically)
+import Util.Some (Some(..))
+import Util.Warden (Warden)
+import qualified Util.Warden as Warden
 
 data Queue = Queue
   { q_warden :: Warden

src/Ambar/Emulator/Queue/Partition/File.hs

@@ -52,7 +52,7 @@ import System.Directory (doesFileExist, getFileSize, removeFile)
 import System.FilePath ((</>))
 
 import Ambar.Emulator.Queue.Partition
-import Utils.STM (atomicallyNamed)
+import Util.STM (atomicallyNamed)
 
 -- | A file-backed Partition for unformatted JSON entries.
 --

src/Ambar/Emulator/Queue/Partition/STMReader.hs

@@ -27,9 +27,9 @@ import Ambar.Emulator.Queue.Partition
   , Record(..)
   , Position(..)
   )
-import Utils.STM (atomicallyNamed)
-import qualified Utils.Warden as Warden
-import Utils.Warden (Warden)
+import Util.STM (atomicallyNamed)
+import qualified Util.Warden as Warden
+import Util.Warden (Warden)
 
 import qualified Ambar.Emulator.Queue.Partition as Partition
 

src/Ambar/Emulator/Queue/Topic.hs

@@ -54,9 +54,9 @@ import GHC.Generics (Generic)
 import GHC.Stack (HasCallStack)
 import System.Random (randomIO)
 
-import Utils.Some (Some(..))
-import Utils.STM (atomicallyNamed)
-import Utils.Warden (Warden)
+import Util.Some (Some(..))
+import Util.STM (atomicallyNamed)
+import Util.Warden (Warden)
 
 import Ambar.Emulator.Queue.Partition
   ( Partition

src/Ambar/Transport.hs

@@ -3,7 +3,7 @@ module Ambar.Transport where
 import Data.Text (Text)
 import Data.ByteString (ByteString)
 
-import Utils.Some (Some(..))
+import Util.Some (Some(..))
 
 -- | A transport is a way to send data to some destination.
 class Transport a where

src/Ambar/Transport/Http.hs

@@ -163,6 +163,7 @@ prettyHttpError httpErr = "*** HTTP Error: " <> case httpErr of
       "invalid proxy environment var: " <> var <> ": " <> val
     Http.ConnectionClosed -> "connection closed"
     Http.InvalidProxySettings _ -> "invalid proxy settings"
+    Http.TooManyHeaderFields -> "too many header fields"
 
 
 

src/Database/MicrosoftSQLServer.hs

@@ -46,7 +46,7 @@ import System.IO.Unsafe (unsafePerformIO)
 import qualified Database.MSSQLServer.Connection as M
 import qualified Database.MSSQLServer.Query as M
 import qualified Database.Tds.Message as M
-import Utils.Exception (annotateWith)
+import Util.Exception (annotateWith)
 
 data ConnectionInfo = ConnectionInfo
   { conn_host :: Text

src/Database/MySQL.hs

@@ -58,8 +58,8 @@ import qualified Database.MySQL.Simple.Result as M (Result(..), ResultError(..))
 import qualified Database.MySQL.Simple.QueryResults as M
 import qualified Database.MySQL.Simple.QueryParams as M
 
-import Utils.Exception (annotateWith, tryAll)
-import Utils.Async (withAsyncBoundThrow)
+import Util.Exception (annotateWith, tryAll)
+import Util.Async (withAsyncBoundThrow)
 
 query :: (ToRow q, FromRow r) => Connection -> M.Query -> q -> IO [r]
 query (Connection run) q params =

src/Main.hs

@@ -17,7 +17,7 @@ import System.Posix.Signals (installHandler, sigINT, sigTERM, Handler(Catch))
 
 import Ambar.Emulator (emulate)
 import Ambar.Emulator.Config (parseEnvConfigFile, EmulatorConfig(..))
-import Utils.Logger (plainLogger, Severity(..), logInfo)
+import Util.Logger (plainLogger, Severity(..), logInfo)
 
 
 _DEFAULT_PARTITIONS_PER_TOPIC :: Int