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

fix cli race

Browse source
This commit is contained in:
Alexander Wang 2023-03-07 11:45:36 -08:00
parent 9adfec210b
commit d1e0a01578
No known key found for this signature in database
GPG key ID: D89FA31966BDBECE
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
d2plugin/plugin_dagre.go
View file

@ -6,6 +6,7 @@ import (
"context" "context"
"encoding/json" "encoding/json"
"fmt" "fmt"
"sync"
"oss.terrastruct.com/d2/d2graph" "oss.terrastruct.com/d2/d2graph"
"oss.terrastruct.com/d2/d2layouts/d2dagrelayout" "oss.terrastruct.com/d2/d2layouts/d2dagrelayout"
@ -19,10 +20,11 @@ func init() {
} }
type dagrePlugin struct { type dagrePlugin struct {
mu sync.Mutex
opts *d2dagrelayout.ConfigurableOpts opts *d2dagrelayout.ConfigurableOpts
} }
func (p dagrePlugin) Flags(context.Context) ([]PluginSpecificFlag, error) { func (p *dagrePlugin) Flags(context.Context) ([]PluginSpecificFlag, error) {
return []PluginSpecificFlag{ return []PluginSpecificFlag{
{ {
Name: "dagre-nodesep", Name: "dagre-nodesep",
@ -42,6 +44,8 @@ func (p dagrePlugin) Flags(context.Context) ([]PluginSpecificFlag, error) {
} }
func (p *dagrePlugin) HydrateOpts(opts []byte) error { func (p *dagrePlugin) HydrateOpts(opts []byte) error {
p.mu.Lock()
defer p.mu.Unlock()
if opts != nil { if opts != nil {
var dagreOpts d2dagrelayout.ConfigurableOpts var dagreOpts d2dagrelayout.ConfigurableOpts
err := json.Unmarshal(opts, &dagreOpts) err := json.Unmarshal(opts, &dagreOpts)
@ -54,7 +58,9 @@ func (p *dagrePlugin) HydrateOpts(opts []byte) error {
return nil return nil
} }
func (p dagrePlugin) Info(ctx context.Context) (*PluginInfo, error) { func (p *dagrePlugin) Info(ctx context.Context) (*PluginInfo, error) {
p.mu.Lock()
defer p.mu.Unlock()
opts := xmain.NewOpts(nil, nil, nil) opts := xmain.NewOpts(nil, nil, nil)
flags, err := p.Flags(ctx) flags, err := p.Flags(ctx)
if err != nil { if err != nil {
@ -80,10 +86,13 @@ Flags:
}, nil }, nil
} }
func (p dagrePlugin) Layout(ctx context.Context, g *d2graph.Graph) error { func (p *dagrePlugin) Layout(ctx context.Context, g *d2graph.Graph) error {
return d2dagrelayout.Layout(ctx, g, p.opts) p.mu.Lock()
optsCopy := *p.opts
p.mu.Unlock()
return d2dagrelayout.Layout(ctx, g, &optsCopy)
} }
func (p dagrePlugin) PostProcess(ctx context.Context, in []byte) ([]byte, error) { func (p *dagrePlugin) PostProcess(ctx context.Context, in []byte) ([]byte, error) {
return in, nil return in, nil
} }