Revert invoke of remote plugins

emcfarlane · emcfarlane · commit fd03c36a8e17 · 2024-11-19T12:59:56.000-05:00
diff --git a/private/buf/bufctl/controller.go b/private/buf/bufctl/controller.go
@@ -128,8 +128,6 @@ type Controller interface {
 		defaultMessageEncoding buffetch.MessageEncoding,
 		options ...FunctionOption,
 	) error
-	PluginKeyProvider() bufplugin.PluginKeyProvider
-	PluginDataProvider() bufplugin.PluginDataProvider
 }
 
 func NewController(
@@ -708,14 +706,6 @@ func (c *controller) PutMessage(
 	return errors.Join(err, writeCloser.Close())
 }
 
-func (c *controller) PluginKeyProvider() bufplugin.PluginKeyProvider {
-	return c.pluginKeyProvider
-}
-
-func (c *controller) PluginDataProvider() bufplugin.PluginDataProvider {
-	return c.pluginDataProvider
-}
-
 func (c *controller) getImage(
 	ctx context.Context,
 	input string,
diff --git a/private/buf/bufmigrate/migrator.go b/private/buf/bufmigrate/migrator.go
@@ -29,7 +29,6 @@ import (
 	"github.com/bufbuild/buf/private/bufpkg/bufconfig"
 	"github.com/bufbuild/buf/private/bufpkg/bufmodule"
 	"github.com/bufbuild/buf/private/bufpkg/bufparse"
-	"github.com/bufbuild/buf/private/bufpkg/bufplugin"
 	"github.com/bufbuild/buf/private/pkg/normalpath"
 	"github.com/bufbuild/buf/private/pkg/slicesext"
 	"github.com/bufbuild/buf/private/pkg/storage"
@@ -696,7 +695,7 @@ func equivalentCheckConfigInV2(
 ) (bufconfig.CheckConfig, error) {
 	// No need for custom lint/breaking plugins since there's no plugins to migrate from <=v1.
 	// TODO: If we ever need v3, then we will have to deal with this.
-	client, err := bufcheck.NewClient(logger, bufcheck.NewRunnerProvider(wasm.UnimplementedRuntime, bufplugin.NopPluginKeyProvider, bufplugin.NopPluginDataProvider))
+	client, err := bufcheck.NewClient(logger, bufcheck.NewRunnerProvider(wasm.UnimplementedRuntime))
 	if err != nil {
 		return nil, err
 	}
diff --git a/private/buf/cmd/buf/buf_test.go b/private/buf/cmd/buf/buf_test.go
@@ -35,7 +35,6 @@ import (
 	"github.com/bufbuild/buf/private/bufpkg/bufcheck"
 	"github.com/bufbuild/buf/private/bufpkg/bufconfig"
 	"github.com/bufbuild/buf/private/bufpkg/bufimage"
-	"github.com/bufbuild/buf/private/bufpkg/bufplugin"
 	imagev1 "github.com/bufbuild/buf/private/gen/proto/go/buf/alpha/image/v1"
 	"github.com/bufbuild/buf/private/pkg/app/appcmd"
 	"github.com/bufbuild/buf/private/pkg/app/appcmd/appcmdtesting"
@@ -1351,11 +1350,7 @@ func TestCheckLsBreakingRulesFromConfigExceptDeprecated(t *testing.T) {
 			// Do not need any custom lint/breaking plugins here.
 			client, err := bufcheck.NewClient(
 				slogtestext.NewLogger(t),
-				bufcheck.NewRunnerProvider(
-					wasm.UnimplementedRuntime,
-					bufplugin.NopPluginKeyProvider,
-					bufplugin.NopPluginDataProvider,
-				),
+				bufcheck.NewRunnerProvider(wasm.UnimplementedRuntime),
 			)
 			require.NoError(t, err)
 			allRules, err := client.AllRules(context.Background(), check.RuleTypeBreaking, version)
diff --git a/private/buf/cmd/buf/command/beta/lsp/lsp.go b/private/buf/cmd/buf/command/beta/lsp/lsp.go
@@ -115,11 +115,7 @@ func run(
 	}()
 	checkClient, err := bufcheck.NewClient(
 		container.Logger(),
-		bufcheck.NewRunnerProvider(
-			wasmRuntime,
-			controller.PluginKeyProvider(),
-			controller.PluginDataProvider(),
-		),
+		bufcheck.NewRunnerProvider(wasmRuntime),
 		bufcheck.ClientWithStderr(container.Stderr()),
 	)
 	if err != nil {
diff --git a/private/buf/cmd/buf/command/breaking/breaking.go b/private/buf/cmd/buf/command/breaking/breaking.go
@@ -220,11 +220,7 @@ func run(
 	for i, imageWithConfig := range imageWithConfigs {
 		client, err := bufcheck.NewClient(
 			container.Logger(),
-			bufcheck.NewRunnerProvider(
-				wasmRuntime,
-				controller.PluginKeyProvider(),
-				controller.PluginDataProvider(),
-			),
+			bufcheck.NewRunnerProvider(wasmRuntime),
 			bufcheck.ClientWithStderr(container.Stderr()),
 		)
 		if err != nil {
diff --git a/private/buf/cmd/buf/command/config/internal/internal.go b/private/buf/cmd/buf/command/config/internal/internal.go
@@ -183,10 +183,6 @@ func lsRun(
 			return err
 		}
 	}
-	controller, err := bufcli.NewController(container)
-	if err != nil {
-		return err
-	}
 	wasmRuntimeCacheDir, err := bufcli.CreateWasmRuntimeCacheDir(container)
 	if err != nil {
 		return err
@@ -200,11 +196,7 @@ func lsRun(
 	}()
 	client, err := bufcheck.NewClient(
 		container.Logger(),
-		bufcheck.NewRunnerProvider(
-			wasmRuntime,
-			controller.PluginKeyProvider(),
-			controller.PluginDataProvider(),
-		),
+		bufcheck.NewRunnerProvider(wasmRuntime),
 		bufcheck.ClientWithStderr(container.Stderr()),
 	)
 	if err != nil {
diff --git a/private/buf/cmd/buf/command/lint/lint.go b/private/buf/cmd/buf/command/lint/lint.go
@@ -145,11 +145,7 @@ func run(
 	for _, imageWithConfig := range imageWithConfigs {
 		client, err := bufcheck.NewClient(
 			container.Logger(),
-			bufcheck.NewRunnerProvider(
-				wasmRuntime,
-				controller.PluginKeyProvider(),
-				controller.PluginDataProvider(),
-			),
+			bufcheck.NewRunnerProvider(wasmRuntime),
 			bufcheck.ClientWithStderr(container.Stderr()),
 		)
 		if err != nil {
diff --git a/private/buf/cmd/buf/command/mod/internal/internal.go b/private/buf/cmd/buf/command/mod/internal/internal.go
@@ -24,7 +24,6 @@ import (
 	"github.com/bufbuild/buf/private/buf/bufcli"
 	"github.com/bufbuild/buf/private/bufpkg/bufcheck"
 	"github.com/bufbuild/buf/private/bufpkg/bufconfig"
-	"github.com/bufbuild/buf/private/bufpkg/bufplugin"
 	"github.com/bufbuild/buf/private/pkg/app/appcmd"
 	"github.com/bufbuild/buf/private/pkg/app/appext"
 	"github.com/bufbuild/buf/private/pkg/slicesext"
@@ -176,11 +175,7 @@ func lsRun(
 	// BufYAMLFiles <=v1 never had plugins.
 	client, err := bufcheck.NewClient(
 		container.Logger(),
-		bufcheck.NewRunnerProvider(
-			wasm.UnimplementedRuntime,
-			bufplugin.NopPluginKeyProvider,
-			bufplugin.NopPluginDataProvider,
-		),
+		bufcheck.NewRunnerProvider(wasm.UnimplementedRuntime),
 		bufcheck.ClientWithStderr(container.Stderr()),
 	)
 	if err != nil {
diff --git a/private/buf/cmd/protoc-gen-buf-breaking/breaking.go b/private/buf/cmd/protoc-gen-buf-breaking/breaking.go
@@ -28,7 +28,6 @@ import (
 	"github.com/bufbuild/buf/private/bufpkg/bufanalysis"
 	"github.com/bufbuild/buf/private/bufpkg/bufcheck"
 	"github.com/bufbuild/buf/private/bufpkg/bufimage"
-	"github.com/bufbuild/buf/private/bufpkg/bufplugin"
 	"github.com/bufbuild/buf/private/pkg/encoding"
 	"github.com/bufbuild/buf/private/pkg/protodescriptor"
 	"github.com/bufbuild/buf/private/pkg/protoencoding"
@@ -126,11 +125,7 @@ func handle(
 	// The protoc plugins do not support custom lint/breaking change plugins for now.
 	client, err := bufcheck.NewClient(
 		container.Logger(),
-		bufcheck.NewRunnerProvider(
-			wasm.UnimplementedRuntime,
-			bufplugin.NopPluginKeyProvider,
-			bufplugin.NopPluginDataProvider,
-		),
+		bufcheck.NewRunnerProvider(wasm.UnimplementedRuntime),
 		bufcheck.ClientWithStderr(pluginEnv.Stderr),
 	)
 	if err != nil {
diff --git a/private/buf/cmd/protoc-gen-buf-lint/lint.go b/private/buf/cmd/protoc-gen-buf-lint/lint.go
@@ -27,7 +27,6 @@ import (
 	"github.com/bufbuild/buf/private/bufpkg/bufanalysis"
 	"github.com/bufbuild/buf/private/bufpkg/bufcheck"
 	"github.com/bufbuild/buf/private/bufpkg/bufimage"
-	"github.com/bufbuild/buf/private/bufpkg/bufplugin"
 	"github.com/bufbuild/buf/private/pkg/encoding"
 	"github.com/bufbuild/buf/private/pkg/protodescriptor"
 	"github.com/bufbuild/buf/private/pkg/protoencoding"
@@ -101,11 +100,7 @@ func handle(
 	// The protoc plugins do not support custom lint/breaking change plugins for now.
 	client, err := bufcheck.NewClient(
 		container.Logger(),
-		bufcheck.NewRunnerProvider(
-			wasm.UnimplementedRuntime,
-			bufplugin.NopPluginKeyProvider,
-			bufplugin.NopPluginDataProvider,
-		),
+		bufcheck.NewRunnerProvider(wasm.UnimplementedRuntime),
 		bufcheck.ClientWithStderr(pluginEnv.Stderr),
 	)
 	if err != nil {
diff --git a/private/bufpkg/bufcheck/breaking_test.go b/private/bufpkg/bufcheck/breaking_test.go
@@ -30,7 +30,6 @@ import (
 	"github.com/bufbuild/buf/private/bufpkg/bufcheck"
 	"github.com/bufbuild/buf/private/bufpkg/bufimage"
 	"github.com/bufbuild/buf/private/bufpkg/bufmodule"
-	"github.com/bufbuild/buf/private/bufpkg/bufplugin"
 	"github.com/bufbuild/buf/private/pkg/slogtestext"
 	"github.com/bufbuild/buf/private/pkg/storage/storageos"
 	"github.com/bufbuild/buf/private/pkg/wasm"
@@ -1345,11 +1344,7 @@ func testBreaking(
 	require.NoError(t, err)
 	breakingConfig := workspace.GetBreakingConfigForOpaqueID(opaqueID)
 	require.NotNil(t, breakingConfig)
-	client, err := bufcheck.NewClient(logger, bufcheck.NewRunnerProvider(
-		wasm.UnimplementedRuntime,
-		bufplugin.NopPluginKeyProvider,
-		bufplugin.NopPluginDataProvider,
-	))
+	client, err := bufcheck.NewClient(logger, bufcheck.NewRunnerProvider(wasm.UnimplementedRuntime))
 	require.NoError(t, err)
 	err = client.Breaking(
 		ctx,
diff --git a/private/bufpkg/bufcheck/bufcheck.go b/private/bufpkg/bufcheck/bufcheck.go
@@ -22,7 +22,6 @@ import (
 	"buf.build/go/bufplugin/check"
 	"github.com/bufbuild/buf/private/bufpkg/bufconfig"
 	"github.com/bufbuild/buf/private/bufpkg/bufimage"
-	"github.com/bufbuild/buf/private/bufpkg/bufplugin"
 	"github.com/bufbuild/buf/private/pkg/slicesext"
 	"github.com/bufbuild/buf/private/pkg/syserror"
 	"github.com/bufbuild/buf/private/pkg/wasm"
@@ -183,13 +182,9 @@ func (r RunnerProviderFunc) NewRunner(pluginConfig bufconfig.PluginConfig) (plug
 // If the PluginConfigType is not supported, an error is returned.
 func NewRunnerProvider(
 	wasmRuntime wasm.Runtime,
-	pluginKeyProvider bufplugin.PluginKeyProvider,
-	pluginDataProvider bufplugin.PluginDataProvider,
 ) RunnerProvider {
 	return newRunnerProvider(
 		wasmRuntime,
-		pluginKeyProvider,
-		pluginDataProvider,
 	)
 }
 
diff --git a/private/bufpkg/bufcheck/lint_test.go b/private/bufpkg/bufcheck/lint_test.go
@@ -27,7 +27,6 @@ import (
 	"github.com/bufbuild/buf/private/bufpkg/bufcheck"
 	"github.com/bufbuild/buf/private/bufpkg/bufimage"
 	"github.com/bufbuild/buf/private/bufpkg/bufmodule"
-	"github.com/bufbuild/buf/private/bufpkg/bufplugin"
 	"github.com/bufbuild/buf/private/pkg/slogtestext"
 	"github.com/bufbuild/buf/private/pkg/storage/storageos"
 	"github.com/bufbuild/buf/private/pkg/wasm"
@@ -1356,11 +1355,7 @@ func testLintWithOptions(
 	})
 	client, err := bufcheck.NewClient(
 		logger,
-		bufcheck.NewRunnerProvider(
-			wasmRuntime,
-			bufplugin.NopPluginKeyProvider,
-			bufplugin.NopPluginDataProvider,
-		),
+		bufcheck.NewRunnerProvider(wasmRuntime),
 	)
 	require.NoError(t, err)
 	err = client.Lint(
diff --git a/private/bufpkg/bufcheck/multi_client_test.go b/private/bufpkg/bufcheck/multi_client_test.go
@@ -24,7 +24,6 @@ import (
 	"buf.build/go/bufplugin/check/checkutil"
 	"buf.build/go/bufplugin/option"
 	"github.com/bufbuild/buf/private/bufpkg/bufconfig"
-	"github.com/bufbuild/buf/private/bufpkg/bufplugin"
 	"github.com/bufbuild/buf/private/pkg/slicesext"
 	"github.com/bufbuild/buf/private/pkg/slogtestext"
 	"github.com/bufbuild/buf/private/pkg/stringutil"
@@ -183,11 +182,7 @@ func TestMultiClientCannotHaveOverlappingRulesWithBuiltIn(t *testing.T) {
 
 	client, err := newClient(
 		slogtestext.NewLogger(t),
-		NewRunnerProvider(
-			wasm.UnimplementedRuntime,
-			bufplugin.NopPluginKeyProvider,
-			bufplugin.NopPluginDataProvider,
-		),
+		NewRunnerProvider(wasm.UnimplementedRuntime),
 	)
 	require.NoError(t, err)
 	duplicateBuiltInRulePluginConfig, err := bufconfig.NewLocalPluginConfig(
@@ -280,11 +275,7 @@ func TestMultiClientCannotHaveOverlappingCategoriesWithBuiltIn(t *testing.T) {
 
 	client, err := newClient(
 		slogtestext.NewLogger(t),
-		NewRunnerProvider(
-			wasm.UnimplementedRuntime,
-			bufplugin.NopPluginKeyProvider,
-			bufplugin.NopPluginDataProvider,
-		),
+		NewRunnerProvider(wasm.UnimplementedRuntime),
 	)
 	require.NoError(t, err)
 	duplicateBuiltInRulePluginConfig, err := bufconfig.NewLocalPluginConfig(
diff --git a/private/bufpkg/bufcheck/runner_provider.go b/private/bufpkg/bufcheck/runner_provider.go
@@ -15,33 +15,24 @@
 package bufcheck
 
 import (
-	"context"
-	"sync"
+	"fmt"
 
 	"github.com/bufbuild/buf/private/bufpkg/bufconfig"
-	"github.com/bufbuild/buf/private/bufpkg/bufparse"
-	"github.com/bufbuild/buf/private/bufpkg/bufplugin"
 	"github.com/bufbuild/buf/private/pkg/pluginrpcutil"
 	"github.com/bufbuild/buf/private/pkg/syserror"
 	"github.com/bufbuild/buf/private/pkg/wasm"
 	"pluginrpc.com/pluginrpc"
 )
 
 type runnerProvider struct {
-	wasmRuntime        wasm.Runtime
-	pluginKeyProvider  bufplugin.PluginKeyProvider
-	pluginDataProvider bufplugin.PluginDataProvider
+	wasmRuntime wasm.Runtime
 }
 
 func newRunnerProvider(
 	wasmRuntime wasm.Runtime,
-	pluginKeyProvider bufplugin.PluginKeyProvider,
-	pluginDataProvider bufplugin.PluginDataProvider,
 ) *runnerProvider {
 	return &runnerProvider{
-		wasmRuntime:        wasmRuntime,
-		pluginKeyProvider:  pluginKeyProvider,
-		pluginDataProvider: pluginDataProvider,
+		wasmRuntime: wasmRuntime,
 	}
 }
 
@@ -63,63 +54,8 @@ func (r *runnerProvider) NewRunner(pluginConfig bufconfig.PluginConfig) (pluginr
 			path[1:]...,
 		), nil
 	case bufconfig.PluginConfigTypeRemote:
-		// We need to load the plugin from the remote provider, then run it.
-		var (
-			once              sync.Once
-			compiledPlugin    wasm.CompiledModule
-			compiledPluginErr error
-		)
-		return rpcRunnerFunc(func(ctx context.Context, env pluginrpc.Env) error {
-			once.Do(func() {
-				compiledPlugin, compiledPluginErr = r.loadRemotePlugin(ctx, pluginConfig)
-			})
-			if compiledPluginErr != nil {
-				return compiledPluginErr
-			}
-			return compiledPlugin.Run(ctx, env)
-		}), nil
+		return nil, fmt.Errorf("remote plugins are not supported")
 	default:
 		return nil, syserror.Newf("unknown PluginConfigType: %v", pluginConfig.Type())
 	}
 }
-
-// loadRemotePlugin loads the remote plugin, the plugin must be of type bufconfig.PluginConfigTypeRemote.
-func (r *runnerProvider) loadRemotePlugin(ctx context.Context, pluginConfig bufconfig.PluginConfig) (wasm.CompiledModule, error) {
-	pluginRef := pluginConfig.Ref()
-	if pluginRef == nil {
-		return nil, syserror.New("Ref is required for remote plugins")
-	}
-	pluginKeys, err := r.pluginKeyProvider.GetPluginKeysForPluginRefs(
-		ctx,
-		[]bufparse.Ref{pluginRef},
-		bufplugin.DigestTypeP1,
-	)
-	if err != nil {
-		return nil, err
-	}
-	if len(pluginKeys) != 1 {
-		return nil, syserror.Newf("expected 1 plugin key for %s", pluginRef)
-	}
-	pluginDatas, err := r.pluginDataProvider.GetPluginDatasForPluginKeys(
-		ctx,
-		pluginKeys,
-	)
-	if err != nil {
-		return nil, err
-	}
-	if len(pluginDatas) != 1 {
-		return nil, syserror.Newf("expected 1 plugin data for %s", pluginRef)
-	}
-	pluginData := pluginDatas[0]
-	data, err := pluginData.Data()
-	if err != nil {
-		return nil, err
-	}
-	return r.wasmRuntime.Compile(ctx, pluginConfig.Name(), data)
-}
-
-type rpcRunnerFunc func(ctx context.Context, env pluginrpc.Env) error
-
-func (f rpcRunnerFunc) Run(ctx context.Context, env pluginrpc.Env) error {
-	return f(ctx, env)
-}
