fix: use PortEndpoint() in a few more modules (#3209)

Author: ash2k

modules/vearch/vearch.go

@@ -2,7 +2,6 @@ package vearch
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"time"
 
@@ -71,15 +70,5 @@ func Run(ctx context.Context, img string, opts ...testcontainers.ContainerCustom
 
 // RESTEndpoint returns the REST endpoint of the Vearch container
 func (c *VearchContainer) RESTEndpoint(ctx context.Context) (string, error) {
-	containerPort, err := c.MappedPort(ctx, "8817/tcp")
-	if err != nil {
-		return "", fmt.Errorf("failed to get container port: %w", err)
-	}
-
-	host, err := c.Host(ctx)
-	if err != nil {
-		return "", errors.New("failed to get container host")
-	}
-
-	return fmt.Sprintf("http://%s:%s", host, containerPort.Port()), nil
+	return c.PortEndpoint(ctx, "8817/tcp", "http")
 }

modules/weaviate/weaviate.go

@@ -2,7 +2,6 @@ package weaviate
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"time"
 
@@ -72,31 +71,16 @@ func Run(ctx context.Context, img string, opts ...testcontainers.ContainerCustom
 //
 //nolint:revive,staticcheck //FIXME
 func (c *WeaviateContainer) HttpHostAddress(ctx context.Context) (string, string, error) {
-	port, err := c.MappedPort(ctx, httpPort)
+	endpoint, err := c.PortEndpoint(ctx, httpPort, "")
 	if err != nil {
-		return "", "", fmt.Errorf("failed to get container port: %w", err)
+		return "", "", fmt.Errorf("port endpoint: %w", err)
 	}
 
-	host, err := c.Host(ctx)
-	if err != nil {
-		return "", "", errors.New("failed to get container host")
-	}
-
-	return "http", fmt.Sprintf("%s:%s", host, port.Port()), nil
+	return "http", endpoint, nil
 }
 
 // GrpcHostAddress returns the gRPC host of the Weaviate container.
 // At the moment, it only supports unsecured gRPC connection.
 func (c *WeaviateContainer) GrpcHostAddress(ctx context.Context) (string, error) {
-	port, err := c.MappedPort(ctx, grpcPort)
-	if err != nil {
-		return "", fmt.Errorf("failed to get container port: %w", err)
-	}
-
-	host, err := c.Host(ctx)
-	if err != nil {
-		return "", errors.New("failed to get container host")
-	}
-
-	return fmt.Sprintf("%s:%s", host, port.Port()), nil
+	return c.PortEndpoint(ctx, grpcPort, "")
 }

modules/yugabytedb/yugabytedb.go

@@ -3,7 +3,6 @@ package yugabytedb
 import (
 	"context"
 	"fmt"
-	"net"
 	"strings"
 
 	"github.com/testcontainers/testcontainers-go"
@@ -105,21 +104,16 @@ func Run(ctx context.Context, img string, opts ...testcontainers.ContainerCustom
 // Additional arguments are appended to the connection string as query parameters
 // in the form of key=value pairs separated by "&".
 func (y *Container) YSQLConnectionString(ctx context.Context, args ...string) (string, error) {
-	host, err := y.Host(ctx)
+	endpoint, err := y.PortEndpoint(ctx, ysqlPort, "")
 	if err != nil {
-		return "", fmt.Errorf("host: %w", err)
-	}
-
-	mappedPort, err := y.MappedPort(ctx, ysqlPort)
-	if err != nil {
-		return "", fmt.Errorf("mapped port: %w", err)
+		return "", fmt.Errorf("port endpoint: %w", err)
 	}
 
 	return fmt.Sprintf(
 		"postgres://%s:%s@%s/%s?%s",
 		y.ysqlDatabaseUser,
 		y.ysqlDatabasePassword,
-		net.JoinHostPort(host, mappedPort.Port()),
+		endpoint,
 		y.ysqlDatabaseName,
 		strings.Join(args, "&"),
 	), nil

wait/host_port.go

@@ -6,7 +6,6 @@ import (
 	"fmt"
 	"net"
 	"os"
-	"strconv"
 	"time"
 
 	"github.com/docker/go-connections/nat"
@@ -226,11 +225,9 @@ func (hp *HostPortStrategy) WaitUntilReady(ctx context.Context, target StrategyT
 
 func externalCheck(ctx context.Context, ipAddress string, port nat.Port, target StrategyTarget, waitInterval time.Duration) error {
 	proto := port.Proto()
-	portNumber := port.Int()
-	portString := strconv.Itoa(portNumber)
 
 	dialer := net.Dialer{}
-	address := net.JoinHostPort(ipAddress, portString)
+	address := net.JoinHostPort(ipAddress, port.Port())
 	for i := 0; ; i++ {
 		if err := checkTarget(ctx, target); err != nil {
 			return fmt.Errorf("check target: retries: %d address: %s: %w", i, address, err)