Enable to get build definition from Inspect API

This commit adds two fields to the response of Inspect API.

- Definition: Build definition of the first build executed by Build API.
- CurrentDefinition: Build definition of the latest build executed by Build or
  Solve API.

The client can use these information for debugging the build deeply.

Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
pull/1656/head
Kohei Tokunaga 2 years ago
parent f72ea677f1
commit 4c730ee96b
No known key found for this signature in database
GPG Key ID: 6CE0A04690DB3FB3

@ -86,16 +86,23 @@ func NewResultHandle(ctx context.Context, cc *client.Client, opt client.SolveOpt
defer cancel(context.Canceled) // ensure no dangling processes defer cancel(context.Canceled) // ensure no dangling processes
var res *gateway.Result var res *gateway.Result
var singleDef *pb.Definition
var err error var err error
resp, err = cc.Build(ctx, opt, product, func(ctx context.Context, c gateway.Client) (*gateway.Result, error) { resp, err = cc.Build(ctx, opt, product, func(ctx context.Context, c gateway.Client) (*gateway.Result, error) {
var err error var err error
res, err = buildFunc(ctx, c) res, err = buildFunc(ctx, c)
if res != nil && err == nil { if res != nil && err == nil {
var defErr error
singleDef, defErr = getSingleDefinition(ctx, res) // TODO: support multi-platform
if defErr != nil {
return nil, defErr
}
if noEval { if noEval {
respHandle = &ResultHandle{ respHandle = &ResultHandle{
client: cc, client: cc,
solveOpt: opt, solveOpt: opt,
def: singleDef,
done: make(chan struct{}), done: make(chan struct{}),
gwClient: c, gwClient: c,
gwCtx: ctx, gwCtx: ctx,
@ -132,6 +139,7 @@ func NewResultHandle(ctx context.Context, cc *client.Client, opt client.SolveOpt
respHandle = &ResultHandle{ respHandle = &ResultHandle{
client: cc, client: cc,
solveOpt: opt, solveOpt: opt,
def: singleDef,
done: make(chan struct{}), done: make(chan struct{}),
solveErr: se, solveErr: se,
gwClient: c, gwClient: c,
@ -190,6 +198,7 @@ func NewResultHandle(ctx context.Context, cc *client.Client, opt client.SolveOpt
respHandle = &ResultHandle{ respHandle = &ResultHandle{
client: cc, client: cc,
solveOpt: opt, solveOpt: opt,
def: singleDef,
done: make(chan struct{}), done: make(chan struct{}),
res: res, res: res,
gwClient: c, gwClient: c,
@ -272,6 +281,29 @@ func evalDefinition(ctx context.Context, c gateway.Client, defs *result.Result[*
return res, nil return res, nil
} }
func getSingleDefinition(ctx context.Context, res *gateway.Result) (*pb.Definition, error) {
defs, err := getDefinition(ctx, res)
if err != nil {
return nil, err
}
ps, err := exptypes.ParsePlatforms(res.Metadata)
if err != nil {
return nil, err
}
def, ok := defs.FindRef(ps.Platforms[0].ID)
if !ok {
return nil, errors.Errorf("no reference found")
}
return def, nil
}
func DefinitionFromResultHandler(ctx context.Context, res *ResultHandle) (*pb.Definition, error) {
if res.def != nil {
return res.def, nil
}
return nil, errors.Errorf("result context doesn't contain build definition")
}
func SolveWithResultHandler(ctx context.Context, product string, resultCtx *ResultHandle, target *pb.Definition, pw progress.Writer) (*ResultHandle, error) { func SolveWithResultHandler(ctx context.Context, product string, resultCtx *ResultHandle, target *pb.Definition, pw progress.Writer) (*ResultHandle, error) {
opt := resultCtx.solveOpt opt := resultCtx.solveOpt
opt.Ref = "" opt.Ref = ""
@ -292,6 +324,7 @@ func SolveWithResultHandler(ctx context.Context, product string, resultCtx *Resu
type ResultHandle struct { type ResultHandle struct {
client *client.Client client *client.Client
solveOpt client.SolveOpt solveOpt client.SolveOpt
def *pb.Definition
res *gateway.Result res *gateway.Result
solveErr *errdefs.SolveError solveErr *errdefs.SolveError

@ -146,7 +146,15 @@ func (b *localController) Inspect(ctx context.Context, ref string) (*controllera
if ref != b.ref { if ref != b.ref {
return nil, errors.Errorf("unknown ref %q", ref) return nil, errors.Errorf("unknown ref %q", ref)
} }
return &controllerapi.InspectResponse{Options: b.buildConfig.buildOptions}, nil var curDef *solverpb.Definition
var origDef *solverpb.Definition
if b.buildConfig.resultCtx != nil {
curDef, _ = build.DefinitionFromResultHandler(ctx, b.buildConfig.resultCtx)
}
if b.originalResult != nil {
origDef, _ = build.DefinitionFromResultHandler(ctx, b.originalResult)
}
return &controllerapi.InspectResponse{Options: b.buildConfig.buildOptions, Definition: origDef, CurrentDefinition: curDef}, nil
} }
func (b *localController) Solve(ctx context.Context, ref string, target *solverpb.Definition, progress progress.Writer) error { func (b *localController) Solve(ctx context.Context, ref string, target *solverpb.Definition, progress progress.Writer) error {

@ -872,10 +872,12 @@ func (m *InspectRequest) GetRef() string {
} }
type InspectResponse struct { type InspectResponse struct {
Options *BuildOptions `protobuf:"bytes,1,opt,name=Options,proto3" json:"Options,omitempty"` Options *BuildOptions `protobuf:"bytes,1,opt,name=Options,proto3" json:"Options,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` Definition *pb1.Definition `protobuf:"bytes,2,opt,name=Definition,proto3" json:"Definition,omitempty"`
XXX_unrecognized []byte `json:"-"` CurrentDefinition *pb1.Definition `protobuf:"bytes,3,opt,name=CurrentDefinition,proto3" json:"CurrentDefinition,omitempty"`
XXX_sizecache int32 `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
} }
func (m *InspectResponse) Reset() { *m = InspectResponse{} } func (m *InspectResponse) Reset() { *m = InspectResponse{} }
@ -909,6 +911,20 @@ func (m *InspectResponse) GetOptions() *BuildOptions {
return nil return nil
} }
func (m *InspectResponse) GetDefinition() *pb1.Definition {
if m != nil {
return m.Definition
}
return nil
}
func (m *InspectResponse) GetCurrentDefinition() *pb1.Definition {
if m != nil {
return m.CurrentDefinition
}
return nil
}
type UlimitOpt struct { type UlimitOpt struct {
Values map[string]*Ulimit `protobuf:"bytes,1,rep,name=values,proto3" json:"values,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` Values map[string]*Ulimit `protobuf:"bytes,1,rep,name=values,proto3" json:"values,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
@ -2133,130 +2149,131 @@ func init() {
func init() { proto.RegisterFile("controller.proto", fileDescriptor_ed7f10298fa1d90f) } func init() { proto.RegisterFile("controller.proto", fileDescriptor_ed7f10298fa1d90f) }
var fileDescriptor_ed7f10298fa1d90f = []byte{ var fileDescriptor_ed7f10298fa1d90f = []byte{
// 1957 bytes of a gzipped FileDescriptorProto // 1984 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x58, 0xdd, 0x6e, 0xdb, 0xc8, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x58, 0xdd, 0x6e, 0xdb, 0xc8,
0x15, 0x2e, 0x2d, 0x59, 0x3f, 0x47, 0x96, 0xd7, 0x99, 0x3a, 0xe9, 0x84, 0xc9, 0x6e, 0x1c, 0xe6, 0xf5, 0xff, 0xd3, 0x92, 0xf5, 0x71, 0x64, 0x39, 0xce, 0xfc, 0x9d, 0x74, 0xc2, 0x64, 0x37, 0x0e,
0xa7, 0x42, 0xb3, 0x90, 0x77, 0xbd, 0x4d, 0xbd, 0xd9, 0xec, 0x02, 0xb5, 0x25, 0x0b, 0xf6, 0x22, 0xf3, 0x51, 0xa1, 0x59, 0xc8, 0xbb, 0xde, 0xa6, 0xde, 0x6c, 0xb2, 0x40, 0x6d, 0xc9, 0x82, 0xbd,
0xb1, 0x8d, 0x91, 0x93, 0x45, 0x5b, 0xa0, 0x0b, 0x4a, 0x1a, 0xcb, 0x84, 0x29, 0x0e, 0xcb, 0x19, 0x48, 0x1c, 0x63, 0xe4, 0x64, 0xd1, 0x16, 0xe8, 0x82, 0x92, 0xc6, 0x32, 0x61, 0x8a, 0xc3, 0x72,
0xc9, 0x76, 0xaf, 0x7a, 0xd3, 0xdb, 0xbe, 0x47, 0xd1, 0x47, 0xe8, 0x55, 0x5f, 0xa2, 0x97, 0x7d, 0x46, 0xb2, 0xdd, 0xab, 0xde, 0xf4, 0xb6, 0xef, 0x51, 0xf4, 0x11, 0x8a, 0x5e, 0xf4, 0x25, 0x7a,
0x84, 0xa2, 0x8f, 0x50, 0xcc, 0x0f, 0x29, 0xd2, 0x12, 0x65, 0xbb, 0xbd, 0xd2, 0x9c, 0xc3, 0xef, 0xd9, 0x47, 0x28, 0xfa, 0x08, 0xc5, 0x7c, 0x90, 0x22, 0x2d, 0x51, 0xb6, 0xdb, 0x2b, 0xcd, 0x39,
0x9c, 0x99, 0x73, 0xe6, 0xfc, 0x8d, 0x60, 0xad, 0xcf, 0x02, 0x11, 0x31, 0xdf, 0xa7, 0x51, 0x33, 0xfc, 0xfd, 0xce, 0xcc, 0x19, 0x9e, 0x2f, 0x0a, 0xd6, 0xfa, 0x2c, 0x10, 0x11, 0xf3, 0x7d, 0x1a,
0x8c, 0x98, 0x60, 0x68, 0xbd, 0x37, 0xf6, 0xfc, 0xc1, 0x65, 0x33, 0xf5, 0x61, 0xf2, 0xa5, 0xfd, 0x35, 0xc3, 0x88, 0x09, 0x86, 0xd6, 0x7b, 0x63, 0xcf, 0x1f, 0x5c, 0x34, 0x53, 0x0f, 0x26, 0x5f,
0x76, 0xe8, 0x89, 0xb3, 0x71, 0xaf, 0xd9, 0x67, 0xa3, 0xcd, 0x11, 0xeb, 0x5d, 0x6d, 0x2a, 0xd4, 0xd9, 0x6f, 0x86, 0x9e, 0x38, 0x1d, 0xf7, 0x9a, 0x7d, 0x36, 0xda, 0x1c, 0xb1, 0xde, 0xe5, 0xa6,
0xb9, 0x27, 0x36, 0xdd, 0xd0, 0xdb, 0xe4, 0x34, 0x9a, 0x78, 0x7d, 0xca, 0x37, 0x8d, 0x50, 0xfc, 0x42, 0x9d, 0x79, 0x62, 0xd3, 0x0d, 0xbd, 0x4d, 0x4e, 0xa3, 0x89, 0xd7, 0xa7, 0x7c, 0xd3, 0x90,
0xab, 0x55, 0xda, 0xaf, 0x73, 0x85, 0x39, 0x1b, 0x47, 0x7d, 0x1a, 0x32, 0xdf, 0xeb, 0x5f, 0x6d, 0xe2, 0x5f, 0x6d, 0xd2, 0x7e, 0x95, 0x4b, 0xe6, 0x6c, 0x1c, 0xf5, 0x69, 0xc8, 0x7c, 0xaf, 0x7f,
0x86, 0xbd, 0x4d, 0xbd, 0x32, 0x62, 0x9f, 0x2f, 0x10, 0xf3, 0x27, 0x34, 0x92, 0x02, 0x2c, 0xe4, 0xb9, 0x19, 0xf6, 0x36, 0xf5, 0xca, 0xd0, 0xbe, 0x58, 0x40, 0xf3, 0x27, 0x34, 0x92, 0x04, 0x16,
0x1a, 0xed, 0x34, 0x60, 0xfd, 0x9d, 0xc7, 0xc5, 0x71, 0xc4, 0xfa, 0x94, 0x73, 0xca, 0x09, 0xfd, 0x72, 0x8d, 0x76, 0x1a, 0xb0, 0xfe, 0xce, 0xe3, 0xe2, 0x28, 0x62, 0x7d, 0xca, 0x39, 0xe5, 0x84,
0xc3, 0x98, 0x72, 0x81, 0xd6, 0xa0, 0x40, 0xe8, 0x29, 0xb6, 0x36, 0xac, 0x46, 0x95, 0xc8, 0xa5, 0xfe, 0x6e, 0x4c, 0xb9, 0x40, 0x6b, 0x50, 0x20, 0xf4, 0x04, 0x5b, 0x1b, 0x56, 0xa3, 0x4a, 0xe4,
0x73, 0x0c, 0xf7, 0xaf, 0x21, 0x79, 0xc8, 0x02, 0x4e, 0xd1, 0x36, 0x2c, 0x1f, 0x04, 0xa7, 0x8c, 0xd2, 0x39, 0x82, 0x7b, 0x57, 0x90, 0x3c, 0x64, 0x01, 0xa7, 0x68, 0x1b, 0x96, 0x0f, 0x82, 0x13,
0x63, 0x6b, 0xa3, 0xd0, 0xa8, 0x6d, 0x3d, 0x6d, 0xce, 0x73, 0x45, 0xd3, 0xc8, 0x49, 0x24, 0xd1, 0xc6, 0xb1, 0xb5, 0x51, 0x68, 0xd4, 0xb6, 0x9e, 0x34, 0xe7, 0x5d, 0x45, 0xd3, 0xf0, 0x24, 0x92,
0x78, 0x87, 0x43, 0x2d, 0xc5, 0x45, 0x8f, 0xa1, 0x1a, 0x93, 0x6d, 0xb3, 0xf1, 0x94, 0x81, 0x3a, 0x68, 0xbc, 0xc3, 0xa1, 0x96, 0xd2, 0xa2, 0x47, 0x50, 0x8d, 0xc5, 0xb6, 0xd9, 0x78, 0xaa, 0x40,
0xb0, 0x72, 0x10, 0x4c, 0xd8, 0x39, 0x6d, 0xb1, 0xe0, 0xd4, 0x1b, 0xe2, 0xa5, 0x0d, 0xab, 0x51, 0x1d, 0x58, 0x39, 0x08, 0x26, 0xec, 0x8c, 0xb6, 0x58, 0x70, 0xe2, 0x0d, 0xf1, 0xd2, 0x86, 0xd5,
0xdb, 0x72, 0xe6, 0x6f, 0x96, 0x46, 0x92, 0x8c, 0x9c, 0xf3, 0x3d, 0xe0, 0xb6, 0xc7, 0xfb, 0x2c, 0xa8, 0x6d, 0x39, 0xf3, 0x37, 0x4b, 0x23, 0x49, 0x86, 0xe7, 0x7c, 0x0f, 0xb8, 0xed, 0xf1, 0x3e,
0x08, 0x68, 0x3f, 0x36, 0x26, 0xd7, 0xe8, 0xec, 0x99, 0x96, 0xae, 0x9d, 0xc9, 0x79, 0x04, 0x0f, 0x0b, 0x02, 0xda, 0x8f, 0x9d, 0xc9, 0x75, 0x3a, 0x7b, 0xa6, 0xa5, 0x2b, 0x67, 0x72, 0x1e, 0xc2,
0xe7, 0xe8, 0xd2, 0x6e, 0x71, 0x7e, 0x0f, 0x2b, 0xbb, 0xf2, 0x6c, 0xf9, 0xca, 0xbf, 0x85, 0xf2, 0x83, 0x39, 0xb6, 0xf4, 0xb5, 0x38, 0xbf, 0x85, 0x95, 0x5d, 0x79, 0xb6, 0x7c, 0xe3, 0x6f, 0xa1,
0x51, 0x28, 0x3c, 0x16, 0xf0, 0xc5, 0xd6, 0x28, 0x35, 0x06, 0x49, 0x62, 0x11, 0xe7, 0x9f, 0x35, 0xfc, 0x21, 0x14, 0x1e, 0x0b, 0xf8, 0x62, 0x6f, 0x94, 0x19, 0x83, 0x24, 0x31, 0xc5, 0xf9, 0x47,
0xb3, 0x81, 0x61, 0xa0, 0x0d, 0xa8, 0xb5, 0x58, 0x20, 0xe8, 0xa5, 0x38, 0x76, 0xc5, 0x99, 0xd9, 0xcd, 0x6c, 0x60, 0x14, 0x68, 0x03, 0x6a, 0x2d, 0x16, 0x08, 0x7a, 0x21, 0x8e, 0x5c, 0x71, 0x6a,
0x28, 0xcd, 0x42, 0x2f, 0x61, 0xb5, 0xcd, 0xfa, 0xe7, 0x34, 0x3a, 0xf5, 0x7c, 0x7a, 0xe8, 0x8e, 0x36, 0x4a, 0xab, 0xd0, 0x0b, 0x58, 0x6d, 0xb3, 0xfe, 0x19, 0x8d, 0x4e, 0x3c, 0x9f, 0x1e, 0xba,
0xa8, 0x31, 0xe9, 0x1a, 0x17, 0x7d, 0x27, 0xad, 0xf6, 0x02, 0xd1, 0x19, 0x07, 0x7d, 0x5c, 0x50, 0x23, 0x6a, 0x5c, 0xba, 0xa2, 0x45, 0xdf, 0x49, 0xaf, 0xbd, 0x40, 0x74, 0xc6, 0x41, 0x1f, 0x17,
0x47, 0x7b, 0x92, 0x77, 0xab, 0x06, 0x46, 0xa6, 0x12, 0xe8, 0x77, 0x50, 0x97, 0x6a, 0x06, 0x66, 0xd4, 0xd1, 0x1e, 0xe7, 0xbd, 0x55, 0x03, 0x23, 0x53, 0x06, 0xfa, 0x0d, 0xd4, 0xa5, 0x99, 0x81,
0x6b, 0x8e, 0x8b, 0x2a, 0x30, 0x5e, 0xdf, 0x6c, 0x5d, 0x33, 0x23, 0xb7, 0x17, 0x88, 0xe8, 0x8a, 0xd9, 0x9a, 0xe3, 0xa2, 0x0a, 0x8c, 0x57, 0xd7, 0x7b, 0xd7, 0xcc, 0xf0, 0xf6, 0x02, 0x11, 0x5d,
0x64, 0x75, 0xa1, 0x75, 0x58, 0xde, 0xf1, 0x7d, 0x76, 0x81, 0x97, 0x37, 0x0a, 0x8d, 0x2a, 0xd1, 0x92, 0xac, 0x2d, 0xb4, 0x0e, 0xcb, 0x3b, 0xbe, 0xcf, 0xce, 0xf1, 0xf2, 0x46, 0xa1, 0x51, 0x25,
0x04, 0xfa, 0x15, 0x94, 0x77, 0x84, 0xa0, 0x5c, 0x70, 0x5c, 0x52, 0x9b, 0x3d, 0x9e, 0xbf, 0x99, 0x5a, 0x40, 0xbf, 0x80, 0xf2, 0x8e, 0x10, 0x94, 0x0b, 0x8e, 0x4b, 0x6a, 0xb3, 0x47, 0xf3, 0x37,
0x06, 0x91, 0x18, 0x8c, 0x8e, 0xa0, 0xaa, 0xf6, 0xdf, 0x89, 0x86, 0x1c, 0x97, 0x95, 0xe4, 0x97, 0xd3, 0x20, 0x12, 0x83, 0xd1, 0x07, 0xa8, 0xaa, 0xfd, 0x77, 0xa2, 0x21, 0xc7, 0x65, 0xc5, 0xfc,
0xb7, 0x38, 0x66, 0x22, 0xa3, 0x8f, 0x38, 0xd5, 0x81, 0xf6, 0xa0, 0xda, 0x72, 0xfb, 0x67, 0xb4, 0xea, 0x06, 0xc7, 0x4c, 0x38, 0xfa, 0x88, 0x53, 0x1b, 0x68, 0x0f, 0xaa, 0x2d, 0xb7, 0x7f, 0x4a,
0x13, 0xb1, 0x11, 0xae, 0x28, 0x85, 0x3f, 0x9f, 0xaf, 0x50, 0xc1, 0x8c, 0x42, 0xa3, 0x26, 0x91, 0x3b, 0x11, 0x1b, 0xe1, 0x8a, 0x32, 0xf8, 0xd3, 0xf9, 0x06, 0x15, 0xcc, 0x18, 0x34, 0x66, 0x12,
0x44, 0x3b, 0x50, 0x56, 0xc4, 0x09, 0xc3, 0xd5, 0xbb, 0x29, 0x89, 0xe5, 0x90, 0x03, 0x2b, 0xad, 0x26, 0xda, 0x81, 0xb2, 0x12, 0x8e, 0x19, 0xae, 0xde, 0xce, 0x48, 0xcc, 0x43, 0x0e, 0xac, 0xb4,
0x61, 0xc4, 0xc6, 0xe1, 0xb1, 0x1b, 0xd1, 0x40, 0x60, 0x50, 0x57, 0x9d, 0xe1, 0xa1, 0xb7, 0x50, 0x86, 0x11, 0x1b, 0x87, 0x47, 0x6e, 0x44, 0x03, 0x81, 0x41, 0xbd, 0xea, 0x8c, 0x0e, 0xbd, 0x81,
0xde, 0xbb, 0x0c, 0x59, 0x24, 0x38, 0xae, 0x2d, 0x4a, 0x5e, 0x0d, 0x32, 0x1b, 0x18, 0x09, 0xf4, 0xf2, 0xde, 0x45, 0xc8, 0x22, 0xc1, 0x71, 0x6d, 0x51, 0xf2, 0x6a, 0x90, 0xd9, 0xc0, 0x30, 0xd0,
0x19, 0xc0, 0xde, 0xa5, 0x88, 0xdc, 0x7d, 0x26, 0xdd, 0xbe, 0xa2, 0xae, 0x23, 0xc5, 0x41, 0x1d, 0xe7, 0x00, 0x7b, 0x17, 0x22, 0x72, 0xf7, 0x99, 0xbc, 0xf6, 0x15, 0xf5, 0x3a, 0x52, 0x1a, 0xd4,
0x28, 0xbd, 0x73, 0x7b, 0xd4, 0xe7, 0xb8, 0xae, 0x74, 0x37, 0x6f, 0xe1, 0x58, 0x2d, 0xa0, 0x37, 0x81, 0xd2, 0x3b, 0xb7, 0x47, 0x7d, 0x8e, 0xeb, 0xca, 0x76, 0xf3, 0x06, 0x17, 0xab, 0x09, 0x7a,
0x32, 0xd2, 0x32, 0xae, 0x0f, 0xa9, 0xb8, 0x60, 0xd1, 0xf9, 0x7b, 0x36, 0xa0, 0x78, 0x55, 0xc7, 0x23, 0xc3, 0x96, 0x71, 0x7d, 0x48, 0xc5, 0x39, 0x8b, 0xce, 0xde, 0xb3, 0x01, 0xc5, 0xab, 0x3a,
0x75, 0x8a, 0x85, 0x9e, 0x43, 0xfd, 0x90, 0x69, 0xe7, 0x79, 0xbe, 0xa0, 0x11, 0xfe, 0x44, 0x1d, 0xae, 0x53, 0x2a, 0xf4, 0x0c, 0xea, 0x87, 0x4c, 0x5f, 0x9e, 0xe7, 0x0b, 0x1a, 0xe1, 0x3b, 0xea,
0x26, 0xcb, 0x54, 0xb9, 0xec, 0xbb, 0xe2, 0x94, 0x45, 0x23, 0x8e, 0xd7, 0x14, 0x62, 0xca, 0x90, 0x30, 0x59, 0xa5, 0xca, 0x65, 0xdf, 0x15, 0x27, 0x2c, 0x1a, 0x71, 0xbc, 0xa6, 0x10, 0x53, 0x85,
0x11, 0xd4, 0xa5, 0xfd, 0x88, 0x0a, 0x8e, 0xef, 0x2d, 0x8a, 0x20, 0x0d, 0x22, 0x31, 0x18, 0x61, 0x8c, 0xa0, 0x2e, 0xed, 0x47, 0x54, 0x70, 0x7c, 0x77, 0x51, 0x04, 0x69, 0x10, 0x89, 0xc1, 0x08,
0x28, 0x77, 0xcf, 0x46, 0x5d, 0xef, 0x8f, 0x14, 0xa3, 0x0d, 0xab, 0x51, 0x20, 0x31, 0x89, 0x5e, 0x43, 0xb9, 0x7b, 0x3a, 0xea, 0x7a, 0xbf, 0xa7, 0x18, 0x6d, 0x58, 0x8d, 0x02, 0x89, 0x45, 0xf4,
0x41, 0xa1, 0xdb, 0xdd, 0xc7, 0x3f, 0x55, 0xda, 0x1e, 0xe6, 0x68, 0xeb, 0xee, 0x13, 0x89, 0x42, 0x12, 0x0a, 0xdd, 0xee, 0x3e, 0xfe, 0x7f, 0x65, 0xed, 0x41, 0x8e, 0xb5, 0xee, 0x3e, 0x91, 0x28,
0x08, 0x8a, 0x27, 0xee, 0x90, 0xe3, 0x75, 0x75, 0x2e, 0xb5, 0x46, 0x0f, 0xa0, 0x74, 0xe2, 0x46, 0x84, 0xa0, 0x78, 0xec, 0x0e, 0x39, 0x5e, 0x57, 0xe7, 0x52, 0x6b, 0x74, 0x1f, 0x4a, 0xc7, 0x6e,
0x43, 0x2a, 0xf0, 0x7d, 0x65, 0xb3, 0xa1, 0xd0, 0x1b, 0x28, 0x7f, 0xf0, 0xbd, 0x91, 0x27, 0x38, 0x34, 0xa4, 0x02, 0xdf, 0x53, 0x3e, 0x1b, 0x09, 0xbd, 0x86, 0xf2, 0x47, 0xdf, 0x1b, 0x79, 0x82,
0x7e, 0xb0, 0x28, 0x39, 0x35, 0xe8, 0x28, 0x14, 0x24, 0xc6, 0xcb, 0xd3, 0x2a, 0x7f, 0xd3, 0x08, 0xe3, 0xfb, 0x8b, 0x92, 0x53, 0x83, 0x3e, 0x84, 0x82, 0xc4, 0x78, 0x79, 0x5a, 0x75, 0xdf, 0x34,
0xff, 0x4c, 0xe9, 0x8c, 0x49, 0xf9, 0xc5, 0xb8, 0x0b, 0xe3, 0x0d, 0xab, 0x51, 0x21, 0x31, 0x29, 0xc2, 0x3f, 0x51, 0x36, 0x63, 0x51, 0x3e, 0x31, 0xd7, 0x85, 0xf1, 0x86, 0xd5, 0xa8, 0x90, 0x58,
0x8f, 0x76, 0x3c, 0xf6, 0x7d, 0xfc, 0x50, 0xb1, 0xd5, 0x5a, 0xdf, 0xbd, 0x0c, 0x83, 0xe3, 0x31, 0x94, 0x47, 0x3b, 0x1a, 0xfb, 0x3e, 0x7e, 0xa0, 0xd4, 0x6a, 0xad, 0xdf, 0xbd, 0x0c, 0x83, 0xa3,
0x3f, 0xc3, 0xb6, 0xfa, 0x92, 0xe2, 0x4c, 0xbf, 0xbf, 0x63, 0xee, 0x00, 0x3f, 0x4a, 0x7f, 0x97, 0x31, 0x3f, 0xc5, 0xb6, 0x7a, 0x92, 0xd2, 0x4c, 0x9f, 0xbf, 0x63, 0xee, 0x00, 0x3f, 0x4c, 0x3f,
0x1c, 0x74, 0x00, 0x2b, 0x5d, 0xd5, 0xc4, 0x8e, 0x55, 0xeb, 0xc2, 0x8f, 0x95, 0x1d, 0x2f, 0x9a, 0x97, 0x1a, 0x74, 0x00, 0x2b, 0x5d, 0xd5, 0xc4, 0x8e, 0x54, 0xeb, 0xc2, 0x8f, 0x94, 0x1f, 0xcf,
0xb2, 0x61, 0x35, 0xe3, 0x86, 0x25, 0x6d, 0x48, 0xb7, 0xba, 0xa6, 0x06, 0x93, 0x8c, 0xa8, 0x2c, 0x9b, 0xb2, 0x61, 0x35, 0xe3, 0x86, 0x25, 0x7d, 0x48, 0xb7, 0xba, 0xa6, 0x06, 0x93, 0x0c, 0x55,
0x08, 0x6d, 0xda, 0x1b, 0x0f, 0xf1, 0xa7, 0x6a, 0x17, 0x4d, 0xd8, 0xbf, 0x06, 0x34, 0x5b, 0x4b, 0x16, 0x84, 0x36, 0xed, 0x8d, 0x87, 0xf8, 0x33, 0xb5, 0x8b, 0x16, 0xec, 0x5f, 0x02, 0x9a, 0xad,
0x64, 0x0d, 0x3e, 0xa7, 0x57, 0x71, 0x0d, 0x3e, 0xa7, 0x4a, 0x7a, 0xe2, 0xfa, 0xe3, 0xb8, 0x12, 0x25, 0xb2, 0x06, 0x9f, 0xd1, 0xcb, 0xb8, 0x06, 0x9f, 0x51, 0xc5, 0x9e, 0xb8, 0xfe, 0x38, 0xae,
0x6a, 0xe2, 0x9b, 0xa5, 0xaf, 0x2d, 0xfb, 0x5b, 0x58, 0xcd, 0xa6, 0xf9, 0x9d, 0xa4, 0xdf, 0x40, 0x84, 0x5a, 0xf8, 0x76, 0xe9, 0x1b, 0xcb, 0x7e, 0x0b, 0xab, 0xd9, 0x34, 0xbf, 0x15, 0xfb, 0x35,
0x2d, 0x15, 0xcb, 0x77, 0x11, 0x75, 0xfe, 0x61, 0x41, 0x2d, 0x95, 0x70, 0x2a, 0x34, 0xae, 0x42, 0xd4, 0x52, 0xb1, 0x7c, 0x1b, 0xaa, 0xf3, 0x77, 0x0b, 0x6a, 0xa9, 0x84, 0x53, 0xa1, 0x71, 0x19,
0x6a, 0x84, 0xd5, 0x1a, 0xed, 0xc2, 0xf2, 0x8e, 0x10, 0x91, 0x6c, 0x1c, 0x32, 0xba, 0x3e, 0xbf, 0x52, 0x43, 0x56, 0x6b, 0xb4, 0x0b, 0xcb, 0x3b, 0x42, 0x44, 0xb2, 0x71, 0xc8, 0xe8, 0xfa, 0xe2,
0x31, 0x6d, 0x9b, 0x0a, 0xae, 0x13, 0x4b, 0x8b, 0xca, 0xbc, 0x6a, 0x53, 0x2e, 0xbc, 0xc0, 0x95, 0xda, 0xb4, 0x6d, 0x2a, 0xb8, 0x4e, 0x2c, 0x4d, 0x95, 0x79, 0xd5, 0xa6, 0x5c, 0x78, 0x81, 0x2b,
0xb9, 0xa7, 0xea, 0x7c, 0x95, 0xa4, 0x59, 0xf6, 0xd7, 0x00, 0x53, 0xb1, 0x3b, 0xd9, 0xf0, 0x37, 0x73, 0x4f, 0xd5, 0xf9, 0x2a, 0x49, 0xab, 0xec, 0x6f, 0x00, 0xa6, 0xb4, 0x5b, 0xf9, 0xf0, 0x17,
0x0b, 0xee, 0xcd, 0xd4, 0xa6, 0xb9, 0x96, 0xec, 0x67, 0x2d, 0xd9, 0xba, 0x65, 0x9d, 0x9b, 0xb5, 0x0b, 0xee, 0xce, 0xd4, 0xa6, 0xb9, 0x9e, 0xec, 0x67, 0x3d, 0xd9, 0xba, 0x61, 0x9d, 0x9b, 0xf5,
0xe7, 0xff, 0x38, 0xed, 0x21, 0x94, 0x74, 0x43, 0x98, 0x7b, 0x42, 0x1b, 0x2a, 0x6d, 0x8f, 0xbb, 0xe7, 0x7f, 0x38, 0xed, 0x21, 0x94, 0x74, 0x43, 0x98, 0x7b, 0x42, 0x1b, 0x2a, 0x6d, 0x8f, 0xbb,
0x3d, 0x9f, 0x0e, 0x94, 0x68, 0x85, 0x24, 0xb4, 0xea, 0x46, 0xea, 0xf4, 0xda, 0x7b, 0x9a, 0x70, 0x3d, 0x9f, 0x0e, 0x14, 0xb5, 0x42, 0x12, 0x59, 0x75, 0x23, 0x75, 0x7a, 0x7d, 0x7b, 0x5a, 0x70,
0x74, 0xe6, 0xa3, 0x55, 0x58, 0x4a, 0x26, 0x99, 0xa5, 0x83, 0xb6, 0x04, 0xcb, 0x36, 0xac, 0x4d, 0x74, 0xe6, 0xa3, 0x55, 0x58, 0x4a, 0x26, 0x99, 0xa5, 0x83, 0xb6, 0x04, 0xcb, 0x36, 0xac, 0x5d,
0xad, 0x12, 0x4d, 0x38, 0x1d, 0x28, 0xe9, 0x5a, 0x32, 0x83, 0xb7, 0xa1, 0xd2, 0xf1, 0x7c, 0xaa, 0xad, 0x12, 0x2d, 0x38, 0x1d, 0x28, 0xe9, 0x5a, 0x32, 0x83, 0xb7, 0xa1, 0xd2, 0xf1, 0x7c, 0xaa,
0xba, 0xb9, 0x3e, 0x73, 0x42, 0x4b, 0xf3, 0xf6, 0x82, 0x89, 0xd9, 0x56, 0x2e, 0x9d, 0xed, 0x54, 0xba, 0xb9, 0x3e, 0x73, 0x22, 0x4b, 0xf7, 0xf6, 0x82, 0x89, 0xd9, 0x56, 0x2e, 0x9d, 0xed, 0x54,
0xd3, 0x96, 0x76, 0xa8, 0xfe, 0x6e, 0xec, 0x50, 0x5d, 0xfd, 0x01, 0x94, 0x3a, 0x2c, 0x1a, 0xb9, 0xd3, 0x96, 0x7e, 0xa8, 0xfe, 0x6e, 0xfc, 0x50, 0x5d, 0xfd, 0x3e, 0x94, 0x3a, 0x2c, 0x1a, 0xb9,
0xc2, 0x28, 0x33, 0x94, 0xe3, 0xc0, 0xea, 0x41, 0xc0, 0x43, 0xda, 0x17, 0xf9, 0xc3, 0xdf, 0x11, 0xc2, 0x18, 0x33, 0x92, 0xe3, 0xc0, 0xea, 0x41, 0xc0, 0x43, 0xda, 0x17, 0xf9, 0xc3, 0xdf, 0xdf,
0x7c, 0x92, 0x60, 0xcc, 0xd8, 0x97, 0x9a, 0x5e, 0xac, 0xbb, 0x4f, 0x2f, 0x7f, 0xb5, 0xa0, 0x9a, 0x2c, 0xb8, 0x93, 0x80, 0xcc, 0xdc, 0x97, 0x1a, 0x5f, 0xac, 0x5b, 0x8f, 0x2f, 0xa8, 0x09, 0xd0,
0xd4, 0x27, 0xd4, 0x82, 0x92, 0xba, 0x8d, 0x78, 0x86, 0x7c, 0x75, 0x43, 0x41, 0x6b, 0x7e, 0x54, 0xa6, 0x27, 0x5e, 0xe0, 0xa9, 0xe0, 0xd3, 0xf3, 0xcf, 0x6a, 0x33, 0xec, 0x35, 0xa7, 0x5a, 0x92,
0x68, 0xd3, 0x27, 0xb4, 0xa8, 0xfd, 0x03, 0xd4, 0x52, 0xec, 0x39, 0x01, 0xb0, 0x95, 0x0e, 0x80, 0x42, 0xa0, 0xb7, 0x70, 0xb7, 0x35, 0x8e, 0x64, 0xd7, 0x4a, 0xd1, 0x0a, 0x73, 0x69, 0xb3, 0x40,
0xdc, 0x02, 0xaf, 0x37, 0x49, 0x87, 0x47, 0x1b, 0x4a, 0x9a, 0x39, 0xd7, 0xad, 0x08, 0x8a, 0xfb, 0xe7, 0xcf, 0x16, 0x54, 0x93, 0x72, 0x88, 0x5a, 0x50, 0x52, 0x2f, 0x3f, 0x1e, 0x59, 0x5f, 0x5e,
0x6e, 0xa4, 0x43, 0xa3, 0x40, 0xd4, 0x5a, 0xf2, 0xba, 0xec, 0x54, 0xa8, 0xeb, 0x29, 0x10, 0xb5, 0x53, 0x3f, 0x9b, 0x9f, 0x14, 0xda, 0xb4, 0x25, 0x4d, 0xb5, 0x7f, 0x80, 0x5a, 0x4a, 0x3d, 0x27,
0x76, 0xfe, 0x6e, 0x41, 0xdd, 0x0c, 0x84, 0xc6, 0x83, 0x14, 0xd6, 0x74, 0x86, 0xd2, 0x28, 0xe6, 0xde, 0xb6, 0xd2, 0xf1, 0x96, 0xdb, 0x4f, 0xf4, 0x26, 0xe9, 0x68, 0x6c, 0x43, 0x49, 0x2b, 0xe7,
0x19, 0xfb, 0xdf, 0x2c, 0x70, 0x65, 0x0c, 0x6d, 0x5e, 0x97, 0xd5, 0xde, 0x98, 0x51, 0x69, 0xb7, 0xbe, 0x45, 0x04, 0xc5, 0x7d, 0x37, 0xd2, 0x91, 0x58, 0x20, 0x6a, 0x2d, 0x75, 0x5d, 0x76, 0x22,
0xe0, 0xfe, 0x5c, 0xe8, 0x9d, 0x52, 0xe4, 0x05, 0xdc, 0x9b, 0x8e, 0xba, 0xf9, 0x71, 0xb2, 0x0e, 0xd4, 0x75, 0x14, 0x88, 0x5a, 0x3b, 0x7f, 0xb5, 0xa0, 0x6e, 0xe6, 0x4f, 0xf3, 0xbe, 0x28, 0xac,
0x28, 0x0d, 0x33, 0xa3, 0xf0, 0x13, 0xa8, 0xc9, 0xa7, 0x43, 0xbe, 0x98, 0x03, 0x2b, 0x1a, 0x60, 0xe9, 0x82, 0x40, 0xa3, 0x58, 0x67, 0xfc, 0x7f, 0xbd, 0xe0, 0xc5, 0xc5, 0xd0, 0xe6, 0x55, 0xae,
0x3c, 0x83, 0xa0, 0x78, 0x4e, 0xaf, 0x74, 0x34, 0x54, 0x89, 0x5a, 0x3b, 0x7f, 0xb1, 0xe4, 0x0b, 0xbe, 0x8d, 0x19, 0x93, 0x76, 0x0b, 0xee, 0xcd, 0x85, 0xde, 0x2a, 0x23, 0x9f, 0xc3, 0xdd, 0xe9,
0x20, 0x1c, 0x8b, 0xf7, 0x94, 0x73, 0x77, 0x28, 0x03, 0xb0, 0x78, 0x10, 0x78, 0xc2, 0x44, 0xdf, 0x64, 0x9d, 0x1f, 0x96, 0xeb, 0x80, 0xd2, 0x30, 0x33, 0x79, 0x3f, 0x86, 0x9a, 0xfc, 0x52, 0xc9,
0xcb, 0xbc, 0x97, 0x40, 0x38, 0x16, 0x12, 0x66, 0xa4, 0xf6, 0x7f, 0x42, 0x94, 0x14, 0xda, 0x86, 0xa7, 0x39, 0xb0, 0xa2, 0x01, 0xe6, 0x66, 0x10, 0x14, 0xcf, 0xe8, 0xa5, 0x8e, 0x86, 0x2a, 0x51,
0x62, 0xdb, 0x15, 0xae, 0x89, 0x85, 0x9c, 0xb9, 0x47, 0x22, 0x52, 0x82, 0x92, 0xdc, 0x2d, 0xcb, 0x6b, 0xe7, 0x4f, 0x96, 0xfc, 0xe0, 0x08, 0xc7, 0xe2, 0x3d, 0xe5, 0xdc, 0x1d, 0xca, 0x70, 0x2f,
0xe7, 0x4e, 0x38, 0x16, 0xce, 0x73, 0x58, 0xbb, 0xae, 0x7d, 0x8e, 0x69, 0x5f, 0x41, 0x2d, 0xa5, 0x1e, 0x04, 0x9e, 0x30, 0xb1, 0xfe, 0x22, 0xef, 0xc3, 0x23, 0x1c, 0x0b, 0x09, 0x33, 0xac, 0xfd,
0x45, 0xe5, 0xed, 0x51, 0x47, 0x01, 0x2a, 0x44, 0x2e, 0xa5, 0xad, 0xc9, 0x41, 0x56, 0xf4, 0x1e, 0xff, 0x23, 0x8a, 0x85, 0xb6, 0xa1, 0xd8, 0x76, 0x85, 0x6b, 0x62, 0x21, 0x67, 0xcc, 0x92, 0x88,
0xce, 0x27, 0x50, 0x57, 0xaa, 0x13, 0x0f, 0xfe, 0x69, 0x09, 0xca, 0xb1, 0x8a, 0xed, 0x8c, 0xdd, 0x14, 0x51, 0x8a, 0xbb, 0x65, 0xf9, 0x75, 0x15, 0x8e, 0x85, 0xf3, 0x0c, 0xd6, 0xae, 0x5a, 0x9f,
0x4f, 0xf3, 0xec, 0x9e, 0x35, 0xf9, 0x35, 0x14, 0x65, 0xfd, 0x30, 0x26, 0xe7, 0x0c, 0x0d, 0x9d, 0xe3, 0xda, 0xd7, 0x50, 0x4b, 0x59, 0x51, 0x65, 0xe2, 0x43, 0x47, 0x01, 0x2a, 0x44, 0x2e, 0xa5,
0x41, 0x4a, 0x4c, 0xc2, 0xd1, 0x77, 0x50, 0x22, 0x94, 0xcb, 0x01, 0x47, 0x3f, 0x05, 0x9e, 0xcd, 0xaf, 0xc9, 0x41, 0x56, 0xf4, 0x1e, 0xce, 0x1d, 0xa8, 0x2b, 0xd3, 0xc9, 0x0d, 0xfe, 0x61, 0x09,
0x17, 0xd4, 0x98, 0xa9, 0xb0, 0x11, 0x92, 0xe2, 0x5d, 0x6f, 0x18, 0xb8, 0x3e, 0x2e, 0x2e, 0x12, 0xca, 0xb1, 0x89, 0xed, 0x8c, 0xdf, 0x4f, 0xf2, 0xfc, 0x9e, 0x75, 0xf9, 0x15, 0x14, 0x65, 0xb9,
0xd7, 0x98, 0x94, 0xb8, 0x66, 0x4c, 0xdd, 0xfd, 0x67, 0x0b, 0x6a, 0x0b, 0x5d, 0xbd, 0xf8, 0xb1, 0x32, 0x2e, 0xe7, 0xcc, 0x28, 0x9d, 0x41, 0x8a, 0x26, 0xe1, 0xe8, 0x3b, 0x28, 0x11, 0xca, 0xe5,
0x36, 0xf3, 0x80, 0x2c, 0xfc, 0x8f, 0x0f, 0xc8, 0x7f, 0x5b, 0x59, 0x45, 0x6a, 0xd6, 0x91, 0xf9, 0x3c, 0xa5, 0xb3, 0xfb, 0xe9, 0x7c, 0xa2, 0xc6, 0x4c, 0xc9, 0x86, 0x24, 0xe9, 0x5d, 0x6f, 0x18,
0x14, 0x32, 0x2f, 0x10, 0x26, 0x64, 0x53, 0x1c, 0x79, 0xd0, 0xd6, 0x68, 0x60, 0x8a, 0xbe, 0x5c, 0xb8, 0x3e, 0x2e, 0x2e, 0xa2, 0x6b, 0x4c, 0x8a, 0xae, 0x15, 0xd3, 0xeb, 0xfe, 0xa3, 0x05, 0xb5,
0x4e, 0x8b, 0x77, 0xc1, 0x14, 0x6f, 0x19, 0x04, 0x1f, 0x38, 0x8d, 0x94, 0x8b, 0xaa, 0x44, 0xad, 0x85, 0x57, 0xbd, 0xf8, 0xdb, 0x70, 0xe6, 0x7b, 0xb5, 0xf0, 0x5f, 0x7e, 0xaf, 0xfe, 0xcb, 0xca,
0x65, 0xbd, 0x3e, 0x64, 0x8a, 0xbb, 0xac, 0xa2, 0xc5, 0x50, 0x4a, 0xdf, 0xc5, 0x00, 0x97, 0xb4, 0x1a, 0x52, 0xa3, 0x95, 0xcc, 0xa7, 0x90, 0x79, 0x81, 0x30, 0x21, 0x9b, 0xd2, 0xc8, 0x83, 0xb6,
0xe1, 0xad, 0x0b, 0xd5, 0x85, 0x0e, 0x99, 0xe4, 0x95, 0xf5, 0x08, 0xa4, 0x08, 0x89, 0x3b, 0x11, 0x46, 0x03, 0xd3, 0x63, 0xe4, 0x72, 0xda, 0x2b, 0x0a, 0xa6, 0x57, 0xc8, 0x20, 0xf8, 0xc8, 0x69,
0x57, 0xb8, 0xa2, 0x43, 0xed, 0x44, 0x5c, 0xc9, 0x86, 0x42, 0x98, 0xef, 0xf7, 0xdc, 0xfe, 0x39, 0xa4, 0xae, 0xa8, 0x4a, 0xd4, 0x5a, 0xb6, 0x87, 0x43, 0xa6, 0xb4, 0xcb, 0x2a, 0x5a, 0x8c, 0xa4,
0xae, 0xea, 0x4e, 0x16, 0xd3, 0x72, 0xfe, 0x93, 0xde, 0xf5, 0x5c, 0x5f, 0xbd, 0x14, 0x2a, 0x24, 0xec, 0x9d, 0x0f, 0x70, 0x49, 0x3b, 0xde, 0x3a, 0x57, 0x4d, 0xef, 0x90, 0x49, 0x5d, 0x59, 0x4f,
0x26, 0x9d, 0x1d, 0xa8, 0x26, 0x41, 0x21, 0x7b, 0x54, 0x67, 0xa0, 0x9c, 0x5e, 0x27, 0x4b, 0x9d, 0x5c, 0x4a, 0x90, 0xb8, 0x63, 0x71, 0x89, 0x2b, 0x3a, 0xd4, 0x8e, 0xc5, 0xa5, 0xec, 0x5f, 0x84,
0x41, 0x1c, 0xcf, 0x4b, 0xb3, 0xf1, 0x5c, 0x48, 0xc5, 0xf3, 0x36, 0xd4, 0x33, 0xe1, 0x21, 0x41, 0xf9, 0x7e, 0xcf, 0xed, 0x9f, 0xe1, 0xaa, 0x6e, 0x9c, 0xb1, 0x2c, 0xc7, 0x4d, 0x79, 0xbb, 0x9e,
0x84, 0x5d, 0x70, 0xa3, 0x48, 0xad, 0x25, 0xaf, 0xc5, 0x7c, 0xfd, 0x16, 0xae, 0x13, 0xb5, 0x76, 0xeb, 0xab, 0x0f, 0x93, 0x0a, 0x89, 0x45, 0x67, 0x07, 0xaa, 0x49, 0x50, 0xc8, 0x96, 0xd8, 0x19,
0x9e, 0x41, 0x3d, 0x13, 0x18, 0xf3, 0x2a, 0xb0, 0xf3, 0x14, 0xea, 0x5d, 0xe1, 0x8a, 0xf1, 0x82, 0xa8, 0x4b, 0xaf, 0x93, 0xa5, 0xce, 0x20, 0x8e, 0xe7, 0xa5, 0xd9, 0x78, 0x2e, 0xa4, 0xe2, 0x79,
0x3f, 0x2f, 0xfe, 0x63, 0xc1, 0x6a, 0x8c, 0x31, 0x35, 0xe6, 0x97, 0x50, 0x99, 0xd0, 0x48, 0xd0, 0x1b, 0xea, 0x99, 0xf0, 0x90, 0x20, 0xc2, 0xce, 0xb9, 0x31, 0xa4, 0xd6, 0x52, 0xd7, 0x62, 0xbe,
0xcb, 0xa4, 0xeb, 0xe0, 0xd9, 0xf1, 0xf3, 0xa3, 0x42, 0x90, 0x04, 0x89, 0xbe, 0x81, 0x0a, 0x57, 0xfe, 0xf4, 0xae, 0x13, 0xb5, 0x76, 0x9e, 0x42, 0x3d, 0x13, 0x18, 0xf3, 0x2a, 0xb0, 0xf3, 0x04,
0x7a, 0x68, 0x3c, 0xb1, 0x7c, 0x96, 0x27, 0x65, 0xf6, 0x4b, 0xf0, 0x68, 0x13, 0x8a, 0x3e, 0x1b, 0xea, 0x5d, 0xe1, 0x8a, 0xf1, 0x82, 0xff, 0x4a, 0xfe, 0x6d, 0xc1, 0x6a, 0x8c, 0x31, 0x35, 0xe6,
0x72, 0x75, 0xef, 0xb5, 0xad, 0x47, 0x79, 0x72, 0xef, 0xd8, 0x90, 0x28, 0x20, 0x7a, 0x0b, 0x95, 0xe7, 0x50, 0x99, 0xd0, 0x48, 0xd0, 0x8b, 0xa4, 0xeb, 0xe0, 0xd9, 0x69, 0xf7, 0x93, 0x42, 0x90,
0x0b, 0x37, 0x0a, 0xbc, 0x60, 0x18, 0xbf, 0xa1, 0x9f, 0xe4, 0x09, 0xfd, 0xa0, 0x71, 0x24, 0x11, 0x04, 0x89, 0xbe, 0x85, 0x0a, 0x57, 0x76, 0x68, 0x3c, 0x20, 0x7d, 0x9e, 0xc7, 0x32, 0xfb, 0x25,
0x70, 0xea, 0x32, 0x5d, 0x4e, 0x99, 0xf1, 0x89, 0xf3, 0x1b, 0x19, 0xb5, 0x92, 0x34, 0xe6, 0x1f, 0x78, 0xb4, 0x09, 0x45, 0x9f, 0x0d, 0xb9, 0x7a, 0xef, 0xb5, 0xad, 0x87, 0x79, 0xbc, 0x77, 0x6c,
0x40, 0x5d, 0x47, 0xfe, 0x47, 0x1a, 0x71, 0x39, 0xff, 0x59, 0x8b, 0xb2, 0x73, 0x37, 0x0d, 0x25, 0x48, 0x14, 0x10, 0xbd, 0x81, 0xca, 0xb9, 0x1b, 0x05, 0x5e, 0x30, 0x8c, 0x3f, 0xd9, 0x1f, 0xe7,
0x59, 0x49, 0xe7, 0x47, 0xd3, 0xd8, 0x62, 0x86, 0x8c, 0xa5, 0xd0, 0xed, 0x9f, 0xbb, 0xc3, 0xf8, 0x91, 0x7e, 0xd0, 0x38, 0x92, 0x10, 0x9c, 0xba, 0x4c, 0x97, 0x13, 0x66, 0xee, 0xc4, 0xf9, 0x95,
0x9e, 0x62, 0x52, 0x7e, 0x99, 0x98, 0xfd, 0x74, 0x82, 0xc6, 0xa4, 0x8c, 0xcd, 0x88, 0x4e, 0x3c, 0x8c, 0x5a, 0x29, 0x1a, 0xf7, 0x0f, 0xa0, 0xae, 0x23, 0xff, 0x13, 0x8d, 0xb8, 0x6c, 0xdd, 0xd6,
0x3e, 0x1d, 0x45, 0x13, 0xda, 0xd9, 0x97, 0xaf, 0x05, 0x7f, 0x42, 0xf3, 0xff, 0x4a, 0x79, 0x99, 0xa2, 0xec, 0xdc, 0x4d, 0x43, 0x49, 0x96, 0xe9, 0xfc, 0x68, 0x1a, 0x5b, 0xac, 0x90, 0xb1, 0x14,
0x3c, 0x95, 0x74, 0x71, 0x5b, 0x6d, 0x86, 0xbd, 0x66, 0x9b, 0x9e, 0x7a, 0x32, 0x86, 0x59, 0x10, 0xba, 0xfd, 0x33, 0x77, 0x18, 0xbf, 0xa7, 0x58, 0x94, 0x4f, 0x26, 0x66, 0x3f, 0x9d, 0xa0, 0xb1,
0x3f, 0x9d, 0x64, 0x61, 0x35, 0x9a, 0xb4, 0x1b, 0xb6, 0xfe, 0x55, 0x06, 0x68, 0x25, 0xa6, 0xa2, 0x28, 0x63, 0x33, 0xa2, 0x13, 0x8f, 0x4f, 0x27, 0xdf, 0x44, 0x76, 0xf6, 0xe5, 0xc7, 0x89, 0x3f,
0x63, 0x58, 0x56, 0xa6, 0x20, 0x67, 0x61, 0x07, 0x56, 0xc7, 0xb0, 0x9f, 0xdd, 0xa2, 0x4b, 0xa3, 0xa1, 0xf9, 0xff, 0xdc, 0xbc, 0x48, 0xbe, 0xcc, 0xe6, 0x0f, 0x2e, 0xe6, 0xa9, 0x2c, 0xac, 0xc6,
0x8f, 0x32, 0xaf, 0xd4, 0xe4, 0x84, 0x9e, 0xe7, 0xd5, 0x9a, 0xf4, 0xf0, 0x65, 0xbf, 0xb8, 0x01, 0x92, 0xbe, 0x86, 0xad, 0x7f, 0x96, 0x01, 0x5a, 0x89, 0xab, 0xe8, 0x08, 0x96, 0x95, 0x2b, 0xc8,
0x65, 0xf4, 0x7e, 0x80, 0x92, 0x0e, 0x30, 0x94, 0x57, 0x50, 0xd3, 0x29, 0x61, 0x3f, 0x5f, 0x0c, 0x59, 0xd8, 0x81, 0xd5, 0x31, 0xec, 0xa7, 0x37, 0xe8, 0xd2, 0xe8, 0x93, 0xcc, 0x2b, 0x35, 0xa7,
0xd2, 0x4a, 0xbf, 0xb0, 0x10, 0x31, 0xe5, 0x16, 0x39, 0x0b, 0xfa, 0xa9, 0x49, 0xc6, 0x3c, 0x07, 0xa1, 0x67, 0x79, 0xb5, 0x26, 0x3d, 0xeb, 0xd9, 0xcf, 0xaf, 0x41, 0x19, 0xbb, 0x1f, 0xa1, 0xa4,
0x64, 0x5a, 0x57, 0xc3, 0x42, 0xdf, 0x43, 0x49, 0x17, 0x4c, 0xf4, 0xe9, 0x7c, 0x81, 0x58, 0xdf, 0x03, 0x0c, 0xe5, 0x15, 0xd4, 0x74, 0x4a, 0xd8, 0xcf, 0x16, 0x83, 0xb4, 0xd1, 0x2f, 0x2d, 0x44,
0xe2, 0xcf, 0x0d, 0xeb, 0x0b, 0x0b, 0xbd, 0x87, 0xa2, 0x9c, 0x14, 0x50, 0x4e, 0xdb, 0x4b, 0x8d, 0x4c, 0xb9, 0x45, 0xce, 0x82, 0x7e, 0x6a, 0x92, 0x31, 0xef, 0x02, 0x32, 0xad, 0xab, 0x61, 0xa1,
0x19, 0xb6, 0xb3, 0x08, 0x62, 0xbc, 0xf8, 0x23, 0xc0, 0x74, 0x5e, 0x41, 0x39, 0x7f, 0xb2, 0xcc, 0xef, 0xa1, 0xa4, 0x0b, 0x26, 0xfa, 0x6c, 0x3e, 0x21, 0xb6, 0xb7, 0xf8, 0x71, 0xc3, 0xfa, 0xd2,
0x0c, 0x3e, 0x76, 0xe3, 0x66, 0xa0, 0xd9, 0xe0, 0xbd, 0x6c, 0xd6, 0xa7, 0x0c, 0xe5, 0xb6, 0xe9, 0x42, 0xef, 0xa1, 0x28, 0x27, 0x05, 0x94, 0xd3, 0xf6, 0x52, 0x63, 0x86, 0xed, 0x2c, 0x82, 0x98,
0x24, 0x43, 0x6d, 0x67, 0x11, 0xc4, 0xa8, 0x3b, 0x83, 0x7a, 0xe6, 0x4f, 0x58, 0xf4, 0x8b, 0x7c, 0x5b, 0xfc, 0x11, 0x60, 0x3a, 0xaf, 0xa0, 0x9c, 0xff, 0x74, 0x66, 0x06, 0x1f, 0xbb, 0x71, 0x3d,
0x23, 0xaf, 0xff, 0xa7, 0x6b, 0xbf, 0xba, 0x15, 0xd6, 0xec, 0x24, 0xd2, 0x03, 0x9f, 0xf9, 0x8c, 0xd0, 0x6c, 0xf0, 0x5e, 0x36, 0xeb, 0x13, 0x86, 0x72, 0xdb, 0x74, 0x92, 0xa1, 0xb6, 0xb3, 0x08,
0x9a, 0x37, 0xd9, 0x9d, 0xfd, 0x43, 0xd5, 0xde, 0xbc, 0x35, 0xde, 0xec, 0x7a, 0x0c, 0xcb, 0x2a, 0x62, 0xcc, 0x9d, 0x42, 0x3d, 0xf3, 0x9f, 0x2f, 0xfa, 0x59, 0xbe, 0x93, 0x57, 0xff, 0x42, 0xb6,
0x3f, 0xf3, 0xc2, 0x2f, 0x5d, 0x06, 0xf2, 0xc2, 0x2f, 0x93, 0xe0, 0xbb, 0xc5, 0xdf, 0x2e, 0x85, 0x5f, 0xde, 0x08, 0x6b, 0x76, 0x12, 0xe9, 0x81, 0xcf, 0x3c, 0x46, 0xcd, 0xeb, 0xfc, 0xce, 0xfe,
0xbd, 0x5e, 0x49, 0xfd, 0xdb, 0xfd, 0xd5, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0xdf, 0x67, 0x70, 0x7f, 0x6b, 0x6f, 0xde, 0x18, 0x6f, 0x76, 0x3d, 0x82, 0x65, 0x95, 0x9f, 0x79, 0xe1, 0x97, 0x2e,
0x17, 0xb9, 0x17, 0x00, 0x00, 0x03, 0x79, 0xe1, 0x97, 0x49, 0xf0, 0xdd, 0xe2, 0xaf, 0x97, 0xc2, 0x5e, 0xaf, 0xa4, 0xfe, 0x5c,
0xff, 0xfa, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xfd, 0x5a, 0x6a, 0x98, 0x28, 0x18, 0x00, 0x00,
} }
// Reference imports to suppress errors if they are not otherwise used. // Reference imports to suppress errors if they are not otherwise used.

@ -122,6 +122,8 @@ message InspectRequest {
message InspectResponse { message InspectResponse {
BuildOptions Options = 1; BuildOptions Options = 1;
pb.Definition Definition = 2;
pb.Definition CurrentDefinition = 3;
} }
message UlimitOpt { message UlimitOpt {

@ -15,6 +15,7 @@ import (
"github.com/docker/buildx/util/progress" "github.com/docker/buildx/util/progress"
"github.com/docker/buildx/version" "github.com/docker/buildx/version"
"github.com/moby/buildkit/client" "github.com/moby/buildkit/client"
solverpb "github.com/moby/buildkit/solver/pb"
"github.com/pkg/errors" "github.com/pkg/errors"
"golang.org/x/sync/errgroup" "golang.org/x/sync/errgroup"
) )
@ -144,16 +145,21 @@ func (m *Server) Inspect(ctx context.Context, req *pb.InspectRequest) (*pb.Inspe
if ref == "" { if ref == "" {
return nil, errors.New("inspect: empty key") return nil, errors.New("inspect: empty key")
} }
var bo *pb.BuildOptions
m.sessionMu.Lock() m.sessionMu.Lock()
if s, ok := m.session[ref]; ok { defer m.sessionMu.Unlock()
bo = s.buildOptions s, ok := m.session[ref]
} else { if !ok {
m.sessionMu.Unlock()
return nil, errors.Errorf("inspect: unknown key %v", ref) return nil, errors.Errorf("inspect: unknown key %v", ref)
} }
m.sessionMu.Unlock() var curDef *solverpb.Definition
return &pb.InspectResponse{Options: bo}, nil var origDef *solverpb.Definition
if s.result != nil {
curDef, _ = build.DefinitionFromResultHandler(context.TODO(), s.result)
}
if s.originalResult != nil {
origDef, _ = build.DefinitionFromResultHandler(context.TODO(), s.originalResult)
}
return &pb.InspectResponse{Options: s.buildOptions, Definition: origDef, CurrentDefinition: curDef}, nil
} }
func (m *Server) Build(ctx context.Context, req *pb.BuildRequest) (*pb.BuildResponse, error) { func (m *Server) Build(ctx context.Context, req *pb.BuildRequest) (*pb.BuildResponse, error) {

Loading…
Cancel
Save