feat(rabbitmq): Clean up tests

Author: MarioCarrion

compose.rabbitmq.yml

@@ -23,6 +23,7 @@ services:
       rabbitmq:
         condition: service_started
   rabbitmq:
+    # Make sure the docker image version listed here matches the one used in `internal/rabbitmq/task_test.go`.
     image: rabbitmq:3.11.10-management-alpine
     ports:
       - 5672:5672

internal/elasticsearch/task_test.go

@@ -2,6 +2,7 @@ package elasticsearch_test
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"io"
 	"net/http"
@@ -203,15 +204,17 @@ type ElasticsearchClient struct {
 }
 
 func (r *ElasticsearchClient) Teardown() error {
+	var err error
+
 	if r.container != nil {
-		if err := testcontainers.TerminateContainer(r.container); err != nil {
-			return fmt.Errorf("failed to terminate container: %w", err)
+		if err1 := testcontainers.TerminateContainer(r.container); err1 != nil {
+			err = fmt.Errorf("failed to terminate container: %w", err1)
 		}
 	}
 
 	if r.err != nil {
-		return r.err
+		err = errors.Join(err, r.err)
 	}
 
-	return nil
+	return err
 }

…ternal/rabbitmq/task_integration_test.go internal/rabbitmq/task_test.gointernal/rabbitmq/task_integration_test.go renamed to internal/rabbitmq/task_test.go internal/rabbitmq/task_integration_test.go renamed to internal/rabbitmq/task_test.go

@@ -1,22 +1,29 @@
 package rabbitmq_test
 
 import (
+	"context"
+	"errors"
+	"fmt"
+	"sync"
 	"testing"
 
 	"github.com/streadway/amqp"
 	"github.com/testcontainers/testcontainers-go"
 	"github.com/testcontainers/testcontainers-go/modules/rabbitmq"
 
 	"github.com/MarioCarrion/todo-api-microservice-example/internal"
-	rabbitmqTask "github.com/MarioCarrion/todo-api-microservice-example/internal/rabbitmq"
+	rabbitmqtask "github.com/MarioCarrion/todo-api-microservice-example/internal/rabbitmq"
 )
 
+// dockerImage must match the docker image listed in `compose.rabbitmq.yml`.
+const dockerImage = "rabbitmq:3.11.10-management-alpine"
+
 func TestTask_Created_Integration(t *testing.T) {
 	t.Parallel()
 
 	ctx := t.Context()
 
-	rmqContainer, err := rabbitmq.Run(ctx, "rabbitmq:3.12-management-alpine")
+	rmqContainer, err := rabbitmq.Run(ctx, dockerImage)
 	if err != nil {
 		t.Fatalf("failed to start rabbitmq container: %v", err)
 	}
@@ -63,7 +70,7 @@ func TestTask_Created_Integration(t *testing.T) {
 	}
 
 	// Create task publisher
-	taskPub := rabbitmqTask.NewTask(channel)
+	taskPub := rabbitmqtask.NewTask(channel)
 
 	// Test Created method
 	task := internal.Task{
@@ -121,7 +128,7 @@ func TestTask_Updated_Integration(t *testing.T) {
 		t.Fatalf("failed to declare exchange: %v", err)
 	}
 
-	taskPub := rabbitmqTask.NewTask(channel)
+	taskPub := rabbitmqtask.NewTask(channel)
 
 	task := internal.Task{
 		ID:          "test-456",
@@ -177,10 +184,85 @@ func TestTask_Deleted_Integration(t *testing.T) {
 		t.Fatalf("failed to declare exchange: %v", err)
 	}
 
-	taskPub := rabbitmqTask.NewTask(channel)
+	taskPub := rabbitmqtask.NewTask(channel)
 
 	err = taskPub.Deleted(ctx, "test-789")
 	if err != nil {
 		t.Fatalf("Failed to publish deleted event: %v", err)
 	}
 }
+
+//-
+
+var setupClient = sync.OnceValue(func() RabbitMQClient { //nolint: gochecknoglobals
+	var res RabbitMQClient
+
+	ctx := context.Background()
+
+	rmqContainer, err := rabbitmq.Run(ctx, dockerImage)
+	if err != nil {
+		res.err = fmt.Errorf("failed to start rabbitmq container: %w", err)
+
+		return res
+	}
+
+	res.container = rmqContainer
+
+	connStr, err := rmqContainer.AmqpURL(ctx)
+	if err != nil {
+		res.err = fmt.Errorf("failed to get connection string: %w", err)
+
+		return res
+	}
+
+	//- RabbitMQ connection
+	conn, err := amqp.Dial(connStr)
+	if err != nil {
+		res.err = fmt.Errorf("failed to connect to rabbitmq: %w", err)
+
+		return res
+	}
+
+	res.connection = conn
+
+	//- RabbitMQ Channel
+
+	channel, err := conn.Channel()
+	if err != nil {
+		res.err = fmt.Errorf("failed to open channel: %w", err)
+
+		return res
+	}
+
+	res.channel = channel
+
+	return res
+
+})
+
+type RabbitMQClient struct {
+	container  *rabbitmq.RabbitMQContainer
+	channel    *amqp.Channel
+	connection *amqp.Connection
+	err        error
+}
+
+func (r *RabbitMQClient) Teardown() error {
+	var err error
+
+	if r.channel != nil {
+		err = r.channel.Close()
+	}
+
+	if r.connection != nil {
+		err = errors.Join(err, fmt.Errorf("failed to close connection: %w", r.connection.Close()))
+	}
+
+	if r.container != nil {
+		if err1 := testcontainers.TerminateContainer(r.container); err1 != nil {
+			err = errors.Join(err, fmt.Errorf("failed to terminate container: %w", err1))
+		}
+	}
+
+	return err
+}

internal/redis/task_test.go

@@ -3,6 +3,7 @@ package redis_test
 import (
 	"context"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"os"
 	"strings"
@@ -278,15 +279,17 @@ type RedisClient struct {
 }
 
 func (r *RedisClient) Teardown() error {
+	var err error
+
 	if r.container != nil {
-		if err := testcontainers.TerminateContainer(r.container); err != nil {
-			return fmt.Errorf("failed to terminate container: %w", err)
+		if err1 := testcontainers.TerminateContainer(r.container); err1 != nil {
+			err = fmt.Errorf("failed to terminate container: %w", err1)
 		}
 	}
 
 	if r.err != nil {
-		return r.err
+		err = errors.Join(err, r.err)
 	}
 
-	return nil
+	return err
 }