Merge branch 'wireapp:develop' into develop

.envrc

@@ -17,16 +17,16 @@ export NIX_CONFIG='extra-experimental-features = nix-command'
 
 [[ -d "$layout_dir" ]] || mkdir -p "$layout_dir"
 
-if [[ ! -d "$env_dir" || ! -f "$layout_dir/nix-rebuild" || "$store_paths" != $(< "$layout_dir/nix-rebuild" ) ]]; then
+if [[ ! -d "$env_dir" || ! -f "$layout_dir/nix-rebuild" || "$store_paths" != $(<"$layout_dir/nix-rebuild") ]]; then
   bcmd=nix
-  if command -v nom &> /dev/null; then
+  if command -v nom &>/dev/null; then
     if [[ "${USE_NOM}" != "0" ]]; then
       bcmd=nom
     fi
   fi
   echo "🔧 Building environment"
   $bcmd build -f nix wireServer.devEnv -Lv --out-link ./.env
-  echo "$store_paths" > "$layout_dir/nix-rebuild"
+  echo "$store_paths" >"$layout_dir/nix-rebuild"
 fi
 
 PATH_add "./.env/bin"
@@ -49,8 +49,13 @@ export LANG=en_US.UTF-8
 export RABBITMQ_USERNAME=guest
 export RABBITMQ_PASSWORD=alpaca-grapefruit
 
-# Redis
+export RABBITMQ_USERNAME_V0=guest
+export RABBITMQ_PASSWORD_V0=alpaca-grapefruit
+
+export RABBITMQ_USERNAME_V1=guest
+export RABBITMQ_PASSWORD_V1=alpaca-grapefruit
 
+# Redis
 export REDIS_PASSWORD=very-secure-redis-cluster-password
 export REDIS_ADDITIONAL_WRITE_PASSWORD=very-secure-redis-master-password
 

changelog.d/3-bug-fixes/WPB-15072

@@ -0,0 +1 @@
+Send team active event in personal user to team flow

changelog.d/3-bug-fixes/WPB-15085

@@ -0,0 +1 @@
+Add profile name to new team owner welcome mail

changelog.d/5-internal/WPB-11810

@@ -0,0 +1 @@
+Delete federation V0 and V1 queues after integration tests

charts/integration/templates/configmap.yaml

@@ -70,6 +70,20 @@ data:
     rabbitmq:
       host: rabbitmq
       adminPort: 15671
+      tls: true
+      vHost: /
+
+    rabbitmq-v0:
+      host: rabbitmq.wire-federation-v0.svc.cluster.local
+      adminPort: 15672
+      tls: false
+      vHost: /
+
+    rabbitmq-v1:
+      host: rabbitmq.wire-federation-v1.svc.cluster.local
+      adminPort: 15672
+      tls: false
+      vHost: /
 
     backendTwo:
 

charts/integration/templates/integration-integration.yaml

@@ -310,6 +310,20 @@ spec:
         secretKeyRef:
           name: brig
           key: rabbitmqPassword
+    - name: RABBITMQ_USERNAME_V0
+      value: "wire-server"
+    - name: RABBITMQ_PASSWORD_V0
+      valueFrom:
+        secretKeyRef:
+          name: rabbitmq-v0
+          key: rabbitmq-password
+    - name: RABBITMQ_USERNAME_V1
+      value: "wire-server"
+    - name: RABBITMQ_PASSWORD_V1
+      valueFrom:
+        secretKeyRef:
+          name: rabbitmq-v1
+          key: rabbitmq-password
     {{- if hasKey .Values.secrets "redisUsername" }}
     - name: REDIS_USERNAME
       valueFrom:

hack/bin/integration-test.sh

@@ -50,6 +50,12 @@ summary() {
     done
 }
 
+# Copy the secrets from the wire-federation-v0 namespace to the current namespace to be able to delete RabbitMQ queues that are created by the integration tests to avoid overflows
+kubectl -n "$NAMESPACE" delete --force secret rabbitmq-v0 || true
+kubectl -n wire-federation-v0 get secrets rabbitmq -ojson | jq 'del(.metadata.namespace) | del(.metadata.resourceVersion) | del(.metadata.uid) | .metadata.name="rabbitmq-v0"' | kubectl -n "$NAMESPACE" apply -f -
+kubectl -n "$NAMESPACE" delete --force secret rabbitmq-v1 || true
+kubectl -n wire-federation-v1 get secrets rabbitmq -ojson | jq 'del(.metadata.namespace) | del(.metadata.resourceVersion) | del(.metadata.uid) | .metadata.name="rabbitmq-v1"' | kubectl -n "$NAMESPACE" apply -f -
+
 # Run tests in parallel using GNU parallel (see https://www.gnu.org/software/parallel/)
 # The below commands are a little convoluted, but we wish to:
 # - run integration tests. If they fail, keep track of this, but still go and get logs, so we see what failed

integration/test/API/GalleyInternal.hs

@@ -119,3 +119,8 @@ patchTeamFeature domain team featureName payload = do
   tid <- asString team
   req <- baseRequest domain Galley Unversioned $ joinHttpPath ["i", "teams", tid, "features", featureName]
   submit "PATCH" $ req & addJSON payload
+
+getTeam :: (HasCallStack, MakesValue domain) => domain -> String -> App Response
+getTeam domain tid = do
+  req <- baseRequest domain Galley Unversioned $ joinHttpPath ["i", "teams", tid]
+  submit "GET" $ req

integration/test/Test/Events.hs

@@ -570,7 +570,10 @@ killConnection backend = do
             port = 0,
             adminPort = fromIntegral rc.adminPort,
             vHost = Text.pack backend.berVHost,
-            tls = Just $ RabbitMqTlsOpts Nothing True
+            tls =
+              if rc.tls
+                then Just $ RabbitMqTlsOpts Nothing True
+                else Nothing
           }
   servantClient <- liftIO $ mkRabbitMqAdminClientEnv opts
   name <- do

integration/test/Test/Teams.hs

@@ -22,7 +22,7 @@ import API.Brig
 import qualified API.BrigInternal as I
 import API.Common
 import API.Galley (getTeam, getTeamMembers, getTeamMembersCsv, getTeamNotifications)
-import API.GalleyInternal (setTeamFeatureStatus)
+import qualified API.GalleyInternal as I
 import API.Gundeck
 import qualified API.Nginz as Nginz
 import Control.Monad.Codensity (Codensity (runCodensity))
@@ -58,7 +58,7 @@ testInvitePersonalUserToTeam = do
           resp.json %. "invitations" `shouldMatch` ([] :: [()])
 
         ownerId <- owner %. "id" & asString
-        setTeamFeatureStatus domain tid "exposeInvitationURLsToTeamAdmin" "enabled" >>= assertSuccess
+        I.setTeamFeatureStatus domain tid "exposeInvitationURLsToTeamAdmin" "enabled" >>= assertSuccess
         user <- I.createUser domain def >>= getJSON 201
         uid <- user %. "id" >>= asString
         email <- user %. "email" >>= asString
@@ -289,6 +289,10 @@ testUpgradePersonalToTeam = do
   team <- getTeam alice tid >>= getJSON 200
   team %. "name" `shouldMatch` teamName
 
+  iTeam <- asString tid >>= I.getTeam alice >>= getJSON 200
+  iTeam %. "team.name" `shouldMatch` teamName
+  iTeam %. "status" `shouldMatch` "active"
+
   bindResponse (getTeamMembers alice tid) $ \resp -> do
     resp.status `shouldMatchInt` 200
     owner <- asList (resp.json %. "members") >>= assertOne

integration/test/Testlib/Env.hs

@@ -109,6 +109,8 @@ mkGlobalEnv cfgFile = do
         gServicesCwdBase = devEnvProjectRoot <&> (</> "services"),
         gBackendResourcePool = resourcePool,
         gRabbitMQConfig = intConfig.rabbitmq,
+        gRabbitMQConfigV0 = intConfig.rabbitmqV0,
+        gRabbitMQConfigV1 = intConfig.rabbitmqV1,
         gTempDir = tempDir,
         gTimeOutSeconds = timeOutSeconds
       }

integration/test/Testlib/ResourcePool.hs

@@ -21,7 +21,6 @@ import Data.Functor
 import Data.IORef
 import qualified Data.Set as Set
 import Data.String
-import qualified Data.Text as T
 import Data.Tuple
 import Database.CQL.IO
 import GHC.Stack (HasCallStack)
@@ -86,13 +85,13 @@ deleteAllRabbitMQQueues rc resource = do
           { host = rc.host,
             port = 0,
             adminPort = fromIntegral rc.adminPort,
-            vHost = T.pack resource.berVHost,
+            vHost = fromString resource.berVHost,
             tls = Just $ RabbitMqTlsOpts Nothing True
           }
   client <- mkRabbitMqAdminClientEnv opts
-  queues <- listQueuesByVHost client (T.pack resource.berVHost) Nothing Nothing
-  for_ queues $ \queue ->
-    deleteQueue client (T.pack resource.berVHost) queue.name
+  queuesPage <- listQueuesByVHost client (fromString resource.berVHost) (fromString "") False 100 1
+  for_ queuesPage.items $ \queue ->
+    deleteQueue client (fromString resource.berVHost) queue.name
 
 deleteAllDynamicBackendConfigs :: BackendResource -> Client ()
 deleteAllDynamicBackendConfigs resource = write cql (defQueryParams LocalQuorum ())

integration/test/Testlib/Run.hs

@@ -9,7 +9,13 @@ import Data.Foldable
 import Data.Function
 import Data.Functor
 import Data.List
+import Data.Maybe (fromMaybe)
+import Data.String (IsString (fromString))
+import Data.Text (Text)
+import qualified Data.Text as T
 import Data.Time.Clock
+import Network.AMQP.Extended
+import Network.RabbitMqAdmin
 import RunAllTests
 import System.Directory
 import System.Environment
@@ -133,11 +139,51 @@ runTests tests mXMLOutput cfg = do
             pure (TestSuiteReport [TestCaseReport qname TestSuccess tm])
       writeChan output Nothing
       wait displayThread
+      deleteFederationV0AndV1Queues genv
       printReport report
       mapM_ (saveXMLReport report) mXMLOutput
       when (any (\testCase -> testCase.result /= TestSuccess) report.cases) $
         exitFailure
 
+deleteFederationV0AndV1Queues :: GlobalEnv -> IO ()
+deleteFederationV0AndV1Queues env = do
+  let testDomains = env.gDomain1 : env.gDomain2 : env.gDynamicDomains
+  putStrLn "Attempting to delete federation V0 queues..."
+  (mV0User, mV0Pass) <- readCredsFromEnvWithSuffix "V0"
+  fromMaybe (putStrLn "No or incomplete credentials for fed V0 RabbitMQ") $
+    deleteFederationQueues testDomains env.gRabbitMQConfigV0 <$> mV0User <*> mV0Pass
+
+  putStrLn "Attempting to delete federation V1 queues..."
+  (mV1User, mV1Pass) <- readCredsFromEnvWithSuffix "V1"
+  fromMaybe (putStrLn "No or incomplete credentials for fed V1 RabbitMQ") $
+    deleteFederationQueues testDomains env.gRabbitMQConfigV1 <$> mV1User <*> mV1Pass
+  where
+    readCredsFromEnvWithSuffix :: String -> IO (Maybe Text, Maybe Text)
+    readCredsFromEnvWithSuffix suffix =
+      (,)
+        <$> (fmap fromString <$> lookupEnv ("RABBITMQ_USERNAME_" <> suffix))
+        <*> (fmap fromString <$> lookupEnv ("RABBITMQ_PASSWORD_" <> suffix))
+
+deleteFederationQueues :: [String] -> RabbitMQConfig -> Text -> Text -> IO ()
+deleteFederationQueues testDomains rc username password = do
+  let opts =
+        RabbitMqAdminOpts
+          { host = rc.host,
+            port = 0,
+            adminPort = fromIntegral rc.adminPort,
+            vHost = fromString rc.vHost,
+            tls =
+              if rc.tls
+                then Just (RabbitMqTlsOpts Nothing True)
+                else Nothing
+          }
+  client <- mkRabbitMqAdminClientEnvWithCreds opts username password
+  for_ testDomains $ \domain -> do
+    page <- client.listQueuesByVHost (fromString rc.vHost) (fromString $ "^backend-notifications\\." <> domain <> "$") True 100 1
+    for_ page.items $ \queue -> do
+      putStrLn $ "Deleting queue " <> T.unpack queue.name
+      void $ deleteQueue client (fromString rc.vHost) queue.name
+
 doListTests :: [(String, String, String, x)] -> IO ()
 doListTests tests = for_ tests $ \(qname, _desc, _full, _) -> do
   putStrLn qname

integration/test/Testlib/Types.hs

@@ -90,7 +90,9 @@ instance FromJSON DynamicBackendConfig
 
 data RabbitMQConfig = RabbitMQConfig
   { host :: String,
-    adminPort :: Word16
+    adminPort :: Word16,
+    tls :: Bool,
+    vHost :: String
   }
   deriving (Show)
 
@@ -100,6 +102,8 @@ instance FromJSON RabbitMQConfig where
       RabbitMQConfig
         <$> ob .: fromString "host"
         <*> ob .: fromString "adminPort"
+        <*> ob .: fromString "tls"
+        <*> ob .: fromString "vHost"
 
 -- | Initialised once per testsuite.
 data GlobalEnv = GlobalEnv
@@ -115,6 +119,8 @@ data GlobalEnv = GlobalEnv
     gServicesCwdBase :: Maybe FilePath,
     gBackendResourcePool :: ResourcePool BackendResource,
     gRabbitMQConfig :: RabbitMQConfig,
+    gRabbitMQConfigV0 :: RabbitMQConfig,
+    gRabbitMQConfigV1 :: RabbitMQConfig,
     gTempDir :: FilePath,
     gTimeOutSeconds :: Int
   }
@@ -127,6 +133,8 @@ data IntegrationConfig = IntegrationConfig
     integrationTestHostName :: String,
     dynamicBackends :: Map String DynamicBackendConfig,
     rabbitmq :: RabbitMQConfig,
+    rabbitmqV0 :: RabbitMQConfig,
+    rabbitmqV1 :: RabbitMQConfig,
     cassandra :: CassandraConfig
   }
   deriving (Show, Generic)
@@ -142,6 +150,8 @@ instance FromJSON IntegrationConfig where
         <*> o .: fromString "integrationTestHostName"
         <*> o .: fromString "dynamicBackends"
         <*> o .: fromString "rabbitmq"
+        <*> o .: fromString "rabbitmq-v0"
+        <*> o .: fromString "rabbitmq-v1"
         <*> o .: fromString "cassandra"
 
 data ServiceMap = ServiceMap

libs/extended/src/Network/AMQP/Extended.hs

@@ -7,6 +7,7 @@ module Network.AMQP.Extended
     withConnection,
     openConnectionWithRetries,
     mkRabbitMqAdminClientEnv,
+    mkRabbitMqAdminClientEnvWithCreds,
     mkRabbitMqChannelMVar,
     demoteOpts,
     RabbitMqTlsOpts (..),
@@ -91,9 +92,8 @@ instance FromJSON RabbitMqAdminOpts where
       <*> parseTlsJson v
       <*> v .: "adminPort"
 
-mkRabbitMqAdminClientEnv :: RabbitMqAdminOpts -> IO (AdminAPI (AsClientT IO))
-mkRabbitMqAdminClientEnv opts = do
-  (username, password) <- readCredsFromEnv
+mkRabbitMqAdminClientEnvWithCreds :: RabbitMqAdminOpts -> Text -> Text -> IO (AdminAPI (AsClientT IO))
+mkRabbitMqAdminClientEnvWithCreds opts username password = do
   mTlsSettings <- traverse (mkTLSSettings opts.host) opts.tls
   let (protocol, managerSettings) = case mTlsSettings of
         Nothing -> (Servant.Http, HTTP.defaultManagerSettings)
@@ -107,6 +107,9 @@ mkRabbitMqAdminClientEnv opts = do
       (either throwM pure <=< flip runClientM clientEnv)
       (toServant $ adminClient basicAuthData)
 
+mkRabbitMqAdminClientEnv :: RabbitMqAdminOpts -> IO (AdminAPI (AsClientT IO))
+mkRabbitMqAdminClientEnv opts = readCredsFromEnv >>= uncurry (mkRabbitMqAdminClientEnvWithCreds opts)
+
 -- | When admin opts are needed use `AmqpEndpoint Identity`, otherwise use
 -- `AmqpEndpoint NoAdmin`.
 data AmqpEndpoint = AmqpEndpoint

libs/extended/src/Network/RabbitMqAdmin.hs

@@ -13,20 +13,36 @@ type VHost = Text
 
 type QueueName = Text
 
+data Page a = Page {items :: [a], page :: Int, pageCount :: Int}
+  deriving (Show, Eq, Generic)
+
+instance (FromJSON a) => FromJSON (Page a) where
+  parseJSON =
+    genericParseJSON $
+      defaultOptions
+        { fieldLabelModifier = camelTo2 '_'
+        }
+
+instance (ToJSON a) => ToJSON (Page a) where
+  toJSON =
+    genericToJSON $
+      defaultOptions
+        { fieldLabelModifier = camelTo2 '_'
+        }
+
 -- | Upstream Docs:
 -- https://rawcdn.githack.com/rabbitmq/rabbitmq-server/v3.12.0/deps/rabbitmq_management/priv/www/api/index.html
 data AdminAPI route = AdminAPI
-  { -- | NOTE: This endpoint can be made paginated, but that complicates
-    -- consumer code a little. This might be needed for performance tuning
-    -- later, but perhaps not.
-    listQueuesByVHost ::
+  { listQueuesByVHost ::
       route
         :- "api"
           :> "queues"
           :> Capture "vhost" VHost
-          :> QueryParam "name" Text
-          :> QueryParam "use_regex" Bool
-          :> Get '[JSON] [Queue],
+          :> QueryParam' '[Required, Strict] "name" Text
+          :> QueryParam' '[Required, Strict] "use_regex" Bool
+          :> QueryParam' '[Required, Strict] "page_size" Int
+          :> QueryParam' '[Required, Strict] "page" Int
+          :> Get '[JSON] (Page Queue),
     deleteQueue ::
       route
         :- "api"

libs/wire-subsystems/src/Wire/EmailSubsystem/Template.hs

@@ -210,15 +210,6 @@ data MemberWelcomeEmailTemplate = MemberWelcomeEmailTemplate
     memberWelcomeEmailSenderName :: !Text
   }
 
-data PersonalUserMemberWelcomeEmailTemplate = PersonalUserMemberWelcomeEmailTemplate
-  { personalUserMemberWelcomeEmailUrl :: !Text,
-    personalUserMemberWelcomeEmailSubject :: !Template,
-    personalUserMemberWelcomeEmailBodyText :: !Template,
-    personalUserMemberWelcomeEmailBodyHtml :: !Template,
-    personalUserMemberWelcomeEmailSender :: !EmailAddress,
-    personalUserMemberWelcomeEmailSenderName :: !Text
-  }
-
 data NewTeamOwnerWelcomeEmailTemplate = NewTeamOwnerWelcomeEmailTemplate
   { newTeamOwnerWelcomeEmailUrl :: !Text,
     newTeamOwnerWelcomeEmailSubject :: !Template,
@@ -233,6 +224,5 @@ data TeamTemplates = TeamTemplates
     existingUserInvitationEmail :: !InvitationEmailTemplate,
     creatorWelcomeEmail :: !CreatorWelcomeEmailTemplate,
     memberWelcomeEmail :: !MemberWelcomeEmailTemplate,
-    personalUserMemberWelcomeEmail :: !PersonalUserMemberWelcomeEmailTemplate,
     newTeamOwnerWelcomeEmail :: !NewTeamOwnerWelcomeEmailTemplate
   }