fixup! fixup! fixup! [#25] Creating one connection manager for all BackendEffect actions

Author: DK318

app/Main.hs

@@ -29,13 +29,13 @@ import Config (configCodec, Config (..))
 import Entry (path, Entry)
 import System.Environment (lookupEnv)
 import Data.Maybe (fromMaybe)
-import Network.HTTP.Client (Manager, defaultManagerSettings, newManager)
+import Network.HTTP.Client (defaultManagerSettings, newManager)
 import Polysemy.Reader (Reader, runReader)
 import Network.HTTP.Client.TLS (tlsManagerSettings)
 
 runBackendIO
-  :: (Manager, Manager)
-  -> Sem '[BackendEffect, Error CofferError, Reader (Manager, Manager), Embed IO, Final IO ] a
+  :: ConnectionManagers
+  -> Sem '[BackendEffect, Error CofferError, Reader ConnectionManagers, Embed IO, Final IO ] a
   -> IO a
 runBackendIO managers action =
   runBackend action
@@ -75,7 +75,7 @@ main = do
   config <- readConfig configPath
   defaultManager <- newManager defaultManagerSettings
   tlsManager <- newManager tlsManagerSettings
-  runBackendIO (defaultManager, tlsManager) do
+  runBackendIO (ConnectionManagers defaultManager tlsManager) do
     case someCommand of
       SomeCommand cmd@CmdView{} -> do
         runCommand config cmd >>= \case

lib/Backend.hs

@@ -5,6 +5,7 @@
 module Backend
   ( BackendEffect (..), readSecret, writeSecret, listSecrets, deleteSecret
   , Backend (..)
+  , ConnectionManagers (..)
   , SomeBackend (..)
   , Effects
   )
@@ -23,7 +24,12 @@ import BackendName (BackendName)
 import Network.HTTP.Client (Manager)
 import Polysemy.Reader (Reader)
 
-type Effects r = (Member (Embed IO) r, Member (Reader (Manager, Manager)) r, Member (Error CofferError) r)
+data ConnectionManagers = ConnectionManagers
+  { cmDefaultManager :: Manager
+  , cmTlsManager     :: Manager
+  }
+
+type Effects r = (Member (Embed IO) r, Member (Reader ConnectionManagers) r, Member (Error CofferError) r)
 
 class Show a => Backend a where
   _name :: a -> BackendName

lib/Backend/Vault/Kv.hs

@@ -11,7 +11,7 @@ import qualified Entry                        as E
 import qualified Backend.Vault.Kv.Internal    as I
 
 import           Error                        (CofferError (..))
-import           Backend                      (Backend (..), Effects)
+import           Backend                      (Backend (..), Effects, ConnectionManagers (cmDefaultManager, cmTlsManager))
 
 import qualified Data.Text                    as T
 import qualified Data.Text.Encoding           as T
@@ -88,12 +88,12 @@ makeLensesWith abbreviatedFields ''CofferSpecials
 
 getEnv :: Effects r => VaultKvBackend -> Sem r ClientEnv
 getEnv backend = do
-  (defaultManager, tlsManager) <- ask
+  connectionManagers <- ask
   case url of
     (BaseUrl Http _ _ _) -> do
-      pure $ mkClientEnv defaultManager url
+      pure $ mkClientEnv (cmDefaultManager connectionManagers) url
     (BaseUrl Https _ _ _) -> do
-      pure $ mkClientEnv tlsManager url
+      pure $ mkClientEnv (cmTlsManager connectionManagers) url
   where
     url = vbAddress backend