Mv Spar.Options => Wire.ServerOptions.Spar

fisx · fisx · commit b213e72dceb0 · 2024-11-05T16:03:16.000+01:00
diff --git a/libs/wire-subsystems/src/Wire/ServerOptions/Spar.hs b/libs/wire-subsystems/src/Wire/ServerOptions/Spar.hs
@@ -19,7 +19,7 @@
 -- with this program. If not, see <https://www.gnu.org/licenses/>.
 
 -- | Reading the Spar config.
-module Spar.Options
+module Wire.ServerOptions.Spar
   ( Opts' (..),
     Opts,
     DerivedOpts (..),
diff --git a/libs/wire-subsystems/wire-subsystems.cabal b/libs/wire-subsystems/wire-subsystems.cabal
@@ -116,11 +116,12 @@ library
     Wire.PropertySubsystem
     Wire.PropertySubsystem.Interpreter
     Wire.Rpc
-    Wire.ServerOptions.Cannon
     Wire.ServerOptions.Brig
-    Wire.ServerOptions.Brig.ZAuth
-    Wire.ServerOptions.Brig.Queue
     Wire.ServerOptions.Brig.CookieLimit
+    Wire.ServerOptions.Brig.Queue
+    Wire.ServerOptions.Brig.ZAuth
+    Wire.ServerOptions.Cannon
+    Wire.ServerOptions.Spar
     Wire.SessionStore
     Wire.SessionStore.Cassandra
     Wire.StoredUser
@@ -159,20 +160,19 @@ library
     , base
     , base16-bytestring
     , bilge
-    , dns
     , bloodhound
     , bytestring
     , bytestring-conversion
     , case-insensitive
     , cassandra-util
-    , openapi3
     , conduit
     , containers
     , cql
     , crypton
     , currency-codes
     , data-default
     , data-timeout
+    , dns
     , errors
     , exceptions
     , extended
@@ -193,6 +193,8 @@ library
     , mime-mail
     , network
     , network-conduit-tls
+    , openapi3
+    , optparse-applicative
     , polysemy
     , polysemy-plugin
     , polysemy-time
@@ -210,6 +212,7 @@ library
     , template
     , text
     , text-icu-translit
+    , text-latin1
     , time
     , time-out
     , time-units
@@ -225,6 +228,7 @@ library
     , wire-api-federation
     , wire-otel
     , witherable
+    , yaml
 
   default-language: GHC2021
 
@@ -240,7 +244,6 @@ test-suite wire-subsystems-tests
   other-modules:
     Spec
     Wire.AuthenticationSubsystem.InterpreterSpec
-    Wire.ServerOptionsSpec
     Wire.MiniBackend
     Wire.MockInterpreters
     Wire.MockInterpreters.ActivationCodeStore
@@ -265,6 +268,7 @@ test-suite wire-subsystems-tests
     Wire.MockInterpreters.VerificationCodeStore
     Wire.NotificationSubsystem.InterpreterSpec
     Wire.PropertySubsystem.InterpreterSpec
+    Wire.ServerOptionsSpec
     Wire.UserSearch.TypesSpec
     Wire.UserStoreSpec
     Wire.UserSubsystem.InterpreterSpec
@@ -274,18 +278,17 @@ test-suite wire-subsystems-tests
   build-depends:
     , aeson
     , async
+    , attoparsec
     , base
     , bilge
-    , yaml
+    , bloodhound
     , bytestring
     , cassandra-util
     , containers
-              , bloodhound
-              , dns
-              , attoparsec
-              , email-validate
     , crypton
     , data-default
+    , dns
+    , email-validate
     , errors
     , extended
     , hspec
@@ -315,3 +318,4 @@ test-suite wire-subsystems-tests
     , wire-api
     , wire-api-federation
     , wire-subsystems
+    , yaml
diff --git a/services/cannon/cannon.cabal b/services/cannon/cannon.cabal
@@ -115,8 +115,8 @@ library
     , warp                                  >=3.0
     , websockets                            >=0.11.2
     , wire-api
-    , wire-subsystems
     , wire-otel
+    , wire-subsystems
 
   default-language:   GHC2021
 
diff --git a/services/spar/exec/Main.hs b/services/spar/exec/Main.hs
@@ -18,8 +18,8 @@
 module Main where
 
 import Imports
-import Spar.Options
 import Spar.Run
+import Wire.ServerOptions.Spar
 
 main :: IO ()
 main = runServer =<< getOpts
diff --git a/services/spar/spar.cabal b/services/spar/spar.cabal
@@ -25,7 +25,6 @@ library
     Spar.Intra.Brig
     Spar.Intra.BrigApp
     Spar.Intra.Galley
-    Spar.Options
     Spar.Orphans
     Spar.Run
     Spar.Schema.Run
@@ -173,7 +172,6 @@ library
     , metrics-wai
     , mtl
     , network-uri
-    , optparse-applicative
     , polysemy
     , polysemy-check         >=0.9
     , polysemy-plugin
@@ -185,7 +183,6 @@ library
     , servant-multipart
     , servant-server
     , text
-    , text-latin1
     , these
     , time
     , tinylog
@@ -200,7 +197,6 @@ library
     , warp
     , wire-api
     , wire-subsystems
-    , yaml
 
   default-language:   Haskell2010
 
@@ -261,6 +257,7 @@ executable spar
       base
     , imports
     , spar
+    , wire-subsystems
 
   default-language:   Haskell2010
 
@@ -397,6 +394,7 @@ executable spar-integration
     , wai-extra
     , wai-utilities
     , wire-api
+    , wire-subsystems
     , xml-conduit
     , yaml
     , zauth
diff --git a/services/spar/src/Spar/API.hs b/services/spar/src/Spar/API.hs
@@ -71,7 +71,6 @@ import Spar.App
 import Spar.CanonicalInterpreter
 import Spar.Error
 import qualified Spar.Intra.BrigApp as Brig
-import Spar.Options
 import Spar.Orphans ()
 import Spar.Scim hiding (handle)
 import Spar.Sem.AReqIDStore (AReqIDStore)
@@ -114,6 +113,7 @@ import qualified Wire.Sem.Logger as Logger
 import Wire.Sem.Now (Now)
 import Wire.Sem.Random (Random)
 import qualified Wire.Sem.Random as Random
+import Wire.ServerOptions.Spar
 
 app :: Env -> Application
 app ctx0 req cont = do
diff --git a/services/spar/src/Spar/App.hs b/services/spar/src/Spar/App.hs
@@ -72,7 +72,6 @@ import Servant
 import qualified Servant.Multipart as Multipart
 import Spar.Error hiding (sparToServerErrorWithLogging)
 import qualified Spar.Intra.BrigApp as Intra
-import Spar.Options
 import Spar.Orphans ()
 import Spar.Sem.AReqIDStore (AReqIDStore)
 import Spar.Sem.BrigAccess (BrigAccess, getAccount)
@@ -102,6 +101,7 @@ import Wire.Sem.Logger (Logger)
 import qualified Wire.Sem.Logger as Logger
 import Wire.Sem.Random (Random)
 import qualified Wire.Sem.Random as Random
+import Wire.ServerOptions.Spar
 
 throwSparSem :: (Member (Error SparError) r) => SparCustomError -> Sem r a
 throwSparSem = throw . SAML.CustomError
diff --git a/services/spar/src/Spar/CanonicalInterpreter.hs b/services/spar/src/Spar/CanonicalInterpreter.hs
@@ -33,7 +33,6 @@ import Polysemy.Input (Input, runInputConst)
 import Servant
 import Spar.App hiding (sparToServerErrorWithLogging)
 import Spar.Error
-import Spar.Options
 import Spar.Orphans ()
 import Spar.Sem.AReqIDStore (AReqIDStore)
 import Spar.Sem.AReqIDStore.Cassandra (aReqIDStoreToCassandra)
@@ -74,6 +73,7 @@ import Wire.Sem.Now (Now)
 import Wire.Sem.Now.IO (nowToIO)
 import Wire.Sem.Random (Random)
 import Wire.Sem.Random.IO (randomToIO)
+import Wire.ServerOptions.Spar
 
 type CanonicalEffs =
   '[ SAML2,
diff --git a/services/spar/src/Spar/Data.hs b/services/spar/src/Spar/Data.hs
@@ -42,9 +42,9 @@ import Imports
 import SAML2.Util (renderURI)
 import qualified SAML2.WebSSO as SAML
 import qualified SAML2.WebSSO.Types.Email as SAMLEmail
-import Spar.Options
 import qualified Spar.Schema.Run as Migrations
 import Wire.API.User.Saml
+import Wire.ServerOptions.Spar
 
 -- | A lower bound: @schemaVersion <= whatWeFoundOnCassandra@, not @==@.
 schemaVersion :: Int32
diff --git a/services/spar/src/Spar/Run.hs b/services/spar/src/Spar/Run.hs
@@ -48,7 +48,6 @@ import Spar.API (SparAPI, app)
 import Spar.App
 import qualified Spar.Data as Data
 import Spar.Data.Instances ()
-import Spar.Options as Opt
 import Spar.Orphans ()
 import System.Logger (Logger)
 import qualified System.Logger as Log
@@ -57,6 +56,7 @@ import Util.Options
 import Wire.API.Routes.Version (expandVersionExp)
 import Wire.API.Routes.Version.Wai
 import Wire.Sem.Logger.TinyLog
+import Wire.ServerOptions.Spar as Opt
 
 ----------------------------------------------------------------------
 -- cassandra
diff --git a/services/spar/src/Spar/Scim.hs b/services/spar/src/Spar/Scim.hs
@@ -78,7 +78,6 @@ import Spar.Error
   ( SparCustomError (SparScimError),
     SparError,
   )
-import Spar.Options
 import Spar.Scim.Auth
 import Spar.Scim.User
 import Spar.Sem.BrigAccess (BrigAccess)
@@ -102,6 +101,7 @@ import Wire.API.User.Scim
 import Wire.Sem.Logger (Logger)
 import Wire.Sem.Now (Now)
 import Wire.Sem.Random (Random)
+import Wire.ServerOptions.Spar
 
 -- | SCIM config for our server.
 --
diff --git a/services/spar/src/Spar/Scim/Auth.hs b/services/spar/src/Spar/Scim/Auth.hs
@@ -49,7 +49,6 @@ import Servant (NoContent (NoContent), ServerT, (:<|>) ((:<|>)))
 import Spar.App (throwSparSem)
 import qualified Spar.Error as E
 import qualified Spar.Intra.BrigApp as Intra.Brig
-import Spar.Options
 import Spar.Sem.BrigAccess (BrigAccess)
 import qualified Spar.Sem.BrigAccess as BrigAccess
 import Spar.Sem.GalleyAccess (GalleyAccess)
@@ -68,6 +67,7 @@ import Wire.Sem.Now (Now)
 import qualified Wire.Sem.Now as Now
 import Wire.Sem.Random (Random)
 import qualified Wire.Sem.Random as Random
+import Wire.ServerOptions.Spar
 
 -- | An instance that tells @hscim@ how authentication should be done for SCIM routes.
 instance (Member ScimTokenStore r) => Scim.Class.Auth.AuthDB SparTag (Sem r) where
diff --git a/services/spar/src/Spar/Scim/User.hs b/services/spar/src/Spar/Scim/User.hs
@@ -76,7 +76,6 @@ import Spar.App (getUserByUrefUnsafe, getUserByUrefViaOldIssuerUnsafe, getUserId
 import qualified Spar.App
 import Spar.Intra.BrigApp as Intra
 import qualified Spar.Intra.BrigApp as Brig
-import Spar.Options
 import Spar.Scim.Auth ()
 import Spar.Scim.Types
 import qualified Spar.Scim.Types as ST
@@ -120,6 +119,7 @@ import Wire.Sem.Now (Now)
 import qualified Wire.Sem.Now as Now
 import Wire.Sem.Random (Random)
 import qualified Wire.Sem.Random as Random
+import Wire.ServerOptions.Spar
 
 ----------------------------------------------------------------------------
 -- UserDB instance
diff --git a/services/spar/src/Spar/Sem/AReqIDStore/Cassandra.hs b/services/spar/src/Spar/Sem/AReqIDStore/Cassandra.hs
@@ -33,11 +33,11 @@ import Polysemy.Input (Input, input)
 import qualified SAML2.WebSSO as SAML
 import qualified Spar.Data as Data
 import Spar.Data.Instances ()
-import Spar.Options
 import Spar.Sem.AReqIDStore
 import Wire.API.User.Saml
 import Wire.Sem.Now (Now)
 import qualified Wire.Sem.Now as Now
+import Wire.ServerOptions.Spar
 
 aReqIDStoreToCassandra ::
   forall m r a.
diff --git a/services/spar/src/Spar/Sem/AssIDStore/Cassandra.hs b/services/spar/src/Spar/Sem/AssIDStore/Cassandra.hs
@@ -33,11 +33,11 @@ import Polysemy.Input
 import qualified SAML2.WebSSO as SAML
 import qualified Spar.Data as Data
 import Spar.Data.Instances ()
-import Spar.Options
 import Spar.Sem.AssIDStore
 import Wire.API.User.Saml
 import Wire.Sem.Now (Now)
 import qualified Wire.Sem.Now as Now
+import Wire.ServerOptions.Spar
 
 assIDStoreToCassandra ::
   forall m r a.
diff --git a/services/spar/src/Spar/Sem/SAML2/Library.hs b/services/spar/src/Spar/Sem/SAML2/Library.hs
@@ -34,7 +34,6 @@ import Polysemy.Internal.Tactics
 import SAML2.WebSSO hiding (Error)
 import qualified SAML2.WebSSO as SAML hiding (Error)
 import Spar.Error (SparCustomError (..), SparError)
-import Spar.Options
 import Spar.Sem.AReqIDStore (AReqIDStore)
 import qualified Spar.Sem.AReqIDStore as AReqIDStore
 import Spar.Sem.AssIDStore (AssIDStore)
@@ -45,6 +44,7 @@ import Spar.Sem.SAML2
 import Wire.API.User.IdentityProvider (WireIdP)
 import Wire.Sem.Logger (Logger)
 import qualified Wire.Sem.Logger as Logger
+import Wire.ServerOptions.Spar
 
 wrapMonadClientSPImpl ::
   ( Member (Error SparError) r,
diff --git a/services/spar/test-integration/Test/Spar/APISpec.hs b/services/spar/test-integration/Test/Spar/APISpec.hs
@@ -71,7 +71,6 @@ import SAML2.WebSSO.Test.Lenses
 import SAML2.WebSSO.Test.MockResponse
 import SAML2.WebSSO.Test.Util
 import qualified Spar.Intra.BrigApp as Intra
-import Spar.Options
 import qualified Spar.Sem.AReqIDStore as AReqIDStore
 import qualified Spar.Sem.BrigAccess as BrigAccess
 import qualified Spar.Sem.IdPConfigStore as IdPEffect
@@ -96,6 +95,7 @@ import Wire.API.User.Client
 import Wire.API.User.Client.Prekey
 import Wire.API.User.IdentityProvider
 import Wire.API.User.Scim hiding (handle)
+import Wire.ServerOptions.Spar
 
 spec :: SpecWith TestEnv
 spec = do
diff --git a/services/spar/test-integration/Test/Spar/DataSpec.hs b/services/spar/test-integration/Test/Spar/DataSpec.hs
@@ -32,7 +32,6 @@ import SAML2.WebSSO as SAML
 import Spar.App as App
 import Spar.Error (IdpDbError (IdpNotFound), SparCustomError (IdpDbError))
 import Spar.Intra.BrigApp (veidFromUserSSOId)
-import Spar.Options
 import qualified Spar.Sem.AReqIDStore as AReqIDStore
 import qualified Spar.Sem.AssIDStore as AssIDStore
 import qualified Spar.Sem.IdPConfigStore as IdPEffect
@@ -48,6 +47,7 @@ import Web.Scim.Schema.Common as Scim.Common
 import Web.Scim.Schema.Meta as Scim.Meta
 import Wire.API.User.IdentityProvider
 import Wire.API.User.Saml
+import Wire.ServerOptions.Spar
 
 spec :: SpecWith TestEnv
 spec = do
diff --git a/services/spar/test-integration/Test/Spar/Scim/UserSpec.hs b/services/spar/test-integration/Test/Spar/Scim/UserSpec.hs
@@ -63,7 +63,6 @@ import qualified SAML2.WebSSO.Test.MockResponse as SAML
 import SAML2.WebSSO.Test.Util.TestSP (makeSampleIdPMetadata)
 import qualified SAML2.WebSSO.Test.Util.Types as SAML
 import qualified Spar.Intra.BrigApp as Intra
-import Spar.Options
 import Spar.Scim
 import Spar.Scim.Types (normalizeLikeStored)
 import qualified Spar.Scim.User as SU
@@ -95,6 +94,7 @@ import qualified Wire.API.User.IdentityProvider as User
 import Wire.API.User.RichInfo
 import qualified Wire.API.User.Scim as Spar.Types
 import qualified Wire.API.User.Search as Search
+import Wire.ServerOptions.Spar
 
 -- | Tests for @\/scim\/v2\/Users@.
 spec :: SpecWith TestEnv
diff --git a/services/spar/test-integration/Util/Core.hs b/services/spar/test-integration/Util/Core.hs
diff --git a/services/spar/test-integration/Util/Types.hs b/services/spar/test-integration/Util/Types.hs
