New integration test suite

.gitignore

@@ -20,6 +20,7 @@ target
 .#*
 *#*#
 .*.sw[a-z]
+**/__pycache__
 .cabal-sandbox
 ID
 cabal.sandbox.config
@@ -113,5 +114,4 @@ result-*
 
 services/nginz/third_party/headers-more-nginx-module
 services/nginz/third_party/nginx-module-vts
-
-**/__pycache__
+services/.integration

Makefile

@@ -91,6 +91,19 @@ endif
 ci: c db-migrate
 	./hack/bin/cabal-run-integration.sh $(package)
 
+
+# Compile and run services
+# Usage: make crun `OR` make crun package=galley
+.PHONY: cr
+cr: c db-migrate
+	./services/run-services
+
+# Run integration from new test suite
+# Usage: make devtest test=TESTNAME
+.PHONY: devtest
+devtest:
+	ghcid --height=1000 --command 'cabal repl integration' --test='Testlib.Run.runITest "$(test)"'
+
 .PHONY: sanitize-pr
 sanitize-pr:
 	./hack/bin/generate-local-nix-packages.sh

cabal.project

@@ -1,5 +1,6 @@
 packages:
-    libs/api-bot/
+    integration
+  , libs/api-bot/
   , libs/api-client/
   , libs/bilge/
   , libs/brig-types/

charts/integration/Chart.yaml

@@ -0,0 +1,4 @@
+apiVersion: v1
+description: Integration tests
+name: integration
+version: 0.0.42

charts/integration/templates/configmap.yaml

@@ -0,0 +1,46 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: "integration-config"
+  annotations:
+    "helm.sh/hook": post-install
+    "helm.sh/hook-delete-policy": before-hook-creation
+data:
+  integration.yaml: |
+    brig:
+      host: brig.{{ .Release.Namespace }}.svc.cluster.local
+      port: 8080
+
+    cannon:
+      host: cannon.{{ .Release.Namespace }}.svc.cluster.local
+      port: 8080
+
+    galley:
+      host: galley.{{ .Release.Namespace }}.svc.cluster.local
+      port: 8080
+
+    cargohold:
+      host: cargohold.{{ .Release.Namespace }}.svc.cluster.local
+      port: 8080
+
+    gundeck:
+      host: gundeck.{{ .Release.Namespace }}.svc.cluster.local
+      port: 8080
+
+    spar:
+      host: spar.{{ .Release.Namespace }}.svc.cluster.local
+      port: 8080
+
+    # not sure if this is correct
+    federatorInternal:
+      host: federator.{{ .Release.Namespace }}.svc.cluster.local
+      port: 8080
+
+    # not sure if this is correct
+    federatorExternal:
+      host: federator.{{ .Release.Namespace }}.svc.cluster.local
+      port: 8081
+
+    nginz:
+      host: nginz-integration-http.{{ .Release.Namespace }}.svc.cluster.local
+      port: 8080

charts/integration/templates/integration-integration.yaml

@@ -0,0 +1,72 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: "{{ .Release.Name }}-integration-integration"
+  annotations:
+    "helm.sh/hook": test
+  labels:
+    app: integration-integration
+    release: {{ .Release.Name }}
+spec:
+  volumes:
+    - name: "integration-config"
+      configMap:
+        name: "integration-config"
+
+    - name: "galley-config"
+      configMap:
+        name: "galley"
+
+    - name: "galley-secrets"
+      secret:
+        secretName: "galley"
+
+    - name: "brig-config"
+      configMap:
+        name: "brig"
+
+    - name: "brig-secrets"
+      secret:
+        secretName: "brig"
+
+    - name: "turn-servers"
+      configMap:
+        name: "turn"
+
+  restartPolicy: Never
+  containers:
+  - name: integration
+    image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+    command: [ "integration", "--config", "/etc/wire/integration/integration.yaml" ]
+    resources:
+      requests:
+        memory: "512Mi"
+        cpu: "2"
+    volumeMounts:
+
+    - name: "integration-config"
+      mountPath: "/etc/wire/integration"
+
+    - name: "galley-config"
+      mountPath: "/etc/wire/galley/conf"
+
+    - name: "galley-secrets"
+      mountPath: "/etc/wire/galley/secrets"
+
+    - name: "brig-config"
+      mountPath: "/etc/wire/brig/conf"
+
+    - name: "brig-secrets"
+      mountPath: "/etc/wire/brig/secrets"
+
+    - name: "turn-servers"
+      mountPath: "/etc/wire/brig/turn"
+
+    env:
+    # these dummy values are necessary for Amazonka's "Discover"
+    - name: AWS_ACCESS_KEY_ID
+      value: "dummy"
+    - name: AWS_SECRET_ACCESS_KEY
+      value: "dummy"
+    - name: AWS_REGION
+      value: "eu-west-1"

charts/integration/values.yaml

@@ -0,0 +1,3 @@
+image:
+  repository: quay.io/wire/integration
+  tag: do-not-use

hack/bin/cabal-run-integration.sh

@@ -43,17 +43,27 @@ run_integration_tests() {
        fi
   fi
 
-  service_dir="$TOP_LEVEL/services/$package"
+  if [[ "$package" = "integration" ]]
+  then
+    cd "$TOP_LEVEL"
+    "$TOP_LEVEL/services/run-services" \
+      "$TOP_LEVEL/dist/integration"
+      "${@:2}"
+  else
+    service_dir="$TOP_LEVEL/services/$package"
 
-  cd "$service_dir"
-  "$TOP_LEVEL/services/run-services" \
-    "$TOP_LEVEL/dist/$package-integration" \
-    -s "$service_dir/$package.integration.yaml" \
-    -i "$TOP_LEVEL/services/integration.yaml" \
-    "${@:2}"
+    cd "$service_dir"
+    "$TOP_LEVEL/services/run-services" \
+      "$TOP_LEVEL/dist/$package-integration" \
+      -s "$service_dir/$package.integration.yaml" \
+      -i "$TOP_LEVEL/services/integration.yaml" \
+      "${@:2}"
+  fi
 }
 
 run_all_integration_tests() {
+  run_integration_tests "integration"
+
   for d in "$TOP_LEVEL/services/"*/; do
     package=$(basename "$d")
     service_dir="$TOP_LEVEL/services/$package"

hack/bin/integration-test.sh

@@ -11,7 +11,7 @@ UPLOAD_LOGS=${UPLOAD_LOGS:-0}
 echo "Running integration tests on wire-server with parallelism=${HELM_PARALLELISM} ..."
 
 CHART=wire-server
-tests=(stern galley cargohold gundeck federator spar brig)
+tests=(stern galley cargohold gundeck federator spar brig integration)
 
 cleanup() {
     if (( CLEANUP_LOCAL_FILES > 0 )); then

hack/bin/set-wire-server-image-version.sh

@@ -6,7 +6,7 @@ target_version=${1?$USAGE}
 TOP_LEVEL="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
 CHARTS_DIR="$TOP_LEVEL/.local/charts"
 
-charts=(brig cannon galley gundeck spar cargohold proxy cassandra-migrations elasticsearch-index federator backoffice)
+charts=(brig cannon galley gundeck spar cargohold proxy cassandra-migrations elasticsearch-index federator backoffice integration)
 
 for chart in "${charts[@]}"; do
     sed -i "s/^  tag: .*/  tag: $target_version/g" "$CHARTS_DIR/$chart/values.yaml"