fix config check

Author: frankli0324

internal/config/config.go

@@ -160,7 +160,8 @@ var ErrPluginExists = errors.New("a plugin with that name already exists")
 var ErrPluginNotFound = errors.New("no plugin found")
 var ErrPluginNoType = errors.New("plugin: field `process` or `wasm` required")
 var ErrPluginBothTypes = errors.New("plugin: `process` and `wasm` cannot both be defined")
-var ErrPluginProcessNoCmd = errors.New("plugin: missing process command")
+var ErrPluginProcessTooManyCmd = errors.New("plugin: only one of `cmd` or `go_package` is allowed for process plugin")
+var ErrPluginProcessNoCmd = errors.New("plugin: missing `cmd` or `go_package` for process plugin")
 
 var ErrInvalidDatabase = errors.New("database must be managed or have a non-empty URI")
 var ErrManagedDatabaseNoProject = errors.New(`managed databases require a cloud project

internal/config/v_two.go

@@ -48,8 +48,11 @@ func v2ParseConfig(rd io.Reader) (Config, error) {
 		if conf.Plugins[i].Process != nil && conf.Plugins[i].WASM != nil {
 			return conf, ErrPluginBothTypes
 		}
-		if conf.Plugins[i].Process != nil {
-			if conf.Plugins[i].Process.Cmd == "" {
+		if r := conf.Plugins[i].Process; r != nil {
+			switch {
+			case r.Cmd != "" && r.GoPkg != "":
+				return conf, ErrPluginProcessTooManyCmd
+			default:
 				return conf, ErrPluginProcessNoCmd
 			}
 		}

internal/ext/process/gen.go

@@ -56,25 +56,21 @@ func (r *Runner) Invoke(ctx context.Context, method string, args any, reply any,
 
 	var cmd *exec.Cmd
 	switch {
-	case r.Cmd != "" && r.GoPkg == "":
+	case r.Cmd != "":
 		// Check if the output plugin exists
 		path, err := exec.LookPath(r.Cmd)
 		if err != nil {
 			return fmt.Errorf("process: %s not found", r.Cmd)
 		}
 		cmd = exec.CommandContext(ctx, path, method)
-	case r.Cmd == "" && r.GoPkg != "":
+	case r.GoPkg != "":
 		// Check if the go binary exists
 		path, err := exec.LookPath("go")
 		if err != nil {
 			return fmt.Errorf("go binary required to run go package %s", r.GoPkg)
 		}
 		cmd = exec.CommandContext(ctx, path, method)
 		cmd.Args = []string{"run", r.GoPkg}
-	case r.Cmd != "" && r.GoPkg != "":
-		return fmt.Errorf("only one of cmd or go_package is allowed")
-	default:
-		return fmt.Errorf("cmd and go_package cannot both be empty for process plugin")
 	}
 
 	cmd.Stdin = bytes.NewReader(stdin)