JohnHammond
/
buildkit
mirror of https://github.com/JohnHammond/buildkit.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

split warning message into short and detail 

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
master
Tonis Tiigi 2021-11-30 21:57:43 -08:00
parent 0dd260bcf5
commit 71316c6f29
18 changed files with 407 additions and 286 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

276
api/services/control/control.pb.go
View File

@ -1006,9 +1006,10 @@ func (m *VertexLog) GetMsg() []byte {
type VertexWarning struct {
Vertex github_com_opencontainers_go_digest.Digest `protobuf:"bytes,1,opt,name=vertex,proto3,customtype=github.com/opencontainers/go-digest.Digest" json:"vertex"`
Level int64 `protobuf:"varint,2,opt,name=level,proto3" json:"level,omitempty"`
Msg []byte `protobuf:"bytes,3,opt,name=msg,proto3" json:"msg,omitempty"`
Info *pb.SourceInfo `protobuf:"bytes,4,opt,name=info,proto3" json:"info,omitempty"`
Ranges []*pb.Range `protobuf:"bytes,5,rep,name=ranges,proto3" json:"ranges,omitempty"`
Short []byte `protobuf:"bytes,3,opt,name=short,proto3" json:"short,omitempty"`
Detail []byte `protobuf:"bytes,4,opt,name=detail,proto3" json:"detail,omitempty"`
Info *pb.SourceInfo `protobuf:"bytes,5,opt,name=info,proto3" json:"info,omitempty"`
Ranges []*pb.Range `protobuf:"bytes,6,rep,name=ranges,proto3" json:"ranges,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
@ -1054,9 +1055,16 @@ func (m *VertexWarning) GetLevel() int64 {
return 0
}
func (m *VertexWarning) GetMsg() []byte {
func (m *VertexWarning) GetShort() []byte {
if m != nil {
return m.Msg
return m.Short
}
return nil
}
func (m *VertexWarning) GetDetail() []byte {
if m != nil {
return m.Detail
}
return nil
}
@ -1245,101 +1253,102 @@ func init() {
func init() { proto.RegisterFile("control.proto", fileDescriptor_0c5120591600887d) }
var fileDescriptor_0c5120591600887d = []byte{
// 1494 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0x4d, 0x6f, 0x1b, 0x45,
0x18, 0xee, 0xda, 0xf1, 0xd7, 0x1b, 0x27, 0x4a, 0xa7, 0xa5, 0x5a, 0x2d, 0x22, 0x49, 0xb7, 0x45,
0xb2, 0xaa, 0x76, 0x9d, 0x1a, 0x8a, 0x4a, 0xf8, 0x50, 0xeb, 0xb8, 0xa8, 0xa9, 0x1a, 0x51, 0xc6,
0x2d, 0x95, 0x7a, 0x40, 0x5a, 0xdb, 0x63, 0x77, 0x95, 0xf5, 0xce, 0x32, 0x33, 0x9b, 0xd6, 0xfc,
0x00, 0xce, 0xdc, 0xf8, 0x01, 0x1c, 0x38, 0x71, 0xe6, 0x17, 0x20, 0x55, 0x9c, 0x38, 0xf7, 0x10,
0x50, 0xef, 0x20, 0x7e, 0x02, 0x9a, 0x8f, 0x75, 0xd6, 0xb1, 0x9d, 0xaf, 0x72, 0xf2, 0xbc, 0xb3,
0xef, 0xf3, 0xf8, 0xfd, 0x9c, 0x99, 0x17, 0x96, 0xba, 0x34, 0x12, 0x8c, 0x86, 0x5e, 0xcc, 0xa8,
0xa0, 0x68, 0x65, 0x48, 0x3b, 0x23, 0xaf, 0x93, 0x04, 0x61, 0x6f, 0x37, 0x10, 0xde, 0xde, 0x4d,
0xe7, 0xc6, 0x20, 0x10, 0xcf, 0x93, 0x8e, 0xd7, 0xa5, 0xc3, 0xfa, 0x80, 0x0e, 0x68, 0x5d, 0x29,
0x76, 0x92, 0xbe, 0x92, 0x94, 0xa0, 0x56, 0x9a, 0xc0, 0x59, 0x1b, 0x50, 0x3a, 0x08, 0xc9, 0x81,
0x96, 0x08, 0x86, 0x84, 0x0b, 0x7f, 0x18, 0x1b, 0x85, 0xeb, 0x19, 0x3e, 0xf9, 0x67, 0xf5, 0xf4,
0xcf, 0xea, 0x9c, 0x86, 0x7b, 0x84, 0xd5, 0xe3, 0x4e, 0x9d, 0xc6, 0xdc, 0x68, 0xd7, 0xe7, 0x6a,
0xfb, 0x71, 0x50, 0x17, 0xa3, 0x98, 0xf0, 0xfa, 0x0b, 0xca, 0x76, 0x09, 0xd3, 0x00, 0xf7, 0x7b,
0x0b, 0xaa, 0x8f, 0x58, 0x12, 0x11, 0x4c, 0xbe, 0x4d, 0x08, 0x17, 0xe8, 0x12, 0x14, 0xfb, 0x41,
0x28, 0x08, 0xb3, 0xad, 0xf5, 0x7c, 0xad, 0x82, 0x8d, 0x84, 0x56, 0x20, 0xef, 0x87, 0xa1, 0x9d,
0x5b, 0xb7, 0x6a, 0x65, 0x2c, 0x97, 0xa8, 0x06, 0xd5, 0x5d, 0x42, 0xe2, 0x56, 0xc2, 0x7c, 0x11,
0xd0, 0xc8, 0xce, 0xaf, 0x5b, 0xb5, 0x7c, 0x73, 0xe1, 0xd5, 0xfe, 0x9a, 0x85, 0x27, 0xbe, 0x20,
0x17, 0x2a, 0x52, 0x6e, 0x8e, 0x04, 0xe1, 0xf6, 0x42, 0x46, 0xed, 0x60, 0xdb, 0xbd, 0x06, 0x2b,
0xad, 0x80, 0xef, 0x3e, 0xe1, 0xfe, 0xe0, 0x38, 0x5b, 0xdc, 0x07, 0x70, 0x3e, 0xa3, 0xcb, 0x63,
0x1a, 0x71, 0x82, 0x6e, 0x41, 0x91, 0x91, 0x2e, 0x65, 0x3d, 0xa5, 0xbc, 0xd8, 0x78, 0xcf, 0x3b,
0x9c, 0x1b, 0xcf, 0x00, 0xa4, 0x12, 0x36, 0xca, 0xee, 0x8f, 0x79, 0x58, 0xcc, 0xec, 0xa3, 0x65,
0xc8, 0x6d, 0xb7, 0x6c, 0x6b, 0xdd, 0xaa, 0x55, 0x70, 0x6e, 0xbb, 0x85, 0x6c, 0x28, 0xed, 0x24,
0xc2, 0xef, 0x84, 0xc4, 0xf8, 0x9e, 0x8a, 0xe8, 0x22, 0x14, 0xb6, 0xa3, 0x27, 0x9c, 0x28, 0xc7,
0xcb, 0x58, 0x0b, 0x08, 0xc1, 0x42, 0x3b, 0xf8, 0x8e, 0x68, 0x37, 0xb1, 0x5a, 0x23, 0x07, 0x8a,
0x8f, 0x7c, 0x46, 0x22, 0x61, 0x17, 0x24, 0x6f, 0x33, 0x67, 0x5b, 0xd8, 0xec, 0xa0, 0x26, 0x54,
0xb6, 0x18, 0xf1, 0x05, 0xe9, 0xdd, 0x15, 0x76, 0x71, 0xdd, 0xaa, 0x2d, 0x36, 0x1c, 0x4f, 0x17,
0x85, 0x97, 0x16, 0x85, 0xf7, 0x38, 0x2d, 0x8a, 0x66, 0xf9, 0xd5, 0xfe, 0xda, 0xb9, 0x1f, 0xfe,
0x94, 0xb1, 0x1b, 0xc3, 0xd0, 0x1d, 0x80, 0x87, 0x3e, 0x17, 0x4f, 0xb8, 0x22, 0x29, 0x1d, 0x4b,
0xb2, 0xa0, 0x08, 0x32, 0x18, 0xb4, 0x0a, 0xa0, 0x82, 0xb0, 0x45, 0x93, 0x48, 0xd8, 0x65, 0x65,
0x7b, 0x66, 0x07, 0xad, 0xc3, 0x62, 0x8b, 0xf0, 0x2e, 0x0b, 0x62, 0x95, 0xea, 0x8a, 0x0a, 0x4f,
0x76, 0x4b, 0x32, 0xe8, 0x08, 0x3e, 0x1e, 0xc5, 0xc4, 0x06, 0xa5, 0x90, 0xd9, 0x91, 0xb9, 0x6c,
0x3f, 0xf7, 0x19, 0xe9, 0xd9, 0x8b, 0x2a, 0x5c, 0x46, 0x92, 0xf1, 0xd5, 0x91, 0xe0, 0x76, 0x55,
0x25, 0x39, 0x15, 0xdd, 0x9f, 0x8a, 0x50, 0x6d, 0xcb, 0x1a, 0x4f, 0xcb, 0x61, 0x05, 0xf2, 0x98,
0xf4, 0x4d, 0x6e, 0xe4, 0x12, 0x79, 0x00, 0x2d, 0xd2, 0x0f, 0xa2, 0x40, 0x59, 0x95, 0x53, 0x8e,
0x2f, 0x7b, 0x71, 0xc7, 0x3b, 0xd8, 0xc5, 0x19, 0x0d, 0xe4, 0x40, 0xf9, 0xde, 0xcb, 0x98, 0x32,
0x59, 0x52, 0x79, 0x45, 0x33, 0x96, 0xd1, 0x53, 0x58, 0x4a, 0xd7, 0x77, 0x85, 0x60, 0xb2, 0x50,
0x65, 0x19, 0xdd, 0x9c, 0x2e, 0xa3, 0xac, 0x51, 0xde, 0x04, 0xe6, 0x5e, 0x24, 0xd8, 0x08, 0x4f,
0xf2, 0x48, 0x0f, 0xdb, 0x84, 0x73, 0x69, 0xa1, 0x4a, 0x3f, 0x4e, 0x45, 0x69, 0xce, 0x17, 0x8c,
0x46, 0x82, 0x44, 0x3d, 0x95, 0xfa, 0x0a, 0x1e, 0xcb, 0xd2, 0x9c, 0x74, 0xad, 0xcd, 0x29, 0x9d,
0xc8, 0x9c, 0x09, 0x8c, 0x31, 0x67, 0x62, 0x0f, 0x6d, 0x42, 0x61, 0xcb, 0xef, 0x3e, 0x27, 0x2a,
0xcb, 0x8b, 0x8d, 0xd5, 0x69, 0x42, 0xf5, 0xf9, 0x4b, 0x95, 0x56, 0xae, 0x1a, 0xf5, 0x1c, 0xd6,
0x10, 0xf4, 0x0d, 0x54, 0xef, 0x45, 0x22, 0x10, 0x21, 0x19, 0xaa, 0x8c, 0x55, 0x64, 0xc6, 0x9a,
0x9b, 0xaf, 0xf7, 0xd7, 0x3e, 0x9a, 0x7b, 0xf0, 0x24, 0x22, 0x08, 0xeb, 0x24, 0x83, 0xf2, 0x32,
0x14, 0x78, 0x82, 0x0f, 0x3d, 0x83, 0xe5, 0xd4, 0xd8, 0xed, 0x28, 0x4e, 0x04, 0xb7, 0x41, 0x79,
0xdd, 0x38, 0xa1, 0xd7, 0x1a, 0xa4, 0xdd, 0x3e, 0xc4, 0xe4, 0xdc, 0x01, 0x34, 0x9d, 0x2b, 0x59,
0x53, 0xbb, 0x64, 0x94, 0xd6, 0xd4, 0x2e, 0x19, 0xc9, 0xb6, 0xde, 0xf3, 0xc3, 0x44, 0xb7, 0x7b,
0x05, 0x6b, 0x61, 0x33, 0x77, 0xdb, 0x92, 0x0c, 0xd3, 0xe1, 0x3d, 0x15, 0xc3, 0x57, 0x70, 0x61,
0x86, 0xa9, 0x33, 0x28, 0xae, 0x66, 0x29, 0xa6, 0x6b, 0xfa, 0x80, 0xd2, 0xfd, 0x25, 0x0f, 0xd5,
0x6c, 0xc2, 0xd0, 0x06, 0x5c, 0xd0, 0x7e, 0x62, 0xd2, 0x6f, 0x91, 0x98, 0x91, 0xae, 0x3c, 0x25,
0x0c, 0xf9, 0xac, 0x4f, 0xa8, 0x01, 0x17, 0xb7, 0x87, 0x66, 0x9b, 0x67, 0x20, 0x39, 0xd5, 0x8f,
0x33, 0xbf, 0x21, 0x0a, 0xef, 0x68, 0x2a, 0x15, 0x89, 0x0c, 0x28, 0xaf, 0x12, 0xf6, 0xf1, 0xd1,
0x55, 0xe5, 0xcd, 0xc4, 0xea, 0xbc, 0xcd, 0xe6, 0x45, 0x9f, 0x41, 0x49, 0x7f, 0x48, 0x1b, 0xf3,
0xca, 0xd1, 0x7f, 0xa1, 0xc9, 0x52, 0x8c, 0x84, 0x6b, 0x3f, 0xb8, 0x5d, 0x38, 0x05, 0xdc, 0x60,
0x9c, 0xfb, 0xe0, 0xcc, 0x37, 0xf9, 0x34, 0x25, 0xe0, 0xfe, 0x6c, 0xc1, 0xf9, 0xa9, 0x3f, 0x92,
0xb7, 0x86, 0x3a, 0x37, 0x35, 0x85, 0x5a, 0xa3, 0x16, 0x14, 0x74, 0xe7, 0xe7, 0x94, 0xc1, 0xde,
0x09, 0x0c, 0xf6, 0x32, 0x6d, 0xaf, 0xc1, 0xce, 0x6d, 0x80, 0xb3, 0x15, 0xab, 0xfb, 0xab, 0x05,
0x4b, 0xa6, 0xcb, 0xcc, 0x15, 0xeb, 0xc3, 0x4a, 0xda, 0x42, 0xe9, 0x9e, 0xb9, 0x6c, 0x6f, 0xcd,
0x6d, 0x50, 0xad, 0xe6, 0x1d, 0xc6, 0x69, 0x1b, 0xa7, 0xe8, 0x9c, 0xad, 0xb4, 0xae, 0x0e, 0xa9,
0x9e, 0xca, 0xf2, 0xcb, 0xb0, 0xd4, 0x16, 0xbe, 0x48, 0xf8, 0xdc, 0x9b, 0xc3, 0xfd, 0xd7, 0x82,
0xe5, 0x54, 0xc7, 0x78, 0xf7, 0x21, 0x94, 0xf7, 0x08, 0x13, 0xe4, 0x25, 0xe1, 0xc6, 0x2b, 0x7b,
0xda, 0xab, 0xaf, 0x95, 0x06, 0x1e, 0x6b, 0xa2, 0x4d, 0x28, 0x73, 0xc5, 0x43, 0xd2, 0x44, 0xad,
0xce, 0x43, 0x99, 0xff, 0x1b, 0xeb, 0xa3, 0x3a, 0x2c, 0x84, 0x74, 0xc0, 0x4d, 0xcf, 0xbc, 0x3b,
0x0f, 0xf7, 0x90, 0x0e, 0xb0, 0x52, 0x44, 0x9f, 0x40, 0xf9, 0x85, 0xcf, 0xa2, 0x20, 0x1a, 0xa4,
0x5d, 0xb0, 0x36, 0x0f, 0xf4, 0x54, 0xeb, 0xe1, 0x31, 0xc0, 0xdd, 0xcf, 0x41, 0x51, 0x7f, 0x43,
0x0f, 0xa0, 0xd8, 0x0b, 0x06, 0x84, 0x0b, 0x1d, 0x92, 0x66, 0x43, 0x1e, 0xf2, 0xaf, 0xf7, 0xd7,
0xae, 0x65, 0x4e, 0x71, 0x1a, 0x93, 0x48, 0x3e, 0x76, 0xfd, 0x20, 0x22, 0x8c, 0xd7, 0x07, 0xf4,
0x86, 0x86, 0x78, 0x2d, 0xf5, 0x83, 0x0d, 0x83, 0xe4, 0x0a, 0xf4, 0x59, 0xad, 0xce, 0x8b, 0xb3,
0x71, 0x69, 0x06, 0xd9, 0x06, 0x91, 0x3f, 0x24, 0xe6, 0x6e, 0x56, 0x6b, 0xf9, 0x70, 0xe8, 0xca,
0x3a, 0xef, 0xa9, 0x27, 0x55, 0x19, 0x1b, 0x09, 0x6d, 0x42, 0x89, 0x0b, 0x9f, 0xc9, 0x33, 0xa7,
0x70, 0xc2, 0x17, 0x4f, 0x0a, 0x40, 0x9f, 0x43, 0xa5, 0x4b, 0x87, 0x71, 0x48, 0x24, 0xba, 0x78,
0x42, 0xf4, 0x01, 0x44, 0x96, 0x1e, 0x61, 0x8c, 0x32, 0xf5, 0xd6, 0xaa, 0x60, 0x2d, 0xb8, 0xff,
0xe4, 0xa0, 0x9a, 0xcd, 0xf4, 0xd4, 0x5b, 0xf2, 0x01, 0x14, 0x75, 0xdd, 0xe8, 0x92, 0x3d, 0x5b,
0xa8, 0x34, 0xc3, 0xcc, 0x50, 0xd9, 0x50, 0xea, 0x26, 0x4c, 0x3d, 0x34, 0xf5, 0xf3, 0x33, 0x15,
0xa5, 0xc1, 0x82, 0x0a, 0x3f, 0x54, 0xa1, 0xca, 0x63, 0x2d, 0xc8, 0xb7, 0xe7, 0x78, 0xdc, 0x38,
0xdd, 0xdb, 0x73, 0x0c, 0xcb, 0xa6, 0xa1, 0xf4, 0x56, 0x69, 0x28, 0x9f, 0x3a, 0x0d, 0xee, 0x6f,
0x16, 0x54, 0xc6, 0x2d, 0x92, 0x89, 0xae, 0xf5, 0xd6, 0xd1, 0x9d, 0x88, 0x4c, 0xee, 0x6c, 0x91,
0xb9, 0x04, 0x45, 0x2e, 0x18, 0xf1, 0x87, 0x7a, 0x32, 0xc2, 0x46, 0x92, 0x87, 0xd1, 0x90, 0x0f,
0x54, 0x86, 0xaa, 0x58, 0x2e, 0xdd, 0xdf, 0x2d, 0x58, 0x9a, 0xe8, 0xda, 0xff, 0xd5, 0x97, 0x8b,
0x50, 0x08, 0xc9, 0x1e, 0xd1, 0xb3, 0x5b, 0x1e, 0x6b, 0x21, 0xb5, 0x22, 0x3f, 0xb6, 0x02, 0xb9,
0xb0, 0x10, 0x44, 0x7d, 0xaa, 0x0c, 0x33, 0x4f, 0x8e, 0x36, 0x4d, 0x58, 0x97, 0x6c, 0x47, 0x7d,
0x8a, 0xd5, 0x37, 0x74, 0x19, 0x8a, 0xcc, 0x8f, 0x06, 0x24, 0xbd, 0x45, 0x2b, 0x52, 0x0b, 0xcb,
0x1d, 0x6c, 0x3e, 0xb8, 0x2e, 0x54, 0xd5, 0x44, 0xb7, 0x43, 0xb8, 0x9c, 0x1f, 0x64, 0xa1, 0xf6,
0x7c, 0xe1, 0x2b, 0x47, 0xaa, 0x58, 0xad, 0xdd, 0xeb, 0x80, 0x1e, 0x06, 0x5c, 0x3c, 0x55, 0x93,
0x28, 0x3f, 0x6e, 0xdc, 0x6b, 0xc3, 0x85, 0x09, 0x6d, 0x73, 0x5e, 0x7f, 0x7a, 0x68, 0xe0, 0xbb,
0x3a, 0x7d, 0x14, 0xaa, 0x81, 0xd7, 0xd3, 0xc0, 0xc9, 0xb9, 0xaf, 0xf1, 0x77, 0x1e, 0x4a, 0x5b,
0x7a, 0x96, 0x47, 0x8f, 0xa1, 0x32, 0x9e, 0x27, 0x91, 0x3b, 0x4d, 0x73, 0x78, 0x30, 0x75, 0xae,
0x1c, 0xa9, 0x63, 0xec, 0xbb, 0x0f, 0x05, 0x35, 0x59, 0xa3, 0x19, 0x17, 0x42, 0x76, 0xe4, 0x76,
0x8e, 0x9e, 0x54, 0x37, 0x2c, 0xc9, 0xa4, 0x6e, 0xd3, 0x59, 0x4c, 0xd9, 0x77, 0xb0, 0xb3, 0x76,
0xcc, 0x35, 0x8c, 0x76, 0xa0, 0x68, 0xce, 0xa6, 0x59, 0xaa, 0xd9, 0x3b, 0xd3, 0x59, 0x9f, 0xaf,
0xa0, 0xc9, 0x36, 0x2c, 0xb4, 0x33, 0x1e, 0x6d, 0x66, 0x99, 0x96, 0x2d, 0x03, 0xe7, 0x98, 0xef,
0x35, 0x6b, 0xc3, 0x42, 0xcf, 0x60, 0x31, 0x93, 0x68, 0x34, 0x23, 0xa1, 0xd3, 0x55, 0xe3, 0xbc,
0x7f, 0x8c, 0x96, 0x36, 0xb6, 0x59, 0x7d, 0xf5, 0x66, 0xd5, 0xfa, 0xe3, 0xcd, 0xaa, 0xf5, 0xd7,
0x9b, 0x55, 0xab, 0x53, 0x54, 0x4d, 0xfc, 0xc1, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x42, 0x5e,
0x7e, 0x04, 0xcf, 0x11, 0x00, 0x00,
// 1514 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0xcb, 0x6e, 0xdb, 0x46,
0x17, 0x0e, 0x25, 0x8b, 0x92, 0x8e, 0x65, 0xc3, 0x99, 0xe4, 0x0f, 0x08, 0xfe, 0xf8, 0x6d, 0x87,
0xc9, 0x0f, 0x18, 0x41, 0x42, 0x39, 0x6e, 0x53, 0xa4, 0xee, 0x05, 0x89, 0xac, 0x14, 0x71, 0x10,
0xa3, 0xe9, 0x28, 0x69, 0x80, 0x2c, 0x0a, 0x50, 0xd2, 0x48, 0x26, 0x4c, 0x71, 0xd8, 0x99, 0xa1,
0x13, 0xf5, 0x01, 0xba, 0xee, 0xae, 0x0f, 0xd0, 0x45, 0x57, 0x5d, 0xf7, 0x09, 0x0a, 0x64, 0xd9,
0x75, 0x16, 0x6e, 0x91, 0x45, 0x77, 0x2d, 0xfa, 0x08, 0xc5, 0x5c, 0x28, 0x53, 0x96, 0xe4, 0x5b,
0xba, 0xd2, 0x9c, 0xe1, 0xf9, 0x3e, 0x9d, 0xeb, 0xcc, 0x1c, 0x58, 0xe8, 0xd0, 0x58, 0x30, 0x1a,
0xf9, 0x09, 0xa3, 0x82, 0xa2, 0xa5, 0x01, 0x6d, 0x0f, 0xfd, 0x76, 0x1a, 0x46, 0xdd, 0xbd, 0x50,
0xf8, 0xfb, 0xb7, 0xdd, 0x5b, 0xfd, 0x50, 0xec, 0xa6, 0x6d, 0xbf, 0x43, 0x07, 0xf5, 0x3e, 0xed,
0xd3, 0xba, 0x52, 0x6c, 0xa7, 0x3d, 0x25, 0x29, 0x41, 0xad, 0x34, 0x81, 0xbb, 0xd2, 0xa7, 0xb4,
0x1f, 0x91, 0x43, 0x2d, 0x11, 0x0e, 0x08, 0x17, 0xc1, 0x20, 0x31, 0x0a, 0x37, 0x73, 0x7c, 0xf2,
0xcf, 0xea, 0xd9, 0x9f, 0xd5, 0x39, 0x8d, 0xf6, 0x09, 0xab, 0x27, 0xed, 0x3a, 0x4d, 0xb8, 0xd1,
0xae, 0xcf, 0xd4, 0x0e, 0x92, 0xb0, 0x2e, 0x86, 0x09, 0xe1, 0xf5, 0x97, 0x94, 0xed, 0x11, 0xa6,
0x01, 0xde, 0xb7, 0x16, 0xd4, 0x9e, 0xb0, 0x34, 0x26, 0x98, 0x7c, 0x9d, 0x12, 0x2e, 0xd0, 0x15,
0xb0, 0x7b, 0x61, 0x24, 0x08, 0x73, 0xac, 0xd5, 0xe2, 0x5a, 0x15, 0x1b, 0x09, 0x2d, 0x41, 0x31,
0x88, 0x22, 0xa7, 0xb0, 0x6a, 0xad, 0x55, 0xb0, 0x5c, 0xa2, 0x35, 0xa8, 0xed, 0x11, 0x92, 0x34,
0x53, 0x16, 0x88, 0x90, 0xc6, 0x4e, 0x71, 0xd5, 0x5a, 0x2b, 0x36, 0xe6, 0x5e, 0x1f, 0xac, 0x58,
0x78, 0xec, 0x0b, 0xf2, 0xa0, 0x2a, 0xe5, 0xc6, 0x50, 0x10, 0xee, 0xcc, 0xe5, 0xd4, 0x0e, 0xb7,
0xbd, 0x1b, 0xb0, 0xd4, 0x0c, 0xf9, 0xde, 0x33, 0x1e, 0xf4, 0x4f, 0xb2, 0xc5, 0x7b, 0x04, 0x17,
0x73, 0xba, 0x3c, 0xa1, 0x31, 0x27, 0xe8, 0x0e, 0xd8, 0x8c, 0x74, 0x28, 0xeb, 0x2a, 0xe5, 0xf9,
0x8d, 0xff, 0xf9, 0x47, 0x73, 0xe3, 0x1b, 0x80, 0x54, 0xc2, 0x46, 0xd9, 0xfb, 0xbe, 0x08, 0xf3,
0xb9, 0x7d, 0xb4, 0x08, 0x85, 0xed, 0xa6, 0x63, 0xad, 0x5a, 0x6b, 0x55, 0x5c, 0xd8, 0x6e, 0x22,
0x07, 0xca, 0x3b, 0xa9, 0x08, 0xda, 0x11, 0x31, 0xbe, 0x67, 0x22, 0xba, 0x0c, 0xa5, 0xed, 0xf8,
0x19, 0x27, 0xca, 0xf1, 0x0a, 0xd6, 0x02, 0x42, 0x30, 0xd7, 0x0a, 0xbf, 0x21, 0xda, 0x4d, 0xac,
0xd6, 0xc8, 0x05, 0xfb, 0x49, 0xc0, 0x48, 0x2c, 0x9c, 0x92, 0xe4, 0x6d, 0x14, 0x1c, 0x0b, 0x9b,
0x1d, 0xd4, 0x80, 0xea, 0x16, 0x23, 0x81, 0x20, 0xdd, 0xfb, 0xc2, 0xb1, 0x57, 0xad, 0xb5, 0xf9,
0x0d, 0xd7, 0xd7, 0x45, 0xe1, 0x67, 0x45, 0xe1, 0x3f, 0xcd, 0x8a, 0xa2, 0x51, 0x79, 0x7d, 0xb0,
0x72, 0xe1, 0xbb, 0xdf, 0x64, 0xec, 0x46, 0x30, 0x74, 0x0f, 0xe0, 0x71, 0xc0, 0xc5, 0x33, 0xae,
0x48, 0xca, 0x27, 0x92, 0xcc, 0x29, 0x82, 0x1c, 0x06, 0x2d, 0x03, 0xa8, 0x20, 0x6c, 0xd1, 0x34,
0x16, 0x4e, 0x45, 0xd9, 0x9e, 0xdb, 0x41, 0xab, 0x30, 0xdf, 0x24, 0xbc, 0xc3, 0xc2, 0x44, 0xa5,
0xba, 0xaa, 0xc2, 0x93, 0xdf, 0x92, 0x0c, 0x3a, 0x82, 0x4f, 0x87, 0x09, 0x71, 0x40, 0x29, 0xe4,
0x76, 0x64, 0x2e, 0x5b, 0xbb, 0x01, 0x23, 0x5d, 0x67, 0x5e, 0x85, 0xcb, 0x48, 0x32, 0xbe, 0x3a,
0x12, 0xdc, 0xa9, 0xa9, 0x24, 0x67, 0xa2, 0xf7, 0x83, 0x0d, 0xb5, 0x96, 0xac, 0xf1, 0xac, 0x1c,
0x96, 0xa0, 0x88, 0x49, 0xcf, 0xe4, 0x46, 0x2e, 0x91, 0x0f, 0xd0, 0x24, 0xbd, 0x30, 0x0e, 0x95,
0x55, 0x05, 0xe5, 0xf8, 0xa2, 0x9f, 0xb4, 0xfd, 0xc3, 0x5d, 0x9c, 0xd3, 0x40, 0x2e, 0x54, 0x1e,
0xbc, 0x4a, 0x28, 0x93, 0x25, 0x55, 0x54, 0x34, 0x23, 0x19, 0x3d, 0x87, 0x85, 0x6c, 0x7d, 0x5f,
0x08, 0x26, 0x0b, 0x55, 0x96, 0xd1, 0xed, 0xc9, 0x32, 0xca, 0x1b, 0xe5, 0x8f, 0x61, 0x1e, 0xc4,
0x82, 0x0d, 0xf1, 0x38, 0x8f, 0xf4, 0xb0, 0x45, 0x38, 0x97, 0x16, 0xaa, 0xf4, 0xe3, 0x4c, 0x94,
0xe6, 0x7c, 0xc6, 0x68, 0x2c, 0x48, 0xdc, 0x55, 0xa9, 0xaf, 0xe2, 0x91, 0x2c, 0xcd, 0xc9, 0xd6,
0xda, 0x9c, 0xf2, 0xa9, 0xcc, 0x19, 0xc3, 0x18, 0x73, 0xc6, 0xf6, 0xd0, 0x26, 0x94, 0xb6, 0x82,
0xce, 0x2e, 0x51, 0x59, 0x9e, 0xdf, 0x58, 0x9e, 0x24, 0x54, 0x9f, 0x3f, 0x57, 0x69, 0xe5, 0xaa,
0x51, 0x2f, 0x60, 0x0d, 0x41, 0x5f, 0x41, 0xed, 0x41, 0x2c, 0x42, 0x11, 0x91, 0x81, 0xca, 0x58,
0x55, 0x66, 0xac, 0xb1, 0xf9, 0xe6, 0x60, 0xe5, 0x83, 0x99, 0x07, 0x4f, 0x2a, 0xc2, 0xa8, 0x4e,
0x72, 0x28, 0x3f, 0x47, 0x81, 0xc7, 0xf8, 0xd0, 0x0b, 0x58, 0xcc, 0x8c, 0xdd, 0x8e, 0x93, 0x54,
0x70, 0x07, 0x94, 0xd7, 0x1b, 0xa7, 0xf4, 0x5a, 0x83, 0xb4, 0xdb, 0x47, 0x98, 0xdc, 0x7b, 0x80,
0x26, 0x73, 0x25, 0x6b, 0x6a, 0x8f, 0x0c, 0xb3, 0x9a, 0xda, 0x23, 0x43, 0xd9, 0xd6, 0xfb, 0x41,
0x94, 0xea, 0x76, 0xaf, 0x62, 0x2d, 0x6c, 0x16, 0xee, 0x5a, 0x92, 0x61, 0x32, 0xbc, 0x67, 0x62,
0xf8, 0x02, 0x2e, 0x4d, 0x31, 0x75, 0x0a, 0xc5, 0xf5, 0x3c, 0xc5, 0x64, 0x4d, 0x1f, 0x52, 0x7a,
0x3f, 0x15, 0xa1, 0x96, 0x4f, 0x18, 0x5a, 0x87, 0x4b, 0xda, 0x4f, 0x4c, 0x7a, 0x4d, 0x92, 0x30,
0xd2, 0x91, 0xa7, 0x84, 0x21, 0x9f, 0xf6, 0x09, 0x6d, 0xc0, 0xe5, 0xed, 0x81, 0xd9, 0xe6, 0x39,
0x48, 0x41, 0xf5, 0xe3, 0xd4, 0x6f, 0x88, 0xc2, 0x7f, 0x34, 0x95, 0x8a, 0x44, 0x0e, 0x54, 0x54,
0x09, 0xfb, 0xf0, 0xf8, 0xaa, 0xf2, 0xa7, 0x62, 0x75, 0xde, 0xa6, 0xf3, 0xa2, 0x4f, 0xa0, 0xac,
0x3f, 0x64, 0x8d, 0x79, 0xed, 0xf8, 0xbf, 0xd0, 0x64, 0x19, 0x46, 0xc2, 0xb5, 0x1f, 0xdc, 0x29,
0x9d, 0x01, 0x6e, 0x30, 0xee, 0x43, 0x70, 0x67, 0x9b, 0x7c, 0x96, 0x12, 0xf0, 0x7e, 0xb4, 0xe0,
0xe2, 0xc4, 0x1f, 0xc9, 0x5b, 0x43, 0x9d, 0x9b, 0x9a, 0x42, 0xad, 0x51, 0x13, 0x4a, 0xba, 0xf3,
0x0b, 0xca, 0x60, 0xff, 0x14, 0x06, 0xfb, 0xb9, 0xb6, 0xd7, 0x60, 0xf7, 0x2e, 0xc0, 0xf9, 0x8a,
0xd5, 0xfb, 0xd9, 0x82, 0x05, 0xd3, 0x65, 0xe6, 0x8a, 0x0d, 0x60, 0x29, 0x6b, 0xa1, 0x6c, 0xcf,
0x5c, 0xb6, 0x77, 0x66, 0x36, 0xa8, 0x56, 0xf3, 0x8f, 0xe2, 0xb4, 0x8d, 0x13, 0x74, 0xee, 0x56,
0x56, 0x57, 0x47, 0x54, 0xcf, 0x64, 0xf9, 0x55, 0x58, 0x68, 0x89, 0x40, 0xa4, 0x7c, 0xe6, 0xcd,
0xe1, 0xfd, 0x6d, 0xc1, 0x62, 0xa6, 0x63, 0xbc, 0x7b, 0x1f, 0x2a, 0xfb, 0x84, 0x09, 0xf2, 0x8a,
0x70, 0xe3, 0x95, 0x33, 0xe9, 0xd5, 0x97, 0x4a, 0x03, 0x8f, 0x34, 0xd1, 0x26, 0x54, 0xb8, 0xe2,
0x21, 0x59, 0xa2, 0x96, 0x67, 0xa1, 0xcc, 0xff, 0x8d, 0xf4, 0x51, 0x1d, 0xe6, 0x22, 0xda, 0xe7,
0xa6, 0x67, 0xfe, 0x3b, 0x0b, 0xf7, 0x98, 0xf6, 0xb1, 0x52, 0x44, 0x1f, 0x41, 0xe5, 0x65, 0xc0,
0xe2, 0x30, 0xee, 0x67, 0x5d, 0xb0, 0x32, 0x0b, 0xf4, 0x5c, 0xeb, 0xe1, 0x11, 0xc0, 0x3b, 0x28,
0x80, 0xad, 0xbf, 0xa1, 0x47, 0x60, 0x77, 0xc3, 0x3e, 0xe1, 0x42, 0x87, 0xa4, 0xb1, 0x21, 0x0f,
0xf9, 0x37, 0x07, 0x2b, 0x37, 0x72, 0xa7, 0x38, 0x4d, 0x48, 0x2c, 0x1f, 0xbb, 0x41, 0x18, 0x13,
0xc6, 0xeb, 0x7d, 0x7a, 0x4b, 0x43, 0xfc, 0xa6, 0xfa, 0xc1, 0x86, 0x41, 0x72, 0x85, 0xfa, 0xac,
0x56, 0xe7, 0xc5, 0xf9, 0xb8, 0x34, 0x83, 0x6c, 0x83, 0x38, 0x18, 0x10, 0x73, 0x37, 0xab, 0xb5,
0x7c, 0x38, 0x74, 0x64, 0x9d, 0x77, 0xd5, 0x93, 0xaa, 0x82, 0x8d, 0x84, 0x36, 0xa1, 0xcc, 0x45,
0xc0, 0xe4, 0x99, 0x53, 0x3a, 0xe5, 0x8b, 0x27, 0x03, 0xa0, 0x4f, 0xa1, 0xda, 0xa1, 0x83, 0x24,
0x22, 0x12, 0x6d, 0x9f, 0x12, 0x7d, 0x08, 0x91, 0xa5, 0x47, 0x18, 0xa3, 0x4c, 0xbd, 0xb5, 0xaa,
0x58, 0x0b, 0xde, 0x5f, 0x05, 0xa8, 0xe5, 0x33, 0x3d, 0xf1, 0x96, 0x7c, 0x04, 0xb6, 0xae, 0x1b,
0x5d, 0xb2, 0xe7, 0x0b, 0x95, 0x66, 0x98, 0x1a, 0x2a, 0x07, 0xca, 0x9d, 0x94, 0xa9, 0x87, 0xa6,
0x7e, 0x7e, 0x66, 0xa2, 0x34, 0x58, 0x50, 0x11, 0x44, 0x2a, 0x54, 0x45, 0xac, 0x05, 0xf9, 0xf6,
0x1c, 0x8d, 0x1b, 0x67, 0x7b, 0x7b, 0x8e, 0x60, 0xf9, 0x34, 0x94, 0xdf, 0x29, 0x0d, 0x95, 0x33,
0xa7, 0xc1, 0xfb, 0xc5, 0x82, 0xea, 0xa8, 0x45, 0x72, 0xd1, 0xb5, 0xde, 0x39, 0xba, 0x63, 0x91,
0x29, 0x9c, 0x2f, 0x32, 0x57, 0xc0, 0xe6, 0x82, 0x91, 0x60, 0xa0, 0x27, 0x23, 0x6c, 0x24, 0x79,
0x18, 0x0d, 0x78, 0x5f, 0x65, 0xa8, 0x86, 0xe5, 0xd2, 0xfb, 0xc3, 0x82, 0x85, 0xb1, 0xae, 0xfd,
0x57, 0x7d, 0xb9, 0x0c, 0xa5, 0x88, 0xec, 0x13, 0x3d, 0xbb, 0x15, 0xb1, 0x16, 0xe4, 0x2e, 0xdf,
0xa5, 0x4c, 0x28, 0xe3, 0x6a, 0x58, 0x0b, 0xd2, 0xe6, 0x2e, 0x11, 0x41, 0x18, 0x19, 0xf3, 0x8c,
0x84, 0x3c, 0x98, 0x0b, 0xe3, 0x1e, 0x35, 0x9d, 0xa6, 0x9e, 0x23, 0x2d, 0x9a, 0xb2, 0x0e, 0xd9,
0x8e, 0x7b, 0x14, 0xab, 0x6f, 0xe8, 0x2a, 0xd8, 0x2c, 0x88, 0xfb, 0x84, 0x3b, 0xb6, 0x3a, 0x9a,
0xaa, 0x52, 0x0b, 0xcb, 0x1d, 0x6c, 0x3e, 0x78, 0x1e, 0xd4, 0xd4, 0xb4, 0xb7, 0x43, 0xb8, 0x9c,
0x2d, 0x64, 0x11, 0x77, 0x03, 0x11, 0x28, 0x27, 0x6b, 0x58, 0xad, 0xbd, 0x9b, 0x80, 0x1e, 0x87,
0x5c, 0x3c, 0x57, 0x53, 0x2a, 0x3f, 0x69, 0x14, 0x6c, 0xc1, 0xa5, 0x31, 0x6d, 0x73, 0x96, 0x7f,
0x7c, 0x64, 0x18, 0xbc, 0x3e, 0x79, 0x4c, 0xaa, 0x61, 0xd8, 0xd7, 0xc0, 0xf1, 0x99, 0x70, 0xe3,
0xcf, 0x22, 0x94, 0xb7, 0xf4, 0x9c, 0x8f, 0x9e, 0x42, 0x75, 0x34, 0x6b, 0x22, 0x6f, 0x92, 0xe6,
0xe8, 0xd0, 0xea, 0x5e, 0x3b, 0x56, 0xc7, 0xd8, 0xf7, 0x10, 0x4a, 0x6a, 0xea, 0x46, 0x53, 0x2e,
0x8b, 0xfc, 0x38, 0xee, 0x1e, 0x3f, 0xc5, 0xae, 0x5b, 0x92, 0x49, 0xdd, 0xb4, 0xd3, 0x98, 0xf2,
0x6f, 0x64, 0x77, 0xe5, 0x84, 0x2b, 0x1a, 0xed, 0x80, 0x6d, 0xce, 0xad, 0x69, 0xaa, 0xf9, 0xfb,
0xd4, 0x5d, 0x9d, 0xad, 0xa0, 0xc9, 0xd6, 0x2d, 0xb4, 0x33, 0x1a, 0x7b, 0xa6, 0x99, 0x96, 0x2f,
0x03, 0xf7, 0x84, 0xef, 0x6b, 0xd6, 0xba, 0x85, 0x5e, 0xc0, 0x7c, 0x2e, 0xd1, 0x68, 0x4a, 0x42,
0x27, 0xab, 0xc6, 0xfd, 0xff, 0x09, 0x5a, 0xda, 0xd8, 0x46, 0xed, 0xf5, 0xdb, 0x65, 0xeb, 0xd7,
0xb7, 0xcb, 0xd6, 0xef, 0x6f, 0x97, 0xad, 0xb6, 0xad, 0x1a, 0xfc, 0xbd, 0x7f, 0x02, 0x00, 0x00,
0xff, 0xff, 0x7c, 0xcd, 0xb2, 0x7e, 0xeb, 0x11, 0x00, 0x00,
}
// Reference imports to suppress errors if they are not otherwise used.
@ -2662,7 +2671,7 @@ func (m *VertexWarning) MarshalToSizedBuffer(dAtA []byte) (int, error) {
i = encodeVarintControl(dAtA, i, uint64(size))
}
i--
dAtA[i] = 0x2a
dAtA[i] = 0x32
}
}
if m.Info != nil {
@ -2675,12 +2684,19 @@ func (m *VertexWarning) MarshalToSizedBuffer(dAtA []byte) (int, error) {
i = encodeVarintControl(dAtA, i, uint64(size))
}
i--
dAtA[i] = 0x2a
}
if len(m.Detail) > 0 {
i -= len(m.Detail)
copy(dAtA[i:], m.Detail)
i = encodeVarintControl(dAtA, i, uint64(len(m.Detail)))
i--
dAtA[i] = 0x22
}
if len(m.Msg) > 0 {
i -= len(m.Msg)
copy(dAtA[i:], m.Msg)
i = encodeVarintControl(dAtA, i, uint64(len(m.Msg)))
if len(m.Short) > 0 {
i -= len(m.Short)
copy(dAtA[i:], m.Short)
i = encodeVarintControl(dAtA, i, uint64(len(m.Short)))
i--
dAtA[i] = 0x1a
}
@ -3265,7 +3281,11 @@ func (m *VertexWarning) Size() (n int) {
if m.Level != 0 {
n += 1 + sovControl(uint64(m.Level))
}
l = len(m.Msg)
l = len(m.Short)
if l > 0 {
n += 1 + l + sovControl(uint64(l))
}
l = len(m.Detail)
if l > 0 {
n += 1 + l + sovControl(uint64(l))
}
@ -6473,7 +6493,7 @@ func (m *VertexWarning) Unmarshal(dAtA []byte) error {
}
case 3:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field Msg", wireType)
return fmt.Errorf("proto: wrong wireType = %d for field Short", wireType)
}
var byteLen int
for shift := uint(0); ; shift += 7 {
@ -6500,12 +6520,46 @@ func (m *VertexWarning) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
m.Msg = append(m.Msg[:0], dAtA[iNdEx:postIndex]...)
if m.Msg == nil {
m.Msg = []byte{}
m.Short = append(m.Short[:0], dAtA[iNdEx:postIndex]...)
if m.Short == nil {
m.Short = []byte{}
}
iNdEx = postIndex
case 4:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field Detail", wireType)
}
var byteLen int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowControl
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
}
b := dAtA[iNdEx]
iNdEx++
byteLen |= int(b&0x7F) << shift
if b < 0x80 {
break
}
}
if byteLen < 0 {
return ErrInvalidLengthControl
}
postIndex := iNdEx + byteLen
if postIndex < 0 {
return ErrInvalidLengthControl
}
if postIndex > l {
return io.ErrUnexpectedEOF
}
m.Detail = append(m.Detail[:0], dAtA[iNdEx:postIndex]...)
if m.Detail == nil {
m.Detail = []byte{}
}
iNdEx = postIndex
case 5:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field Info", wireType)
}
@ -6541,7 +6595,7 @@ func (m *VertexWarning) Unmarshal(dAtA []byte) error {
return err
}
iNdEx = postIndex
case 5:
case 6:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field Ranges", wireType)
}

7
api/services/control/control.proto
View File

@ -138,9 +138,10 @@ message VertexLog {
message VertexWarning {
string vertex = 1 [(gogoproto.customtype) = "github.com/opencontainers/go-digest.Digest", (gogoproto.nullable) = false];
int64 level = 2;
bytes msg = 3;
pb.SourceInfo info = 4;
repeated pb.Range ranges = 5;
bytes short = 3;
bytes detail = 4;
pb.SourceInfo info = 5;
repeated pb.Range ranges = 6;
}
message BytesMessage {

4
client/build_test.go
View File

@ -193,6 +193,7 @@ func testWarnings(t *testing.T, sb integration.Sandbox) {
Range: []*pb.Range{
{Start: pb.Position{Line: 2}, End: pb.Position{Line: 4}},
},
Detail: []byte("this is detail"),
}))
return r, nil
@ -239,7 +240,8 @@ func testWarnings(t *testing.T, sb integration.Sandbox) {
w := warnings[0]
require.Equal(t, "this is warning", string(w.Message))
require.Equal(t, "this is warning", string(w.Short))
require.Equal(t, "this is detail", string(w.Detail))
require.Equal(t, 3, w.Level)
_, ok := vertexes[w.Vertex]
require.True(t, ok)

3
client/graph.go
View File

@ -38,7 +38,8 @@ type VertexLog struct {
type VertexWarning struct {
Vertex digest.Digest
Level int
Message []byte
Short []byte
Detail []byte
SourceInfo *pb.SourceInfo
Range []*pb.Range
}

3
client/solve.go
View File

@ -296,7 +296,8 @@ func (c *Client) solve(ctx context.Context, def *llb.Definition, runGateway runG
s.Warnings = append(s.Warnings, &VertexWarning{
Vertex: v.Vertex,
Level: int(v.Level),
Message: v.Msg,
Short: v.Short,
Detail: v.Detail,
SourceInfo: v.Info,
Range: v.Ranges,
})

3
control/control.go
View File

@ -380,7 +380,8 @@ func (c *Controller) Status(req *controlapi.StatusRequest, stream controlapi.Con
sr.Warnings = append(sr.Warnings, &controlapi.VertexWarning{
Vertex: v.Vertex,
Level: int64(v.Level),
Msg: v.Message,
Short: v.Short,
Detail: v.Detail,
Info: v.SourceInfo,
Ranges: v.Range,
})

8
frontend/dockerfile/builder/build.go
View File

@ -455,11 +455,11 @@ func Build(ctx context.Context, c client.Client) (*client.Result, error) {
LLBCaps: &caps,
SourceMap: sourceMap,
Hostname: opts[keyHostname],
Warn: func(msg string, location *parser.Range) {
Warn: func(msg, detail string, location *parser.Range) {
if i != 0 {
return
}
c.Warn(ctx, defVtx, msg, warnOpts(sourceMap, location))
c.Warn(ctx, defVtx, msg, warnOpts(sourceMap, location, detail))
},
})
@ -779,8 +779,8 @@ func scopeToSubDir(c *llb.State, fileop bool, dir string) *llb.State {
return &bc
}
func warnOpts(sm *llb.SourceMap, r *parser.Range) client.WarnOpts {
opts := client.WarnOpts{Level: 1}
func warnOpts(sm *llb.SourceMap, r *parser.Range, detail string) client.WarnOpts {
opts := client.WarnOpts{Level: 1, Detail: []byte(detail)}
if r == nil {
return opts
}

4
frontend/dockerfile/dockerfile2llb/convert.go
View File

@ -68,7 +68,7 @@ type ConvertOpt struct {
ContextLocalName string
SourceMap *llb.SourceMap
Hostname string
Warn func(msg string, location *parser.Range)
Warn func(short, detail string, location *parser.Range)
}
func Dockerfile2LLB(ctx context.Context, dt []byte, opt ConvertOpt) (*llb.State, *Image, error) {
@ -93,7 +93,7 @@ func Dockerfile2LLB(ctx context.Context, dt []byte, opt ConvertOpt) (*llb.State,
}
for _, w := range dockerfile.Warnings {
opt.Warn(w.Message, w.Location)
opt.Warn(w.Short, w.Detail, w.Location)
}
proxyEnv := proxyEnvFromBuildArgs(opt.BuildArgs)

8
frontend/dockerfile/parser/parser.go
View File

@ -273,7 +273,8 @@ type Result struct {
}
type Warning struct {
Message string
Short string
Detail string
Location *Range
}
@ -283,7 +284,7 @@ func (r *Result) PrintWarnings(out io.Writer) {
return
}
for _, w := range r.Warnings {
fmt.Fprintf(out, "[WARNING]: %s\n", w.Message)
fmt.Fprintf(out, "[WARNING]: %s\n", w.Short)
}
if len(r.Warnings) > 0 {
fmt.Fprintf(out, "[WARNING]: Empty continuation lines will become errors in a future release.\n")
@ -352,7 +353,8 @@ func Parse(rwc io.Reader) (*Result, error) {
if hasEmptyContinuationLine {
warnings = append(warnings, Warning{
Message: "Empty continuation line found in: " + line,
Short: "Empty continuation line found in: " + line,
Detail: "Empty continuation lines will become errors in a future release. https://github.com/moby/moby/pull/33719",
Location: &Range{Start: Position{Line: currentLine}, End: Position{Line: currentLine}},
})
}

10
frontend/dockerfile/parser/parser_test.go
View File

@ -162,11 +162,11 @@ RUN indented \
result, err := Parse(dockerfile)
require.NoError(t, err)
warnings := result.Warnings
require.Equal(t, 3, len(warnings))
require.Contains(t, warnings[0], "Empty continuation line found in")
require.Contains(t, warnings[0], "RUN something following more")
require.Contains(t, warnings[1], "RUN another thing")
require.Contains(t, warnings[2], "will become errors in a future release")
require.Equal(t, 2, len(warnings))
require.Contains(t, warnings[0].Short, "Empty continuation line found in")
require.Contains(t, warnings[0].Short, "RUN something following more")
require.Contains(t, warnings[1].Short, "RUN another thing")
require.Contains(t, warnings[0].Detail, "will become errors in a future release")
}
func TestParseReturnsScannerErrors(t *testing.T) {

1
frontend/gateway/client/client.go
View File

@ -139,4 +139,5 @@ type WarnOpts struct {
Level int
SourceInfo *pb.SourceInfo
Range []*pb.Range
Detail []byte
}

3
frontend/gateway/gateway.go
View File

@ -994,10 +994,11 @@ func (lbf *llbBridgeForwarder) ReleaseContainer(ctx context.Context, in *pb.Rele
}
func (lbf *llbBridgeForwarder) Warn(ctx context.Context, in *pb.WarnRequest) (*pb.WarnResponse, error) {
err := lbf.llbBridge.Warn(ctx, in.Digest, string(in.Message), frontend.WarnOpts{
err := lbf.llbBridge.Warn(ctx, in.Digest, string(in.Short), frontend.WarnOpts{
Level: int(in.Level),
SourceInfo: in.Info,
Range: in.Ranges,
Detail: in.Detail,
})
if err != nil {
return nil, err

11
frontend/gateway/grpcclient/client.go
View File

@ -300,11 +300,12 @@ func (c *grpcClient) requestForRef(ref client.Reference) (*pb.SolveRequest, erro
func (c *grpcClient) Warn(ctx context.Context, dgst digest.Digest, msg string, opts client.WarnOpts) error {
_, err := c.client.Warn(ctx, &pb.WarnRequest{
Digest: dgst,
Level: int64(opts.Level),
Message: []byte(msg),
Info: opts.SourceInfo,
Ranges: opts.Range,
Digest: dgst,
Level: int64(opts.Level),
Short: []byte(msg),
Info: opts.SourceInfo,
Ranges: opts.Range,
Detail: opts.Detail,
})
return err
}

338
frontend/gateway/pb/gateway.pb.go
View File

@ -1333,9 +1333,10 @@ func (m *PongResponse) GetWorkers() []*types1.WorkerRecord {
type WarnRequest struct {
Digest github_com_opencontainers_go_digest.Digest `protobuf:"bytes,1,opt,name=Digest,proto3,customtype=github.com/opencontainers/go-digest.Digest" json:"Digest"`
Level int64 `protobuf:"varint,2,opt,name=Level,proto3" json:"Level,omitempty"`
Message []byte `protobuf:"bytes,3,opt,name=Message,proto3" json:"Message,omitempty"`
Info *pb.SourceInfo `protobuf:"bytes,4,opt,name=info,proto3" json:"info,omitempty"`
Ranges []*pb.Range `protobuf:"bytes,5,rep,name=ranges,proto3" json:"ranges,omitempty"`
Short []byte `protobuf:"bytes,3,opt,name=Short,proto3" json:"Short,omitempty"`
Detail []byte `protobuf:"bytes,4,opt,name=Detail,proto3" json:"Detail,omitempty"`
Info *pb.SourceInfo `protobuf:"bytes,5,opt,name=info,proto3" json:"info,omitempty"`
Ranges []*pb.Range `protobuf:"bytes,6,rep,name=ranges,proto3" json:"ranges,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
@ -1381,9 +1382,16 @@ func (m *WarnRequest) GetLevel() int64 {
return 0
}
func (m *WarnRequest) GetMessage() []byte {
func (m *WarnRequest) GetShort() []byte {
if m != nil {
return m.Message
return m.Short
}
return nil
}
func (m *WarnRequest) GetDetail() []byte {
if m != nil {
return m.Detail
}
return nil
}
@ -2180,134 +2188,135 @@ func init() {
func init() { proto.RegisterFile("gateway.proto", fileDescriptor_f1a937782ebbded5) }
var fileDescriptor_f1a937782ebbded5 = []byte{
// 2021 bytes of a gzipped FileDescriptorProto
// 2033 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x58, 0x4f, 0x6f, 0x1b, 0xc7,
0x15, 0xd7, 0x8a, 0xa4, 0x48, 0x3e, 0xfe, 0xb1, 0x32, 0x76, 0xd3, 0xf5, 0x22, 0x70, 0x94, 0x45,
0xaa, 0xd2, 0x8e, 0xb2, 0x4c, 0xe5, 0x04, 0x72, 0xe5, 0x20, 0xa9, 0xf5, 0x0f, 0x52, 0x23, 0xc9,
0xea, 0x28, 0x85, 0x81, 0x20, 0x05, 0xba, 0xe2, 0x0e, 0xe9, 0x85, 0xa9, 0x9d, 0xed, 0xec, 0xd0,
0x15, 0xd7, 0x8a, 0x94, 0x48, 0x3e, 0xfe, 0xb1, 0x32, 0x76, 0x53, 0x7a, 0x11, 0x38, 0xca, 0x22,
0x55, 0x69, 0x47, 0x59, 0xa6, 0x72, 0x02, 0xb9, 0x72, 0x90, 0xd4, 0xfa, 0x07, 0xa9, 0x91, 0x64,
0x75, 0x94, 0xc2, 0x40, 0x90, 0x02, 0x5d, 0x71, 0x87, 0xf4, 0xc2, 0xab, 0x9d, 0xed, 0xec, 0xd0,
0xb2, 0x92, 0x4b, 0x7b, 0xeb, 0xb1, 0x40, 0x81, 0x5e, 0x0b, 0xf4, 0x13, 0xf4, 0xd2, 0x6b, 0xcf,
0x39, 0xe6, 0x58, 0xf4, 0x60, 0x14, 0xfe, 0x0c, 0xfd, 0x00, 0xc5, 0x9b, 0x99, 0x25, 0x97, 0x14,
0xb5, 0x14, 0xd1, 0x9c, 0xb8, 0xf3, 0xe6, 0xfd, 0xde, 0xbc, 0x7f, 0xf3, 0xde, 0x1b, 0x42, 0xa3,
0xe7, 0x4b, 0x76, 0xe1, 0x5f, 0x7a, 0xb1, 0xe0, 0x92, 0x93, 0xbb, 0xe7, 0xfc, 0xec, 0xd2, 0x3b,
0x1b, 0x84, 0xfd, 0xe0, 0x45, 0x28, 0xbd, 0x97, 0x3f, 0xf3, 0xba, 0x82, 0x47, 0x92, 0x45, 0x81,
0xf3, 0x61, 0x2f, 0x94, 0xcf, 0x07, 0x67, 0x5e, 0x87, 0x9f, 0xb7, 0x7b, 0xbc, 0xc7, 0xdb, 0x0a,
0x71, 0x36, 0xe8, 0xaa, 0x95, 0x5a, 0xa8, 0x2f, 0x2d, 0xc9, 0x59, 0x9f, 0x64, 0xef, 0x71, 0xde,
0xeb, 0x33, 0x3f, 0x0e, 0x13, 0xf3, 0xd9, 0x16, 0x71, 0xa7, 0x9d, 0x48, 0x5f, 0x0e, 0x12, 0x83,
0x59, 0xcb, 0x60, 0x50, 0x91, 0x76, 0xaa, 0x48, 0x3b, 0xe1, 0xfd, 0x97, 0x4c, 0xb4, 0xe3, 0xb3,
0x36, 0x8f, 0x53, 0xee, 0xf6, 0xb5, 0xdc, 0x7e, 0x1c, 0xb6, 0xe5, 0x65, 0xcc, 0x92, 0xf6, 0x05,
0x17, 0x2f, 0x98, 0x30, 0x80, 0x87, 0xd7, 0x02, 0x06, 0x32, 0xec, 0x23, 0xaa, 0xe3, 0xc7, 0x09,
0x1e, 0x82, 0xbf, 0x06, 0x94, 0x35, 0x5b, 0xf2, 0x28, 0x4c, 0x64, 0x18, 0xf6, 0xc2, 0x76, 0x37,
0x51, 0x18, 0x7d, 0x0a, 0x1a, 0xa1, 0xd9, 0xdd, 0x3f, 0x16, 0x60, 0x89, 0xb2, 0x64, 0xd0, 0x97,
0x64, 0x15, 0x1a, 0x82, 0x75, 0x77, 0x58, 0x2c, 0x58, 0xc7, 0x97, 0x2c, 0xb0, 0xad, 0x15, 0xab,
0x55, 0xdd, 0x5f, 0xa0, 0xe3, 0x64, 0xf2, 0x6b, 0x68, 0x0a, 0xd6, 0x4d, 0x32, 0x8c, 0x8b, 0x2b,
0x56, 0xab, 0xb6, 0xfe, 0x81, 0x77, 0x6d, 0x30, 0x3c, 0xca, 0xba, 0x47, 0x7e, 0x3c, 0x82, 0xec,
0x2f, 0xd0, 0x09, 0x21, 0x64, 0x1d, 0x0a, 0x82, 0x75, 0xed, 0x82, 0x92, 0x75, 0x2f, 0x5f, 0xd6,
0xfe, 0x02, 0x45, 0x66, 0xb2, 0x01, 0x45, 0x94, 0x62, 0x17, 0x15, 0xe8, 0xbd, 0x99, 0x0a, 0xec,
0x2f, 0x50, 0x05, 0x20, 0x5f, 0x40, 0xe5, 0x9c, 0x49, 0x3f, 0xf0, 0xa5, 0x6f, 0xc3, 0x4a, 0xa1,
0x55, 0x5b, 0x6f, 0xe7, 0x82, 0xd1, 0x41, 0xde, 0x91, 0x41, 0xec, 0x46, 0x52, 0x5c, 0xd2, 0xa1,
0x00, 0xe7, 0x31, 0x34, 0xc6, 0xb6, 0xc8, 0x32, 0x14, 0x5e, 0xb0, 0x4b, 0xed, 0x3f, 0x8a, 0x9f,
0xe4, 0x0e, 0x94, 0x5e, 0xfa, 0xfd, 0x01, 0x53, 0xae, 0xaa, 0x53, 0xbd, 0xd8, 0x5c, 0x7c, 0x64,
0x6d, 0x55, 0x60, 0x49, 0x28, 0xf1, 0xee, 0x5f, 0x2c, 0x58, 0x9e, 0xf4, 0x13, 0x39, 0x30, 0x16,
0x5a, 0x4a, 0xc9, 0x4f, 0xe6, 0x70, 0x31, 0x12, 0x12, 0xad, 0xaa, 0x12, 0xe1, 0x6c, 0x40, 0x75,
0x48, 0x9a, 0xa5, 0x62, 0x35, 0xa3, 0xa2, 0xbb, 0x01, 0x05, 0xca, 0xba, 0xa4, 0x09, 0x8b, 0xa1,
0x49, 0x0a, 0xba, 0x18, 0x06, 0x64, 0x05, 0x0a, 0x01, 0xeb, 0x9a, 0xe0, 0x37, 0xbd, 0xf8, 0xcc,
0xdb, 0x61, 0xdd, 0x30, 0x0a, 0x65, 0xc8, 0x23, 0x8a, 0x5b, 0xee, 0xdf, 0x2c, 0x4c, 0x2e, 0x54,
0x8b, 0x7c, 0x3e, 0x66, 0xc7, 0xec, 0x54, 0xb9, 0xa2, 0xfd, 0xb3, 0x7c, 0xed, 0x3f, 0xce, 0x6a,
0x3f, 0x33, 0x7f, 0xb2, 0xd6, 0x49, 0x68, 0x50, 0x26, 0x07, 0x22, 0xa2, 0xec, 0x77, 0x03, 0x96,
0x48, 0xf2, 0xf3, 0x34, 0x22, 0x4a, 0xfe, 0xac, 0xb4, 0x42, 0x46, 0x6a, 0x00, 0xa4, 0x05, 0x25,
0x26, 0x04, 0x17, 0x46, 0x0b, 0xe2, 0xe9, 0xca, 0xe1, 0x89, 0xb8, 0xe3, 0x9d, 0xaa, 0xca, 0x41,
0x35, 0x83, 0xbb, 0x0c, 0xcd, 0xf4, 0xd4, 0x24, 0xe6, 0x51, 0xc2, 0xdc, 0x5b, 0xd0, 0x38, 0x88,
0xe2, 0x81, 0x4c, 0x8c, 0x1e, 0xee, 0x3f, 0x2d, 0x68, 0xa6, 0x14, 0xcd, 0x43, 0xbe, 0x86, 0xda,
0xc8, 0xc7, 0xa9, 0x33, 0x37, 0x73, 0xf4, 0x1b, 0xc7, 0x67, 0x02, 0x64, 0x7c, 0x9b, 0x15, 0xe7,
0x1c, 0xc3, 0xf2, 0x24, 0xc3, 0x14, 0x4f, 0xbf, 0x3f, 0xee, 0xe9, 0xc9, 0xc0, 0x67, 0x3c, 0xfb,
0x67, 0x0b, 0xee, 0x52, 0xa6, 0x4a, 0xe1, 0xc1, 0xb9, 0xdf, 0x63, 0xdb, 0x3c, 0xea, 0x86, 0xbd,
0xd4, 0xcd, 0xcb, 0x2a, 0xab, 0x52, 0xc9, 0x98, 0x60, 0x2d, 0xa8, 0x9c, 0xf4, 0x7d, 0xd9, 0xe5,
0xe2, 0xdc, 0x08, 0xaf, 0xa3, 0xf0, 0x94, 0x46, 0x87, 0xbb, 0x64, 0x05, 0x6a, 0x46, 0xf0, 0x11,
0x0f, 0x98, 0xaa, 0x19, 0x55, 0x9a, 0x25, 0x11, 0x1b, 0xca, 0x87, 0xbc, 0x77, 0xec, 0x9f, 0x33,
0x55, 0x1c, 0xaa, 0x34, 0x5d, 0xba, 0xbf, 0xb7, 0xc0, 0x99, 0xa6, 0x95, 0x71, 0xf1, 0x2f, 0x61,
0x69, 0x27, 0xec, 0xb1, 0x44, 0x47, 0xbf, 0xba, 0xb5, 0xfe, 0xdd, 0xeb, 0x77, 0x17, 0xfe, 0xfd,
0xfa, 0xdd, 0x07, 0x99, 0xba, 0xca, 0x63, 0x16, 0x75, 0x78, 0x24, 0xfd, 0x30, 0x62, 0x02, 0xdb,
0xc3, 0x87, 0x81, 0x82, 0x78, 0x1a, 0x49, 0x8d, 0x04, 0xf2, 0x36, 0x2c, 0x69, 0xe9, 0xe6, 0xda,
0x9b, 0x95, 0xfb, 0xdf, 0x12, 0xd4, 0x4f, 0x51, 0x81, 0xd4, 0x17, 0x1e, 0xc0, 0xc8, 0x85, 0x26,
0xed, 0x26, 0x1d, 0x9b, 0xe1, 0x20, 0x0e, 0x54, 0xf6, 0x4c, 0x88, 0xcd, 0x75, 0x1d, 0xae, 0xc9,
0x57, 0x50, 0x4b, 0xbf, 0x9f, 0xc6, 0xd2, 0x2e, 0xa8, 0x1c, 0x79, 0x94, 0x93, 0x23, 0x59, 0x4d,
0xbc, 0x0c, 0xd4, 0x64, 0x48, 0x86, 0x42, 0x3e, 0x85, 0xbb, 0x07, 0xe7, 0x31, 0x17, 0x72, 0xdb,
0xef, 0x3c, 0x67, 0x74, 0xbc, 0x0b, 0x14, 0x57, 0x0a, 0xad, 0x2a, 0xbd, 0x9e, 0x81, 0xac, 0xc1,
0x5b, 0x7e, 0xbf, 0xcf, 0x2f, 0xcc, 0xa5, 0x51, 0xe9, 0x6f, 0x97, 0x56, 0xac, 0x56, 0x85, 0x5e,
0xdd, 0x20, 0x1f, 0xc1, 0xed, 0x0c, 0xf1, 0x89, 0x10, 0xfe, 0x25, 0xe6, 0xcb, 0x92, 0xe2, 0x9f,
0xb6, 0x85, 0x15, 0x6c, 0x2f, 0x8c, 0xfc, 0xbe, 0x0d, 0x8a, 0x47, 0x2f, 0x88, 0x0b, 0xf5, 0xdd,
0x57, 0xa8, 0x12, 0x13, 0x4f, 0xa4, 0x14, 0x76, 0x4d, 0x85, 0x62, 0x8c, 0x46, 0x4e, 0xa0, 0xae,
0x14, 0xd6, 0xba, 0x27, 0x76, 0x5d, 0x39, 0x6d, 0x2d, 0xc7, 0x69, 0x8a, 0xfd, 0x69, 0x9c, 0xb9,
0x4a, 0x63, 0x12, 0x48, 0x07, 0x9a, 0xa9, 0xe3, 0xf4, 0x1d, 0xb4, 0x1b, 0x4a, 0xe6, 0xe3, 0x79,
0x03, 0xa1, 0xd1, 0xfa, 0x88, 0x09, 0x91, 0x98, 0x06, 0xbb, 0x78, 0xdd, 0x7c, 0xc9, 0xec, 0xa6,
0xb2, 0x79, 0xb8, 0x76, 0x3e, 0x83, 0xe5, 0xc9, 0x58, 0xce, 0x53, 0xf4, 0x9d, 0x5f, 0xc1, 0xed,
0x29, 0x2a, 0xfc, 0x5f, 0xf5, 0xe0, 0xef, 0x16, 0xbc, 0x75, 0xc5, 0x6f, 0x84, 0x40, 0xf1, 0xcb,
0xcb, 0x98, 0x19, 0x91, 0xea, 0x9b, 0x1c, 0x41, 0x09, 0xe3, 0x92, 0xd8, 0x8b, 0xca, 0x69, 0x1b,
0xf3, 0x04, 0xc2, 0x53, 0x48, 0xed, 0x30, 0x2d, 0xc5, 0x79, 0x04, 0x30, 0x22, 0xce, 0xd5, 0xfa,
0xbe, 0x86, 0x86, 0x89, 0x8a, 0x29, 0x0f, 0xcb, 0x7a, 0x4a, 0x31, 0x60, 0x9c, 0x41, 0x46, 0xed,
0xa2, 0x30, 0x67, 0xbb, 0x70, 0xbf, 0x85, 0x5b, 0x94, 0xf9, 0xc1, 0x5e, 0xd8, 0x67, 0xd7, 0x57,
0x45, 0xbc, 0xeb, 0x61, 0x9f, 0x9d, 0xf8, 0xf2, 0xf9, 0xf0, 0xae, 0x9b, 0x35, 0xd9, 0x84, 0x12,
0xf5, 0xa3, 0x1e, 0x33, 0x47, 0xbf, 0x9f, 0x73, 0xb4, 0x3a, 0x04, 0x79, 0xa9, 0x86, 0xb8, 0x8f,
0xa1, 0x3a, 0xa4, 0x61, 0xa5, 0x7a, 0xda, 0xed, 0x26, 0x4c, 0x57, 0xbd, 0x02, 0x35, 0x2b, 0xa4,
0x1f, 0xb2, 0xa8, 0x67, 0x8e, 0x2e, 0x50, 0xb3, 0x72, 0x57, 0x71, 0x54, 0x49, 0x35, 0x37, 0xae,
0x21, 0x50, 0xdc, 0xc1, 0x79, 0xca, 0x52, 0x17, 0x4c, 0x7d, 0xbb, 0x01, 0xb6, 0x39, 0x3f, 0xd8,
0x09, 0xc5, 0xf5, 0x06, 0xda, 0x50, 0xde, 0x09, 0x45, 0xc6, 0xbe, 0x74, 0x49, 0x56, 0xb1, 0x01,
0x76, 0xfa, 0x83, 0x00, 0xad, 0x95, 0x4c, 0x44, 0xa6, 0xd2, 0x4f, 0x50, 0xdd, 0xcf, 0xb5, 0x1f,
0xd5, 0x29, 0x46, 0x99, 0x35, 0x28, 0xb3, 0x48, 0x8a, 0x90, 0xa5, 0x5d, 0x92, 0x78, 0x7a, 0x04,
0xf6, 0xd4, 0x08, 0xac, 0xba, 0x31, 0x4d, 0x59, 0xdc, 0x0d, 0xb8, 0x85, 0x84, 0xfc, 0x40, 0x10,
0x28, 0x66, 0x94, 0x54, 0xdf, 0xee, 0x26, 0x2c, 0x8f, 0x80, 0xe6, 0xe8, 0x55, 0x28, 0xe2, 0x80,
0x6d, 0xca, 0xf8, 0xb4, 0x73, 0xd5, 0xbe, 0xdb, 0x80, 0xda, 0x49, 0x18, 0xa5, 0xfd, 0xd0, 0x7d,
0x63, 0x41, 0xfd, 0x84, 0x47, 0xa3, 0x4e, 0x74, 0x02, 0xb7, 0xd2, 0x1b, 0xf8, 0xe4, 0xe4, 0x60,
0xdb, 0x8f, 0x53, 0x53, 0x56, 0xae, 0x86, 0xd9, 0xbc, 0x05, 0x3c, 0xcd, 0xb8, 0x55, 0xc4, 0xa6,
0x45, 0x27, 0xe1, 0xe4, 0x17, 0x50, 0x3e, 0x3c, 0xdc, 0x52, 0x92, 0x16, 0xe7, 0x92, 0x94, 0xc2,
0xc8, 0x67, 0x50, 0x7e, 0xa6, 0x9e, 0x28, 0x89, 0x69, 0x2c, 0x53, 0x52, 0x4e, 0x1b, 0xaa, 0xd9,
0x28, 0xeb, 0x70, 0x11, 0xd0, 0x14, 0xe4, 0x7e, 0x6f, 0x41, 0xed, 0x99, 0x3f, 0x9a, 0xb5, 0x7e,
0xc8, 0x6e, 0x7b, 0x07, 0x4a, 0x87, 0xec, 0x25, 0xeb, 0x9b, 0x54, 0xd5, 0x0b, 0xcc, 0xae, 0x23,
0x96, 0x24, 0xbe, 0xb9, 0x24, 0x75, 0x9a, 0x2e, 0x89, 0x0b, 0xc5, 0x30, 0xea, 0x72, 0xf3, 0x78,
0x50, 0x75, 0xeb, 0x94, 0x0f, 0x44, 0x87, 0x1d, 0x44, 0x5d, 0x4e, 0xd5, 0x1e, 0x79, 0x0f, 0x96,
0x04, 0x5e, 0x90, 0xc4, 0x2e, 0x29, 0x73, 0xab, 0xc8, 0xa5, 0xaf, 0x91, 0xd9, 0x70, 0x9b, 0x50,
0xd7, 0x16, 0x99, 0x39, 0xee, 0x4f, 0x8b, 0x70, 0xfb, 0x98, 0x5d, 0x6c, 0xa7, 0x1a, 0xa7, 0xa6,
0xae, 0x40, 0x6d, 0x48, 0x3b, 0xd8, 0x31, 0x89, 0x95, 0x25, 0xe1, 0x61, 0x47, 0x7c, 0x10, 0xc9,
0x34, 0x3a, 0xea, 0x30, 0x45, 0xa1, 0x66, 0x83, 0xfc, 0x04, 0xca, 0xc7, 0x4c, 0xe2, 0x2b, 0x51,
0x59, 0xd3, 0x5c, 0xaf, 0x21, 0xcf, 0x31, 0x93, 0x38, 0xf4, 0xd0, 0x74, 0x0f, 0x27, 0xa9, 0x38,
0x9d, 0xa4, 0x8a, 0xd3, 0x26, 0xa9, 0x74, 0x97, 0x6c, 0x40, 0xad, 0xc3, 0xa3, 0x44, 0x0a, 0x3f,
0xc4, 0x83, 0x4b, 0x8a, 0xf9, 0x47, 0xc8, 0xac, 0x43, 0xb6, 0x3d, 0xda, 0xa4, 0x59, 0x4e, 0xf2,
0x00, 0x80, 0xbd, 0x92, 0xc2, 0xdf, 0xe7, 0x89, 0x4c, 0xec, 0x25, 0xa5, 0x30, 0x20, 0x0e, 0x09,
0x07, 0x27, 0x34, 0xb3, 0xeb, 0xbe, 0x0d, 0x77, 0xc6, 0x3d, 0x62, 0x5c, 0xf5, 0x18, 0x7e, 0x4c,
0x59, 0x9f, 0xf9, 0x09, 0x9b, 0xdf, 0x5b, 0xae, 0x03, 0xf6, 0x55, 0xb0, 0x11, 0xfc, 0x8f, 0x02,
0xd4, 0x76, 0x5f, 0xb1, 0x4e, 0x1a, 0xea, 0x77, 0xa0, 0x7a, 0x22, 0x78, 0x87, 0x25, 0xc9, 0x50,
0xd6, 0x88, 0x40, 0x3e, 0x85, 0xe2, 0x41, 0x14, 0x4a, 0xd3, 0xc0, 0x56, 0x73, 0xc7, 0xe9, 0x50,
0x1a, 0x99, 0xf8, 0x94, 0xc4, 0x25, 0xd9, 0x84, 0x22, 0x5e, 0xff, 0x9b, 0x94, 0xe0, 0x20, 0x83,
0x45, 0x0c, 0xd9, 0x52, 0x8f, 0xef, 0xf0, 0x1b, 0x66, 0xa2, 0xd4, 0xca, 0xef, 0x1d, 0xe1, 0x37,
0x6c, 0x24, 0xc1, 0x20, 0xc9, 0x2e, 0x94, 0x4f, 0xa5, 0x2f, 0x70, 0x02, 0xd3, 0xd1, 0xbb, 0x9f,
0x37, 0x62, 0x68, 0xce, 0x91, 0x94, 0x14, 0x8b, 0x4e, 0xd8, 0x7d, 0x15, 0x4a, 0x35, 0x5f, 0xe5,
0x3b, 0x01, 0xd9, 0x32, 0x86, 0xe0, 0x12, 0xd1, 0x3b, 0x3c, 0x62, 0x76, 0x79, 0x26, 0x1a, 0xd9,
0x32, 0x68, 0x5c, 0x6e, 0x95, 0xa1, 0xa4, 0x66, 0x0c, 0xf7, 0xaf, 0x16, 0xd4, 0x32, 0x3e, 0xbe,
0xc1, 0x9d, 0x79, 0x07, 0x8a, 0xf8, 0xf6, 0x36, 0xb1, 0xab, 0xa8, 0x1b, 0xc3, 0xa4, 0x4f, 0x15,
0x15, 0x8b, 0xf8, 0x5e, 0xa0, 0x4b, 0x55, 0x83, 0xe2, 0x27, 0x52, 0xbe, 0x94, 0x97, 0xca, 0xdd,
0x15, 0x8a, 0x9f, 0x64, 0x0d, 0x2a, 0xa7, 0xac, 0x33, 0x10, 0xa1, 0xbc, 0x54, 0x0e, 0x6c, 0xae,
0x2f, 0xab, 0x52, 0x60, 0x68, 0xea, 0x62, 0x0d, 0x39, 0xdc, 0x2f, 0x30, 0xb1, 0x46, 0x0a, 0x12,
0x28, 0x6e, 0xe3, 0x0b, 0x04, 0x35, 0x6b, 0x50, 0xf5, 0x8d, 0x8f, 0xc0, 0xdd, 0x59, 0x8f, 0xc0,
0xdd, 0xf4, 0x11, 0x38, 0x1e, 0x10, 0xec, 0x09, 0x19, 0x07, 0xb9, 0x4f, 0xa0, 0x3a, 0x4c, 0x1a,
0x7c, 0x7f, 0xef, 0x05, 0xe6, 0xa4, 0xc5, 0xbd, 0x00, 0x4d, 0xd9, 0x7d, 0xba, 0xa7, 0x4e, 0xa9,
0x50, 0xfc, 0x1c, 0x76, 0xe0, 0x42, 0xa6, 0x03, 0x6f, 0xe0, 0xf3, 0x36, 0x93, 0x39, 0xc8, 0x44,
0xf9, 0x45, 0x92, 0xaa, 0x8c, 0xdf, 0xda, 0x8c, 0x7e, 0xa2, 0x64, 0x29, 0x33, 0xfa, 0xc9, 0xfa,
0xbf, 0xaa, 0x50, 0x3d, 0x3c, 0xdc, 0xda, 0x12, 0x61, 0xd0, 0x63, 0xe4, 0x0f, 0x16, 0x90, 0xab,
0xaf, 0x26, 0xf2, 0x71, 0x7e, 0xc2, 0x4e, 0x7f, 0xfa, 0x39, 0x9f, 0xcc, 0x89, 0x32, 0x0d, 0xf1,
0x2b, 0x28, 0xa9, 0x61, 0x8c, 0xfc, 0xf4, 0x86, 0x43, 0xb4, 0xd3, 0x9a, 0xcd, 0x68, 0x64, 0x77,
0xa0, 0x92, 0x0e, 0x34, 0xe4, 0x41, 0xae, 0x7a, 0x63, 0xf3, 0x9a, 0xf3, 0xc1, 0x8d, 0x78, 0xcd,
0x21, 0xbf, 0x85, 0xb2, 0x99, 0x53, 0xc8, 0xfd, 0x19, 0xb8, 0xd1, 0xc4, 0xe4, 0x3c, 0xb8, 0x09,
0xeb, 0xc8, 0x8c, 0x74, 0x1e, 0xc9, 0x35, 0x63, 0x62, 0xda, 0xc9, 0x35, 0xe3, 0xca, 0x80, 0xf3,
0x0c, 0x8a, 0x38, 0xb8, 0x90, 0xbc, 0x6b, 0x9e, 0x99, 0x6c, 0x9c, 0xbc, 0x70, 0x8d, 0x4d, 0x3c,
0xbf, 0xc1, 0x72, 0xa8, 0x1e, 0x7f, 0xf9, 0x85, 0x30, 0xf3, 0x6f, 0x8d, 0x73, 0xff, 0x06, 0x9c,
0x23, 0xf1, 0xe6, 0xe1, 0xd4, 0xba, 0xc1, 0x5f, 0x26, 0xb3, 0xc5, 0x4f, 0xfc, 0x39, 0xc3, 0xa1,
0x9e, 0xed, 0x72, 0xc4, 0xcb, 0x81, 0x4e, 0x19, 0x10, 0x9c, 0xf6, 0x8d, 0xf9, 0xcd, 0x81, 0xdf,
0xe2, 0x10, 0x3e, 0xde, 0x01, 0xc9, 0x7a, 0xae, 0x3b, 0xa6, 0xf6, 0x5a, 0xe7, 0xe1, 0x5c, 0x18,
0x73, 0xb8, 0xaf, 0x3b, 0xac, 0xe9, 0xa2, 0x24, 0xbf, 0x61, 0x0c, 0x3b, 0xb1, 0x73, 0x43, 0xbe,
0x96, 0xf5, 0x91, 0x85, 0x79, 0x86, 0x93, 0x55, 0xae, 0xec, 0xcc, 0x30, 0x99, 0x9b, 0x67, 0xd9,
0x11, 0x6d, 0xab, 0xfe, 0xdd, 0x9b, 0x7b, 0xd6, 0xf7, 0x6f, 0xee, 0x59, 0xff, 0x79, 0x73, 0xcf,
0x3a, 0x5b, 0x52, 0xff, 0x84, 0x3f, 0xfc, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x88, 0x89, 0x64,
0x24, 0x5b, 0x18, 0x00, 0x00,
0x39, 0xf6, 0x58, 0xf4, 0x60, 0x14, 0x46, 0x3f, 0x42, 0x3f, 0x40, 0xf1, 0x66, 0x66, 0xc9, 0x25,
0x45, 0x2d, 0x49, 0x34, 0x27, 0xee, 0xbc, 0x79, 0xbf, 0x37, 0xef, 0xdf, 0xbc, 0xf7, 0x86, 0x50,
0xef, 0x79, 0x92, 0x5d, 0x7a, 0x57, 0x6e, 0x2c, 0xb8, 0xe4, 0xe4, 0xee, 0x05, 0x3f, 0xbf, 0x72,
0xcf, 0xfb, 0x41, 0xe8, 0xbf, 0x08, 0xa4, 0xfb, 0xf2, 0x27, 0x6e, 0x57, 0xf0, 0x48, 0xb2, 0xc8,
0xb7, 0x3f, 0xec, 0x05, 0xf2, 0x79, 0xff, 0xdc, 0xed, 0xf0, 0x8b, 0x76, 0x8f, 0xf7, 0x78, 0x5b,
0x21, 0xce, 0xfb, 0x5d, 0xb5, 0x52, 0x0b, 0xf5, 0xa5, 0x25, 0xd9, 0x1b, 0xe3, 0xec, 0x3d, 0xce,
0x7b, 0x21, 0xf3, 0xe2, 0x20, 0x31, 0x9f, 0x6d, 0x11, 0x77, 0xda, 0x89, 0xf4, 0x64, 0x3f, 0x31,
0x98, 0xf5, 0x0c, 0x06, 0x15, 0x69, 0xa7, 0x8a, 0xb4, 0x13, 0x1e, 0xbe, 0x64, 0xa2, 0x1d, 0x9f,
0xb7, 0x79, 0x9c, 0x72, 0xb7, 0x6f, 0xe4, 0xf6, 0xe2, 0xa0, 0x2d, 0xaf, 0x62, 0x96, 0xb4, 0x2f,
0xb9, 0x78, 0xc1, 0x84, 0x01, 0x3c, 0xbc, 0x11, 0xd0, 0x97, 0x41, 0x88, 0xa8, 0x8e, 0x17, 0x27,
0x78, 0x08, 0xfe, 0x1a, 0x50, 0xd6, 0x6c, 0xc9, 0xa3, 0x20, 0x91, 0x41, 0xd0, 0x0b, 0xda, 0xdd,
0x44, 0x61, 0xf4, 0x29, 0x68, 0x84, 0x66, 0x77, 0x7e, 0x5f, 0x80, 0x65, 0xca, 0x92, 0x7e, 0x28,
0xc9, 0x1a, 0xd4, 0x05, 0xeb, 0xee, 0xb2, 0x58, 0xb0, 0x8e, 0x27, 0x99, 0xdf, 0xb4, 0x56, 0xad,
0x56, 0xe5, 0x60, 0x81, 0x8e, 0x92, 0xc9, 0x2f, 0xa1, 0x21, 0x58, 0x37, 0xc9, 0x30, 0x2e, 0xae,
0x5a, 0xad, 0xea, 0xc6, 0x07, 0xee, 0x8d, 0xc1, 0x70, 0x29, 0xeb, 0x1e, 0x7b, 0xf1, 0x10, 0x72,
0xb0, 0x40, 0xc7, 0x84, 0x90, 0x0d, 0x28, 0x08, 0xd6, 0x6d, 0x16, 0x94, 0xac, 0x7b, 0xf9, 0xb2,
0x0e, 0x16, 0x28, 0x32, 0x93, 0x4d, 0x28, 0xa2, 0x94, 0x66, 0x51, 0x81, 0xde, 0x9b, 0xaa, 0xc0,
0xc1, 0x02, 0x55, 0x00, 0xf2, 0x05, 0x94, 0x2f, 0x98, 0xf4, 0x7c, 0x4f, 0x7a, 0x4d, 0x58, 0x2d,
0xb4, 0xaa, 0x1b, 0xed, 0x5c, 0x30, 0x3a, 0xc8, 0x3d, 0x36, 0x88, 0xbd, 0x48, 0x8a, 0x2b, 0x3a,
0x10, 0x60, 0x3f, 0x86, 0xfa, 0xc8, 0x16, 0x59, 0x81, 0xc2, 0x0b, 0x76, 0xa5, 0xfd, 0x47, 0xf1,
0x93, 0xdc, 0x81, 0xa5, 0x97, 0x5e, 0xd8, 0x67, 0xca, 0x55, 0x35, 0xaa, 0x17, 0x5b, 0x8b, 0x8f,
0xac, 0xed, 0x32, 0x2c, 0x0b, 0x25, 0xde, 0xf9, 0x93, 0x05, 0x2b, 0xe3, 0x7e, 0x22, 0x87, 0xc6,
0x42, 0x4b, 0x29, 0xf9, 0xc9, 0x1c, 0x2e, 0x46, 0x42, 0xa2, 0x55, 0x55, 0x22, 0xec, 0x4d, 0xa8,
0x0c, 0x48, 0xd3, 0x54, 0xac, 0x64, 0x54, 0x74, 0x36, 0xa1, 0x40, 0x59, 0x97, 0x34, 0x60, 0x31,
0x30, 0x49, 0x41, 0x17, 0x03, 0x9f, 0xac, 0x42, 0xc1, 0x67, 0x5d, 0x13, 0xfc, 0x86, 0x1b, 0x9f,
0xbb, 0xbb, 0xac, 0x1b, 0x44, 0x81, 0x0c, 0x78, 0x44, 0x71, 0xcb, 0xf9, 0x8b, 0x85, 0xc9, 0x85,
0x6a, 0x91, 0xcf, 0x47, 0xec, 0x98, 0x9e, 0x2a, 0xd7, 0xb4, 0x7f, 0x96, 0xaf, 0xfd, 0xc7, 0x59,
0xed, 0xa7, 0xe6, 0x4f, 0xd6, 0x3a, 0x09, 0x75, 0xca, 0x64, 0x5f, 0x44, 0x94, 0xfd, 0xa6, 0xcf,
0x12, 0x49, 0x7e, 0x9a, 0x46, 0x44, 0xc9, 0x9f, 0x96, 0x56, 0xc8, 0x48, 0x0d, 0x80, 0xb4, 0x60,
0x89, 0x09, 0xc1, 0x85, 0xd1, 0x82, 0xb8, 0xba, 0x72, 0xb8, 0x22, 0xee, 0xb8, 0x67, 0xaa, 0x72,
0x50, 0xcd, 0xe0, 0xac, 0x40, 0x23, 0x3d, 0x35, 0x89, 0x79, 0x94, 0x30, 0xe7, 0x16, 0xd4, 0x0f,
0xa3, 0xb8, 0x2f, 0x13, 0xa3, 0x87, 0xf3, 0x77, 0x0b, 0x1a, 0x29, 0x45, 0xf3, 0x90, 0xaf, 0xa1,
0x3a, 0xf4, 0x71, 0xea, 0xcc, 0xad, 0x1c, 0xfd, 0x46, 0xf1, 0x99, 0x00, 0x19, 0xdf, 0x66, 0xc5,
0xd9, 0x27, 0xb0, 0x32, 0xce, 0x30, 0xc1, 0xd3, 0xef, 0x8f, 0x7a, 0x7a, 0x3c, 0xf0, 0x19, 0xcf,
0xfe, 0xd1, 0x82, 0xbb, 0x94, 0xa9, 0x52, 0x78, 0x78, 0xe1, 0xf5, 0xd8, 0x0e, 0x8f, 0xba, 0x41,
0x2f, 0x75, 0xf3, 0x8a, 0xca, 0xaa, 0x54, 0x32, 0x26, 0x58, 0x0b, 0xca, 0xa7, 0xa1, 0x27, 0xbb,
0x5c, 0x5c, 0x18, 0xe1, 0x35, 0x14, 0x9e, 0xd2, 0xe8, 0x60, 0x97, 0xac, 0x42, 0xd5, 0x08, 0x3e,
0xe6, 0x3e, 0x53, 0x35, 0xa3, 0x42, 0xb3, 0x24, 0xd2, 0x84, 0xd2, 0x11, 0xef, 0x9d, 0x78, 0x17,
0x4c, 0x15, 0x87, 0x0a, 0x4d, 0x97, 0xce, 0x6f, 0x2d, 0xb0, 0x27, 0x69, 0x65, 0x5c, 0xfc, 0x73,
0x58, 0xde, 0x0d, 0x7a, 0x2c, 0xd1, 0xd1, 0xaf, 0x6c, 0x6f, 0x7c, 0xf7, 0xfa, 0xdd, 0x85, 0x7f,
0xbd, 0x7e, 0xf7, 0x41, 0xa6, 0xae, 0xf2, 0x98, 0x45, 0x1d, 0x1e, 0x49, 0x2f, 0x88, 0x98, 0xc0,
0xf6, 0xf0, 0xa1, 0xaf, 0x20, 0xae, 0x46, 0x52, 0x23, 0x81, 0xbc, 0x0d, 0xcb, 0x5a, 0xba, 0xb9,
0xf6, 0x66, 0xe5, 0xfc, 0x77, 0x09, 0x6a, 0x67, 0xa8, 0x40, 0xea, 0x0b, 0x17, 0x60, 0xe8, 0x42,
0x93, 0x76, 0xe3, 0x8e, 0xcd, 0x70, 0x10, 0x1b, 0xca, 0xfb, 0x26, 0xc4, 0xe6, 0xba, 0x0e, 0xd6,
0xe4, 0x2b, 0xa8, 0xa6, 0xdf, 0x4f, 0x63, 0xd9, 0x2c, 0xa8, 0x1c, 0x79, 0x94, 0x93, 0x23, 0x59,
0x4d, 0xdc, 0x0c, 0xd4, 0x64, 0x48, 0x86, 0x42, 0x3e, 0x85, 0xbb, 0x87, 0x17, 0x31, 0x17, 0x72,
0xc7, 0xeb, 0x3c, 0x67, 0x74, 0xb4, 0x0b, 0x14, 0x57, 0x0b, 0xad, 0x0a, 0xbd, 0x99, 0x81, 0xac,
0xc3, 0x5b, 0x5e, 0x18, 0xf2, 0x4b, 0x73, 0x69, 0x54, 0xfa, 0x37, 0x97, 0x56, 0xad, 0x56, 0x99,
0x5e, 0xdf, 0x20, 0x1f, 0xc1, 0xed, 0x0c, 0xf1, 0x89, 0x10, 0xde, 0x15, 0xe6, 0xcb, 0xb2, 0xe2,
0x9f, 0xb4, 0x85, 0x15, 0x6c, 0x3f, 0x88, 0xbc, 0xb0, 0x09, 0x8a, 0x47, 0x2f, 0x88, 0x03, 0xb5,
0xbd, 0x57, 0xa8, 0x12, 0x13, 0x4f, 0xa4, 0x14, 0xcd, 0xaa, 0x0a, 0xc5, 0x08, 0x8d, 0x9c, 0x42,
0x4d, 0x29, 0xac, 0x75, 0x4f, 0x9a, 0x35, 0xe5, 0xb4, 0xf5, 0x1c, 0xa7, 0x29, 0xf6, 0xa7, 0x71,
0xe6, 0x2a, 0x8d, 0x48, 0x20, 0x1d, 0x68, 0xa4, 0x8e, 0xd3, 0x77, 0xb0, 0x59, 0x57, 0x32, 0x1f,
0xcf, 0x1b, 0x08, 0x8d, 0xd6, 0x47, 0x8c, 0x89, 0xc4, 0x34, 0xd8, 0xc3, 0xeb, 0xe6, 0x49, 0xd6,
0x6c, 0x28, 0x9b, 0x07, 0x6b, 0xfb, 0x33, 0x58, 0x19, 0x8f, 0xe5, 0x3c, 0x45, 0xdf, 0xfe, 0x05,
0xdc, 0x9e, 0xa0, 0xc2, 0xff, 0x55, 0x0f, 0xfe, 0x6a, 0xc1, 0x5b, 0xd7, 0xfc, 0x46, 0x08, 0x14,
0xbf, 0xbc, 0x8a, 0x99, 0x11, 0xa9, 0xbe, 0xc9, 0x31, 0x2c, 0x61, 0x5c, 0x92, 0xe6, 0xa2, 0x72,
0xda, 0xe6, 0x3c, 0x81, 0x70, 0x15, 0x52, 0x3b, 0x4c, 0x4b, 0xb1, 0x1f, 0x01, 0x0c, 0x89, 0x73,
0xb5, 0xbe, 0xaf, 0xa1, 0x6e, 0xa2, 0x62, 0xca, 0xc3, 0x8a, 0x9e, 0x52, 0x0c, 0x18, 0x67, 0x90,
0x61, 0xbb, 0x28, 0xcc, 0xd9, 0x2e, 0x9c, 0x6f, 0xe1, 0x16, 0x65, 0x9e, 0xbf, 0x1f, 0x84, 0xec,
0xe6, 0xaa, 0x88, 0x77, 0x3d, 0x08, 0xd9, 0xa9, 0x27, 0x9f, 0x0f, 0xee, 0xba, 0x59, 0x93, 0x2d,
0x58, 0xa2, 0x5e, 0xd4, 0x63, 0xe6, 0xe8, 0xf7, 0x73, 0x8e, 0x56, 0x87, 0x20, 0x2f, 0xd5, 0x10,
0xe7, 0x31, 0x54, 0x06, 0x34, 0xac, 0x54, 0x4f, 0xbb, 0xdd, 0x84, 0xe9, 0xaa, 0x57, 0xa0, 0x66,
0x85, 0xf4, 0x23, 0x16, 0xf5, 0xcc, 0xd1, 0x05, 0x6a, 0x56, 0xce, 0x1a, 0x8e, 0x2a, 0xa9, 0xe6,
0xc6, 0x35, 0x04, 0x8a, 0xbb, 0x38, 0x4f, 0x59, 0xea, 0x82, 0xa9, 0x6f, 0xc7, 0xc7, 0x36, 0xe7,
0xf9, 0xbb, 0x81, 0xb8, 0xd9, 0xc0, 0x26, 0x94, 0x76, 0x03, 0x91, 0xb1, 0x2f, 0x5d, 0x92, 0x35,
0x6c, 0x80, 0x9d, 0xb0, 0xef, 0xa3, 0xb5, 0x92, 0x89, 0xc8, 0x54, 0xfa, 0x31, 0xaa, 0xf3, 0xb9,
0xf6, 0xa3, 0x3a, 0xc5, 0x28, 0xb3, 0x0e, 0x25, 0x16, 0x49, 0x11, 0xb0, 0xb4, 0x4b, 0x12, 0x57,
0x8f, 0xc0, 0xae, 0x1a, 0x81, 0x55, 0x37, 0xa6, 0x29, 0x8b, 0xb3, 0x09, 0xb7, 0x90, 0x90, 0x1f,
0x08, 0x02, 0xc5, 0x8c, 0x92, 0xea, 0xdb, 0xd9, 0x82, 0x95, 0x21, 0xd0, 0x1c, 0xbd, 0x06, 0x45,
0x1c, 0xb0, 0x4d, 0x19, 0x9f, 0x74, 0xae, 0xda, 0x77, 0xea, 0x50, 0x3d, 0x0d, 0xa2, 0xb4, 0x1f,
0x3a, 0x6f, 0x2c, 0xa8, 0x9d, 0xf2, 0x68, 0xd8, 0x89, 0x4e, 0xe1, 0x56, 0x7a, 0x03, 0x9f, 0x9c,
0x1e, 0xee, 0x78, 0x71, 0x6a, 0xca, 0xea, 0xf5, 0x30, 0x9b, 0xb7, 0x80, 0xab, 0x19, 0xb7, 0x8b,
0xd8, 0xb4, 0xe8, 0x38, 0x9c, 0xfc, 0x0c, 0x4a, 0x47, 0x47, 0xdb, 0x4a, 0xd2, 0xe2, 0x5c, 0x92,
0x52, 0x18, 0xf9, 0x0c, 0x4a, 0xcf, 0xd4, 0x13, 0x25, 0x31, 0x8d, 0x65, 0x42, 0xca, 0x69, 0x43,
0x35, 0x1b, 0x65, 0x1d, 0x2e, 0x7c, 0x9a, 0x82, 0x9c, 0xff, 0x58, 0x50, 0x7d, 0xe6, 0x0d, 0x67,
0xad, 0xef, 0xb3, 0xdb, 0xde, 0x81, 0xa5, 0x23, 0xf6, 0x92, 0x85, 0x26, 0x55, 0xf5, 0x02, 0xa9,
0x67, 0xcf, 0xb9, 0xd0, 0xb7, 0xb3, 0x46, 0xf5, 0x02, 0xf3, 0x7a, 0x97, 0x49, 0x2f, 0x08, 0xd5,
0x74, 0x50, 0xa3, 0x66, 0x45, 0x1c, 0x28, 0x06, 0x51, 0x97, 0xab, 0xae, 0x64, 0x6a, 0xd9, 0x19,
0xef, 0x8b, 0x0e, 0x3b, 0x8c, 0xba, 0x9c, 0xaa, 0x3d, 0xf2, 0x1e, 0x2c, 0x0b, 0xbc, 0x34, 0x49,
0x73, 0x59, 0xb9, 0xa0, 0x82, 0x5c, 0xfa, 0x6a, 0x99, 0x0d, 0xa7, 0x01, 0x35, 0x6d, 0xa5, 0x99,
0xed, 0xfe, 0xb0, 0x08, 0xb7, 0x4f, 0xd8, 0xe5, 0x4e, 0x6a, 0x45, 0x6a, 0xfe, 0x2a, 0x54, 0x07,
0xb4, 0xc3, 0x5d, 0x93, 0x6c, 0x59, 0x12, 0x1e, 0x76, 0xcc, 0xfb, 0x91, 0x4c, 0x23, 0xa6, 0x0e,
0x53, 0x14, 0x6a, 0x36, 0xc8, 0x8f, 0xa0, 0x74, 0xc2, 0x24, 0xbe, 0x1c, 0x95, 0x8d, 0x8d, 0x8d,
0x2a, 0xf2, 0x9c, 0x30, 0x89, 0x83, 0x10, 0x4d, 0xf7, 0x70, 0xba, 0x8a, 0xd3, 0xe9, 0xaa, 0x38,
0x69, 0xba, 0x4a, 0x77, 0xc9, 0x26, 0x54, 0x3b, 0x3c, 0x4a, 0xa4, 0xf0, 0x02, 0x3c, 0x58, 0xfb,
0xe2, 0x07, 0xc8, 0xac, 0xc3, 0xb8, 0x33, 0xdc, 0xa4, 0x59, 0x4e, 0xf2, 0x00, 0x80, 0xbd, 0x92,
0xc2, 0x3b, 0xe0, 0x89, 0x4c, 0xbd, 0x03, 0x88, 0x43, 0xc2, 0xe1, 0x29, 0xcd, 0xec, 0x3a, 0x6f,
0xc3, 0x9d, 0x51, 0x8f, 0x18, 0x57, 0x3d, 0x86, 0x1f, 0x52, 0x16, 0x32, 0x2f, 0x61, 0xf3, 0x7b,
0xcb, 0xb1, 0xa1, 0x79, 0x1d, 0x6c, 0x04, 0xff, 0xad, 0x00, 0xd5, 0xbd, 0x57, 0xac, 0x73, 0xcc,
0x92, 0xc4, 0xeb, 0x31, 0xf2, 0x0e, 0x54, 0x4e, 0x05, 0xef, 0xb0, 0x24, 0x19, 0xc8, 0x1a, 0x12,
0xc8, 0xa7, 0x50, 0x3c, 0x8c, 0x02, 0x69, 0x9a, 0xda, 0x5a, 0xee, 0x88, 0x1d, 0x48, 0x23, 0x13,
0x9f, 0x97, 0xb8, 0x24, 0x5b, 0x50, 0xc4, 0x92, 0x30, 0x4b, 0x59, 0xf6, 0x33, 0x58, 0xc4, 0x90,
0x6d, 0xf5, 0x20, 0x0f, 0xbe, 0x61, 0x26, 0x4a, 0xad, 0xfc, 0x7e, 0x12, 0x7c, 0xc3, 0x86, 0x12,
0x0c, 0x92, 0xec, 0x41, 0xe9, 0x4c, 0x7a, 0x02, 0xa7, 0x32, 0x1d, 0xbd, 0xfb, 0x79, 0x63, 0x87,
0xe6, 0x1c, 0x4a, 0x49, 0xb1, 0xe8, 0x84, 0xbd, 0x57, 0x81, 0x54, 0x33, 0x57, 0xbe, 0x13, 0x90,
0x2d, 0x63, 0x08, 0x2e, 0x11, 0xbd, 0xcb, 0x23, 0xd6, 0x2c, 0x4d, 0x45, 0x23, 0x5b, 0x06, 0x8d,
0xcb, 0xed, 0x12, 0x2c, 0xa9, 0xb9, 0xc3, 0xf9, 0xb3, 0x05, 0xd5, 0x8c, 0x8f, 0x67, 0xb8, 0x33,
0xef, 0x40, 0x11, 0xdf, 0xe3, 0x26, 0x76, 0x65, 0x75, 0x63, 0x98, 0xf4, 0xa8, 0xa2, 0x62, 0x61,
0xdf, 0xf7, 0x75, 0xf9, 0xaa, 0x53, 0xfc, 0x44, 0xca, 0x97, 0xf2, 0x4a, 0xb9, 0xbb, 0x4c, 0xf1,
0x93, 0xac, 0x43, 0xf9, 0x8c, 0x75, 0xfa, 0x22, 0x90, 0x57, 0xca, 0x81, 0x8d, 0x8d, 0x15, 0x55,
0x0a, 0x0c, 0x4d, 0x5d, 0xac, 0x01, 0x87, 0xf3, 0x05, 0x26, 0xd6, 0x50, 0x41, 0x02, 0xc5, 0x1d,
0x7c, 0x95, 0xa0, 0x66, 0x75, 0xaa, 0xbe, 0xf1, 0x61, 0xb8, 0x37, 0xed, 0x61, 0xb8, 0x97, 0x3e,
0x0c, 0x47, 0x03, 0x82, 0x7d, 0x22, 0xe3, 0x20, 0xe7, 0x09, 0x54, 0x06, 0x49, 0x83, 0x6f, 0xf2,
0x7d, 0xdf, 0x9c, 0xb4, 0xb8, 0xef, 0xa3, 0x29, 0x7b, 0x4f, 0xf7, 0xd5, 0x29, 0x65, 0x8a, 0x9f,
0x83, 0xae, 0x5c, 0xc8, 0x74, 0xe5, 0x4d, 0x7c, 0xf2, 0x66, 0x32, 0x07, 0x99, 0x28, 0xbf, 0x4c,
0x52, 0x95, 0xf1, 0x5b, 0x9b, 0x11, 0x26, 0x4a, 0x96, 0x32, 0x23, 0x4c, 0x36, 0xfe, 0x59, 0x81,
0xca, 0xd1, 0xd1, 0xf6, 0xb6, 0x08, 0xfc, 0x1e, 0x23, 0xbf, 0xb3, 0x80, 0x5c, 0x7f, 0x49, 0x91,
0x8f, 0xf3, 0x13, 0x76, 0xf2, 0x73, 0xd0, 0xfe, 0x64, 0x4e, 0x94, 0x69, 0x92, 0x5f, 0xc1, 0x92,
0x1a, 0xd0, 0xc8, 0x8f, 0x67, 0x1c, 0xac, 0xed, 0xd6, 0x74, 0x46, 0x23, 0xbb, 0x03, 0xe5, 0x74,
0xc8, 0x21, 0x0f, 0x72, 0xd5, 0x1b, 0x99, 0xe1, 0xec, 0x0f, 0x66, 0xe2, 0x35, 0x87, 0xfc, 0x1a,
0x4a, 0x66, 0x76, 0x21, 0xf7, 0xa7, 0xe0, 0x86, 0x53, 0x94, 0xfd, 0x60, 0x16, 0xd6, 0xa1, 0x19,
0xe9, 0x8c, 0x92, 0x6b, 0xc6, 0xd8, 0x04, 0x94, 0x6b, 0xc6, 0xb5, 0xa1, 0xe7, 0x19, 0x14, 0x71,
0x98, 0x21, 0x79, 0xd7, 0x3c, 0x33, 0xed, 0xd8, 0x79, 0xe1, 0x1a, 0x99, 0x82, 0x7e, 0x85, 0xe5,
0x50, 0x3d, 0x08, 0xf3, 0x0b, 0x61, 0xe6, 0x1f, 0x1c, 0xfb, 0xfe, 0x0c, 0x9c, 0x43, 0xf1, 0xe6,
0x31, 0xd5, 0x9a, 0xe1, 0x6f, 0x94, 0xe9, 0xe2, 0xc7, 0xfe, 0xb0, 0xe1, 0x50, 0xcb, 0x76, 0x39,
0xe2, 0xe6, 0x40, 0x27, 0x0c, 0x08, 0x76, 0x7b, 0x66, 0x7e, 0x73, 0xe0, 0xb7, 0x38, 0x98, 0x8f,
0x76, 0x40, 0xb2, 0x91, 0xeb, 0x8e, 0x89, 0xbd, 0xd6, 0x7e, 0x38, 0x17, 0xc6, 0x1c, 0xee, 0xe9,
0x0e, 0x6b, 0xba, 0x28, 0xc9, 0x6f, 0x18, 0x83, 0x4e, 0x6c, 0xcf, 0xc8, 0xd7, 0xb2, 0x3e, 0xb2,
0x30, 0xcf, 0x70, 0xb2, 0xca, 0x95, 0x9d, 0x19, 0x30, 0x73, 0xf3, 0x2c, 0x3b, 0xa2, 0x6d, 0xd7,
0xbe, 0x7b, 0x73, 0xcf, 0xfa, 0xc7, 0x9b, 0x7b, 0xd6, 0xbf, 0xdf, 0xdc, 0xb3, 0xce, 0x97, 0xd5,
0xbf, 0xe3, 0x0f, 0xff, 0x17, 0x00, 0x00, 0xff, 0xff, 0xf6, 0x9b, 0x02, 0x2b, 0x6f, 0x18, 0x00,
0x00,
}
// Reference imports to suppress errors if they are not otherwise used.
@ -4055,7 +4064,7 @@ func (m *WarnRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) {
i = encodeVarintGateway(dAtA, i, uint64(size))
}
i--
dAtA[i] = 0x2a
dAtA[i] = 0x32
}
}
if m.Info != nil {
@ -4068,12 +4077,19 @@ func (m *WarnRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) {
i = encodeVarintGateway(dAtA, i, uint64(size))
}
i--
dAtA[i] = 0x2a
}
if len(m.Detail) > 0 {
i -= len(m.Detail)
copy(dAtA[i:], m.Detail)
i = encodeVarintGateway(dAtA, i, uint64(len(m.Detail)))
i--
dAtA[i] = 0x22
}
if len(m.Message) > 0 {
i -= len(m.Message)
copy(dAtA[i:], m.Message)
i = encodeVarintGateway(dAtA, i, uint64(len(m.Message)))
if len(m.Short) > 0 {
i -= len(m.Short)
copy(dAtA[i:], m.Short)
i = encodeVarintGateway(dAtA, i, uint64(len(m.Short)))
i--
dAtA[i] = 0x1a
}
@ -5300,7 +5316,11 @@ func (m *WarnRequest) Size() (n int) {
if m.Level != 0 {
n += 1 + sovGateway(uint64(m.Level))
}
l = len(m.Message)
l = len(m.Short)
if l > 0 {
n += 1 + l + sovGateway(uint64(l))
}
l = len(m.Detail)
if l > 0 {
n += 1 + l + sovGateway(uint64(l))
}
@ -9051,7 +9071,7 @@ func (m *WarnRequest) Unmarshal(dAtA []byte) error {
}
case 3:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field Message", wireType)
return fmt.Errorf("proto: wrong wireType = %d for field Short", wireType)
}
var byteLen int
for shift := uint(0); ; shift += 7 {
@ -9078,12 +9098,46 @@ func (m *WarnRequest) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
m.Message = append(m.Message[:0], dAtA[iNdEx:postIndex]...)
if m.Message == nil {
m.Message = []byte{}
m.Short = append(m.Short[:0], dAtA[iNdEx:postIndex]...)
if m.Short == nil {
m.Short = []byte{}
}
iNdEx = postIndex
case 4:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field Detail", wireType)
}
var byteLen int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowGateway
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
}
b := dAtA[iNdEx]
iNdEx++
byteLen |= int(b&0x7F) << shift
if b < 0x80 {
break
}
}
if byteLen < 0 {
return ErrInvalidLengthGateway
}
postIndex := iNdEx + byteLen
if postIndex < 0 {
return ErrInvalidLengthGateway
}
if postIndex > l {
return io.ErrUnexpectedEOF
}
m.Detail = append(m.Detail[:0], dAtA[iNdEx:postIndex]...)
if m.Detail == nil {
m.Detail = []byte{}
}
iNdEx = postIndex
case 5:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field Info", wireType)
}
@ -9119,7 +9173,7 @@ func (m *WarnRequest) Unmarshal(dAtA []byte) error {
return err
}
iNdEx = postIndex
case 5:
case 6:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field Ranges", wireType)
}

7
frontend/gateway/pb/gateway.proto
View File

@ -176,9 +176,10 @@ message PongResponse{
message WarnRequest {
string Digest = 1 [(gogoproto.customtype) = "github.com/opencontainers/go-digest.Digest", (gogoproto.nullable) = false];
int64 Level = 2;
bytes Message = 3;
pb.SourceInfo info = 4;
repeated pb.Range ranges = 5;
bytes Short = 3;
bytes Detail = 4;
pb.SourceInfo info = 5;
repeated pb.Range ranges = 6;
}
message WarnResponse{}

3
solver/llbsolver/bridge.go
View File

@ -52,9 +52,10 @@ func (b *llbBridge) Warn(ctx context.Context, dgst digest.Digest, msg string, op
pw.Write(identity.NewID(), client.VertexWarning{
Vertex: dgst,
Level: level,
Message: []byte(msg),
Short: []byte(msg),
SourceInfo: opts.SourceInfo,
Range: opts.Range,
Detail: opts.Detail,
})
return pw.Close()
})

2
util/progress/progressui/display.go
View File

@ -389,7 +389,7 @@ func (t *trace) displayInfo() (d displayInfo) {
jobs = append(jobs, j)
}
for _, w := range v.warnings {
msg := "WARN: " + string(w.Message)
msg := "WARN: " + string(w.Short)
j := &job{
startTime: addTime(v.Started, t.localTimeDiff),
completedTime: addTime(v.Completed, t.localTimeDiff),

2
util/progress/progressui/printer.go
View File

@ -126,7 +126,7 @@ func (p *textMux) printVtx(t *trace, dgst digest.Digest) {
v.statusUpdates = map[string]struct{}{}
for _, w := range v.warnings[v.warningIdx:] {
fmt.Fprintf(p.w, "#%d WARN: %s\n", v.index, w.Message)
fmt.Fprintf(p.w, "#%d WARN: %s\n", v.index, w.Short)
v.warningIdx++
}