|
|
|
package remote
|
|
|
|
|
|
|
|
import (
|
|
|
|
"context"
|
|
|
|
"io"
|
|
|
|
"sync"
|
|
|
|
"time"
|
|
|
|
|
|
|
|
"github.com/containerd/containerd/defaults"
|
|
|
|
"github.com/containerd/containerd/pkg/dialer"
|
|
|
|
"github.com/docker/buildx/controller/pb"
|
|
|
|
"github.com/docker/buildx/util/progress"
|
|
|
|
"github.com/moby/buildkit/client"
|
|
|
|
"github.com/moby/buildkit/identity"
|
|
|
|
"github.com/moby/buildkit/util/grpcerrors"
|
|
|
|
"github.com/pkg/errors"
|
|
|
|
"golang.org/x/sync/errgroup"
|
|
|
|
"google.golang.org/grpc"
|
|
|
|
"google.golang.org/grpc/backoff"
|
|
|
|
"google.golang.org/grpc/credentials/insecure"
|
|
|
|
)
|
|
|
|
|
|
|
|
func NewClient(ctx context.Context, addr string) (*Client, error) {
|
|
|
|
backoffConfig := backoff.DefaultConfig
|
|
|
|
backoffConfig.MaxDelay = 3 * time.Second
|
|
|
|
connParams := grpc.ConnectParams{
|
|
|
|
Backoff: backoffConfig,
|
|
|
|
}
|
|
|
|
gopts := []grpc.DialOption{
|
|
|
|
grpc.WithBlock(),
|
|
|
|
grpc.WithTransportCredentials(insecure.NewCredentials()),
|
|
|
|
grpc.WithConnectParams(connParams),
|
|
|
|
grpc.WithContextDialer(dialer.ContextDialer),
|
|
|
|
grpc.WithDefaultCallOptions(grpc.MaxCallRecvMsgSize(defaults.DefaultMaxRecvMsgSize)),
|
|
|
|
grpc.WithDefaultCallOptions(grpc.MaxCallSendMsgSize(defaults.DefaultMaxSendMsgSize)),
|
|
|
|
grpc.WithUnaryInterceptor(grpcerrors.UnaryClientInterceptor),
|
|
|
|
grpc.WithStreamInterceptor(grpcerrors.StreamClientInterceptor),
|
|
|
|
}
|
|
|
|
conn, err := grpc.DialContext(ctx, dialer.DialAddress(addr), gopts...)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
return &Client{conn: conn}, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
type Client struct {
|
|
|
|
conn *grpc.ClientConn
|
|
|
|
closeOnce sync.Once
|
|
|
|
}
|
|
|
|
|
|
|
|
func (c *Client) Close() (err error) {
|
|
|
|
c.closeOnce.Do(func() {
|
|
|
|
err = c.conn.Close()
|
|
|
|
})
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
func (c *Client) Version(ctx context.Context) (string, string, string, error) {
|
|
|
|
res, err := c.client().Info(ctx, &pb.InfoRequest{})
|
|
|
|
if err != nil {
|
|
|
|
return "", "", "", err
|
|
|
|
}
|
|
|
|
v := res.BuildxVersion
|
|
|
|
return v.Package, v.Version, v.Revision, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func (c *Client) List(ctx context.Context) (keys []string, retErr error) {
|
|
|
|
res, err := c.client().List(ctx, &pb.ListRequest{})
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
return res.Keys, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func (c *Client) Disconnect(ctx context.Context, key string) error {
|
|
|
|
if key == "" {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
_, err := c.client().Disconnect(ctx, &pb.DisconnectRequest{Ref: key})
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
func (c *Client) ListProcesses(ctx context.Context, ref string) (infos []*pb.ProcessInfo, retErr error) {
|
|
|
|
res, err := c.client().ListProcesses(ctx, &pb.ListProcessesRequest{Ref: ref})
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
return res.Infos, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func (c *Client) DisconnectProcess(ctx context.Context, ref, pid string) error {
|
|
|
|
_, err := c.client().DisconnectProcess(ctx, &pb.DisconnectProcessRequest{Ref: ref, ProcessID: pid})
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
func (c *Client) Invoke(ctx context.Context, ref string, pid string, invokeConfig pb.InvokeConfig, in io.ReadCloser, stdout io.WriteCloser, stderr io.WriteCloser) error {
|
|
|
|
if ref == "" || pid == "" {
|
|
|
|
return errors.New("build reference must be specified")
|
|
|
|
}
|
|
|
|
stream, err := c.client().Invoke(ctx)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
return attachIO(ctx, stream, &pb.InitMessage{Ref: ref, ProcessID: pid, InvokeConfig: &invokeConfig}, ioAttachConfig{
|
|
|
|
stdin: in,
|
|
|
|
stdout: stdout,
|
|
|
|
stderr: stderr,
|
|
|
|
// TODO: Signal, Resize
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
func (c *Client) Inspect(ctx context.Context, ref string) (*pb.InspectResponse, error) {
|
|
|
|
return c.client().Inspect(ctx, &pb.InspectRequest{Ref: ref})
|
|
|
|
}
|
|
|
|
|
controller: refactor progress api
Refactor the progress printer creation to the caller-side of the
controller api. Then, instead of passing around status channels (and
progressMode strings), we can simply pass around the higher level
interface progress.Writer.
This has a couple of benefits:
- A simplified interface to the controller
- Allows us to correctly extract warnings out of the controller, so that
they can be displayed correctly from the client side.
Some extra work is required to make sure that we can pass a
progress.Printer into the debug monitor. If we want to keep it
persistent, then we need a way to temporarily suspend output from it,
otherwise it will continue printing as the monitor is prompting for
input from the user, and forwarding output from debug containers.
To handle this, we add two methods to the printer, `Pause` and
`Unpause`. `Pause` acts similarly to `Wait`, closing the printer, and
cleanly shutting down the display - however, the printer does not
terminate, and can later be resumed by a call to `Unpause`. This
provides a neater interface to the caller, instead of needing to
continually reconstruct printers for every single time we want to
produce progress output.
Signed-off-by: Justin Chadwell <me@jedevc.com>
2 years ago
|
|
|
func (c *Client) Build(ctx context.Context, options pb.BuildOptions, in io.ReadCloser, progress progress.Writer) (string, *client.SolveResponse, error) {
|
|
|
|
ref := identity.NewID()
|
|
|
|
statusChan := make(chan *client.SolveStatus)
|
|
|
|
eg, egCtx := errgroup.WithContext(ctx)
|
|
|
|
var resp *client.SolveResponse
|
|
|
|
eg.Go(func() error {
|
|
|
|
defer close(statusChan)
|
|
|
|
var err error
|
|
|
|
resp, err = c.build(egCtx, ref, options, in, statusChan)
|
|
|
|
return err
|
|
|
|
})
|
|
|
|
eg.Go(func() error {
|
|
|
|
for s := range statusChan {
|
|
|
|
st := s
|
controller: refactor progress api
Refactor the progress printer creation to the caller-side of the
controller api. Then, instead of passing around status channels (and
progressMode strings), we can simply pass around the higher level
interface progress.Writer.
This has a couple of benefits:
- A simplified interface to the controller
- Allows us to correctly extract warnings out of the controller, so that
they can be displayed correctly from the client side.
Some extra work is required to make sure that we can pass a
progress.Printer into the debug monitor. If we want to keep it
persistent, then we need a way to temporarily suspend output from it,
otherwise it will continue printing as the monitor is prompting for
input from the user, and forwarding output from debug containers.
To handle this, we add two methods to the printer, `Pause` and
`Unpause`. `Pause` acts similarly to `Wait`, closing the printer, and
cleanly shutting down the display - however, the printer does not
terminate, and can later be resumed by a call to `Unpause`. This
provides a neater interface to the caller, instead of needing to
continually reconstruct printers for every single time we want to
produce progress output.
Signed-off-by: Justin Chadwell <me@jedevc.com>
2 years ago
|
|
|
progress.Write(st)
|
|
|
|
}
|
|
|
|
return nil
|
|
|
|
})
|
|
|
|
return ref, resp, eg.Wait()
|
|
|
|
}
|
|
|
|
|
|
|
|
func (c *Client) build(ctx context.Context, ref string, options pb.BuildOptions, in io.ReadCloser, statusChan chan *client.SolveStatus) (*client.SolveResponse, error) {
|
|
|
|
eg, egCtx := errgroup.WithContext(ctx)
|
|
|
|
done := make(chan struct{})
|
|
|
|
|
|
|
|
var resp *client.SolveResponse
|
|
|
|
|
|
|
|
eg.Go(func() error {
|
|
|
|
defer close(done)
|
|
|
|
pbResp, err := c.client().Build(egCtx, &pb.BuildRequest{
|
|
|
|
Ref: ref,
|
|
|
|
Options: &options,
|
|
|
|
})
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
resp = &client.SolveResponse{
|
|
|
|
ExporterResponse: pbResp.ExporterResponse,
|
|
|
|
}
|
|
|
|
return nil
|
|
|
|
})
|
|
|
|
eg.Go(func() error {
|
|
|
|
stream, err := c.client().Status(egCtx, &pb.StatusRequest{
|
|
|
|
Ref: ref,
|
|
|
|
})
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
for {
|
|
|
|
resp, err := stream.Recv()
|
|
|
|
if err != nil {
|
|
|
|
if err == io.EOF {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
return errors.Wrap(err, "failed to receive status")
|
|
|
|
}
|
|
|
|
statusChan <- pb.FromControlStatus(resp)
|
|
|
|
}
|
|
|
|
})
|
|
|
|
if in != nil {
|
|
|
|
eg.Go(func() error {
|
|
|
|
stream, err := c.client().Input(egCtx)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
if err := stream.Send(&pb.InputMessage{
|
|
|
|
Input: &pb.InputMessage_Init{
|
|
|
|
Init: &pb.InputInitMessage{
|
|
|
|
Ref: ref,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}); err != nil {
|
|
|
|
return errors.Wrap(err, "failed to init input")
|
|
|
|
}
|
|
|
|
|
|
|
|
inReader, inWriter := io.Pipe()
|
|
|
|
eg2, _ := errgroup.WithContext(ctx)
|
|
|
|
eg2.Go(func() error {
|
|
|
|
<-done
|
|
|
|
return inWriter.Close()
|
|
|
|
})
|
|
|
|
go func() {
|
|
|
|
// do not wait for read completion but return here and let the caller send EOF
|
|
|
|
// this allows us to return on ctx.Done() without being blocked by this reader.
|
|
|
|
io.Copy(inWriter, in)
|
|
|
|
inWriter.Close()
|
|
|
|
}()
|
|
|
|
eg2.Go(func() error {
|
|
|
|
for {
|
|
|
|
buf := make([]byte, 32*1024)
|
|
|
|
n, err := inReader.Read(buf)
|
|
|
|
if err != nil {
|
|
|
|
if err == io.EOF {
|
|
|
|
break // break loop and send EOF
|
|
|
|
}
|
|
|
|
return err
|
|
|
|
} else if n > 0 {
|
|
|
|
if stream.Send(&pb.InputMessage{
|
|
|
|
Input: &pb.InputMessage_Data{
|
|
|
|
Data: &pb.DataMessage{
|
|
|
|
Data: buf[:n],
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}); err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return stream.Send(&pb.InputMessage{
|
|
|
|
Input: &pb.InputMessage_Data{
|
|
|
|
Data: &pb.DataMessage{
|
|
|
|
EOF: true,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
})
|
|
|
|
})
|
|
|
|
return eg2.Wait()
|
|
|
|
})
|
|
|
|
}
|
|
|
|
return resp, eg.Wait()
|
|
|
|
}
|
|
|
|
|
|
|
|
func (c *Client) client() pb.ControllerClient {
|
|
|
|
return pb.NewControllerClient(c.conn)
|
|
|
|
}
|