From c19fd505cb9f16b9ffa1d73a648e5d24616e24f3 Mon Sep 17 00:00:00 2001
From: Magnus Viernickel <magnus.viernickel@wire.com>
Date: Wed, 8 Nov 2023 15:14:17 +0100
Subject: [PATCH 1/3] [fix] attempt to fix flaking test by removing invocations
 of shell

---
 .gitignore                                    |  3 ++
 .../brig/test/integration/API/MLS/Util.hs     | 37 ++++++++++---------
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/.gitignore b/.gitignore
index 44db47dc2e5..b1af8dfb780 100644
--- a/.gitignore
+++ b/.gitignore
@@ -114,3 +114,6 @@ result-*
 
 services/nginz/third_party/headers-more-nginx-module
 services/nginz/third_party/nginx-module-vts
+
+# dumped out by running tests in kind
+logs-integration
diff --git a/services/brig/test/integration/API/MLS/Util.hs b/services/brig/test/integration/API/MLS/Util.hs
index 9b103e63f86..c2725fd0a3d 100644
--- a/services/brig/test/integration/API/MLS/Util.hs
+++ b/services/brig/test/integration/API/MLS/Util.hs
@@ -51,9 +51,10 @@ data KeyingInfo = KeyingInfo
 instance Default KeyingInfo where
   def = KeyingInfo SetKey Nothing
 
-cliCmd :: FilePath -> ClientIdentity -> [String]
-cliCmd tmp qcid =
-  ["mls-test-cli", "--store", tmp </> (show qcid <> ".db")]
+cliCmd :: FilePath -> ClientIdentity -> [String] -> CreateProcess
+cliCmd tmp qcid cmnds =
+  proc "mls-test-cli" $
+    ["--store", tmp </> (show qcid <> ".db")] <> cmnds
 
 initStore ::
   HasCallStack =>
@@ -62,9 +63,8 @@ initStore ::
   ClientIdentity ->
   m ()
 initStore tmp qcid = do
-  let cmd0 = cliCmd tmp qcid
-  void . liftIO . flip spawn Nothing . shell . unwords $
-    cmd0 <> ["init", show qcid]
+  void . liftIO . flip spawn Nothing $
+    cliCmd tmp qcid ["init", show qcid]
 
 generateKeyPackage ::
   HasCallStack =>
@@ -74,13 +74,12 @@ generateKeyPackage ::
   Maybe Timeout ->
   m (RawMLS KeyPackage, KeyPackageRef)
 generateKeyPackage tmp qcid lifetime = do
-  let cmd0 = cliCmd tmp qcid
   kp <-
     liftIO $
-      decodeMLSError <=< (flip spawn Nothing . shell . unwords) $
-        cmd0
-          <> ["key-package", "create"]
-          <> (("--lifetime " <>) . show . (#> Second) <$> maybeToList lifetime)
+      decodeMLSError <=< flip spawn Nothing $
+        cliCmd tmp qcid $
+          ["key-package", "create"]
+            <> (("--lifetime " <>) . show . (#> Second) <$> maybeToList lifetime)
   let ref = fromJust (kpRef' kp)
   pure (kp, ref)
 
@@ -94,22 +93,22 @@ uploadKeyPackages ::
   Int ->
   Http ()
 uploadKeyPackages brig tmp KeyingInfo {..} u c n = do
-  let cmd0 = cliCmd tmp cid
-      cid = mkClientIdentity u c
+  let cid = mkClientIdentity u c
   initStore tmp cid
   kps <- replicateM n (fst <$> generateKeyPackage tmp cid kiLifetime)
   when (kiSetKey == SetKey) $
     do
       pk <-
-        liftIO . flip spawn Nothing . shell . unwords $
-          cmd0 <> ["public-key"]
+        liftIO . flip spawn Nothing $
+          cliCmd tmp cid ["public-key"]
       put
         ( brig
             . paths ["clients", toByteString' c]
             . zUser (qUnqualified u)
             . json defUpdateClient {updateClientMLSPublicKeys = Map.fromList [(Ed25519, pk)]}
         )
-      !!! const 200 === statusCode
+      !!! const 200
+        === statusCode
   let upload = object ["key_packages" .= toJSON (map (Base64ByteString . raw) kps)]
   post
     ( brig
@@ -117,7 +116,8 @@ uploadKeyPackages brig tmp KeyingInfo {..} u c n = do
         . zUser (qUnqualified u)
         . json upload
     )
-    !!! const (case kiSetKey of SetKey -> 201; DontSetKey -> 400) === statusCode
+    !!! const (case kiSetKey of SetKey -> 201; DontSetKey -> 400)
+      === statusCode
 
 getKeyPackageCount :: HasCallStack => Brig -> Qualified UserId -> ClientId -> Http KeyPackageCount
 getKeyPackageCount brig u c =
@@ -127,7 +127,8 @@ getKeyPackageCount brig u c =
           . paths ["mls", "key-packages", "self", toByteString' c, "count"]
           . zUser (qUnqualified u)
       )
-      <!! const 200 === statusCode
+      <!! const 200
+        === statusCode
 
 decodeMLSError :: ParseMLS a => ByteString -> IO a
 decodeMLSError s = case decodeMLS' s of

From c95f2a3b4375a94c52e2830f6000020bc145ab62 Mon Sep 17 00:00:00 2001
From: Magnus Viernickel <magnus.viernickel@wire.com>
Date: Wed, 8 Nov 2023 15:15:49 +0100
Subject: [PATCH 2/3] [chore] add changelog.d

---
 changelog.d/3-bug-fixes/brig-flake | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/3-bug-fixes/brig-flake

diff --git a/changelog.d/3-bug-fixes/brig-flake b/changelog.d/3-bug-fixes/brig-flake
new file mode 100644
index 00000000000..af71cad5d8f
--- /dev/null
+++ b/changelog.d/3-bug-fixes/brig-flake
@@ -0,0 +1 @@
+don't use shell when communicating with mls-test-cli

From 94ba0428a947d5fb76b5a7e7026ca3556098ee48 Mon Sep 17 00:00:00 2001
From: Magnus Viernickel <magnus.viernickel@wire.com>
Date: Thu, 9 Nov 2023 12:53:51 +0100
Subject: [PATCH 3/3] [fix] hi ci