Refactor MongoDB replica set initiation and remove unused localNonLoopbackIP function

Author: ttruongatl

modules/mongodb/mongodb.go

@@ -191,26 +191,15 @@ func initiateReplicaSet(req *testcontainers.GenericContainerRequest, cli mongoCl
 		req.LifecycleHooks, testcontainers.ContainerLifecycleHooks{
 			PostStarts: []testcontainers.ContainerHook{
 				func(ctx context.Context, c testcontainers.Container) error {
-					// Wait for MongoDB to be ready
-					if err := waitForMongoReady(ctx, c, cli); err != nil {
-						return fmt.Errorf("wait for mongo: %w", err)
-					}
-
-					// Initiate replica set
-					host, err := c.Host(ctx)
-					if err != nil {
-						return fmt.Errorf("get host: %w", err)
-					}
-					mappedPort, err := c.MappedPort(ctx, "27017/tcp")
+					ip, err := c.ContainerIP(ctx)
 					if err != nil {
-						return fmt.Errorf("get mapped port: %w", err)
+						return fmt.Errorf("container ip: %w", err)
 					}
 
 					cmd := cli.eval(
-						"rs.initiate({ _id: '%s', members: [ { _id: 0, host: '%s:%s' } ] })",
+						"rs.initiate({ _id: '%s', members: [ { _id: 0, host: '%s:27017' } ] })",
 						replSetName,
-						host,
-						mappedPort.Port(),
+						ip,
 					)
 					return wait.ForExec(cmd).WaitUntilReady(ctx, c)
 				},

modules/mongodb/mongodb_test.go

@@ -2,9 +2,7 @@ package mongodb_test
 
 import (
 	"context"
-	"errors"
 	"fmt"
-	"net"
 	"net/url"
 	"testing"
 
@@ -17,52 +15,7 @@ import (
 	"github.com/testcontainers/testcontainers-go/modules/mongodb"
 )
 
-func localNonLoopbackIP() (string, error) {
-	interfaces, err := net.Interfaces()
-	if err != nil {
-		return "", fmt.Errorf("list network interfaces: %w", err)
-	}
-
-	for _, iface := range interfaces {
-		// Skip down or loopback interfaces.
-		if iface.Flags&net.FlagUp == 0 || iface.Flags&net.FlagLoopback != 0 {
-			continue
-		}
-
-		addrs, err := iface.Addrs()
-		if err != nil {
-			continue // try next interface
-		}
-		for _, addr := range addrs {
-			var ip net.IP
-			switch v := addr.(type) {
-			case *net.IPNet:
-				ip = v.IP
-			case *net.IPAddr:
-				ip = v.IP
-			default:
-				continue
-			}
-			// Check if it's a valid IPv4 and not loopback.
-			if ip.IsLoopback() {
-				continue
-			}
-			ip = ip.To4()
-			if ip == nil {
-				continue // not IPv4
-			}
-			return ip.String(), nil
-		}
-	}
-	return "", errors.New("no non-loopback IPv4 address found")
-}
-
 func TestMongoDB(t *testing.T) {
-	host, err := localNonLoopbackIP()
-	if err != nil {
-		host = "host.docker.internal"
-	}
-	t.Setenv("TESTCONTAINERS_HOST_OVERRIDE", host)
 	type tests struct {
 		name string
 		img  string