Cleanup Wasm runtime creation (#3755)

Author: emcfarlane

private/buf/bufcli/cache.go

@@ -15,6 +15,7 @@
 package bufcli
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"io/fs"
@@ -37,6 +38,7 @@ import (
 	"github.com/bufbuild/buf/private/pkg/filelock"
 	"github.com/bufbuild/buf/private/pkg/normalpath"
 	"github.com/bufbuild/buf/private/pkg/storage/storageos"
+	"github.com/bufbuild/buf/private/pkg/wasm"
 )
 
 var (
@@ -173,17 +175,21 @@ func NewPluginDataProvider(container appext.Container) (bufplugin.PluginDataProv
 	)
 }
 
-// CreateWasmRuntimeCacheDir creates the cache directory for the Wasm runtime.
-//
-// This is used by the Wasm runtime to cache compiled Wasm plugins. This is an
-// implementation specific cache and opaque outside of the runtime. The runtime
-// will manage the cache versioning itself within this directory.
-func CreateWasmRuntimeCacheDir(container appext.Container) (string, error) {
+// NewWasmRuntime returns a new Wasm runtime while creating the required cache
+// directories.
+func NewWasmRuntime(ctx context.Context, container appext.Container) (wasm.Runtime, error) {
+	// This is used by the Wasm runtime to cache compiled Wasm plugins. This is an
+	// implementation specific cache and opaque outside of the runtime. The runtime
+	// will manage the cache versioning itself within this directory.
 	if err := createCacheDir(container.CacheDirPath(), v3CacheWasmRuntimeRelDirPath); err != nil {
-		return "", err
+		return nil, err
 	}
 	fullCacheDirPath := normalpath.Join(container.CacheDirPath(), v3CacheWasmRuntimeRelDirPath)
-	return fullCacheDirPath, nil
+	wasmRuntime, err := wasm.NewRuntime(ctx, wasm.WithLocalCacheDir(fullCacheDirPath))
+	if err != nil {
+		return nil, err
+	}
+	return wasmRuntime, nil
 }
 
 // NewWKTStore returns a new bufwktstore.Store while creating the required cache directories.

private/buf/cmd/buf/command/beta/lsp/lsp.go

@@ -29,7 +29,6 @@ import (
 	"github.com/bufbuild/buf/private/pkg/app/appcmd"
 	"github.com/bufbuild/buf/private/pkg/app/appext"
 	"github.com/bufbuild/buf/private/pkg/ioext"
-	"github.com/bufbuild/buf/private/pkg/wasm"
 	"github.com/spf13/pflag"
 	"go.lsp.dev/jsonrpc2"
 )
@@ -101,11 +100,7 @@ func run(
 		return err
 	}
 
-	wasmRuntimeCacheDir, err := bufcli.CreateWasmRuntimeCacheDir(container)
-	if err != nil {
-		return err
-	}
-	wasmRuntime, err := wasm.NewRuntime(ctx, wasm.WithLocalCacheDir(wasmRuntimeCacheDir))
+	wasmRuntime, err := bufcli.NewWasmRuntime(ctx, container)
 	if err != nil {
 		return err
 	}

private/buf/cmd/buf/command/breaking/breaking.go

@@ -176,11 +176,7 @@ func run(
 	if err != nil {
 		return err
 	}
-	wasmRuntimeCacheDir, err := bufcli.CreateWasmRuntimeCacheDir(container)
-	if err != nil {
-		return err
-	}
-	wasmRuntime, err := wasm.NewRuntime(ctx, wasm.WithLocalCacheDir(wasmRuntimeCacheDir))
+	wasmRuntime, err := bufcli.NewWasmRuntime(ctx, container)
 	if err != nil {
 		return err
 	}

private/buf/cmd/buf/command/config/internal/internal.go

@@ -31,7 +31,6 @@ import (
 	"github.com/bufbuild/buf/private/pkg/slicesext"
 	"github.com/bufbuild/buf/private/pkg/stringutil"
 	"github.com/bufbuild/buf/private/pkg/syserror"
-	"github.com/bufbuild/buf/private/pkg/wasm"
 	"github.com/spf13/pflag"
 )
 
@@ -183,11 +182,7 @@ func lsRun(
 			return err
 		}
 	}
-	wasmRuntimeCacheDir, err := bufcli.CreateWasmRuntimeCacheDir(container)
-	if err != nil {
-		return err
-	}
-	wasmRuntime, err := wasm.NewRuntime(ctx, wasm.WithLocalCacheDir(wasmRuntimeCacheDir))
+	wasmRuntime, err := bufcli.NewWasmRuntime(ctx, container)
 	if err != nil {
 		return err
 	}

private/buf/cmd/buf/command/lint/lint.go

@@ -27,7 +27,6 @@ import (
 	"github.com/bufbuild/buf/private/pkg/app/appcmd"
 	"github.com/bufbuild/buf/private/pkg/app/appext"
 	"github.com/bufbuild/buf/private/pkg/stringutil"
-	"github.com/bufbuild/buf/private/pkg/wasm"
 	"github.com/spf13/pflag"
 )
 
@@ -122,11 +121,7 @@ func run(
 	if err != nil {
 		return err
 	}
-	wasmRuntimeCacheDir, err := bufcli.CreateWasmRuntimeCacheDir(container)
-	if err != nil {
-		return err
-	}
-	wasmRuntime, err := wasm.NewRuntime(ctx, wasm.WithLocalCacheDir(wasmRuntimeCacheDir))
+	wasmRuntime, err := bufcli.NewWasmRuntime(ctx, container)
 	if err != nil {
 		return err
 	}