make long-lived gateway configurable

This helps with the REPL, too! Funny that both "loops" need it. Makes sense.
vito · Apr 16, 2023 · 49075e5 · 49075e5
1 parent 71ee57b
commit 49075e5
Show file tree

Hide file tree

Showing 9 changed files with 58 additions and 54 deletions.
diff --git a/cmd/bass/bump.go b/cmd/bass/bump.go
@@ -13,7 +13,7 @@ import (
 )
 
 func bump(ctx context.Context) error {
-	ctx, _, err := setupPool(ctx)
+	ctx, _, err := setupPool(ctx, true)
 	if err != nil {
 		return err
 	}

diff --git a/cmd/bass/export.go b/cmd/bass/export.go
@@ -18,7 +18,7 @@ import (
 )
 
 func export(ctx context.Context) error {
-	ctx, _, err := setupPool(ctx)
+	ctx, _, err := setupPool(ctx, true)
 	if err != nil {
 		return err
 	}

diff --git a/cmd/bass/main.go b/cmd/bass/main.go
@@ -105,26 +105,6 @@ func main() {
 	}
 }
 
-var DefaultConfig = bass.Config{
-	Runtimes: []bass.RuntimeConfig{},
-}
-
-func init() {
-	var runtime string
-	if os.Getenv("DAGGER_SESSION_PORT") != "" || os.Getenv("_EXPERIMENTAL_DAGGER_CLI_BIN") != "" {
-		runtime = runtimes.DaggerName
-	} else {
-		runtime = runtimes.BuildkitName
-	}
-
-	DefaultConfig.Runtimes = []bass.RuntimeConfig{
-		{
-			Platform: bass.LinuxPlatform,
-			Runtime:  runtime,
-		},
-	}
-}
-
 func root(ctx context.Context) error {
 	if showVersion {
 		printVersion(ctx)
@@ -204,8 +184,29 @@ func root(ctx context.Context) error {
 	return cli.WithProgress(ctx, run)
 }
 
-func setupPool(ctx context.Context) (context.Context, *runtimes.Pool, error) {
-	config, err := bass.LoadConfig(DefaultConfig)
+func setupPool(ctx context.Context, oneShot bool) (context.Context, *runtimes.Pool, error) {
+	defaultConfig := bass.Config{
+		Runtimes: []bass.RuntimeConfig{},
+	}
+
+	var runtime string
+	if os.Getenv("DAGGER_SESSION_PORT") != "" || os.Getenv("_EXPERIMENTAL_DAGGER_CLI_BIN") != "" {
+		runtime = runtimes.DaggerName
+	} else {
+		runtime = runtimes.BuildkitName
+	}
+
+	defaultConfig.Runtimes = []bass.RuntimeConfig{
+		{
+			Platform: bass.LinuxPlatform,
+			Runtime:  runtime,
+			Config: bass.Bindings{
+				"oneshot": bass.Bool(oneShot),
+			}.Scope(),
+		},
+	}
+
+	config, err := bass.LoadConfig(defaultConfig)
 	if err != nil {
 		cli.WriteError(ctx, err)
 		return nil, nil, err

diff --git a/cmd/bass/prune.go b/cmd/bass/prune.go
@@ -10,7 +10,7 @@ import (
 )
 
 func prune(ctx context.Context) error {
-	ctx, _, err := setupPool(ctx)
+	ctx, _, err := setupPool(ctx, true)
 	if err != nil {
 		return err
 	}

diff --git a/cmd/bass/repl.go b/cmd/bass/repl.go
@@ -8,7 +8,7 @@ import (
 )
 
 func repl(ctx context.Context) error {
-	ctx, _, err := setupPool(ctx)
+	ctx, _, err := setupPool(ctx, false)
 	if err != nil {
 		return err
 	}

diff --git a/cmd/bass/run.go b/cmd/bass/run.go
@@ -11,7 +11,7 @@ import (
 )
 
 func run(ctx context.Context) error {
-	ctx, _, err := setupPool(ctx)
+	ctx, _, err := setupPool(ctx, true)
 	if err != nil {
 		return err
 	}

diff --git a/cmd/bass/run_thunk.go b/cmd/bass/run_thunk.go
@@ -10,7 +10,7 @@ import (
 )
 
 func runThunk(ctx context.Context) error {
-	ctx, _, err := setupPool(ctx)
+	ctx, _, err := setupPool(ctx, true)
 	if err != nil {
 		return err
 	}

diff --git a/cmd/bass/runner.go b/cmd/bass/runner.go
@@ -33,7 +33,7 @@ var defaultKeys = []string{
 }
 
 func runnerLoop(ctx context.Context, client *runtimes.SSHClient) error {
-	ctx, pool, err := setupPool(ctx)
+	ctx, pool, err := setupPool(ctx, false)
 	if err != nil {
 		return err
 	}

diff --git a/pkg/runtimes/buildkit.go b/pkg/runtimes/buildkit.go
@@ -72,6 +72,7 @@ const ociStoreName = "bass"
 const ociTagAnnotation = "org.opencontainers.image.ref.name"
 
 type BuildkitConfig struct {
+	Oneshot      bool   `json:"oneshot,omitempty"`
 	Debug        bool   `json:"debug,omitempty"`
 	Addr         string `json:"addr,omitempty"`
 	Installation string `json:"installation,omitempty"`
@@ -190,33 +191,35 @@ func NewBuildkit(ctx context.Context, _ bass.RuntimePool, cfg *bass.Scope) (bass
 
 	solveOpt := newSolveOpt(authp, secrets, ociStore)
 
-	gwCh := make(chan gwclient.Client, 1)
-	gwErrCh := make(chan error, 1)
-	go func() {
-		statusProxy := forwardStatus(progrock.RecorderFromContext(ctx))
-		defer statusProxy.Wait()
+	var gw gwclient.Client
+	if config.Oneshot {
+		gwCh := make(chan gwclient.Client, 1)
+		gwErrCh := make(chan error, 1)
+		go func() {
+			statusProxy := forwardStatus(progrock.RecorderFromContext(ctx))
+			defer statusProxy.Wait()
 
-		_, err := client.Build(
-			ctx,
-			solveOpt,
-			buildkitProduct,
-			func(_ context.Context, gw gwclient.Client) (*gwclient.Result, error) {
-				gwCh <- gw
-				<-ctx.Done()
-				return gwclient.NewResult(), nil
-			},
-			statusProxy.Writer(),
-		)
-		if err != nil {
-			gwErrCh <- err
-		}
-	}()
+			_, err := client.Build(
+				ctx,
+				solveOpt,
+				buildkitProduct,
+				func(_ context.Context, gw gwclient.Client) (*gwclient.Result, error) {
+					gwCh <- gw
+					<-ctx.Done()
+					return gwclient.NewResult(), nil
+				},
+				statusProxy.Writer(),
+			)
+			if err != nil {
+				gwErrCh <- err
+			}
+		}()
 
-	var gw gwclient.Client
-	select {
-	case gw = <-gwCh:
-	case err := <-gwErrCh:
-		return nil, fmt.Errorf("buildkit gateway: %w", err)
+		select {
+		case gw = <-gwCh:
+		case err := <-gwErrCh:
+			return nil, fmt.Errorf("buildkit gateway: %w", err)
+		}
 	}
 
 	return &Buildkit{