pick random postgres port and return dsn

Author: EasterTheBunny

framework/components/dockercompose/billing_platform_service/billing_platform_service.go

@@ -17,6 +17,7 @@ import (
 
 	"github.com/smartcontractkit/chainlink-testing-framework/framework"
 	"github.com/smartcontractkit/chainlink-testing-framework/framework/components/dockercompose/utils"
+	"github.com/smartcontractkit/freeport"
 )
 
 const DefaultPostgresDSN = "postgres://postgres:postgres@postgres:5432/billing_platform"
@@ -27,12 +28,10 @@ type Output struct {
 }
 
 type BillingPlatformServiceOutput struct {
-	BillingGRPCInternalURL   string
-	BillingGRPCExternalURL   string
-	CreditGRPCInternalURL    string
-	CreditGRPCExternalURL    string
-	OwnershipGRPCInternalURL string
-	OwnershipGRPCExternalURL string
+	BillingGRPCInternalURL string
+	BillingGRPCExternalURL string
+	CreditGRPCInternalURL  string
+	CreditGRPCExternalURL  string
 }
 
 type PostgresOutput struct {
@@ -64,10 +63,11 @@ func defaultBillingPlatformService(in *Input) *Input {
 const (
 	DEFAULT_STACK_NAME = "billing-platform-service"
 
-	DEFAULT_BILLING_PLATFORM_SERVICE_BILLING_GRPC_PORT   = "2222"
-	DEFAULT_BILLING_PLATFORM_SERVICE_CREDIT_GRPC_PORT    = "2223"
-	DEFAULT_BILLING_PLATFORM_SERVICE_OWNERSHIP_GRPC_PORT = "2257"
-	DEFAULT_BILLING_PLATFORM_SERVICE_SERVICE_NAME        = "billing-platform-service"
+	DEFAULT_BILLING_PLATFORM_SERVICE_BILLING_GRPC_PORT = "2222"
+	DEFAULT_BILLING_PLATFORM_SERVICE_CREDIT_GRPC_PORT  = "2223"
+	DEFAULT_POSTGRES_PORT                              = "5432"
+	DEFAULT_BILLING_PLATFORM_SERVICE_SERVICE_NAME      = "billing-platform-service"
+	DEFAULT_POSTGRES_SERVICE_NAME                      = "postgres"
 )
 
 func New(in *Input) (*Output, error) {
@@ -124,6 +124,13 @@ func New(in *Input) (*Output, error) {
 	envVars["STREAMS_API_KEY"] = in.StreamsAPIKey
 	envVars["STREAMS_API_SECRET"] = in.StreamsAPISecret
 
+	port, err := freeport.Take(1)
+	if err != nil {
+		return nil, errors.Wrap(err, "failed to get free port for Billing Platform Service postgres")
+	}
+
+	envVars["POSTGRES_PORT"] = strconv.FormatInt(int64(port[0]), 10)
+
 	for _, env := range os.Environ() {
 		pair := strings.SplitN(env, "=", 2)
 		if len(pair) == 2 {
@@ -144,7 +151,6 @@ func New(in *Input) (*Output, error) {
 			wait.ForLog("GRPC server is live").WithPollInterval(200*time.Millisecond),
 			wait.ForListeningPort(DEFAULT_BILLING_PLATFORM_SERVICE_BILLING_GRPC_PORT),
 			wait.ForListeningPort(DEFAULT_BILLING_PLATFORM_SERVICE_CREDIT_GRPC_PORT),
-			wait.ForListeningPort(DEFAULT_BILLING_PLATFORM_SERVICE_OWNERSHIP_GRPC_PORT),
 		).WithDeadline(1*time.Minute),
 	)
 
@@ -153,6 +159,11 @@ func New(in *Input) (*Output, error) {
 		return nil, errors.Wrap(billingErr, "failed to get billing-platform-service container")
 	}
 
+	postgresContainer, postgresErr := stack.ServiceContainer(ctx, DEFAULT_POSTGRES_SERVICE_NAME)
+	if postgresErr != nil {
+		return nil, errors.Wrap(postgresErr, "failed to get postgres container")
+	}
+
 	cli, cliErr := client.NewClientWithOpts(
 		client.FromEnv,
 		client.WithAPIVersionNegotiation(),
@@ -195,16 +206,27 @@ func New(in *Input) (*Output, error) {
 		return nil, errors.Wrap(billingExternalHostErr, "failed to get host for Billing Platform Service")
 	}
 
+	// get hosts for billing platform service
+	postgresExternalHost, postgresExternalHostErr := utils.GetContainerHost(ctx, postgresContainer)
+	if postgresExternalHostErr != nil {
+		return nil, errors.Wrap(postgresExternalHostErr, "failed to get host for postgres")
+	}
+
 	// get mapped ports for billing platform service
 	serviceOutput, err := getExternalPorts(ctx, billingExternalHost, billingContainer)
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to get mapped port for Billing Platform Service")
 	}
 
+	externalPostgresPort, err := utils.FindMappedPort(ctx, 20*time.Second, postgresContainer, nat.Port(DEFAULT_POSTGRES_PORT+"/tcp"))
+	if err != nil {
+		return nil, errors.Wrap(err, "failed to get mapped port for postgres")
+	}
+
 	output := &Output{
 		BillingPlatformService: serviceOutput,
 		Postgres: &PostgresOutput{
-			DSN: DefaultPostgresDSN,
+			DSN: fmt.Sprintf("postgres://postgres:postgres@%s:%s/billing_platform", postgresExternalHost, externalPostgresPort.Port()),
 		},
 	}
 
@@ -215,9 +237,8 @@ func New(in *Input) (*Output, error) {
 
 func getExternalPorts(ctx context.Context, billingExternalHost string, billingContainer *testcontainers.DockerContainer) (*BillingPlatformServiceOutput, error) {
 	ports := map[string]nat.Port{
-		"billing":   DEFAULT_BILLING_PLATFORM_SERVICE_BILLING_GRPC_PORT,
-		"credit":    DEFAULT_BILLING_PLATFORM_SERVICE_CREDIT_GRPC_PORT,
-		"ownership": DEFAULT_BILLING_PLATFORM_SERVICE_OWNERSHIP_GRPC_PORT,
+		"billing": DEFAULT_BILLING_PLATFORM_SERVICE_BILLING_GRPC_PORT,
+		"credit":  DEFAULT_BILLING_PLATFORM_SERVICE_CREDIT_GRPC_PORT,
 	}
 
 	output := BillingPlatformServiceOutput{}
@@ -238,9 +259,6 @@ func getExternalPorts(ctx context.Context, billingExternalHost string, billingCo
 		case "credit":
 			output.CreditGRPCInternalURL = internal
 			output.CreditGRPCExternalURL = external
-		case "ownership":
-			output.OwnershipGRPCInternalURL = internal
-			output.OwnershipGRPCExternalURL = external
 		}
 	}
 

framework/components/dockercompose/billing_platform_service/docker-compose.yml

@@ -64,7 +64,7 @@ services:
       POSTGRES_USER: postgres
       POSTGRES_PASSWORD: postgres
     ports:
-      - "5432:5432"
+      - "${POSTGRES_PORT:-5432}:5432"
     healthcheck:
       test: ["CMD","pg_isready","-U","${POSTGRES_USER}","-d","${POSTGRES_DB}","-h","${POSTGRES_HOST}"]
       interval: 5s

framework/components/dockercompose/go.mod

@@ -12,6 +12,7 @@ require (
 	github.com/google/go-github/v72 v72.0.0
 	github.com/pkg/errors v0.9.1
 	github.com/smartcontractkit/chainlink-testing-framework/framework v0.0.0-00010101000000-000000000000
+	github.com/smartcontractkit/freeport v0.1.2
 	github.com/testcontainers/testcontainers-go v0.37.0
 	github.com/testcontainers/testcontainers-go/modules/compose v0.37.0
 	golang.org/x/oauth2 v0.25.0

framework/components/dockercompose/go.sum

@@ -567,6 +567,8 @@ github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 h1:JIAuq3EEf9cgbU6AtGPK4CTG3Zf6CKMNqf0MHTggAUA=
 github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966/go.mod h1:sUM3LWHvSMaG192sy56D9F7CNvL7jUJVXoqM1QKLnog=
+github.com/smartcontractkit/freeport v0.1.2 h1:xMZ0UFHmjfB4MwbDANae3RS7UKt7OJ0JVqhjPSXdKVk=
+github.com/smartcontractkit/freeport v0.1.2/go.mod h1:T4zH9R8R8lVWKfU7tUvYz2o2jMv1OpGCdpY2j2QZXzU=
 github.com/spdx/tools-golang v0.5.3 h1:ialnHeEYUC4+hkm5vJm4qz2x+oEJbS0mAMFrNXdQraY=
 github.com/spdx/tools-golang v0.5.3/go.mod h1:/ETOahiAo96Ob0/RAIBmFZw6XN0yTnyr/uFZm2NTMhI=
 github.com/spf13/cast v0.0.0-20150508191742-4d07383ffe94 h1:JmfC365KywYwHB946TTiQWEb8kqPY+pybPLoGE9GgVk=