fix: pass in bind allocator to build engine (#3179)

We already added bind allocator to build engine so that it can launch
language plugins but we did not pass in the bind allocator.

Added a task to clean this up here:
#2452

Author: matt2e

frontend/cli/cmd_box.go

@@ -15,6 +15,7 @@ import (
 	"github.com/TBD54566975/ftl"
 	"github.com/TBD54566975/ftl/backend/controller/dsn"
 	"github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/v1/ftlv1connect"
+	"github.com/TBD54566975/ftl/internal/bind"
 	"github.com/TBD54566975/ftl/internal/buildengine"
 	"github.com/TBD54566975/ftl/internal/exec"
 	"github.com/TBD54566975/ftl/internal/log"
@@ -123,7 +124,15 @@ func (b *boxCmd) Run(ctx context.Context, client ftlv1connect.ControllerServiceC
 	if len(b.Build.Dirs) == 0 {
 		return errors.New("no directories specified")
 	}
-	engine, err := buildengine.New(ctx, client, projConfig.Root(), b.Build.Dirs, buildengine.BuildEnv(b.Build.BuildEnv), buildengine.Parallelism(b.Build.Parallelism))
+
+	// use the cli endpoint to create the bind allocator, but leave the first port unused as it is meant to be reserved by a controller
+	bindAllocator, err := bind.NewBindAllocator(cli.Endpoint)
+	if err != nil {
+		return fmt.Errorf("could not create bind allocator: %w", err)
+	}
+	_ = bindAllocator.Next()
+
+	engine, err := buildengine.New(ctx, client, projConfig.Root(), b.Build.Dirs, bindAllocator, buildengine.BuildEnv(b.Build.BuildEnv), buildengine.Parallelism(b.Build.Parallelism))
 	if err != nil {
 		return err
 	}

frontend/cli/cmd_box_run.go

@@ -75,7 +75,7 @@ func (b *boxRunCmd) Run(ctx context.Context, projConfig projectconfig.Config) er
 		return fmt.Errorf("controller failed to start: %w", err)
 	}
 
-	engine, err := buildengine.New(ctx, client, projConfig.Root(), []string{b.Dir})
+	engine, err := buildengine.New(ctx, client, projConfig.Root(), []string{b.Dir}, runnerPortAllocator)
 	if err != nil {
 		return fmt.Errorf("failed to create build engine: %w", err)
 	}

frontend/cli/cmd_build.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 
 	"github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/v1/ftlv1connect"
+	"github.com/TBD54566975/ftl/internal/bind"
 	"github.com/TBD54566975/ftl/internal/buildengine"
 	"github.com/TBD54566975/ftl/internal/projectconfig"
 )
@@ -23,7 +24,14 @@ func (b *buildCmd) Run(ctx context.Context, client ftlv1connect.ControllerServic
 	if len(b.Dirs) == 0 {
 		return errors.New("no directories specified")
 	}
-	engine, err := buildengine.New(ctx, client, projConfig.Root(), b.Dirs, buildengine.BuildEnv(b.BuildEnv), buildengine.Parallelism(b.Parallelism))
+	// use the cli endpoint to create the bind allocator, but leave the first port unused as it is meant to be reserved by a controller
+	bindAllocator, err := bind.NewBindAllocator(cli.Endpoint)
+	if err != nil {
+		return fmt.Errorf("could not create bind allocator: %w", err)
+	}
+	_ = bindAllocator.Next()
+
+	engine, err := buildengine.New(ctx, client, projConfig.Root(), b.Dirs, bindAllocator, buildengine.BuildEnv(b.BuildEnv), buildengine.Parallelism(b.Parallelism))
 	if err != nil {
 		return err
 	}

frontend/cli/cmd_deploy.go

@@ -2,9 +2,11 @@ package main
 
 import (
 	"context"
+	"fmt"
 
 	"github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/v1/ftlv1connect"
 	"github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/v1beta1/provisioner/provisionerconnect"
+	"github.com/TBD54566975/ftl/internal/bind"
 	"github.com/TBD54566975/ftl/internal/buildengine"
 	"github.com/TBD54566975/ftl/internal/projectconfig"
 	"github.com/TBD54566975/ftl/internal/rpc"
@@ -24,7 +26,15 @@ func (d *deployCmd) Run(ctx context.Context, projConfig projectconfig.Config) er
 	} else {
 		client = rpc.ClientFromContext[ftlv1connect.ControllerServiceClient](ctx)
 	}
-	engine, err := buildengine.New(ctx, client, projConfig.Root(), d.Build.Dirs, buildengine.BuildEnv(d.Build.BuildEnv), buildengine.Parallelism(d.Build.Parallelism))
+
+	// use the cli endpoint to create the bind allocator, but leave the first port unused as it is meant to be reserved by a controller
+	bindAllocator, err := bind.NewBindAllocator(cli.Endpoint)
+	if err != nil {
+		return fmt.Errorf("could not create bind allocator: %w", err)
+	}
+	_ = bindAllocator.Next()
+
+	engine, err := buildengine.New(ctx, client, projConfig.Root(), d.Build.Dirs, bindAllocator, buildengine.BuildEnv(d.Build.BuildEnv), buildengine.Parallelism(d.Build.Parallelism))
 	if err != nil {
 		return err
 	}

frontend/cli/cmd_dev.go

@@ -12,6 +12,7 @@ import (
 
 	"github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/v1/ftlv1connect"
 	"github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/v1beta1/provisioner/provisionerconnect"
+	"github.com/TBD54566975/ftl/internal/bind"
 	"github.com/TBD54566975/ftl/internal/buildengine"
 	"github.com/TBD54566975/ftl/internal/dev"
 	"github.com/TBD54566975/ftl/internal/log"
@@ -65,6 +66,12 @@ func (d *devCmd) Run(ctx context.Context, k *kong.Kong, projConfig projectconfig
 	}
 	sm := terminal.FromContext(ctx)
 	starting := sm.NewStatus("\u001B[92mStarting FTL Server 🚀\u001B[39m")
+
+	bindAllocator, err := bind.NewBindAllocator(d.ServeCmd.Bind)
+	if err != nil {
+		return fmt.Errorf("could not create bind allocator: %w", err)
+	}
+
 	// cmdServe will notify this channel when startup commands are complete and the controller is ready
 	controllerReady := make(chan bool, 1)
 	if !d.NoServe {
@@ -80,7 +87,7 @@ func (d *devCmd) Run(ctx context.Context, k *kong.Kong, projConfig projectconfig
 		}
 
 		g.Go(func() error {
-			return d.ServeCmd.run(ctx, projConfig, optional.Some(controllerReady), true)
+			return d.ServeCmd.run(ctx, projConfig, optional.Some(controllerReady), true, bindAllocator)
 		})
 	}
 
@@ -101,7 +108,7 @@ func (d *devCmd) Run(ctx context.Context, k *kong.Kong, projConfig projectconfig
 			})
 		}
 
-		engine, err := buildengine.New(ctx, client, projConfig.Root(), d.Build.Dirs, opts...)
+		engine, err := buildengine.New(ctx, client, projConfig.Root(), d.Build.Dirs, bindAllocator, opts...)
 		if err != nil {
 			return err
 		}

frontend/cli/cmd_serve.go

@@ -56,10 +56,15 @@ type serveCmd struct {
 const ftlRunningErrorMsg = "FTL is already running. Use 'ftl serve --stop' to stop it"
 
 func (s *serveCmd) Run(ctx context.Context, projConfig projectconfig.Config) error {
-	return s.run(ctx, projConfig, optional.None[chan bool](), false)
+	bindAllocator, err := bind.NewBindAllocator(s.Bind)
+	if err != nil {
+		return fmt.Errorf("could not create bind allocator: %w", err)
+	}
+	return s.run(ctx, projConfig, optional.None[chan bool](), false, bindAllocator)
 }
 
-func (s *serveCmd) run(ctx context.Context, projConfig projectconfig.Config, initialised optional.Option[chan bool], devMode bool) error {
+//nolint:maintidx
+func (s *serveCmd) run(ctx context.Context, projConfig projectconfig.Config, initialised optional.Option[chan bool], devMode bool, bindAllocator *bind.BindAllocator) error {
 	logger := log.FromContext(ctx)
 	controllerClient := rpc.ClientFromContext[ftlv1connect.ControllerServiceClient](ctx)
 	provisionerClient := rpc.ClientFromContext[provisionerconnect.ProvisionerServiceClient](ctx)
@@ -112,11 +117,6 @@ func (s *serveCmd) run(ctx context.Context, projConfig projectconfig.Config, ini
 
 	wg, ctx := errgroup.WithContext(ctx)
 
-	bindAllocator, err := bind.NewBindAllocator(s.Bind)
-	if err != nil {
-		return err
-	}
-
 	controllerAddresses := make([]*url.URL, 0, s.Controllers)
 	controllerIngressAddresses := make([]*url.URL, 0, s.Controllers)
 	for range s.Controllers {

internal/buildengine/engine.go

@@ -236,7 +236,7 @@ func WithStartTime(startTime time.Time) Option {
 // pull in missing schemas.
 //
 // "dirs" are directories to scan for local modules.
-func New(ctx context.Context, client DeployClient, projectRoot string, moduleDirs []string, options ...Option) (*Engine, error) {
+func New(ctx context.Context, client DeployClient, projectRoot string, moduleDirs []string, bindAllocator *bind.BindAllocator, options ...Option) (*Engine, error) {
 	ctx = rpc.ContextWithClient(ctx, client)
 	e := &Engine{
 		client:           client,
@@ -252,6 +252,7 @@ func New(ctx context.Context, client DeployClient, projectRoot string, moduleDir
 		invalidateDeps:   make(chan invalidateDependenciesEvent, 128),
 		rawEngineUpdates: make(chan rawEngineEvent, 128),
 		EngineUpdates:    pubsub.New[EngineEvent](),
+		bindAllocator:    bindAllocator,
 	}
 	for _, option := range options {
 		option(e)

internal/buildengine/engine_test.go

@@ -2,18 +2,26 @@ package buildengine_test
 
 import (
 	"context"
+	"net/url"
 	"testing"
 
 	"github.com/alecthomas/assert/v2"
 
+	"github.com/TBD54566975/ftl/internal/bind"
 	"github.com/TBD54566975/ftl/internal/buildengine"
 	"github.com/TBD54566975/ftl/internal/log"
 	"github.com/TBD54566975/ftl/internal/schema"
 )
 
 func TestGraph(t *testing.T) {
 	ctx := log.ContextWithNewDefaultLogger(context.Background())
-	engine, err := buildengine.New(ctx, nil, t.TempDir(), []string{"testdata/alpha", "testdata/other", "testdata/another"})
+
+	bindURL, err := url.Parse("http://127.0.0.1:8893")
+	assert.NoError(t, err)
+	bindAllocator, err := bind.NewBindAllocator(bindURL)
+	assert.NoError(t, err)
+
+	engine, err := buildengine.New(ctx, nil, t.TempDir(), []string{"testdata/alpha", "testdata/other", "testdata/another"}, bindAllocator)
 	assert.NoError(t, err)
 
 	defer engine.Close()