From ad12358522c02997c69723354214d48402a541b8 Mon Sep 17 00:00:00 2001
From: Matthias Fischmann <mf@zerobuzz.net>
Date: Mon, 3 Jul 2023 13:20:19 +0200
Subject: [PATCH 1/2] Remove dead code from cannon.

---
 charts/cannon/templates/configmap.yaml   |  4 ----
 services/cannon/cannon.integration.yaml  |  4 ----
 services/cannon/cannon2.integration.yaml |  4 ----
 services/cannon/src/Cannon/Options.hs    | 12 ------------
 services/cannon/src/Cannon/Run.hs        |  8 --------
 5 files changed, 32 deletions(-)

diff --git a/charts/cannon/templates/configmap.yaml b/charts/cannon/templates/configmap.yaml
index 0c9c2c43cf0..940d6013065 100644
--- a/charts/cannon/templates/configmap.yaml
+++ b/charts/cannon/templates/configmap.yaml
@@ -14,10 +14,6 @@ data:
       host: gundeck
       port: 8080
 
-    brig:
-      host: brig
-      port: 8080
-
     drainOpts:
       gracePeriodSeconds: {{ .Values.config.drainOpts.gracePeriodSeconds }}
       millisecondsBetweenBatches: {{ .Values.config.drainOpts.millisecondsBetweenBatches }}
diff --git a/services/cannon/cannon.integration.yaml b/services/cannon/cannon.integration.yaml
index 1886f69405f..f64f3c104f7 100644
--- a/services/cannon/cannon.integration.yaml
+++ b/services/cannon/cannon.integration.yaml
@@ -16,10 +16,6 @@ gundeck:
   host: 127.0.0.1
   port: 8086
 
-brig:
-  host: 0.0.0.0
-  port: 8082
-
 drainOpts:
   gracePeriodSeconds: 1
   millisecondsBetweenBatches: 500
diff --git a/services/cannon/cannon2.integration.yaml b/services/cannon/cannon2.integration.yaml
index 2aa003cfd6c..5c259376521 100644
--- a/services/cannon/cannon2.integration.yaml
+++ b/services/cannon/cannon2.integration.yaml
@@ -16,10 +16,6 @@ gundeck:
   host: 127.0.0.1
   port: 8086
 
-brig:
-  host: 0.0.0.0
-  port: 8082
-
 drainOpts:
   gracePeriodSeconds: 1
   millisecondsBetweenBatches: 5
diff --git a/services/cannon/src/Cannon/Options.hs b/services/cannon/src/Cannon/Options.hs
index 8e59927ff41..bce5cba50cc 100644
--- a/services/cannon/src/Cannon/Options.hs
+++ b/services/cannon/src/Cannon/Options.hs
@@ -24,8 +24,6 @@ module Cannon.Options
     port,
     cannon,
     gundeck,
-    brig,
-    Brig (..),
     externalHost,
     externalHostFile,
     logLevel,
@@ -69,15 +67,6 @@ makeFields ''Gundeck
 
 deriveApiFieldJSON ''Gundeck
 
-data Brig = Brig
-  { _brigHost :: !Text,
-    _brigPort :: !Word16
-  }
-  deriving (Eq, Show, Generic)
-
-makeFields ''Brig
-deriveApiFieldJSON ''Brig
-
 data DrainOpts = DrainOpts
   { -- | Maximum amount of time draining should take. Must not be set to 0.
     _drainOptsGracePeriodSeconds :: Word64,
@@ -98,7 +87,6 @@ deriveApiFieldJSON ''DrainOpts
 data Opts = Opts
   { _optsCannon :: !Cannon,
     _optsGundeck :: !Gundeck,
-    _optsBrig :: !Brig,
     _optsLogLevel :: !Level,
     _optsLogNetStrings :: !(Maybe (Last Bool)),
     _optsLogFormat :: !(Maybe (Last LogFormat)),
diff --git a/services/cannon/src/Cannon/Run.hs b/services/cannon/src/Cannon/Run.hs
index 19338dccf32..643ad29143d 100644
--- a/services/cannon/src/Cannon/Run.hs
+++ b/services/cannon/src/Cannon/Run.hs
@@ -56,8 +56,6 @@ import qualified System.Logger.Extended as L
 import System.Posix.Signals
 import qualified System.Posix.Signals as Signals
 import System.Random.MWC (createSystemRandom)
-import Util.Options (Endpoint (..))
-import Wire.API.FederationUpdate
 import qualified Wire.API.Routes.Internal.Cannon as Internal
 import Wire.API.Routes.Public.Cannon
 import Wire.API.Routes.Version.Wai
@@ -82,11 +80,6 @@ run o = do
   refreshMetricsThread <- Async.async $ runCannon' e refreshMetrics
   s <- newSettings $ Server (o ^. cannon . host) (o ^. cannon . port) (applog e) m (Just idleTimeout)
 
-  -- Get the federation domain list from Brig and start the updater loop
-  let brigEndpoint = Endpoint bh bp
-      Brig bh bp = o ^. brig
-  (_, updateDomainsThread) <- syncFedDomainConfigs brigEndpoint g emptySyncFedDomainConfigsCallback
-
   let middleware :: Wai.Middleware
       middleware =
         versionMiddleware (fold (o ^. disabledAPIVersions))
@@ -109,7 +102,6 @@ run o = do
       -- the same time and then calling the drain script. I suspect this might be due to some
       -- cleanup in wai.  this needs to be tested very carefully when touched.
       Async.cancel refreshMetricsThread
-      Async.cancel updateDomainsThread
       L.close (applog e)
   where
     idleTimeout = fromIntegral $ maxPingInterval + 3

From 678578e46d38ec9668287d55f146b1b289a9a0ba Mon Sep 17 00:00:00 2001
From: Matthias Fischmann <mf@zerobuzz.net>
Date: Mon, 3 Jul 2023 13:21:26 +0200
Subject: [PATCH 2/2] changelog.

---
 changelog.d/0-release-notes/pr-3260 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changelog.d/0-release-notes/pr-3260 b/changelog.d/0-release-notes/pr-3260
index bf9127f6ad5..32483e84189 100644
--- a/changelog.d/0-release-notes/pr-3260
+++ b/changelog.d/0-release-notes/pr-3260
@@ -62,4 +62,4 @@ with the temporary contents of
 `brig.config.optSettings.setFederationDomainConfigs`, it is safe to
 remove the latter and the above lines from the federator config.
 
-[See also.](http://docs.wire.com/understand/configure-federation.html#if-your-instance-has-been-federating-before) (#3260, #3384)
+[See also.](http://docs.wire.com/understand/configure-federation.html#if-your-instance-has-been-federating-before) (#3260, #3384, #3389)