From d6b5a3220f713bf4e74d5c76ce85c59831b08bff Mon Sep 17 00:00:00 2001
From: Roberto J Rojas <robertojrojas@gmail.com>
Date: Sat, 21 Jan 2023 12:55:49 -0500
Subject: [PATCH] fixes FIFO bugs

Signed-off-by: Roberto J Rojas <robertojrojas@gmail.com>
---
 .github/workflows/certification.yml                          | 4 ++--
 .../pubsub/aws/snssqs/components/fifo/pubsub.yaml            | 4 +++-
 tests/certification/pubsub/aws/snssqs/snssqs_test.go         | 5 +++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/certification.yml b/.github/workflows/certification.yml
index 52e49c1cb..f179c0aab 100644
--- a/.github/workflows/certification.yml
+++ b/.github/workflows/certification.yml
@@ -311,8 +311,8 @@ jobs:
         PUBSUB_AWS_SNSSQS_QUEUE_FIFO="sqssnscerttest-q-fifo-${{env.UNIQUE_ID}}"
         echo "PUBSUB_AWS_SNSSQS_QUEUE_FIFO=$PUBSUB_AWS_SNSSQS_QUEUE_FIFO" >> $GITHUB_ENV
         PUBSUB_AWS_SNSSQS_TOPIC_FIFO="sqssnscerttest-t-fifo-${{env.UNIQUE_ID}}"
-        echo "PUBSUB_AWS_SNSSQS_FIFO_GROUP_ID=$PUBSUB_AWS_SNSSQS_FIFO_GROUP_ID" >> $GITHUB_ENV
-        PUBSUB_AWS_SNSSQS_TOPIC_FIFO="sqssnscerttest-q-fifo-${{env.UNIQUE_ID}}"
+        echo "PUBSUB_AWS_SNSSQS_TOPIC_FIFO=$PUBSUB_AWS_SNSSQS_TOPIC_FIFO" >> $GITHUB_ENV
+        PUBSUB_AWS_SNSSQS_FIFO_GROUP_ID="sqssnscerttest-q-fifo-${{env.UNIQUE_ID}}"
         echo "PUBSUB_AWS_SNSSQS_FIFO_GROUP_ID=$PUBSUB_AWS_SNSSQS_FIFO_GROUP_ID" >> $GITHUB_ENV
 
         AWS_REGION="us-east-1"
diff --git a/tests/certification/pubsub/aws/snssqs/components/fifo/pubsub.yaml b/tests/certification/pubsub/aws/snssqs/components/fifo/pubsub.yaml
index 66ce6e6c3..69df5514e 100644
--- a/tests/certification/pubsub/aws/snssqs/components/fifo/pubsub.yaml
+++ b/tests/certification/pubsub/aws/snssqs/components/fifo/pubsub.yaml
@@ -29,7 +29,9 @@ spec:
     - name: fifo
       value: "true"
     - name: messageMaxNumber
-      value: "1"
+      value: "10"
+    - name: concurrencyMode
+      value: "single"
     
 auth:
   secretstore: envvar-secret-store
\ No newline at end of file
diff --git a/tests/certification/pubsub/aws/snssqs/snssqs_test.go b/tests/certification/pubsub/aws/snssqs/snssqs_test.go
index 2417eaae9..6bb96bf0c 100644
--- a/tests/certification/pubsub/aws/snssqs/snssqs_test.go
+++ b/tests/certification/pubsub/aws/snssqs/snssqs_test.go
@@ -90,7 +90,6 @@ var topics = []string{
 	topicPassiveName,
 	topicToBeCreated,
 	topicDefaultName,
-	fifoTopic,
 }
 
 func init() {
@@ -119,10 +118,12 @@ func init() {
 	qn = os.Getenv("PUBSUB_AWS_SNSSQS_TOPIC_MVT")
 	if qn != "" {
 		messageVisibilityTimeoutTopic = qn
+		topics = append(topics, messageVisibilityTimeoutTopic)
 	}
 	qn = os.Getenv("PUBSUB_AWS_SNSSQS_TOPIC_FIFO")
 	if qn != "" {
 		fifoTopic = qn
+		topics = append(topics, fifoTopic)
 	}
 }
 
@@ -1219,7 +1220,7 @@ func SNSSQSFIFOMessages(t *testing.T) {
 	consumerGroup1 := watcher.NewOrdered()
 
 	// prepare the messages
-	maxFifoMessages := 10
+	maxFifoMessages := 20
 	fifoMessages := make([]string, maxFifoMessages)
 	for i := 0; i < maxFifoMessages; i++ {
 		fifoMessages[i] = fmt.Sprintf("m%d", i+1)