Merge pull request #1515 from mdelapenya/tc-go-adoption-2

chore: adopt testcontainers-go for Postgres, MySQL and MongoDB

Author: ReneWerner87

.github/workflows/benchmark.yml

@@ -81,46 +81,6 @@ jobs:
         run: |
           docker run -d -p 11211:11211 memcached:latest
 
-      - name: Install MongoDB
-        if: ${{ matrix.package == 'mongodb' }}
-        run: |
-          docker run -d -p 27017:27017 mongo:latest
-
-      - name: Install MSSQL
-        if: ${{ matrix.package == 'mssql' }}
-        run: |
-          docker run -d -p 1433:1433 \
-            -e "ACCEPT_EULA=Y" -e "SA_PASSWORD=MsSql!1234" \
-            -e "MSSQL_DB=master" -e "MSSQL_USER=sa" \
-            -e "MSSQL_PASSWORD=MsSql!1234" \
-            --health-cmd "/opt/mssql-tools/bin/sqlcmd -U sa -P $SA_PASSWORD -Q 'select 1' -b -o /dev/null" \
-            --health-interval 1s \
-            --health-timeout 30s \
-            --health-start-period 10s \
-            --health-retries 20 \
-            mcmoe/mssqldocker:latest
-
-      - name: Install MySQL
-        if: ${{ matrix.package == 'mysql' }}
-        run: |
-          docker run -d -p 3306:3306 \
-            -e "MYSQL_DATABASE=fiber" \
-            -e "MYSQL_USER=username" \
-            -e "MYSQL_PASSWORD=password" \
-            -e "MYSQL_ROOT_PASSWORD=password" \
-            --health-cmd "mysqladmin ping" --health-interval 10s --health-timeout 5s --health-retries 5 \
-            mysql:latest
-
-      - name: Install Postgres
-        if: ${{ matrix.package == 'postgres' }}
-        run: |
-          docker run -d -p 5432:5432 \
-            -e "POSTGRES_DB=fiber" \
-            -e "POSTGRES_USER=username" \
-            -e "POSTGRES_PASSWORD=pass#w%rd" \
-            --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5 \
-            postgres:latest
-
       - name: Install Azurite
         if: ${{ matrix.package == 'azureblob' }}
         run: |
@@ -179,21 +139,18 @@ jobs:
         run: |
           set -o pipefail
           echo "Bench dir: ${{ matrix.package }}"
-          go test ./... -benchmem -run=^$ -bench . | tee -a output.txt
+          go test ./... -timeout 900s -benchmem -run=^$ -bench . | tee -a output.txt
         shell: bash
         env:
           MSSQL_DATABASE: master
           MSSQL_USERNAME: sa
           MSSQL_PASSWORD: MsSql!1234
-          MYSQL_USERNAME: username
-          MYSQL_PASSWORD: password
-          MYSQL_DATABASE: fiber
-          POSTGRES_DATABASE: fiber
-          POSTGRES_USERNAME: username
-          POSTGRES_PASSWORD: "pass#w%rd"
           TEST_CLICKHOUSE_IMAGE: "clickhouse/clickhouse-server:23-alpine"
-          TEST_COUCHBASE_IMAGE: "couchbase:enterprise-7.1.1"
+          TEST_COUCHBASE_IMAGE: "couchbase:enterprise-7.6.5"
           TEST_MINIO_IMAGE: "docker.io/minio/minio:RELEASE.2024-08-17T01-24-54Z"
+          TEST_MONGODB_IMAGE: "docker.io/mongo:7"
+          TEST_MYSQL_IMAGE: "docker.io/mysql:9"
+          TEST_POSTGRES_IMAGE: "docker.io/postgres:16-alpine"
 
       - name: Get Previous Benchmark Results
         uses: actions/cache@v4

.github/workflows/test-clickhouse.yml

@@ -15,8 +15,9 @@ jobs:
     strategy:
       matrix:
         go-version:
-          - 1.21.x
           - 1.22.x
+          - 1.23.x
+          - 1.24.x
     steps:
       - name: Fetch Repository
         uses: actions/checkout@v4

.github/workflows/test-couchbase.yml

@@ -15,9 +15,9 @@ jobs:
     strategy:
       matrix:
         go-version:
-          - 1.21.x
           - 1.22.x
           - 1.23.x
+          - 1.24.x
     steps:
       - name: Fetch Repository
         uses: actions/checkout@v4
@@ -27,5 +27,5 @@ jobs:
             go-version: '${{ matrix.go-version }}'
       -   name: Run Test
           env:
-            TEST_COUCHBASE_IMAGE: couchbase:enterprise-7.1.1
+            TEST_COUCHBASE_IMAGE: couchbase:enterprise-7.6.5
           run: cd ./couchbase && go test ./... -v -race

.github/workflows/test-minio.yml

@@ -15,9 +15,9 @@ jobs:
         strategy:
             matrix:
                 go-version:
-                    - 1.21.x
                     - 1.22.x
                     - 1.23.x
+                    - 1.24.x
         steps:
             -   name: Fetch Repository
                 uses: actions/checkout@v4

.github/workflows/test-mongodb.yml

@@ -12,17 +12,12 @@ name: "Tests Mongodb"
 jobs:
     Tests:
         runs-on: ubuntu-latest
-        services:
-            mongo:
-                image: 'mongo:latest'
-                ports:
-                    - '27017:27017'
         strategy:
             matrix:
                 go-version:
-                    - 1.19.x
-                    - 1.20.x
-                    - 1.21.x
+                    - 1.22.x
+                    - 1.23.x
+                    - 1.24.x
         steps:
             -   name: Fetch Repository
                 uses: actions/checkout@v4
@@ -31,5 +26,7 @@ jobs:
                 with:
                     go-version: '${{ matrix.go-version }}'
             -   name: Run Test
+                env:
+                    TEST_MONGODB_IMAGE: docker.io/mongo:7
                 run: cd ./mongodb && go test ./... -v -race
 

.github/workflows/test-mysql.yml

@@ -12,25 +12,12 @@ name: "Tests MySQL"
 jobs:
     Tests:
         runs-on: ubuntu-latest
-        services:
-            mysql:
-                image: 'mysql:latest'
-                env:
-                    MYSQL_DATABASE: fiber
-                    MYSQL_USER: username
-                    MYSQL_PASSWORD: password
-                    MYSQL_ROOT_PASSWORD: password
-                ports:
-                    - '3306:3306'
-                options: >-
-                    --health-cmd "mysqladmin ping" --health-interval 10s --health-timeout
-                    5s --health-retries 5
         strategy:
             matrix:
                 go-version:
-                    - 1.19.x
-                    - 1.20.x
-                    - 1.21.x
+                    - 1.22.x
+                    - 1.23.x
+                    - 1.24.x
         steps:
             -   name: Fetch Repository
                 uses: actions/checkout@v4
@@ -39,8 +26,6 @@ jobs:
                 with:
                     go-version: '${{ matrix.go-version }}'
             -   name: Run Test
-                run: cd ./mysql && go test ./... -v -race
                 env:
-                    MYSQL_USERNAME: username
-                    MYSQL_PASSWORD: password
-                    MYSQL_DATABASE: fiber
+                    TEST_MYSQL_IMAGE: docker.io/mysql:9
+                run: cd ./mysql && go test ./... -v -race

.github/workflows/test-postgres.yml

@@ -12,24 +12,12 @@ name: "Tests Postgres"
 jobs:
     Tests:
         runs-on: ubuntu-latest
-        services:
-            postgres:
-                image: 'postgres:latest'
-                ports:
-                    - '5432:5432'
-                env:
-                    POSTGRES_DB: fiber
-                    POSTGRES_USER: username
-                    POSTGRES_PASSWORD: "pass#w%rd"
-                options: >-
-                    --health-cmd pg_isready --health-interval 10s --health-timeout 5s
-                    --health-retries 5
         strategy:
             matrix:
                 go-version:
-                    - 1.20.x
-                    - 1.21.x
                     - 1.22.x
+                    - 1.23.x
+                    - 1.24.x
         steps:
             -   name: Fetch Repository
                 uses: actions/checkout@v4
@@ -38,8 +26,6 @@ jobs:
                 with:
                     go-version: '${{ matrix.go-version }}'
             -   name: Run Test
-                run: cd ./postgres && go test ./... -v -race
                 env:
-                    POSTGRES_DATABASE: fiber
-                    POSTGRES_USERNAME: username
-                    POSTGRES_PASSWORD: "pass#w%rd"
+                    TEST_POSTGRES_IMAGE: "docker.io/postgres:16-alpine"
+                run: cd ./postgres && go test ./... -v -race

clickhouse/clickhouse_test.go

@@ -11,7 +11,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
+	"github.com/testcontainers/testcontainers-go"
 	"github.com/testcontainers/testcontainers-go/modules/clickhouse"
+	"github.com/testcontainers/testcontainers-go/wait"
 )
 
 const (
@@ -21,6 +23,8 @@ const (
 	clickhouseUser        string = "default"
 	clickhousePass        string = "password"
 	clickhouseDB          string = "fiber"
+	clickhouseHttpPort           = "8123/tcp"
+	clickhouseSuccessCode        = 200
 )
 
 func getTestConnection(t testing.TB, cfg Config) (*Storage, error) {
@@ -38,7 +42,16 @@ func getTestConnection(t testing.TB, cfg Config) (*Storage, error) {
 		clickhouse.WithUsername(clickhouseUser),
 		clickhouse.WithPassword(clickhousePass),
 		clickhouse.WithDatabase(clickhouseDB),
+		testcontainers.WithWaitStrategy(
+			wait.ForAll(
+				wait.ForListeningPort(clickhouseHttpPort),
+				wait.NewHTTPStrategy("/").WithPort(clickhouseHttpPort).WithStatusCodeMatcher(func(status int) bool {
+					return status == clickhouseSuccessCode
+				}),
+			),
+		),
 	)
+	testcontainers.CleanupContainer(t, c)
 	if err != nil {
 		return nil, err
 	}
@@ -67,13 +80,14 @@ func getTestConnection(t testing.TB, cfg Config) (*Storage, error) {
 }
 
 func Test_Connection(t *testing.T) {
-	_, err := getTestConnection(t, Config{
+	client, err := getTestConnection(t, Config{
 		Engine: Memory,
 		Table:  "test_table",
 		Clean:  true,
 	})
-
 	require.NoError(t, err)
+
+	defer client.Close()
 }
 
 func Test_Set(t *testing.T) {
@@ -191,6 +205,17 @@ func Test_Reset(t *testing.T) {
 	assert.Equal(t, []byte{}, value)
 }
 
+func TestClose_ShouldReturn_NoError(t *testing.T) {
+	client, err := getTestConnection(t, Config{
+		Engine: Memory,
+		Table:  "test_table",
+		Clean:  true,
+	})
+	require.NoError(t, err)
+
+	require.NoError(t, client.Close())
+}
+
 func Benchmark_Clickhouse_Set(b *testing.B) {
 	b.ReportAllocs()
 	b.ResetTimer()

clickhouse/go.mod

@@ -1,11 +1,12 @@
 module github.com/gofiber/storage/clickhouse
 
-go 1.21
+go 1.22
 
 require (
 	github.com/ClickHouse/clickhouse-go/v2 v2.26.0
 	github.com/stretchr/testify v1.9.0
-	github.com/testcontainers/testcontainers-go/modules/clickhouse v0.33.0
+	github.com/testcontainers/testcontainers-go v0.35.0
+	github.com/testcontainers/testcontainers-go/modules/clickhouse v0.35.0
 )
 
 require (
@@ -18,7 +19,7 @@ require (
 	github.com/containerd/containerd v1.7.18 // indirect
 	github.com/containerd/log v0.1.0 // indirect
 	github.com/containerd/platforms v0.2.1 // indirect
-	github.com/cpuguy83/dockercfg v0.3.1 // indirect
+	github.com/cpuguy83/dockercfg v0.3.2 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/distribution/reference v0.6.0 // indirect
 	github.com/docker/docker v27.1.1+incompatible // indirect
@@ -53,15 +54,14 @@ require (
 	github.com/shoenig/go-m1cpu v0.1.6 // indirect
 	github.com/shopspring/decimal v1.4.0 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
-	github.com/testcontainers/testcontainers-go v0.33.0 // indirect
 	github.com/tklauser/go-sysconf v0.3.12 // indirect
 	github.com/tklauser/numcpus v0.6.1 // indirect
 	github.com/yusufpapurcu/wmi v1.2.3 // indirect
 	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
 	go.opentelemetry.io/otel v1.28.0 // indirect
 	go.opentelemetry.io/otel/metric v1.28.0 // indirect
 	go.opentelemetry.io/otel/trace v1.28.0 // indirect
-	golang.org/x/crypto v0.24.0 // indirect
-	golang.org/x/sys v0.21.0 // indirect
+	golang.org/x/crypto v0.31.0 // indirect
+	golang.org/x/sys v0.28.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )