From 139263c523257988abaaa1ffc092c019feaf6925 Mon Sep 17 00:00:00 2001
From: Leif Battermann <leif.battermann@wire.com>
Date: Wed, 30 Oct 2024 14:21:36 +0000
Subject: [PATCH 1/2] fix http2 directive for older nginx versions

---
 .../federation-v0/nginz/conf/integration.conf         |  6 ++----
 .../federation-v1/nginz/conf/integration.conf         |  6 ++----
 deploy/dockerephemeral/run.sh                         | 11 +++++++----
 integration/test/Test/MLS/One2One.hs                  |  4 ++++
 4 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/deploy/dockerephemeral/federation-v0/nginz/conf/integration.conf b/deploy/dockerephemeral/federation-v0/nginz/conf/integration.conf
index fa168d16f4d..74dd1a09113 100644
--- a/deploy/dockerephemeral/federation-v0/nginz/conf/integration.conf
+++ b/deploy/dockerephemeral/federation-v0/nginz/conf/integration.conf
@@ -15,7 +15,5 @@ listen 8090;
 # But to also test tls forwarding, this port can be used.
 # This applies only locally, as for kubernetes (helm chart) based deployments,
 # TLS is terminated at the ingress level, not at nginz level
-listen 8443 ssl;
-listen [::]:8443 ssl;
-
-http2 on;
+listen 8443 ssl http2;
+listen [::]:8443 ssl http2;
diff --git a/deploy/dockerephemeral/federation-v1/nginz/conf/integration.conf b/deploy/dockerephemeral/federation-v1/nginz/conf/integration.conf
index fa168d16f4d..74dd1a09113 100644
--- a/deploy/dockerephemeral/federation-v1/nginz/conf/integration.conf
+++ b/deploy/dockerephemeral/federation-v1/nginz/conf/integration.conf
@@ -15,7 +15,5 @@ listen 8090;
 # But to also test tls forwarding, this port can be used.
 # This applies only locally, as for kubernetes (helm chart) based deployments,
 # TLS is terminated at the ingress level, not at nginz level
-listen 8443 ssl;
-listen [::]:8443 ssl;
-
-http2 on;
+listen 8443 ssl http2;
+listen [::]:8443 ssl http2;
diff --git a/deploy/dockerephemeral/run.sh b/deploy/dockerephemeral/run.sh
index f6455dacf5c..bbb6f012079 100755
--- a/deploy/dockerephemeral/run.sh
+++ b/deploy/dockerephemeral/run.sh
@@ -1,17 +1,20 @@
 #!/usr/bin/env bash
 
+# To start the federation v0, v1 backends, set ENABLE_FEDERATION_V0=1, ENABLE_FEDERATION_V1=1
+# in the env where this script is run
+
 set -e
 
 # run.sh should work no matter what is the current directory
-SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 DOCKER_FILE="$SCRIPT_DIR/docker-compose.yaml"
 FED_VERSIONS=(0 1)
 
-opts=( "--file" "$DOCKER_FILE" )
+opts=("--file" "$DOCKER_FILE")
 for v in "${FED_VERSIONS[@]}"; do
   var="ENABLE_FEDERATION_V$v"
   if [[ "${!var}" == 1 ]]; then
-    opts+=( "--file" "$SCRIPT_DIR/federation-v$v.yaml" )
+    opts+=("--file" "$SCRIPT_DIR/federation-v$v.yaml")
   fi
 done
 
@@ -19,7 +22,7 @@ dc() {
   docker-compose "${opts[@]}" "$@"
 }
 
-cleanup () {
+cleanup() {
   dc down
 }
 
diff --git a/integration/test/Test/MLS/One2One.hs b/integration/test/Test/MLS/One2One.hs
index cbc4c1339e2..d93e5f582c2 100644
--- a/integration/test/Test/MLS/One2One.hs
+++ b/integration/test/Test/MLS/One2One.hs
@@ -395,6 +395,8 @@ testMLSGhostOne2OneConv = do
 -- still be created but only by the user whose backend hosts this conversation.
 
 -- | See Note: [Federated 1:1 MLS Conversations]
+-- To run locally this test requires federation-v1 docker containers to be up and running.
+-- See `deploy/dockerephemeral/run.sh` and comment on `StaticFedDomain` in `Testlib/VersionedFed.hs` for more details.
 testMLSFederationV1ConvOnOldBackend :: App ()
 testMLSFederationV1ConvOnOldBackend = do
   alice <- randomUser OwnDomain def
@@ -447,6 +449,8 @@ testMLSFederationV1ConvOnOldBackend = do
     parsedMsg %. "message.content.sender.External" `shouldMatchInt` 0
 
 -- | See Note: Federated 1:1 MLS Conversations
+-- To run locally this test requires federation-v1 docker containers to be up and running.
+-- See `deploy/dockerephemeral/run.sh` and comment on `StaticFedDomain` in `Testlib/VersionedFed.hs` for more details.
 testMLSFederationV1ConvOnNewBackend :: App ()
 testMLSFederationV1ConvOnNewBackend = do
   alice <- randomUser OwnDomain def

From 054fe47c5a4fd9883960caaba46d7e18eb352782 Mon Sep 17 00:00:00 2001
From: Leif Battermann <leif.battermann@wire.com>
Date: Wed, 30 Oct 2024 14:25:13 +0000
Subject: [PATCH 2/2] changelog

---
 changelog.d/5-internal/fix-local-fed-v1 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/5-internal/fix-local-fed-v1

diff --git a/changelog.d/5-internal/fix-local-fed-v1 b/changelog.d/5-internal/fix-local-fed-v1
new file mode 100644
index 00000000000..2bff4d110c1
--- /dev/null
+++ b/changelog.d/5-internal/fix-local-fed-v1
@@ -0,0 +1 @@
+Local integration tests of federation version V1 fixed