services/brig/integration/*

Author: eyeinsky

services/brig/test/integration/API/User.hs

@@ -29,7 +29,6 @@ import API.User.Handles qualified
 import API.User.RichInfo qualified
 import API.User.Util
 import Bilge hiding (accept, timeout)
-import Brig.AWS qualified as AWS
 import Brig.App (initZAuth)
 import Brig.Options qualified as Opt
 import Cassandra qualified as DB
@@ -39,6 +38,7 @@ import Test.Tasty hiding (Timeout)
 import Util
 import Util.AWS (UserJournalWatcher)
 import Wire.API.Federation.Component
+import Wire.AWSSubsystem.AWS qualified as AWS
 import Wire.AuthenticationSubsystem.Config
 
 tests ::

services/brig/test/integration/API/User/Account.hs

@@ -27,7 +27,6 @@ import API.Team.Util
 import API.User.Util
 import Bilge hiding (accept, timeout)
 import Bilge.Assert
-import Brig.AWS qualified as AWS
 import Brig.AWS.Types
 import Brig.Options qualified as Opt
 import Brig.Types.Activation
@@ -70,6 +69,7 @@ import Network.HTTP.Types qualified as Http
 import Network.Wai qualified as Wai
 import Network.Wai.Utilities.Error qualified as Error
 import Network.Wai.Utilities.Error qualified as Wai
+import Polysemy (runFinal)
 import Test.QuickCheck (arbitrary, generate)
 import Test.Tasty hiding (Timeout)
 import Test.Tasty.Cannon hiding (Cannon, Timeout)
@@ -93,8 +93,10 @@ import Wire.API.User.Activation
 import Wire.API.User.Auth
 import Wire.API.User.Auth qualified as Auth
 import Wire.API.User.Client
+import Wire.AWSSubsystem qualified as AWS
+import Wire.AWSSubsystem.AWS qualified as AWSI
 
-tests :: ConnectionLimit -> Timeout -> Opt.Opts -> Manager -> Brig -> Cannon -> CargoHold -> Galley -> AWS.Env -> UserJournalWatcher -> TestTree
+tests :: ConnectionLimit -> Timeout -> Opt.Opts -> Manager -> Brig -> Cannon -> CargoHold -> Galley -> AWSI.Env -> UserJournalWatcher -> TestTree
 tests _ at opts p b c ch g aws userJournalWatcher =
   testGroup
     "account"
@@ -471,7 +473,7 @@ testCreateUserInvalidEmail _ brig = do
 
 -- @END
 
-testCreateUserBlacklist :: Opt.Opts -> Brig -> AWS.Env -> Http ()
+testCreateUserBlacklist :: Opt.Opts -> Brig -> AWSI.Env -> Http ()
 testCreateUserBlacklist (Opt.restrictUserCreation . Opt.settings -> Just True) _ _ = pure ()
 testCreateUserBlacklist _ brig aws =
   mapM_ ensureBlacklist ["bounce", "complaint"]
@@ -511,7 +513,7 @@ testCreateUserBlacklist _ brig aws =
           ]
     -- If there is no queue available, we need to force it either by publishing an event or using the API
     forceBlacklist :: Text -> EmailAddress -> Http ()
-    forceBlacklist typ em = case aws ^. AWS.sesQueue of
+    forceBlacklist typ em = case aws ^. AWSI.sesQueue of
       Just queue -> publishMessage typ em queue
       Nothing -> Bilge.post (brig . path "i/users/blacklist" . queryItem "email" (toByteString' em)) !!! const 200 === statusCode
     publishMessage :: Text -> EmailAddress -> Text -> Http ()
@@ -520,7 +522,7 @@ testCreateUserBlacklist _ brig aws =
             "bounce" -> MailBounce BouncePermanent [Mailbox Nothing em]
             "complaint" -> MailComplaint [Mailbox Nothing em]
             x -> error ("Unsupported message type: " ++ show x)
-      void . AWS.execute aws $ AWS.enqueueStandard queue bdy
+      void . liftIO . runFinal . AWSI.runAWSSubsystem aws $ AWS.enqueueStandard queue bdy
     awaitBlacklist :: Int -> EmailAddress -> Http ()
     awaitBlacklist n e = do
       r <- Bilge.head (brig . path "i/users/blacklist" . queryItem "email" (toByteString' e))

services/brig/test/integration/Run.hs

@@ -35,7 +35,6 @@ import API.User qualified as User
 import API.UserPendingActivation qualified as UserPendingActivation
 import Bilge hiding (header, host, port)
 import Bilge qualified
-import Brig.AWS qualified as AWS
 import Brig.App (initHttpManagerWithTLSConfig)
 import Brig.Options qualified as Opts
 import Cassandra.Util (defInitCassandra)
@@ -66,6 +65,7 @@ import Util.Test.SQS qualified as SQS
 import Web.HttpApiData
 import Wire.API.Federation.API
 import Wire.API.Routes.Version
+import Wire.AWSSubsystem.AWS qualified as AWS
 
 data BackendConf = BackendConf
   { remoteBrig :: Endpoint,
@@ -130,14 +130,14 @@ runTests iConf brigOpts otherArgs = do
         Opts.TurnSourceFiles files -> files
         Opts.TurnSourceDNS _ -> error "The integration tests can only be run when TurnServers are sourced from files"
       localDomain = brigOpts.settings.federationDomain
-      awsOpts = Opts.aws brigOpts
+      awsOpts = brigOpts.aws
   lg <- Logger.new Logger.defSettings -- TODO: use mkLogger'?
   db <- defInitCassandra (brigOpts.cassandra) lg
   mg <- initHttpManagerWithTLSConfig False Nothing
   let fedBrigClient = FedClient @'Brig mg (brig iConf)
   emailAWSOpts <- parseEmailAWSOpts
   awsEnv <- AWS.mkEnv lg awsOpts emailAWSOpts mg
-  mUserJournalWatcher <- for (Opts.userJournalQueue awsOpts) $ SQS.watchSQSQueue (view AWS.amazonkaEnv awsEnv)
+  mUserJournalWatcher <- for awsOpts.userJournalQueue $ SQS.watchSQSQueue (view AWS.amazonkaEnv awsEnv)
   userApi <- User.tests brigOpts fedBrigClient mg b c ch g n awsEnv db mUserJournalWatcher
   providerApi <- Provider.tests localDomain brigOpts (provider iConf) mg db b c g n
   searchApis <- Search.tests brigOpts iConf.additionalElasticSearch mg g b
@@ -196,7 +196,7 @@ runTests iConf brigOpts otherArgs = do
         latestVersion :: Version
         latestVersion = maxBound
 
-    parseEmailAWSOpts :: IO (Maybe Opts.EmailAWSOpts)
+    parseEmailAWSOpts :: IO (Maybe AWS.EmailAWSOpts)
     parseEmailAWSOpts = case Opts.email . Opts.emailSMS $ brigOpts of
       (Opts.EmailAWS aws) -> pure (Just aws)
       (Opts.EmailSMTP _) -> pure Nothing

services/brig/test/integration/Util/AWS.hs

@@ -17,7 +17,6 @@
 
 module Util.AWS where
 
-import Brig.AWS qualified as AWS
 import Control.Lens
 import Data.ByteString.Conversion
 import Data.ByteString.Lazy qualified as Lazy
@@ -31,6 +30,7 @@ import Proto.UserEvents_Fields qualified as PU
 import Test.Tasty.HUnit
 import Util.Test.SQS qualified as SQS
 import Wire.API.User
+import Wire.AWSSubsystem.AWS qualified as AWS
 
 type UserJournalWatcher = Maybe (SQS.SQSWatcher PU.UserEvent)