BAU: Make integration tests rerunnable after failures

Refactor SqsQueueExtension to handle container recreation:
- Always create fresh queue to handle container restarts
- Improve queue creation logic with fallback handling
- Add error handling for queue purge operations
- Remove unused Optional import

Author: andrew-moores

build.gradle

@@ -200,7 +200,7 @@ spotless {
 
 dockerCompose {
     buildBeforeUp = true
-    forceRecreate = false
+    forceRecreate = true
 
     if (System.getProperty("os.arch") == "aarch64") {
         useComposeFiles = [

docker-compose.yml

@@ -20,6 +20,11 @@ services:
       - di-authentication-api-net
     ports:
       - 45678:45678
+    healthcheck:
+      test: curl -f http://localhost:45678/_localstack/health || exit 1
+      interval: 5s
+      timeout: 10s
+      retries: 5
 
   redis:
     image: redis:6.2.19-alpine@sha256:7fe72c486b910f6b1a9769c937dad5d63648ddee82e056f47417542dd40825bb

orchestration-shared-test/src/main/java/uk/gov/di/orchestration/sharedtest/extensions/SqsQueueExtension.java

@@ -18,7 +18,6 @@
 
 import java.net.URI;
 import java.util.List;
-import java.util.Optional;
 
 import static java.text.MessageFormat.format;
 
@@ -88,26 +87,30 @@ public void beforeAll(ExtensionContext context) {
                         context.getTestClass().map(Class::getSimpleName).orElse("unknown"),
                         queueNameSuffix);
         var truncatedQueueName = queueName.substring(0, Math.min(80, queueName.length()));
-        queueUrl =
-                getQueueUrlFor(truncatedQueueName).orElseGet(() -> createQueue(truncatedQueueName));
-        sqsClient.purgeQueue(PurgeQueueRequest.builder().queueUrl(queueUrl).build());
-    }
 
-    private Optional<String> getQueueUrlFor(String queueName) {
+        // Always create a fresh queue to handle container recreation
+        queueUrl = createQueue(truncatedQueueName);
+
+        // Clear any existing messages
         try {
-            return Optional.of(
-                    sqsClient
-                            .getQueueUrl(GetQueueUrlRequest.builder().queueName(queueName).build())
-                            .toString());
-        } catch (QueueDoesNotExistException ignored) {
-            return Optional.empty();
+            sqsClient.purgeQueue(PurgeQueueRequest.builder().queueUrl(queueUrl).build());
+        } catch (Exception e) {
+            // Ignore purge errors as queue might be newly created
         }
     }
 
     private String createQueue(String queueName) {
-        return sqsClient
-                .createQueue(CreateQueueRequest.builder().queueName(queueName).build())
-                .queueUrl();
+        try {
+            // Try to get existing queue first
+            return sqsClient
+                    .getQueueUrl(GetQueueUrlRequest.builder().queueName(queueName).build())
+                    .queueUrl();
+        } catch (QueueDoesNotExistException e) {
+            // Create new queue if it doesn't exist
+            return sqsClient
+                    .createQueue(CreateQueueRequest.builder().queueName(queueName).build())
+                    .queueUrl();
+        }
     }
 
     private List<Message> getMessages(int numberOfMessages) {

shared-test/src/main/java/uk/gov/di/authentication/sharedtest/extensions/SqsQueueExtension.java

@@ -18,7 +18,6 @@
 
 import java.net.URI;
 import java.util.List;
-import java.util.Optional;
 import java.util.stream.Collectors;
 
 import static java.text.MessageFormat.format;
@@ -91,26 +90,30 @@ public void beforeAll(ExtensionContext context) {
                         context.getTestClass().map(Class::getSimpleName).orElse("unknown"),
                         queueNameSuffix);
         var truncatedQueueName = queueName.substring(0, Math.min(80, queueName.length()));
-        queueUrl =
-                getQueueUrlFor(truncatedQueueName).orElseGet(() -> createQueue(truncatedQueueName));
-        sqsClient.purgeQueue(PurgeQueueRequest.builder().queueUrl(queueUrl).build());
-    }
 
-    private Optional<String> getQueueUrlFor(String queueName) {
+        // Always create a fresh queue to handle container recreation
+        queueUrl = createQueue(truncatedQueueName);
+
+        // Clear any existing messages
         try {
-            return Optional.of(
-                    sqsClient
-                            .getQueueUrl(GetQueueUrlRequest.builder().queueName(queueName).build())
-                            .toString());
-        } catch (QueueDoesNotExistException ignored) {
-            return Optional.empty();
+            sqsClient.purgeQueue(PurgeQueueRequest.builder().queueUrl(queueUrl).build());
+        } catch (Exception e) {
+            // Ignore purge errors as queue might be newly created
         }
     }
 
     private String createQueue(String queueName) {
-        return sqsClient
-                .createQueue(CreateQueueRequest.builder().queueName(queueName).build())
-                .queueUrl();
+        try {
+            // Try to get existing queue first
+            return sqsClient
+                    .getQueueUrl(GetQueueUrlRequest.builder().queueName(queueName).build())
+                    .queueUrl();
+        } catch (QueueDoesNotExistException e) {
+            // Create new queue if it doesn't exist
+            return sqsClient
+                    .createQueue(CreateQueueRequest.builder().queueName(queueName).build())
+                    .queueUrl();
+        }
     }
 
     private List<Message> getMessages(int numberOfMessages) {