mirror of
https://github.com/onepanelio/onepanel.git
synced 2025-10-17 11:10:37 +08:00
stream logs from s3
This commit is contained in:
rushtehrani
@@ -495,55 +495,56 @@ func init() {
|
||||
func init() { proto.RegisterFile("workflow.proto", fileDescriptor_892c7f566756b0be) }
|
||||
|
||||
var fileDescriptor_892c7f566756b0be = []byte{
|
||||
// 768 bytes of a gzipped FileDescriptorProto
|
||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x96, 0xcd, 0x4e, 0x1b, 0x49,
|
||||
0x10, 0xc7, 0xd5, 0x18, 0xb3, 0xb8, 0x90, 0x81, 0x2d, 0x8c, 0xf1, 0x7a, 0x59, 0x2d, 0xdb, 0xcb,
|
||||
0x4a, 0xb0, 0x20, 0x8f, 0xf1, 0x6e, 0xa2, 0x88, 0x08, 0x25, 0x11, 0x02, 0x72, 0xb0, 0xa2, 0xc8,
|
||||
0xf9, 0x40, 0xe2, 0x12, 0x1a, 0xbb, 0x71, 0x46, 0x31, 0xd3, 0x93, 0xe9, 0xb6, 0x51, 0x64, 0xf9,
|
||||
0x92, 0x48, 0x39, 0xe4, 0x9a, 0xdc, 0xf2, 0x22, 0x39, 0x27, 0x8f, 0xc0, 0x2b, 0xe4, 0x01, 0xf2,
|
||||
0x08, 0xd1, 0xb4, 0xa7, 0x07, 0xcf, 0x78, 0x92, 0xd8, 0xe1, 0x36, 0xdd, 0x55, 0x5d, 0xff, 0x5f,
|
||||
0x75, 0x55, 0xb5, 0x0d, 0xb3, 0xe7, 0xc2, 0x7b, 0x76, 0xda, 0x12, 0xe7, 0x25, 0xd7, 0x13, 0x4a,
|
||||
0x60, 0x8a, 0xb9, 0x76, 0x71, 0xb9, 0x29, 0x44, 0xb3, 0xc5, 0x2d, 0xe6, 0xda, 0x16, 0x73, 0x1c,
|
||||
0xa1, 0x98, 0xb2, 0x85, 0x23, 0xfb, 0x2e, 0xc5, 0x25, 0x73, 0xe4, 0x89, 0xe2, 0x67, 0x6e, 0x8b,
|
||||
0x29, 0xde, 0x37, 0xd0, 0x63, 0x58, 0xdc, 0xf5, 0x38, 0x53, 0xfc, 0x30, 0x70, 0xa8, 0xf1, 0xe7,
|
||||
0x6d, 0x2e, 0x15, 0x2e, 0x43, 0xc6, 0x61, 0x67, 0x5c, 0xba, 0xac, 0xce, 0x0b, 0x64, 0x85, 0xac,
|
||||
0x65, 0x6a, 0x97, 0x1b, 0xb8, 0x0e, 0xd3, 0x26, 0x62, 0x61, 0x62, 0x85, 0xac, 0xcd, 0x54, 0xb2,
|
||||
0x25, 0xe6, 0xda, 0xa5, 0x30, 0x4a, 0x68, 0xa6, 0xfb, 0x80, 0x07, 0x5c, 0x8d, 0x17, 0x1e, 0x61,
|
||||
0xd2, 0x5f, 0xe8, 0xd0, 0x99, 0x9a, 0xfe, 0xa6, 0x77, 0x21, 0x77, 0xc8, 0x54, 0xfd, 0xe9, 0xd5,
|
||||
0x23, 0xbd, 0x21, 0x90, 0x1f, 0x40, 0xaa, 0x8a, 0xa6, 0xfc, 0xe9, 0x60, 0x58, 0x80, 0x5f, 0x5c,
|
||||
0xd1, 0xb8, 0xe7, 0x6f, 0xa7, 0xf4, 0xb6, 0x59, 0xe2, 0x2a, 0x64, 0xeb, 0xc2, 0x51, 0xcc, 0x76,
|
||||
0xb8, 0xa7, 0xed, 0x93, 0xda, 0x1e, 0xdd, 0xa4, 0xa7, 0x90, 0xab, 0xda, 0x32, 0x84, 0x19, 0x91,
|
||||
0xa4, 0x0c, 0x0b, 0xe6, 0x82, 0x1f, 0x06, 0x05, 0x7d, 0x64, 0x37, 0x02, 0xb0, 0x24, 0x13, 0x3d,
|
||||
0x82, 0xc5, 0x98, 0x8e, 0x74, 0x85, 0x23, 0x39, 0xe6, 0x20, 0x5d, 0x17, 0x6d, 0x47, 0x69, 0x91,
|
||||
0x74, 0xad, 0xbf, 0xc0, 0x0d, 0xc8, 0x98, 0x28, 0xb2, 0x30, 0xb1, 0x92, 0x1a, 0xae, 0xf0, 0xa5,
|
||||
0x9d, 0xae, 0xc2, 0x74, 0x55, 0x34, 0xf7, 0x1c, 0xe5, 0xbd, 0xf0, 0xef, 0xc3, 0x4f, 0x90, 0x07,
|
||||
0x01, 0x33, 0x35, 0xb3, 0xa4, 0x9f, 0x08, 0x4c, 0x9b, 0xd3, 0x38, 0x0f, 0xa9, 0xb6, 0xdd, 0x08,
|
||||
0x5c, 0xfc, 0xcf, 0xc4, 0xcb, 0xcd, 0xc3, 0x94, 0x54, 0x4c, 0xb5, 0x65, 0x70, 0xb7, 0xc1, 0x0a,
|
||||
0xaf, 0x03, 0xb8, 0xcc, 0x63, 0x67, 0x5c, 0x71, 0x4f, 0x16, 0x26, 0x35, 0x5e, 0x3e, 0x82, 0x77,
|
||||
0xdf, 0x98, 0x6b, 0x03, 0x9e, 0x78, 0x07, 0xe6, 0xe3, 0x77, 0x53, 0x48, 0xeb, 0xf6, 0x5d, 0x8c,
|
||||
0x9c, 0x36, 0xc6, 0xda, 0x90, 0x3b, 0xdd, 0x81, 0x5f, 0x87, 0x34, 0x42, 0x76, 0x32, 0xc0, 0x9e,
|
||||
0x83, 0x74, 0x87, 0xb5, 0xda, 0x26, 0xa1, 0xfe, 0xa2, 0xf2, 0x65, 0x06, 0xe6, 0xcc, 0xf9, 0x07,
|
||||
0xdc, 0xeb, 0xd8, 0x75, 0x8e, 0x1e, 0xcc, 0x46, 0x67, 0x10, 0x8b, 0x9a, 0x26, 0x71, 0x30, 0x8b,
|
||||
0xd1, 0x32, 0xd0, 0x6b, 0x2f, 0x2f, 0x3e, 0xbf, 0x9d, 0xb0, 0xe8, 0xdf, 0xfe, 0xe4, 0x4b, 0xab,
|
||||
0xb3, 0x75, 0xc2, 0x15, 0xdb, 0xb2, 0xba, 0x61, 0xaf, 0xf4, 0xac, 0xb0, 0x50, 0xdb, 0xe1, 0x54,
|
||||
0xa2, 0x0d, 0x33, 0x03, 0x23, 0x80, 0x4b, 0x3a, 0xe8, 0xf0, 0x9c, 0xc6, 0xd5, 0x2a, 0x5a, 0x6d,
|
||||
0x13, 0xff, 0x1d, 0x41, 0xad, 0xbf, 0xdb, 0x43, 0x09, 0xd9, 0x48, 0xe7, 0xe1, 0x6f, 0x3a, 0x66,
|
||||
0x52, 0xd7, 0x17, 0x8b, 0x49, 0xa6, 0x7e, 0xa3, 0xd2, 0x0d, 0xad, 0xfd, 0x0f, 0x8e, 0x92, 0x29,
|
||||
0xb6, 0x21, 0x1b, 0x79, 0x2d, 0x02, 0xd1, 0xa4, 0x17, 0x24, 0x9e, 0xe3, 0x0d, 0xad, 0x53, 0xc1,
|
||||
0xf2, 0xe8, 0x39, 0x5a, 0xe7, 0x7e, 0xdc, 0x32, 0xc1, 0xd7, 0x04, 0xe6, 0x62, 0x4f, 0x0b, 0xfe,
|
||||
0x1e, 0xbf, 0xdb, 0x81, 0x07, 0x27, 0xd0, 0x36, 0xd3, 0x43, 0xf7, 0xb4, 0xf6, 0x2d, 0xdc, 0x19,
|
||||
0x43, 0xdb, 0x15, 0x0d, 0x69, 0x75, 0x83, 0x57, 0xa7, 0x67, 0xb5, 0x44, 0xb3, 0x4c, 0xf0, 0x3d,
|
||||
0x81, 0x7c, 0xb4, 0x7f, 0x4c, 0x07, 0x23, 0x4d, 0x68, 0xae, 0xb0, 0xe1, 0x03, 0xac, 0xe4, 0x71,
|
||||
0xa0, 0xfb, 0x1a, 0xef, 0x36, 0xdd, 0xfc, 0x31, 0x5e, 0xf8, 0x43, 0x23, 0xb7, 0x87, 0x86, 0x08,
|
||||
0x3f, 0x12, 0xf8, 0x23, 0x19, 0xe0, 0x31, 0xf7, 0xa4, 0x2d, 0x9c, 0xab, 0x40, 0x9e, 0x6a, 0xc8,
|
||||
0x63, 0x5a, 0x1d, 0x07, 0xd2, 0xea, 0xc6, 0x21, 0x4b, 0x6d, 0xbb, 0xd1, 0xb3, 0x3a, 0x7d, 0x9e,
|
||||
0xa4, 0x24, 0x2e, 0x08, 0x2c, 0x0c, 0x54, 0x35, 0xdc, 0xff, 0x33, 0x5e, 0xef, 0x11, 0xb9, 0x5f,
|
||||
0x11, 0x0d, 0xde, 0xc3, 0xca, 0x78, 0xe0, 0x3e, 0xe7, 0xd1, 0x01, 0xee, 0x8d, 0x7f, 0x2a, 0xcc,
|
||||
0xce, 0xea, 0x06, 0x5f, 0x3d, 0xfc, 0x40, 0x60, 0x79, 0x70, 0xfe, 0x62, 0x85, 0x91, 0xb8, 0x36,
|
||||
0x34, 0xa2, 0x71, 0x17, 0x93, 0xe7, 0xfa, 0x08, 0x9e, 0xc1, 0x6c, 0xef, 0xea, 0xd4, 0x77, 0xf0,
|
||||
0xe6, 0x15, 0x92, 0xc0, 0x77, 0x24, 0xfa, 0x1b, 0x67, 0xd4, 0x24, 0xfe, 0xf5, 0x4d, 0x92, 0x10,
|
||||
0x96, 0x7e, 0xcf, 0x25, 0xa0, 0xfc, 0x5f, 0x53, 0x96, 0x70, 0xac, 0xf6, 0x3f, 0x99, 0xd2, 0xff,
|
||||
0xb4, 0xfe, 0xfb, 0x1a, 0x00, 0x00, 0xff, 0xff, 0x85, 0x5f, 0xab, 0xe2, 0xb7, 0x09, 0x00, 0x00,
|
||||
// 773 bytes of a gzipped FileDescriptorProto
|
||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x96, 0xdd, 0x4e, 0x13, 0x41,
|
||||
0x14, 0xc7, 0xb3, 0x94, 0x22, 0x3d, 0x58, 0xc0, 0x43, 0x29, 0xb5, 0x62, 0xc4, 0x11, 0x13, 0x10,
|
||||
0xd2, 0x2d, 0xf5, 0x23, 0x06, 0x43, 0xa2, 0x21, 0x80, 0x17, 0x8d, 0x31, 0xf5, 0x83, 0x88, 0x17,
|
||||
0x32, 0xb4, 0x43, 0xdd, 0x58, 0x76, 0xd6, 0x9d, 0x69, 0x89, 0x69, 0x7a, 0xa3, 0x77, 0xc6, 0x3b,
|
||||
0xbd, 0xf3, 0xce, 0xa7, 0xf0, 0x5a, 0x1f, 0x81, 0x57, 0xf0, 0x41, 0xcc, 0x4e, 0x77, 0x96, 0xee,
|
||||
0x76, 0xd5, 0x56, 0xee, 0x76, 0xe6, 0x9c, 0x39, 0xe7, 0x77, 0x66, 0xce, 0xff, 0xb4, 0x30, 0x79,
|
||||
0xcc, 0xdd, 0x37, 0x87, 0x0d, 0x7e, 0x5c, 0x70, 0x5c, 0x2e, 0x39, 0x26, 0xa8, 0x63, 0xe5, 0xe7,
|
||||
0xeb, 0x9c, 0xd7, 0x1b, 0xcc, 0xa4, 0x8e, 0x65, 0x52, 0xdb, 0xe6, 0x92, 0x4a, 0x8b, 0xdb, 0xa2,
|
||||
0xeb, 0x92, 0x9f, 0xd3, 0x47, 0x5e, 0x49, 0x76, 0xe4, 0x34, 0xa8, 0x64, 0x5d, 0x03, 0xd9, 0x87,
|
||||
0xd9, 0x4d, 0x97, 0x51, 0xc9, 0x76, 0x7d, 0x87, 0x0a, 0x7b, 0xdb, 0x64, 0x42, 0xe2, 0x3c, 0xa4,
|
||||
0x6c, 0x7a, 0xc4, 0x84, 0x43, 0xab, 0x2c, 0x67, 0x2c, 0x18, 0x4b, 0xa9, 0xca, 0xe9, 0x06, 0x2e,
|
||||
0xc3, 0xb8, 0x8e, 0x98, 0x1b, 0x59, 0x30, 0x96, 0x26, 0x4a, 0xe9, 0x02, 0x75, 0xac, 0x42, 0x10,
|
||||
0x25, 0x30, 0x93, 0x6d, 0xc0, 0x1d, 0x26, 0x87, 0x0b, 0x8f, 0x30, 0xea, 0x2d, 0x54, 0xe8, 0x54,
|
||||
0x45, 0x7d, 0x93, 0x87, 0x90, 0xd9, 0xa5, 0xb2, 0xfa, 0xfa, 0xec, 0x91, 0x3e, 0x1a, 0x90, 0xed,
|
||||
0x41, 0x2a, 0xf3, 0xba, 0xf8, 0xef, 0x60, 0x98, 0x83, 0x73, 0x0e, 0xaf, 0x3d, 0xf2, 0xb6, 0x13,
|
||||
0x6a, 0x5b, 0x2f, 0x71, 0x11, 0xd2, 0x55, 0x6e, 0x4b, 0x6a, 0xd9, 0xcc, 0x55, 0xf6, 0x51, 0x65,
|
||||
0x0f, 0x6f, 0x92, 0x43, 0xc8, 0x94, 0x2d, 0x11, 0xc0, 0x0c, 0x48, 0x52, 0x84, 0x19, 0x7d, 0xc1,
|
||||
0x4f, 0xfd, 0x07, 0x7d, 0x66, 0xd5, 0x7c, 0xb0, 0x38, 0x13, 0xd9, 0x83, 0xd9, 0x48, 0x1e, 0xe1,
|
||||
0x70, 0x5b, 0x30, 0xcc, 0x40, 0xb2, 0xca, 0x9b, 0xb6, 0x54, 0x49, 0x92, 0x95, 0xee, 0x02, 0x57,
|
||||
0x20, 0xa5, 0xa3, 0x88, 0xdc, 0xc8, 0x42, 0xa2, 0xff, 0x85, 0x4f, 0xed, 0x64, 0x11, 0xc6, 0xcb,
|
||||
0xbc, 0xbe, 0x65, 0x4b, 0xf7, 0x9d, 0x77, 0x1f, 0x5e, 0x81, 0xcc, 0x0f, 0x98, 0xaa, 0xe8, 0x25,
|
||||
0xf9, 0x69, 0xc0, 0xb8, 0x3e, 0x8d, 0xd3, 0x90, 0x68, 0x5a, 0x35, 0xdf, 0xc5, 0xfb, 0x8c, 0xbd,
|
||||
0xdc, 0x2c, 0x8c, 0x09, 0x49, 0x65, 0x53, 0xf8, 0x77, 0xeb, 0xaf, 0xf0, 0x0e, 0x80, 0x43, 0x5d,
|
||||
0x7a, 0xc4, 0x24, 0x73, 0x45, 0x6e, 0x54, 0xe1, 0x65, 0x43, 0x78, 0x8f, 0xb5, 0xb9, 0xd2, 0xe3,
|
||||
0x89, 0x0f, 0x60, 0x3a, 0x7a, 0x37, 0xb9, 0xa4, 0x6a, 0xdf, 0xd9, 0xd0, 0x69, 0x6d, 0xac, 0xf4,
|
||||
0xb9, 0x93, 0x0d, 0xb8, 0xd0, 0x97, 0x23, 0x60, 0x37, 0x7a, 0xd8, 0x33, 0x90, 0x6c, 0xd1, 0x46,
|
||||
0x53, 0x17, 0xd4, 0x5d, 0x94, 0x3e, 0x9d, 0x87, 0x29, 0x7d, 0xfe, 0x09, 0x73, 0x5b, 0x56, 0x95,
|
||||
0xa1, 0x0b, 0x93, 0x61, 0x0d, 0x62, 0x5e, 0xd1, 0xc4, 0x0a, 0x33, 0x1f, 0x7e, 0x06, 0x72, 0xfb,
|
||||
0xfd, 0xc9, 0xaf, 0xcf, 0x23, 0x26, 0xb9, 0xe6, 0x29, 0x5f, 0x98, 0xad, 0xb5, 0x03, 0x26, 0xe9,
|
||||
0x9a, 0xd9, 0x0e, 0x7a, 0xa5, 0x63, 0x06, 0x0f, 0xb5, 0x1e, 0xa8, 0x12, 0x2d, 0x98, 0xe8, 0x91,
|
||||
0x00, 0xce, 0xa9, 0xa0, 0xfd, 0x3a, 0x8d, 0x66, 0x2b, 0xa9, 0x6c, 0xab, 0x78, 0x63, 0x80, 0x6c,
|
||||
0xdd, 0xdd, 0x0e, 0x0a, 0x48, 0x87, 0x3a, 0x0f, 0x2f, 0xaa, 0x98, 0x71, 0x5d, 0x9f, 0xcf, 0xc7,
|
||||
0x99, 0xba, 0x8d, 0x4a, 0x56, 0x54, 0xee, 0xeb, 0x38, 0x48, 0xa5, 0xd8, 0x84, 0x74, 0x68, 0x5a,
|
||||
0xf8, 0x49, 0xe3, 0x26, 0x48, 0xb4, 0xc6, 0xbb, 0x2a, 0x4f, 0x09, 0x8b, 0x83, 0xd7, 0x68, 0x1e,
|
||||
0x7b, 0x71, 0x8b, 0x06, 0x7e, 0x33, 0x60, 0x2a, 0x32, 0x5a, 0xf0, 0x52, 0xf4, 0x6e, 0x7b, 0x06,
|
||||
0x8e, 0x9f, 0x5b, 0xab, 0x87, 0x50, 0x95, 0xfb, 0x25, 0xbe, 0x18, 0x22, 0xb7, 0xc3, 0x6b, 0xc2,
|
||||
0x6c, 0xfb, 0x53, 0xa7, 0x63, 0x06, 0xe3, 0x45, 0x98, 0xed, 0xd0, 0xa8, 0xe9, 0x98, 0x0d, 0x5e,
|
||||
0x17, 0x45, 0x03, 0xbf, 0x1a, 0x90, 0x0d, 0xf7, 0x96, 0xee, 0x6e, 0x24, 0x31, 0x8d, 0x17, 0x88,
|
||||
0xc1, 0x47, 0x8e, 0x97, 0x0a, 0xd9, 0x56, 0xe8, 0xf7, 0xc9, 0xea, 0xbf, 0xd1, 0x83, 0x1f, 0x21,
|
||||
0xb1, 0xde, 0x27, 0x30, 0xfc, 0x61, 0xc0, 0xe5, 0x78, 0x80, 0xe7, 0xcc, 0x15, 0x16, 0xb7, 0xcf,
|
||||
0x02, 0x79, 0xa8, 0x20, 0xf7, 0x49, 0x79, 0x18, 0x48, 0xb3, 0x1d, 0x85, 0x2c, 0x34, 0xad, 0x5a,
|
||||
0xc7, 0x6c, 0x75, 0x79, 0xe2, 0x8a, 0x38, 0x31, 0x60, 0xa6, 0xe7, 0xc5, 0x83, 0xfd, 0x2b, 0xd1,
|
||||
0x5e, 0x18, 0x90, 0xfb, 0x83, 0xa1, 0xc0, 0x3b, 0x58, 0x1a, 0x0e, 0xdc, 0xe3, 0xdc, 0xdb, 0xc1,
|
||||
0xad, 0xe1, 0x4f, 0x05, 0xd5, 0x99, 0x6d, 0xff, 0xab, 0x83, 0xdf, 0x0d, 0x98, 0xef, 0xd5, 0x66,
|
||||
0xe4, 0x61, 0x04, 0x2e, 0xf5, 0xc9, 0x37, 0xea, 0xa2, 0xeb, 0x5c, 0x1e, 0xc0, 0xd3, 0xd7, 0xfd,
|
||||
0xa6, 0x2a, 0x7d, 0x03, 0xef, 0x9d, 0xa1, 0x08, 0xfc, 0x62, 0x84, 0x7f, 0xff, 0x74, 0x36, 0x81,
|
||||
0x57, 0xff, 0x48, 0x12, 0xc0, 0x92, 0xbf, 0xb9, 0xf8, 0x94, 0xb7, 0x14, 0x65, 0x01, 0x87, 0x6a,
|
||||
0xff, 0x83, 0x31, 0xf5, 0x2f, 0xec, 0xe6, 0xef, 0x00, 0x00, 0x00, 0xff, 0xff, 0x18, 0x2a, 0x86,
|
||||
0x9a, 0xd3, 0x09, 0x00, 0x00,
|
||||
}
|
||||
|
||||
// Reference imports to suppress errors if they are not otherwise used.
|
||||
|
||||
@@ -292,10 +292,6 @@ func request_WorkflowService_WatchWorkflow_0(ctx context.Context, marshaler runt
|
||||
|
||||
}
|
||||
|
||||
var (
|
||||
filter_WorkflowService_GetWorkflowLogs_0 = &utilities.DoubleArray{Encoding: map[string]int{"namespace": 0, "name": 1, "podName": 2}, Base: []int{1, 1, 2, 3, 0, 0, 0}, Check: []int{0, 1, 1, 1, 2, 3, 4}}
|
||||
)
|
||||
|
||||
func request_WorkflowService_GetWorkflowLogs_0(ctx context.Context, marshaler runtime.Marshaler, client WorkflowServiceClient, req *http.Request, pathParams map[string]string) (WorkflowService_GetWorkflowLogsClient, runtime.ServerMetadata, error) {
|
||||
var protoReq GetWorkflowLogsRequest
|
||||
var metadata runtime.ServerMetadata
|
||||
@@ -340,11 +336,15 @@ func request_WorkflowService_GetWorkflowLogs_0(ctx context.Context, marshaler ru
|
||||
return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "podName", err)
|
||||
}
|
||||
|
||||
if err := req.ParseForm(); err != nil {
|
||||
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
|
||||
val, ok = pathParams["containerName"]
|
||||
if !ok {
|
||||
return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "containerName")
|
||||
}
|
||||
if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_WorkflowService_GetWorkflowLogs_0); err != nil {
|
||||
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
|
||||
|
||||
protoReq.ContainerName, err = runtime.String(val)
|
||||
|
||||
if err != nil {
|
||||
return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "containerName", err)
|
||||
}
|
||||
|
||||
stream, err := client.GetWorkflowLogs(ctx, &protoReq)
|
||||
@@ -1313,7 +1313,7 @@ var (
|
||||
|
||||
pattern_WorkflowService_WatchWorkflow_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 2, 2, 3, 1, 0, 4, 1, 5, 4, 2, 5}, []string{"apis", "v1beta1", "namespace", "workflows", "name", "watch"}, "", runtime.AssumeColonVerbOpt(true)))
|
||||
|
||||
pattern_WorkflowService_GetWorkflowLogs_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 2, 2, 3, 1, 0, 4, 1, 5, 4, 2, 5, 1, 0, 4, 1, 5, 6, 2, 7}, []string{"apis", "v1beta1", "namespace", "workflows", "name", "pods", "podName", "log"}, "", runtime.AssumeColonVerbOpt(true)))
|
||||
pattern_WorkflowService_GetWorkflowLogs_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 2, 2, 3, 1, 0, 4, 1, 5, 4, 2, 5, 1, 0, 4, 1, 5, 6, 2, 7, 1, 0, 4, 1, 5, 8, 2, 9}, []string{"apis", "v1beta1", "namespace", "workflows", "name", "pods", "podName", "containers", "containerName", "logs"}, "", runtime.AssumeColonVerbOpt(true)))
|
||||
|
||||
pattern_WorkflowService_CreateWorkflowTemplate_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 2, 2, 3}, []string{"apis", "v1beta1", "namespace", "workflow_templates"}, "", runtime.AssumeColonVerbOpt(true)))
|
||||
|
||||
|
||||
@@ -34,7 +34,7 @@ service WorkflowService {
|
||||
|
||||
rpc GetWorkflowLogs (GetWorkflowLogsRequest) returns (stream LogEntry) {
|
||||
option (google.api.http) = {
|
||||
get: "/apis/v1beta1/{namespace}/workflows/{name}/pods/{podName}/log"
|
||||
get: "/apis/v1beta1/{namespace}/workflows/{name}/pods/{podName}/containers/{containerName}/logs"
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@@ -298,7 +298,7 @@
|
||||
]
|
||||
}
|
||||
},
|
||||
"/apis/v1beta1/{namespace}/workflows/{name}/pods/{podName}/log": {
|
||||
"/apis/v1beta1/{namespace}/workflows/{name}/pods/{podName}/containers/{containerName}/logs": {
|
||||
"get": {
|
||||
"operationId": "GetWorkflowLogs",
|
||||
"responses": {
|
||||
@@ -330,8 +330,8 @@
|
||||
},
|
||||
{
|
||||
"name": "containerName",
|
||||
"in": "query",
|
||||
"required": false,
|
||||
"in": "path",
|
||||
"required": true,
|
||||
"type": "string"
|
||||
}
|
||||
],
|
||||
|
||||
@@ -4,12 +4,14 @@ import (
|
||||
"bufio"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"io"
|
||||
"os"
|
||||
"strconv"
|
||||
"time"
|
||||
|
||||
"github.com/onepanelio/core/kube"
|
||||
"github.com/onepanelio/core/model"
|
||||
"github.com/onepanelio/core/s3"
|
||||
"github.com/onepanelio/core/util"
|
||||
"google.golang.org/grpc/codes"
|
||||
)
|
||||
@@ -136,7 +138,30 @@ func (r *ResourceManager) WatchWorkflow(namespace, name string) (<-chan *model.W
|
||||
}
|
||||
|
||||
func (r *ResourceManager) GetWorkflowLogs(namespace, name, podName, containerName string) (<-chan *model.LogEntry, error) {
|
||||
stream, err := r.kubeClient.GetPodLogs(namespace, podName, containerName)
|
||||
wf, err := r.kubeClient.GetWorkflow(namespace, name)
|
||||
if err != nil {
|
||||
return nil, util.NewUserError(codes.NotFound, "Workflow not found.")
|
||||
}
|
||||
|
||||
var (
|
||||
stream io.ReadCloser
|
||||
s3Client *s3.Client
|
||||
)
|
||||
|
||||
if wf.Status.Completed() {
|
||||
s3Client, err = s3.NewClient(s3.Config{
|
||||
AccessKey: os.Getenv("ARTIFACT_REPOSITORY_ACCESS_KEY"),
|
||||
SecretKey: os.Getenv("ARTIFACT_REPOSITORY_SECRET_KEY"),
|
||||
Region: os.Getenv("ARTIFACT_REPOSITORY_REGION"),
|
||||
Endpoint: os.Getenv("ARTIFACT_REPOSITORY_ENDPOINT"),
|
||||
})
|
||||
if err != nil {
|
||||
return nil, util.NewUserError(codes.PermissionDenied, "Can't connect to S3 storage.")
|
||||
}
|
||||
stream, err = s3Client.StreamObject(os.Getenv("ARTIFACT_REPOSITORY_BUCKET"), "artifacts/"+namespace+"/"+name+"/"+podName+"/"+containerName+".log")
|
||||
} else {
|
||||
stream, err = r.kubeClient.GetPodLogs(namespace, podName, containerName)
|
||||
}
|
||||
// TODO: Catch exact kubernetes error
|
||||
if err != nil {
|
||||
return nil, util.NewUserError(codes.NotFound, "Log not found.")
|
||||
|
||||
36
s3/s3.go
36
s3/s3.go
@@ -1,8 +1,7 @@
|
||||
package s3
|
||||
|
||||
import (
|
||||
"io/ioutil"
|
||||
"time"
|
||||
"io"
|
||||
|
||||
"github.com/aws/aws-sdk-go/aws"
|
||||
"github.com/aws/aws-sdk-go/aws/credentials"
|
||||
@@ -14,17 +13,18 @@ type Client struct {
|
||||
*s3.S3
|
||||
}
|
||||
|
||||
type Object struct {
|
||||
Key *string `json:"key"`
|
||||
LastModified *time.Time `json:"last_modified"`
|
||||
Size *int64 `json:"size"`
|
||||
IsPrefix bool `json:"is_prefix"`
|
||||
type Config struct {
|
||||
AccessKey string
|
||||
SecretKey string
|
||||
Endpoint string
|
||||
Region string
|
||||
}
|
||||
|
||||
func NewClient(id, secret, region string) (s3Client *Client, err error) {
|
||||
func NewClient(config Config) (s3Client *Client, err error) {
|
||||
session, err := session.NewSession(&aws.Config{
|
||||
Credentials: credentials.NewStaticCredentials(id, secret, ""),
|
||||
Region: aws.String(region),
|
||||
Credentials: credentials.NewStaticCredentials(config.AccessKey, config.SecretKey, ""),
|
||||
Region: aws.String(config.Region),
|
||||
Endpoint: aws.String(config.Endpoint),
|
||||
})
|
||||
if err != nil {
|
||||
return nil, err
|
||||
@@ -32,7 +32,7 @@ func NewClient(id, secret, region string) (s3Client *Client, err error) {
|
||||
return &Client{S3: s3.New(session)}, nil
|
||||
}
|
||||
|
||||
func (c *Client) GetObject(bucket, key string) (content *[]byte, err error) {
|
||||
func (c *Client) StreamObject(bucket, key string) (stream io.ReadCloser, err error) {
|
||||
out, err := c.S3.GetObject(&s3.GetObjectInput{
|
||||
Bucket: aws.String(bucket),
|
||||
Key: aws.String(key),
|
||||
@@ -41,12 +41,12 @@ func (c *Client) GetObject(bucket, key string) (content *[]byte, err error) {
|
||||
return
|
||||
}
|
||||
|
||||
defer out.Body.Close()
|
||||
data, err := ioutil.ReadAll(out.Body)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
content = &data
|
||||
switch {
|
||||
case (out.Body != nil):
|
||||
return out.Body, nil
|
||||
|
||||
return
|
||||
default:
|
||||
defer out.Body.Close()
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user