Skip to content
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions util/sourcemeta/resolver.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,12 @@ var _ sourceresolver.MetaResolver = &Resolver{}
type Resolver struct {
startOnce sync.Once
closeOnce sync.Once
openOnce sync.Once
started atomic.Bool
mu sync.Mutex

ready chan sourceresolver.MetaResolver
opened chan struct{}
done chan struct{}
openErr error
doneErr error
Expand All @@ -44,12 +46,19 @@ func NewResolver(c *client.Client) *Resolver {

func newWithRun(run func(context.Context, chan<- sourceresolver.MetaResolver) error) *Resolver {
return &Resolver{
ready: make(chan sourceresolver.MetaResolver, 1),
done: make(chan struct{}),
run: run,
ready: make(chan sourceresolver.MetaResolver, 1),
opened: make(chan struct{}),
done: make(chan struct{}),
run: run,
}
}

func (r *Resolver) notifyOpenComplete() {
r.openOnce.Do(func() {
close(r.opened)
})
}

func (r *Resolver) ResolveSourceMetadata(ctx context.Context, op *pb.SourceOp, opt sourceresolver.Opt) (*sourceresolver.MetaResponse, error) {
mr, err := r.open(ctx)
if err != nil {
Expand Down Expand Up @@ -107,6 +116,7 @@ func (r *Resolver) open(ctx context.Context) (sourceresolver.MetaResolver, error
r.mu.Lock()
if r.metaResolver == nil {
r.metaResolver = mr
r.notifyOpenComplete()
}
r.mu.Unlock()
case <-r.done:
Expand All @@ -117,8 +127,10 @@ func (r *Resolver) open(ctx context.Context) (sourceresolver.MetaResolver, error
err = errors.New("gateway build finished without a source metadata resolver")
}
r.openErr = err
r.notifyOpenComplete()
}
r.mu.Unlock()
case <-r.opened:
case <-ctx.Done():
return nil, context.Cause(ctx)
}
Expand Down