fix(influxdb): Respect custom waitStrategy

modules/influxdb/influxdb.go

@@ -34,7 +34,6 @@ func Run(ctx context.Context, img string, opts ...testcontainers.ContainerCustom
 			"INFLUXDB_HTTP_HTTPS_ENABLED":    "false",
 			"INFLUXDB_HTTP_AUTH_ENABLED":     "false",
 		},
-		WaitingFor: wait.ForListeningPort("8086/tcp"),
 	}
 	genericContainerReq := testcontainers.GenericContainerRequest{
 		ContainerRequest: req,
@@ -47,8 +46,24 @@ func Run(ctx context.Context, img string, opts ...testcontainers.ContainerCustom
 		}
 	}
 
-	hasInitDb := false
+	if genericContainerReq.WaitingFor == nil {
+		genericContainerReq.WaitingFor = defaultWaitStrategy(genericContainerReq)
+	}
+
+	container, err := testcontainers.GenericContainer(ctx, genericContainerReq)
+	var c *InfluxDbContainer
+	if container != nil {
+		c = &InfluxDbContainer{Container: container}
+	}
+
+	if err != nil {
+		return c, fmt.Errorf("generic container: %w", err)
+	}
+
+	return c, nil
+}
 
+func defaultWaitStrategy(genericContainerReq testcontainers.GenericContainerRequest) wait.Strategy {
 	for _, f := range genericContainerReq.Files {
 		if f.ContainerFilePath == "/" && strings.HasSuffix(f.HostFilePath, "docker-entrypoint-initdb.d") {
 			// Init service in container will start influxdb, run scripts in docker-entrypoint-initdb.d and then
@@ -57,39 +72,24 @@ func Run(ctx context.Context, img string, opts ...testcontainers.ContainerCustom
 			// "Open shard" which is the last thing that happens before the server is ready to accept connections.
 			// This is probably different for InfluxDB 2.x, but that is left as an exercise for the reader.
 			strategies := []wait.Strategy{
-				genericContainerReq.WaitingFor,
+				wait.ForListeningPort("8086/tcp"),
 				wait.ForLog("influxdb init process in progress..."),
 				wait.ForLog("Server shutdown completed"),
 				wait.ForLog("Opened shard"),
 			}
-			genericContainerReq.WaitingFor = wait.ForAll(strategies...)
-			hasInitDb = true
-			break
+			return wait.ForAll(strategies...)
 		}
 	}
 
-	if !hasInitDb {
-		if lastIndex := strings.LastIndex(genericContainerReq.Image, ":"); lastIndex != -1 {
-			tag := genericContainerReq.Image[lastIndex+1:]
-			if tag == "latest" || tag[0] == '2' {
-				genericContainerReq.WaitingFor = wait.ForLog(`Listening log_id=[0-9a-zA-Z_~]+ service=tcp-listener transport=http`).AsRegexp()
-			}
-		} else {
-			genericContainerReq.WaitingFor = wait.ForLog("Listening for signals")
+	if lastIndex := strings.LastIndex(genericContainerReq.Image, ":"); lastIndex != -1 {
+		tag := genericContainerReq.Image[lastIndex+1:]
+		if tag == "latest" || tag[0] == '2' {
+			return wait.ForLog(`Listening log_id=[0-9a-zA-Z_~]+ service=tcp-listener transport=http`).AsRegexp()
 		}
+	} else {
+		return wait.ForLog("Listening for signals")
 	}
-
-	container, err := testcontainers.GenericContainer(ctx, genericContainerReq)
-	var c *InfluxDbContainer
-	if container != nil {
-		c = &InfluxDbContainer{Container: container}
-	}
-
-	if err != nil {
-		return c, fmt.Errorf("generic container: %w", err)
-	}
-
-	return c, nil
+	return wait.ForListeningPort("8086/tcp")
 }
 
 func (c *InfluxDbContainer) MustConnectionUrl(ctx context.Context) string {

modules/influxdb/influxdb_test.go

@@ -3,6 +3,7 @@ package influxdb_test
 import (
 	"context"
 	"encoding/json"
+	"net/http"
 	"path/filepath"
 	"testing"
 	"time"
@@ -13,6 +14,7 @@ import (
 
 	"github.com/testcontainers/testcontainers-go"
 	"github.com/testcontainers/testcontainers-go/modules/influxdb"
+	"github.com/testcontainers/testcontainers-go/wait"
 )
 
 func TestV1Container(t *testing.T) {
@@ -48,6 +50,29 @@ func TestV2Container(t *testing.T) {
 	}
 }
 
+func TestWithWaitStrategy(t *testing.T) {
+	ctx := context.Background()
+	influxDbContainer, err := influxdb.Run(ctx,
+		"influxdb:2.7.5-alpine",
+		influxdb.WithDatabase("foo"),
+		influxdb.WithUsername("root"),
+		influxdb.WithPassword("password"),
+		testcontainers.WithWaitStrategy(wait.ForHTTP("/health").
+			WithStatusCodeMatcher(func(status int) bool {
+				return status == http.StatusOK
+			})),
+	)
+	testcontainers.CleanupContainer(t, influxDbContainer)
+	require.NoError(t, err)
+
+	state, err := influxDbContainer.State(ctx)
+	require.NoError(t, err)
+
+	if !state.Running {
+		t.Fatal("InfluxDB container is not running")
+	}
+}
+
 func TestWithInitDb(t *testing.T) {
 	ctx := context.Background()
 	influxDbContainer, err := influxdb.Run(ctx,