chore(redis): use Run function (#3429)

* chore(redis): use Run function

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <[email protected]>

* fix(redis): always wait for listening port

- Move wait.ForListeningPort to base moduleOpts instead of conditional TLS block
- Port 6379 is always listening (regular or TLS traffic) so wait should be unconditional
- Removed duplicate wait strategy that was only added for TLS case

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <[email protected]>

---------

Co-authored-by: Claude <[email protected]>

Author: mdelapenya

modules/redis/options.go

@@ -43,17 +43,16 @@ func WithConfigFile(configFile string) testcontainers.CustomizeRequestOption {
 	const defaultConfigFile = "/usr/local/redis.conf"
 
 	return func(req *testcontainers.GenericContainerRequest) error {
-		cf := testcontainers.ContainerFile{
+		if err := testcontainers.WithFiles(testcontainers.ContainerFile{
 			HostFilePath:      configFile,
 			ContainerFilePath: defaultConfigFile,
 			FileMode:          0o755,
+		})(req); err != nil {
+			return err
 		}
-		req.Files = append(req.Files, cf)
 
 		// prepend the command to run the redis server with the config file, which must be the first argument of the redis server process
-		req.Cmd = append([]string{defaultConfigFile}, req.Cmd...)
-
-		return nil
+		return testcontainers.WithCmd(append([]string{defaultConfigFile}, req.Cmd...)...)(req)
 	}
 }
 

modules/redis/redis.go

@@ -56,16 +56,7 @@ func RunContainer(ctx context.Context, opts ...testcontainers.ContainerCustomize
 
 // Run creates an instance of the Redis container type
 func Run(ctx context.Context, img string, opts ...testcontainers.ContainerCustomizer) (*RedisContainer, error) {
-	req := testcontainers.ContainerRequest{
-		Image:        img,
-		ExposedPorts: []string{redisPort},
-	}
-
-	genericContainerReq := testcontainers.GenericContainerRequest{
-		ContainerRequest: req,
-		Started:          true,
-	}
-
+	// Process custom options to extract settings
 	var settings options
 	for _, opt := range opts {
 		if opt, ok := opt.(Option); ok {
@@ -75,17 +66,15 @@ func Run(ctx context.Context, img string, opts ...testcontainers.ContainerCustom
 		}
 	}
 
-	tcOpts := []testcontainers.ContainerCustomizer{}
-
-	waitStrategies := []wait.Strategy{
-		wait.ForListeningPort(redisPort).WithStartupTimeout(time.Second * 10),
-		wait.ForLog("* Ready to accept connections"),
+	moduleOpts := []testcontainers.ContainerCustomizer{
+		testcontainers.WithExposedPorts(redisPort),
+		testcontainers.WithWaitStrategy(
+			wait.ForListeningPort(redisPort).WithStartupTimeout(time.Second*10),
+			wait.ForLog("* Ready to accept connections"),
+		),
 	}
 
 	if settings.tlsEnabled {
-		// wait for the TLS port to be available
-		waitStrategies = append(waitStrategies, wait.ForListeningPort(redisPort).WithStartupTimeout(time.Second*10))
-
 		// Generate TLS certificates in the fly and add them to the container before it starts.
 		// Update the CMD to use the TLS certificates.
 		caCert, clientCert, serverCert, err := createTLSCerts()
@@ -104,23 +93,26 @@ func Run(ctx context.Context, img string, opts ...testcontainers.ContainerCustom
 			"--tls-auth-clients", "yes",
 		}
 
-		tcOpts = append(tcOpts, testcontainers.WithCmdArgs(cmds...)) // Append the default CMD with the TLS certificates.
-		tcOpts = append(tcOpts, testcontainers.WithFiles(
-			testcontainers.ContainerFile{
-				Reader:            bytes.NewReader(caCert.Bytes),
-				ContainerFilePath: "/tls/ca.crt",
-				FileMode:          0o644,
-			},
-			testcontainers.ContainerFile{
-				Reader:            bytes.NewReader(serverCert.Bytes),
-				ContainerFilePath: "/tls/server.crt",
-				FileMode:          0o644,
-			},
-			testcontainers.ContainerFile{
-				Reader:            bytes.NewReader(serverCert.KeyBytes),
-				ContainerFilePath: "/tls/server.key",
-				FileMode:          0o644,
-			}))
+		moduleOpts = append(moduleOpts,
+			testcontainers.WithCmdArgs(cmds...),
+			testcontainers.WithFiles(
+				testcontainers.ContainerFile{
+					Reader:            bytes.NewReader(caCert.Bytes),
+					ContainerFilePath: "/tls/ca.crt",
+					FileMode:          0o644,
+				},
+				testcontainers.ContainerFile{
+					Reader:            bytes.NewReader(serverCert.Bytes),
+					ContainerFilePath: "/tls/server.crt",
+					FileMode:          0o644,
+				},
+				testcontainers.ContainerFile{
+					Reader:            bytes.NewReader(serverCert.KeyBytes),
+					ContainerFilePath: "/tls/server.key",
+					FileMode:          0o644,
+				},
+			),
+		)
 
 		settings.tlsConfig = &tls.Config{
 			MinVersion:   tls.VersionTLS12,
@@ -130,26 +122,17 @@ func Run(ctx context.Context, img string, opts ...testcontainers.ContainerCustom
 		}
 	}
 
-	tcOpts = append(tcOpts, testcontainers.WithWaitStrategy(waitStrategies...))
-
 	// Append the customizers passed to the Run function.
-	tcOpts = append(tcOpts, opts...)
-
-	// Apply the testcontainers customizers.
-	for _, opt := range tcOpts {
-		if err := opt.Customize(&genericContainerReq); err != nil {
-			return nil, err
-		}
-	}
+	moduleOpts = append(moduleOpts, opts...)
 
-	container, err := testcontainers.GenericContainer(ctx, genericContainerReq)
+	ctr, err := testcontainers.Run(ctx, img, moduleOpts...)
 	var c *RedisContainer
-	if container != nil {
-		c = &RedisContainer{Container: container, settings: settings}
+	if ctr != nil {
+		c = &RedisContainer{Container: ctr, settings: settings}
 	}
 
 	if err != nil {
-		return c, fmt.Errorf("generic container: %w", err)
+		return c, fmt.Errorf("run redis: %w", err)
 	}
 
 	return c, nil