Fix test

bufbuild · Sep 30, 2024 · 58c9e6f · 58c9e6f
1 parent a17f1c1
commit 58c9e6f
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 13 deletions.
diff --git a/make/buf/all.mk b/make/buf/all.mk
@@ -26,12 +26,7 @@ GO_TEST_BINS := $(GO_TEST_BINS) \
 	private/bufpkg/bufcheck/internal/cmd/buf-plugin-duplicate-category \
 	private/bufpkg/bufcheck/internal/cmd/buf-plugin-duplicate-rule
 GO_TEST_WASM_BINS := $(GO_TEST_WASM_BINS) \
-	private/bufpkg/bufcheck/internal/cmd/buf-plugin-panic \
-	private/bufpkg/bufcheck/internal/cmd/buf-plugin-suffix \
-	private/bufpkg/bufcheck/internal/cmd/buf-plugin-protovalidate-ext \
-	private/bufpkg/bufcheck/internal/cmd/buf-plugin-rpc-ext \
-	private/bufpkg/bufcheck/internal/cmd/buf-plugin-duplicate-category \
-	private/bufpkg/bufcheck/internal/cmd/buf-plugin-duplicate-rule
+	private/bufpkg/bufcheck/internal/cmd/buf-plugin-suffix
 GO_MOD_VERSION := 1.22
 DOCKER_BINS := $(DOCKER_BINS) buf
 FILE_IGNORES := $(FILE_IGNORES) \

diff --git a/private/buf/bufprotopluginexec/bufprotopluginexec.go b/private/buf/bufprotopluginexec/bufprotopluginexec.go
@@ -199,11 +199,6 @@ func newHandlerOptions() *handlerOptions {
 	return &handlerOptions{}
 }
 
-// FindPluginPath returns the path to the specific plugin specified by pluginName.
-func FindPluginPath(pluginName string) (string, error) {
-	return unsafeLookPath(pluginName)
-}
-
 // unsafeLookPath is a wrapper around exec.LookPath that restores the original
 // pre-Go 1.19 behavior of resolving queries that would use relative PATH
 // entries. We consider it acceptable for the use case of locating plugins.

diff --git a/private/bufpkg/bufcheck/runner_provider.go b/private/bufpkg/bufcheck/runner_provider.go
@@ -16,11 +16,12 @@ package bufcheck
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"os"
+	"os/exec"
 	"sync"
 
-	"github.com/bufbuild/buf/private/buf/bufprotopluginexec"
 	"github.com/bufbuild/buf/private/bufpkg/bufconfig"
 	"github.com/bufbuild/buf/private/bufpkg/bufwasm"
 	"github.com/bufbuild/buf/private/pkg/command"
@@ -131,7 +132,7 @@ func (r *wasmRunner) loadPlugin(ctx context.Context) (bufwasm.Plugin, error) {
 		path = r.programName
 	} else {
 		var err error
-		path, err = bufprotopluginexec.FindPluginPath(r.programName)
+		path, err = unsafeLookPath(r.programName)
 		if err != nil {
 			return nil, fmt.Errorf("could not find plugin %q in PATH: %v", r.programName, err)
 		}
@@ -150,3 +151,16 @@ func (r *wasmRunner) loadPlugin(ctx context.Context) (bufwasm.Plugin, error) {
 	// runner is limited to the CLI.
 	return plugin, nil
 }
+
+// unsafeLookPath is a wrapper around exec.LookPath that restores the original
+// pre-Go 1.19 behavior of resolving queries that would use relative PATH
+// entries. We consider it acceptable for the use case of locating plugins.
+//
+// https://pkg.go.dev/os/exec#hdr-Executables_in_the_current_directory
+func unsafeLookPath(file string) (string, error) {
+	path, err := exec.LookPath(file)
+	if errors.Is(err, exec.ErrDot) {
+		err = nil
+	}
+	return path, err
+}
diff --git a/windows/test.bash b/windows/test.bash
@@ -40,4 +40,6 @@ go install ./cmd/buf \
   ./private/bufpkg/bufcheck/internal/cmd/buf-plugin-rpc-ext \
   ./private/bufpkg/bufcheck/internal/cmd/buf-plugin-duplicate-category \
   ./private/bufpkg/bufcheck/internal/cmd/buf-plugin-duplicate-rule
+GOOS=wasip1 GOARCH=wasm go install -o $(GOBIN)/buf-plugin-suffix.wasm \
+  ./private/bufpkg/bufcheck/internal/cmd/buf-plugin-suffix
 go test ./...