Mv Gundeck.Options => Wire.ServerOptions.Gundeck [WIP]

Author: fisx

services/gundeck/src/Gundeck/Options.hs …ystems/src/Wire/ServerOptions/Gundeck.hsservices/gundeck/src/Gundeck/Options.hs renamed to libs/wire-subsystems/src/Wire/ServerOptions/Gundeck.hs services/gundeck/src/Gundeck/Options.hs renamed to libs/wire-subsystems/src/Wire/ServerOptions/Gundeck.hs

@@ -18,14 +18,15 @@
 -- You should have received a copy of the GNU Affero General Public License along
 -- with this program. If not, see <https://www.gnu.org/licenses/>.
 
-module Gundeck.Options where
+module Wire.ServerOptions.Gundeck where
 
+import Amazonka (Region)
 import Control.Lens hiding (Level)
 import Data.Aeson.TH
 import Data.Yaml (FromJSON)
-import Gundeck.Aws.Arn
 import Imports
 import System.Logger.Extended (Level, LogFormat)
+import Text.Shakespeare.Text (ToText (..))
 import Util.Options
 import Util.Options.Common
 import Wire.API.Routes.Version
@@ -34,6 +35,12 @@ newtype NotificationTTL = NotificationTTL
   {notificationTTLSeconds :: Word32}
   deriving (Eq, Ord, Show, Generic, FromJSON)
 
+newtype ArnEnv = ArnEnv {arnEnvText :: Text}
+  deriving (Show, ToText, FromJSON)
+
+newtype Account = Account {fromAccount :: Text}
+  deriving (Eq, Ord, Show, ToText, FromJSON)
+
 data AWSOpts = AWSOpts
   { -- | AWS account
     _account :: !Account,

libs/wire-subsystems/wire-subsystems.cabal

@@ -121,6 +121,7 @@ library
     Wire.ServerOptions.Brig.Queue
     Wire.ServerOptions.Brig.ZAuth
     Wire.ServerOptions.Cannon
+    Wire.ServerOptions.Gundeck
     Wire.ServerOptions.Spar
     Wire.SessionStore
     Wire.SessionStore.Cassandra
@@ -208,6 +209,7 @@ library
     , schema-profunctor
     , servant
     , servant-client-core
+    , shakespeare
     , stomp-queue
     , template
     , text

services/brig/src/Brig/API/Public.hs

@@ -198,10 +198,10 @@ serverOptionsDocsAPI = Named @"server-config-options" $ pure allOptsSchema
   where
     allOptsSchema =
       mkJsonObject
-        ( [ "brig" .= ("comping up!" :: Text), -- TODO
-            "galley" .= ("comping up!" :: Text), -- TODO
-            "spar" .= ("comping up!" :: Text), -- TODO
-            "gundeck" .= ("comping up!" :: Text), -- TODO
+        ( [ "brig" .= ("comping up!" :: Text), -- TODO: use schema-profunctor, then connect here.
+            "galley" .= ("comping up!" :: Text), -- TODO: move to wire-subsystems.
+            "spar" .= ("comping up!" :: Text), -- TODO: use schema-profunctor, then connect here.
+            "gundeck" .= ("comping up!" :: Text), -- TODO: get it to compile.
             "cannon" .= describeOpts (Proxy @Wire.ServerOptions.Cannon.Opts),
             "cargohold" .= ("comping up!" :: Text), -- TODO
             "federator" .= ("comping up!" :: Text), -- TODO

services/gundeck/gundeck.cabal

@@ -29,7 +29,6 @@ library
     Gundeck.Monad
     Gundeck.Notification
     Gundeck.Notification.Data
-    Gundeck.Options
     Gundeck.Presence
     Gundeck.Presence.Data
     Gundeck.Push
@@ -167,7 +166,7 @@ library
     , wai-utilities                         >=0.16
     , wire-api
     , wire-otel
-    , yaml                                  >=0.8
+    , wire-subsystems
 
   default-language:   GHC2021
 

services/gundeck/src/Gundeck/Aws/Arn.hs

@@ -59,10 +59,7 @@ import Data.Attoparsec.Text
 import Data.Text qualified as Text
 import Imports
 import Wire.API.Push.V2 (AppName (..), Transport (..))
-
-newtype ArnEnv = ArnEnv {arnEnvText :: Text} deriving (Show, ToText, FromJSON)
-
-newtype Account = Account {fromAccount :: Text} deriving (Eq, Ord, Show, ToText, FromJSON)
+import Wire.ServerOptions.Gundeck
 
 newtype EndpointId = EndpointId Text deriving (Eq, Ord, Show, ToText)
 

services/gundeck/src/Gundeck/ThreadBudget/Internal.hs

@@ -29,13 +29,13 @@ import Data.Set qualified as Set
 import Data.Time
 import Data.UUID (UUID, toText)
 import Data.UUID.V4 (nextRandom)
-import Gundeck.Options
 import Imports
 import Prometheus (MonadMonitor)
 import Prometheus qualified as Prom
 import System.Logger.Class qualified as LC
 import UnliftIO.Async
 import UnliftIO.Exception (finally)
+import Wire.ServerOptions.Gundeck
 
 data ThreadBudgetState = ThreadBudgetState
   { threadBudgetLimits :: MaxConcurrentNativePushes,