simplify port forwarding, use only x:y format

Author: skudasov

framework/components/blockchain/aptos.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"path/filepath"
+	"strings"
 
 	"github.com/docker/docker/api/types/container"
 	"github.com/testcontainers/testcontainers-go"
@@ -12,6 +13,11 @@ import (
 	"github.com/smartcontractkit/chainlink-testing-framework/framework"
 )
 
+const (
+	DefaultAptosAPIPort    = "8080"
+	DefaultAptosFaucetPort = "8081"
+)
+
 var (
 	DefaultAptosAccount    = "0xa337b42bd0eecf8fb59ee5929ea4541904b3c35a642040223f3d26ab57f59d6e"
 	DefaultAptosPrivateKey = "0xd477c65f88ed9e6d4ec6e2014755c3cfa3e0c44e521d0111a02868c5f04c41d4"
@@ -21,11 +27,15 @@ func defaultAptos(in *Input) {
 	if in.Image == "" {
 		in.Image = "aptoslabs/tools:aptos-node-v1.27.2"
 	}
-	framework.L.Warn().Msg("Aptos node API can only be exposed on port 8080!")
+	framework.L.Warn().Msgf("Aptos node API can only be exposed on port %s!", DefaultAptosAPIPort)
+	if in.Port == "" {
+		// enable default API exposed port
+		in.Port = DefaultAptosAPIPort
+	}
 	if in.CustomPorts == nil {
-		in.CustomPorts = append(in.CustomPorts, "8080:8080", "8081:8081")
+		// enable default API and faucet forwarding
+		in.CustomPorts = append(in.CustomPorts, fmt.Sprintf("%s:%s", in.Port, DefaultAptosAPIPort), fmt.Sprintf("%s:%s", DefaultAptosFaucetPort, DefaultAptosFaucetPort))
 	}
-	in.Port = "8080"
 }
 
 func newAptos(in *Input) (*Output, error) {
@@ -42,6 +52,7 @@ func newAptos(in *Input) (*Output, error) {
 	if err != nil {
 		return nil, err
 	}
+	exposedPorts = append(exposedPorts, in.Port)
 
 	cmd := []string{
 		"aptos",
@@ -102,13 +113,20 @@ func newAptos(in *Input) (*Output, error) {
 	if err != nil {
 		return nil, err
 	}
+	// expose default API port if remapped
+	var exposedAPIPort string
+	for _, portPair := range in.CustomPorts {
+		if strings.Contains(portPair, fmt.Sprintf(":%s", DefaultAptosAPIPort)) {
+			exposedAPIPort = strings.Split(portPair, ":")[0]
+		}
+	}
 	return &Output{
 		UseCache:      true,
 		Family:        "aptos",
 		ContainerName: containerName,
 		Nodes: []*Node{
 			{
-				ExternalHTTPUrl: fmt.Sprintf("http://%s:%s", host, in.Port),
+				ExternalHTTPUrl: fmt.Sprintf("http://%s:%s", host, exposedAPIPort),
 				InternalHTTPUrl: fmt.Sprintf("http://%s:%s", containerName, in.Port),
 			},
 		},

framework/docker.go

@@ -421,32 +421,22 @@ func GenerateCustomPortsData(portsProvided []string) ([]string, nat.PortMap, err
 	portBindings := nat.PortMap{}
 	customPorts := make([]string, 0)
 	for _, p := range portsProvided {
-		if strings.Contains(p, ":") {
-			pp := strings.Split(p, ":")
-			if len(pp) != 2 {
-				return nil, nil, fmt.Errorf("custom_ports has ':' but you must provide both ports, you provided: %s", pp)
-			}
-			customPorts = append(customPorts, fmt.Sprintf("%s/tcp", pp[1]))
-
-			dockerPort := nat.Port(fmt.Sprintf("%s/tcp", pp[1]))
-			hostPort := pp[0]
-			portBindings[dockerPort] = []nat.PortBinding{
-				{
-					HostIP:   "0.0.0.0",
-					HostPort: hostPort,
-				},
-			}
-		} else {
-			customPorts = append(customPorts, fmt.Sprintf("%s/tcp", p))
-
-			dockerPort := nat.Port(fmt.Sprintf("%s/tcp", p))
-			hostPort := p
-			portBindings[dockerPort] = []nat.PortBinding{
-				{
-					HostIP:   "0.0.0.0",
-					HostPort: hostPort,
-				},
-			}
+		if !strings.Contains(p, ":") {
+			return nil, nil, fmt.Errorf("custom ports must have format external_port:internal_port, you provided: %s", p)
+		}
+		pp := strings.Split(p, ":")
+		if len(pp) != 2 {
+			return nil, nil, fmt.Errorf("custom_ports has ':' but you must provide both ports, you provided: %s", pp)
+		}
+		customPorts = append(customPorts, fmt.Sprintf("%s/tcp", pp[1]))
+
+		dockerPort := nat.Port(fmt.Sprintf("%s/tcp", pp[1]))
+		hostPort := pp[0]
+		portBindings[dockerPort] = []nat.PortBinding{
+			{
+				HostIP:   "0.0.0.0",
+				HostPort: hostPort,
+			},
 		}
 	}
 	exposedPorts = append(exposedPorts, customPorts...)

framework/examples/myproject/smoke_aptos.toml

@@ -1,4 +1,4 @@
 [blockchain_a]
   type = "aptos"
-  custom_ports = ["2020", "4050:4050", "8080:8080", "8081:8081"]
+  custom_ports = ["9005:8080", "9006:8081"]
   docker_cmd_params = ["--skip-metadata-apply"]