From f190a0f17d7be612977acbdd7140c40089fd98b5 Mon Sep 17 00:00:00 2001
From: Akshay Mankar <akshay@wire.com>
Date: Mon, 4 Dec 2023 14:55:23 +0100
Subject: [PATCH] CI Setup: Create SQS queues using config

Not sure why we created the script, perhaps people didn't know about existence
of this config value.
---
 .../templates/integration-integration.yaml    |  1 -
 hack/helm_vars/fake-aws/values.yaml           | 26 +++++++++++++++++++
 .../integration-dynamic-backends-sqs.sh       | 26 -------------------
 nix/wire-server.nix                           |  8 ------
 4 files changed, 26 insertions(+), 35 deletions(-)
 delete mode 100755 integration/scripts/integration-dynamic-backends-sqs.sh

diff --git a/charts/integration/templates/integration-integration.yaml b/charts/integration/templates/integration-integration.yaml
index 044b63b3b9a..2fe7718fa5f 100644
--- a/charts/integration/templates/integration-integration.yaml
+++ b/charts/integration/templates/integration-integration.yaml
@@ -113,7 +113,6 @@ spec:
         # FUTUREWORK: Do all of this in the integration test binary
         integration-dynamic-backends-db-schemas.sh --host {{ .Values.config.cassandra.host }} --port {{ .Values.config.cassandra.port }} --replication-factor {{ .Values.config.cassandra.replicationFactor }}
         integration-dynamic-backends-brig-index.sh --elasticsearch-server http://{{ .Values.config.elasticsearch.host }}:9200
-        integration-dynamic-backends-sqs.sh {{ .Values.config.sqsEndpointUrl }}
         integration-dynamic-backends-ses.sh {{ .Values.config.sesEndpointUrl }}
         integration-dynamic-backends-s3.sh {{ .Values.config.s3EndpointUrl }}
         {{- range $name, $dynamicBackend := .Values.config.dynamicBackends }}
diff --git a/hack/helm_vars/fake-aws/values.yaml b/hack/helm_vars/fake-aws/values.yaml
index 543867c48cf..9b5f18ad870 100644
--- a/hack/helm_vars/fake-aws/values.yaml
+++ b/hack/helm_vars/fake-aws/values.yaml
@@ -1,3 +1,29 @@
 fake-aws-ses:
   enabled: true
   sesSender: "backend-integrationk8s@wire.com"
+
+fake-aws-sqs:
+  queueNames:
+  - "integration-brig-events"
+  - "integration-brig-events-internal"
+  - "integration-gundeck-events"
+  - "integration-user-events.fifo"
+  - "integration-team-events.fifo"
+
+  - "integration-brig-events3"
+  - "integration-brig-events-internal3"
+  - "integration-gundeck-events3"
+  - "integration-user-events3.fifo"
+  - "integration-team-events3.fifo"
+
+  - "integration-brig-events4"
+  - "integration-brig-events-internal4"
+  - "integration-gundeck-events4"
+  - "integration-user-events4.fifo"
+  - "integration-team-events4.fifo"
+
+  - "integration-brig-events5"
+  - "integration-brig-events-internal5"
+  - "integration-gundeck-events5"
+  - "integration-user-events5.fifo"
+  - "integration-team-events5.fifo"
diff --git a/integration/scripts/integration-dynamic-backends-sqs.sh b/integration/scripts/integration-dynamic-backends-sqs.sh
deleted file mode 100755
index d85a3c85f06..00000000000
--- a/integration/scripts/integration-dynamic-backends-sqs.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/env bash
-
-set -eo pipefail
-
-ENDPOINT_URL=$1
-
-for i in $(seq "$INTEGRATION_DYNAMIC_BACKENDS_POOLSIZE"); do
-    suffix=$((i + 2))
-    aws --endpoint-url="$ENDPOINT_URL" sqs create-queue --queue-name integration-brig-events$suffix
-    aws --endpoint-url="$ENDPOINT_URL" sqs set-queue-attributes --queue-url "$ENDPOINT_URL/integration-brig-events$suffix" --attributes VisibilityTimeout=1
-    aws --endpoint-url="$ENDPOINT_URL" sqs create-queue --queue-name integration-brig-events-internal$suffix
-    aws --endpoint-url="$ENDPOINT_URL" sqs set-queue-attributes --queue-url "$ENDPOINT_URL/integration-brig-events-internal$suffix" --attributes VisibilityTimeout=1
-    aws --endpoint-url="$ENDPOINT_URL" sqs create-queue --queue-name integration-user-events.fifo$suffix
-    aws --endpoint-url="$ENDPOINT_URL" sqs set-queue-attributes --queue-url "$ENDPOINT_URL/integration-user-events.fifo$suffix" --attributes VisibilityTimeout=1
-
-    # Gundeck's feedback queue
-    aws --endpoint-url="$ENDPOINT_URL" sqs create-queue --queue-name "integration-gundeck-events$suffix"
-    aws --endpoint-url="$ENDPOINT_URL" sqs set-queue-attributes --queue-url "$ENDPOINT_URL/integration-gundeck-events$suffix" --attributes VisibilityTimeout=1
-
-    # Galley's team event queue
-    aws --endpoint-url="$ENDPOINT_URL" sqs create-queue --queue-name "integration-team-events.fifo$suffix"
-    aws --endpoint-url="$ENDPOINT_URL" sqs set-queue-attributes --queue-url "$ENDPOINT_URL/integration-team-events.fifo$suffix" --attributes VisibilityTimeout=1
-done
-
-echo 'AWS sqs queues created successfully!'
-
diff --git a/nix/wire-server.nix b/nix/wire-server.nix
index 82a0211e427..89356ed00c2 100644
--- a/nix/wire-server.nix
+++ b/nix/wire-server.nix
@@ -223,13 +223,6 @@ let
     checkPhase = "";
   };
 
-  integration-dynamic-backends-sqs = pkgs.writeShellApplication {
-    name = "integration-dynamic-backends-sqs.sh";
-    text = "${builtins.readFile ../integration/scripts/integration-dynamic-backends-sqs.sh}";
-    runtimeInputs = [ pkgs.parallel pkgs.awscli2 ];
-    checkPhase = "";
-  };
-
   integration-dynamic-backends-ses = pkgs.writeShellApplication {
     name = "integration-dynamic-backends-ses.sh";
     text = "${builtins.readFile ../integration/scripts/integration-dynamic-backends-ses.sh}";
@@ -286,7 +279,6 @@ let
       pkgs.awscli2
       integration-dynamic-backends-db-schemas
       integration-dynamic-backends-brig-index
-      integration-dynamic-backends-sqs
       integration-dynamic-backends-ses
       integration-dynamic-backends-s3
       integration-dynamic-backends-vhosts