luciano/d2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

d2plugin: Fix Serve

Browse source
This commit is contained in:
Anmol Sethi 2022-12-01 15:33:48 -08:00
parent 5abd3506f9
commit da54919051
No known key found for this signature in database
GPG key ID: 25BC68888A99A8BA
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
d2plugin/serve.go
View file

@ -7,6 +7,7 @@ import (
"fmt" "fmt"
"io" "io"
"github.com/spf13/pflag"
"oss.terrastruct.com/util-go/xmain" "oss.terrastruct.com/util-go/xmain"
"oss.terrastruct.com/d2/d2graph" "oss.terrastruct.com/d2/d2graph"
@ -20,12 +21,21 @@ import (
// Also see execPlugin in exec.go for the d2 binary plugin protocol. // Also see execPlugin in exec.go for the d2 binary plugin protocol.
func Serve(p Plugin) xmain.RunFunc { func Serve(p Plugin) xmain.RunFunc {
return func(ctx context.Context, ms *xmain.State) (err error) { return func(ctx context.Context, ms *xmain.State) (err error) {
if len(ms.Opts.Flags.Args()) < 1 { err = ms.Opts.Flags.Parse(ms.Opts.Args)
return errors.New("expected first argument to plugin binary to be function name") if !errors.Is(err, pflag.ErrHelp) && err != nil {
return xmain.UsageErrorf("failed to parse flags: %v", err)
}
if errors.Is(err, pflag.ErrHelp) {
// At some point we want to write a friendly help.
return info(ctx, p, ms)
} }
reqFunc := ms.Opts.Flags.Arg(0)
switch ms.Opts.Flags.Arg(0) { if len(ms.Opts.Flags.Args()) < 1 {
return xmain.UsageErrorf("expected first argument to be subcmd name")
}
subcmd := ms.Opts.Flags.Arg(0)
switch subcmd {
case "info": case "info":
return info(ctx, p, ms) return info(ctx, p, ms)
case "layout": case "layout":
@ -33,7 +43,7 @@ func Serve(p Plugin) xmain.RunFunc {
case "postprocess": case "postprocess":
return postProcess(ctx, p, ms) return postProcess(ctx, p, ms)
default: default:
return fmt.Errorf("unrecognized command: %s", reqFunc) return xmain.UsageErrorf("unrecognized command: %s", subcmd)
} }
} }
} }