fix issue with internal ip of a container

Author: pitabwire

frametests/definition/options.go

@@ -45,6 +45,7 @@ func (o *ContainerOpts) Configure(
 	}
 
 	if o.UseHostMode {
+		containerRequest.ExposedPorts = nil
 		containerRequest.HostConfigModifier = func(hostConfig *container.HostConfig) {
 			hostConfig.NetworkMode = "host"
 		}
@@ -71,13 +72,14 @@ func (o *ContainerOpts) ConfigurationExtend(
 	}
 
 	if o.UseHostMode {
-		containerCustomize = append(containerCustomize, testcontainers.WithHostConfigModifier(
-			func(hostConfig *container.HostConfig) {
-				hostConfig.NetworkMode = HostNetworkingMode
-			}))
+		containerCustomize = append(containerCustomize,
+			testcontainers.WithHostConfigModifier(
+				func(hostConfig *container.HostConfig) {
+					hostConfig.NetworkMode = HostNetworkingMode
+				}))
 	} else {
 		containerCustomize = append(containerCustomize,
-			// testcontainers.WithExposedPorts(o.Ports...),
+			testcontainers.WithExposedPorts(o.Ports...),
 			network.WithNetwork([]string{ntwk.Name}, ntwk),
 			network.WithNetworkName(o.NetworkAliases, ntwk.Name))
 	}

frametests/deps/testnats/nats.go

@@ -14,12 +14,8 @@ import (
 )
 
 const (
-
-	// NATS configuration.
-
 	NatsImage = "nats:latest"
 
-	NatsPort    = "4222"
 	NatsUser    = "frame"
 	NatsPass    = "fr@m3"
 	NatsCluster = "frame_test"
@@ -44,7 +40,7 @@ func NewWithOpts(cluster string, containerOpts ...definition.ContainerOption) de
 		ImageName:      NatsImage,
 		UserName:       NatsUser,
 		Password:       NatsPass,
-		Ports:          []string{NatsPort},
+		Ports:          []string{"4222/tcp", "6222/tcp", "8222/tcp"},
 		NetworkAliases: []string{"nats", "queue-nats"},
 	}
 	opts.Setup(containerOpts...)
@@ -70,21 +66,21 @@ func (d *natsDependancy) Setup(ctx context.Context, ntwk *testcontainers.DockerN
 		tcNats.WithPassword(d.opts.Password),
 	}...)
 
-	natsqContainer, err := tcNats.Run(ctx, d.opts.ImageName, containerCustomize...)
+	natsContainer, err := tcNats.Run(ctx, d.opts.ImageName, containerCustomize...)
 	if err != nil {
 		return fmt.Errorf("failed to start nats container: %w", err)
 	}
 
-	d.container = natsqContainer
+	d.container = natsContainer
 
-	conn, err := natsqContainer.ConnectionString(ctx)
+	conn, err := natsContainer.ConnectionString(ctx)
 	if err != nil {
 		return fmt.Errorf("failed to get connection string for container: %w", err)
 	}
 
 	d.conn = frame.DataSource(conn)
 
-	internalIP, err := natsqContainer.ContainerIP(ctx)
+	internalIP, err := natsContainer.ContainerIP(ctx)
 	if err != nil {
 		return fmt.Errorf("failed to get internal host ip for container: %w", err)
 	}

frametests/deps/testoryhydra/hydra.go

@@ -191,6 +191,11 @@ func (d *hydraDependancy) Setup(ctx context.Context, ntwk *testcontainers.Docker
 	if err != nil {
 		return fmt.Errorf("failed to get internal host ip for hydraContainer: %w", err)
 	}
+
+	if d.opts.UseHostMode && internalIP == "" {
+		internalIP = host
+	}
+
 	d.internalConn = frame.DataSource(
 		fmt.Sprintf("http://%s", net.JoinHostPort(internalIP, adminPort.Port())),
 	)

frametests/deps/testoryketo/keto.go

@@ -189,6 +189,11 @@ func (d *ketoDependancy) Setup(ctx context.Context, ntwk *testcontainers.DockerN
 	if err != nil {
 		return fmt.Errorf("failed to get internal host ip for ketoContainer: %w", err)
 	}
+
+	if d.opts.UseHostMode && internalIP == "" {
+		internalIP = host
+	}
+
 	d.internalConn = frame.DataSource(fmt.Sprintf("http://%s", net.JoinHostPort(internalIP, adminPort.Port())))
 
 	d.container = ketoContainer

frametests/deps/testpostgres/postgres.go

@@ -35,7 +35,7 @@ const (
 	// DBName is the default database name for the PostgreSQL test database.
 	DBName = "frame_test"
 	// DBPort is the default port for the PostgreSQL test database.
-	DBPort = "5432"
+	DBPort = "5432/tcp"
 
 	// OccurrenceValue is the number of occurrences to wait for in the log pattern.
 	OccurrenceValue = 2

frametests/deps/testvalkey/valkey.go

@@ -18,7 +18,7 @@ const (
 	// ValKey configuration.
 
 	ValKeyImage = "docker.io/valkey/valkey:latest"
-	ValKeyPort  = "6379"
+	ValKeyPort  = "6379/tcp"
 
 	ValKeyUser    = "frame"
 	ValKeyPass    = "fr@m3"