Local setup for end2end tests

Makefile

@@ -249,11 +249,50 @@ ifeq ($(package), all)
 	./dist/galley-schema --keyspace galley_test --replication-factor 1 --reset
 	./dist/gundeck-schema --keyspace gundeck_test --replication-factor 1 --reset
 	./dist/spar-schema --keyspace spar_test --replication-factor 1 --reset
+ifeq ($(INTEGRATION_FEDERATION_TESTS), 1)
+	./dist/brig-schema --keyspace brig_test2 --replication-factor 1 --reset
+	./dist/galley-schema --keyspace galley_test2 --replication-factor 1 --reset
+	./dist/gundeck-schema --keyspace gundeck_test2 --replication-factor 1 --reset
+	./dist/spar-schema --keyspace spar_test2 --replication-factor 1 --reset
+endif
 else
 	$(EXE_SCHEMA) --keyspace $(package)_test --replication-factor 1 --reset
+ifeq ($(INTEGRATION_FEDERATION_TESTS), 1)
+	$(EXE_SCHEMA) --keyspace $(package)_test2 --replication-factor 1 --reset
+endif
 endif
 	./dist/brig-index reset --elasticsearch-server http://localhost:9200 > /dev/null
 
+# Usage:
+#
+# Migrate all keyspaces and reset the ES index
+# make db-migrate
+#
+# Migrate keyspace for only one service, say galley:
+# make db-migrate package=galley
+.PHONY: db-reset
+db-reset: c
+	@echo "Make sure you have ./deploy/dockerephemeral/run.sh running in another window!"
+ifeq ($(package), all)
+	./dist/brig-schema --keyspace brig_test --replication-factor 1 --reset
+	./dist/galley-schema --keyspace galley_test --replication-factor 1 --reset
+	./dist/gundeck-schema --keyspace gundeck_test --replication-factor 1 --reset
+	./dist/spar-schema --keyspace spar_test --replication-factor 1 --reset
+ifeq ($(INTEGRATION_FEDERATION_TESTS), 1)
+	./dist/brig-schema --keyspace brig_test2 --replication-factor 1 --reset
+	./dist/galley-schema --keyspace galley_test2 --replication-factor 1 --reset
+	./dist/gundeck-schema --keyspace gundeck_test2 --replication-factor 1 --reset
+	./dist/spar-schema --keyspace spar_test2 --replication-factor 1 --reset
+endif
+else
+	$(EXE_SCHEMA) --keyspace $(package)_test --replication-factor 1 --reset
+ifeq ($(INTEGRATION_FEDERATION_TESTS), 1)
+	$(EXE_SCHEMA) --keyspace $(package)_test2 --replication-factor 1 --reset
+endif
+endif
+	./dist/brig-index reset --elasticsearch-index directory_test --elasticsearch-server http://localhost:9200 > /dev/null
+	./dist/brig-index reset --elasticsearch-index directory_test2 --elasticsearch-server http://localhost:9200 > /dev/null
+
 # Usage:
 #
 # Migrate all keyspaces and reset the ES index
@@ -267,7 +306,14 @@ db-migrate: c
 	./dist/galley-schema --keyspace galley_test --replication-factor 1 > /dev/null
 	./dist/gundeck-schema --keyspace gundeck_test --replication-factor 1 > /dev/null
 	./dist/spar-schema --keyspace spar_test --replication-factor 1 > /dev/null
-	./dist/brig-index reset --elasticsearch-server http://localhost:9200 > /dev/null
+ifeq ($(INTEGRATION_FEDERATION_TESTS), 1)
+	./dist/brig-schema --keyspace brig_test2 --replication-factor 1 > /dev/null
+	./dist/galley-schema --keyspace galley_test2 --replication-factor 1 > /dev/null
+	./dist/gundeck-schema --keyspace gundeck_test2 --replication-factor 1 > /dev/null
+	./dist/spar-schema --keyspace spar_test2 --replication-factor 1 > /dev/null
+endif
+	./dist/brig-index reset --elasticsearch-index-prefix directory --elasticsearch-server http://localhost:9200 > /dev/null
+	./dist/brig-index reset --elasticsearch-index-prefix directory2 --elasticsearch-server http://localhost:9200 > /dev/null
 
 #################################
 ## dependencies

changelog.d/5-internal/local-end2end-setup

@@ -0,0 +1 @@
+New integration test script with support for running end2end tests locally

charts/gundeck/templates/tests/configmap.yaml

@@ -19,7 +19,7 @@ data:
       # some gundeck integration tests make use of two different
       # cannon instances to test the distributed case.  when running
       # the integration tests locally, the two instances will be spun
-      # up separately (see `wire-server/services/integration.sh`).
+      # up separately (see `wire-server/services/run-services`).
       #
       # here, we spin up two replicas, provide the integration tests
       # with the same service coordinates, and rely on the k8s load

deploy/dockerephemeral/coredns-config/db.example.com

@@ -12,4 +12,6 @@ $ORIGIN example.com.
 
 www     IN A     127.0.0.1
         IN AAAA  ::1
-_wire-server-federator._tcp  IN SRV 0 0 443 federator.integration.example.com.
+_wire-server-federator._tcp    IN SRV 0 0 8443 localhost.
+_wire-server-federator._tcp.b  IN SRV 0 0 9443 localhost.
+

hack/bin/cabal-run-integration.sh

@@ -46,7 +46,7 @@ run_integration_tests() {
   service_dir="$TOP_LEVEL/services/$package"
 
   cd "$service_dir"
-  "$TOP_LEVEL/services/integration.sh" \
+  "$TOP_LEVEL/services/run-services" \
     "$TOP_LEVEL/dist/$package-integration" \
     -s "$service_dir/$package.integration.yaml" \
     -i "$TOP_LEVEL/services/integration.yaml" \

nix/overlay.nix

@@ -87,7 +87,7 @@ self: super: {
     inherit (super) stdenv fetchurl;
   };
 
-  helm = super.callPackage ./pkgs/helm {};
+  helm = super.callPackage ./pkgs/helm { };
 
   helmfile = staticBinary {
     pname = "helmfile";

nix/wire-server.nix

@@ -372,7 +372,8 @@ in
       pkgs.kind
       pkgs.netcat
       pkgs.niv
-      pkgs.python3
+      (pkgs.python3.withPackages
+        (ps: with ps; [ pyyaml ]))
       pkgs.rsync
       pkgs.wget
       pkgs.yq

services/brig/brig.integration.yaml

@@ -195,6 +195,4 @@ optSettings:
   setEnableMLS: true
 
 logLevel: Warn
-# ^ NOTE: We log too much in brig, if we set this to Info like other services, running tests
-#   produces too many logs, hence this is set to Warn.
 logNetStrings: false

services/brig/src/Brig/Index/Options.hs

@@ -146,7 +146,18 @@ elasticServerParser =
 restrictedElasticSettingsParser :: Parser ElasticSettings
 restrictedElasticSettingsParser = do
   server <- elasticServerParser
-  pure $ localElasticSettings & esServer .~ server
+  prefix <-
+    strOption
+      ( long "elasticsearch-index-prefix"
+          <> metavar "PREFIX"
+          <> help "Elasticsearch Index Prefix. The actual index name will be PREFIX_test."
+          <> value "directory"
+          <> showDefault
+      )
+  pure $
+    localElasticSettings
+      & esServer .~ server
+      & esIndex .~ ES.IndexName (prefix <> "_test")
 
 indexNameParser :: Parser ES.IndexName
 indexNameParser =

services/cannon/cannon.integration.yaml

@@ -21,5 +21,5 @@ drainOpts:
   millisecondsBetweenBatches: 500
   minBatchSize: 5
 
-logLevel: Info
+logLevel: Warn
 logNetStrings: false

services/cargohold/cargohold.integration.yaml

@@ -24,5 +24,5 @@ settings:
   downloadLinkTTL: 300    # Seconds
   federationDomain: example.com
 
-logLevel: Info
+logLevel: Warn
 logNetStrings: false

services/federator/federator.integration.yaml

@@ -14,7 +14,7 @@ galley:
   host: 0.0.0.0
   port: 8085
 
-logLevel: Debug
+logLevel: Warn
 logNetStrings: false
 
 optSettings:

services/federator/src/Federator/Remote.hs

@@ -123,7 +123,9 @@ interpretRemote = interpret $ \case
     let path =
           LBS.toStrict . toLazyByteString $
             HTTP.encodePathSegments ["federation", componentName component, rpc]
-        req' = HTTP2.requestBuilder HTTP.methodPost path headers body
+        -- filter out Host header, because the HTTP2 client adds it back
+        headers' = filter ((/= "Host") . fst) headers
+        req' = HTTP2.requestBuilder HTTP.methodPost path headers' body
         tlsConfig = mkTLSConfig settings hostname port
 
     resp <- mapError (RemoteError target) . (fromEither @FederatorClientHTTP2Error =<<) . embed $

services/galley/galley.integration.yaml

@@ -73,7 +73,7 @@ settings:
         status: disabled
         lockStatus: locked
 
-logLevel: Info
+logLevel: Warn
 logNetStrings: false
 
 journal: # if set, journals; if not set, disables journaling

services/gundeck/gundeck.integration.yaml

@@ -37,5 +37,5 @@ settings:
     hard: 30  # more than this number of threads will not be allowed
     soft: 10  # more than this number of threads will be warned about
 
-logLevel: Info
+logLevel: Warn
 logNetStrings: false

services/integration.yaml

@@ -88,7 +88,7 @@ backendTwo:
     port: 9084
   cannon:
     host: 127.0.0.1
-    port: 9086
+    port: 9083
 
 redis2:
   host: 127.0.0.1

services/nginz/integration-test/conf/nginz/integration.conf

@@ -0,0 +1,19 @@
+# plain TCP/http listening for integration tests only.
+listen 8080;
+listen 8081;
+
+# for nginx-without-tls, we need to use a separate port for http2 traffic,
+# as nginx cannot handle unencrypted http1 and http2 trafic on the same
+# port.
+# This port is only used for trying out nginx http2 forwarding without TLS locally and should not
+# be ported to any production nginz config.
+listen 8090 http2;
+
+######## TLS/SSL block start ##############
+#
+# Most integration tests simply use the http ports 8080 and 8081
+# 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 http2;
+listen [::]:8443 ssl http2;