diff --git a/pkg/skaffold/event/v2/event.go b/pkg/skaffold/event/v2/event.go index b06e086a007..001f5c31a6c 100644 --- a/pkg/skaffold/event/v2/event.go +++ b/pkg/skaffold/event/v2/event.go @@ -68,6 +68,8 @@ type eventHandler struct { logLock sync.Mutex applicationLogs []proto.Event applicationLogsLock sync.Mutex + skaffoldLogs []proto.Event + skaffoldLogsLock sync.Mutex cfg Config iteration int @@ -76,6 +78,7 @@ type eventHandler struct { eventChan chan *proto.Event eventListeners []*listener applicationLogListeners []*listener + skaffoldLogListeners []*listener } type listener struct { @@ -101,6 +104,10 @@ func ForEachApplicationLog(callback func(*proto.Event) error) error { return handler.forEachApplicationLog(callback) } +func ForEachSkaffoldLog(callback func(*proto.Event) error) error { + return handler.forEachSkaffoldLog(callback) +} + func Handle(event *proto.Event) error { if event != nil { handler.handle(event) @@ -178,6 +185,10 @@ func (ev *eventHandler) forEachApplicationLog(callback func(*proto.Event) error) return ev.forEach(&ev.applicationLogListeners, &ev.applicationLogs, &ev.applicationLogsLock, callback) } +func (ev *eventHandler) forEachSkaffoldLog(callback func(*proto.Event) error) error { + return ev.forEach(&ev.skaffoldLogListeners, &ev.skaffoldLogs, &ev.skaffoldLogsLock, callback) +} + func emptyState(cfg Config) proto.State { builds := map[string]string{} for _, p := range cfg.GetPipelines() { diff --git a/pkg/skaffold/server/v2/endpoints.go b/pkg/skaffold/server/v2/endpoints.go index 194e3c702a2..65ecddc9779 100644 --- a/pkg/skaffold/server/v2/endpoints.go +++ b/pkg/skaffold/server/v2/endpoints.go @@ -46,6 +46,10 @@ func (s *Server) ApplicationLogs(_ *empty.Empty, stream proto.SkaffoldV2Service_ return event.ForEachApplicationLog(stream.Send) } +func (s *Server) SkaffoldLogs(_ *empty.Empty, stream proto.SkaffoldV2Service_SkaffoldLogsServer) error { + return event.ForEachSkaffoldLog(stream.Send) +} + func (s *Server) Handle(ctx context.Context, e *proto.Event) (*empty.Empty, error) { return &empty.Empty{}, event.Handle(e) } diff --git a/proto/v2/skaffold.pb.go b/proto/v2/skaffold.pb.go index c17b3f0b4c6..dba7107db83 100644 --- a/proto/v2/skaffold.pb.go +++ b/proto/v2/skaffold.pb.go @@ -2723,144 +2723,145 @@ func init() { func init() { proto.RegisterFile("v2/skaffold.proto", fileDescriptor_39088757fd9c8e40) } var fileDescriptor_39088757fd9c8e40 = []byte{ - // 2187 bytes of a gzipped FileDescriptorProto + // 2197 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x59, 0x4f, 0x6f, 0x1b, 0xc7, - 0x15, 0x37, 0x49, 0x2d, 0xc9, 0x7d, 0x14, 0x65, 0x69, 0x64, 0x4b, 0x2c, 0x2d, 0x27, 0xf2, 0x26, + 0x15, 0x17, 0x49, 0x2d, 0xc9, 0x7d, 0x14, 0x65, 0x69, 0x64, 0x4b, 0x2c, 0x2d, 0x27, 0xf2, 0x26, 0x69, 0x9d, 0x7f, 0xa4, 0x25, 0xb7, 0x71, 0x60, 0x54, 0x09, 0x24, 0x59, 0x96, 0x54, 0xbb, 0x76, - 0x3c, 0x52, 0x02, 0xf4, 0x4f, 0x60, 0xac, 0xb8, 0x23, 0x7a, 0x21, 0x72, 0x97, 0xdd, 0x9d, 0x65, - 0xca, 0x5b, 0xd1, 0x53, 0xcf, 0x6d, 0x3e, 0x40, 0xaf, 0xbd, 0xf5, 0xd0, 0x6f, 0x50, 0xa0, 0xf7, - 0xa2, 0x40, 0xaf, 0x45, 0x81, 0x1e, 0x8a, 0xa2, 0x1f, 0xa2, 0x98, 0x7f, 0xbb, 0x33, 0xbb, 0xa4, - 0x25, 0xd9, 0x30, 0x7a, 0x91, 0x76, 0x66, 0x7e, 0xef, 0xcd, 0x7b, 0x6f, 0xde, 0xbc, 0xf9, 0xcd, - 0x10, 0x96, 0xc6, 0x9b, 0xdd, 0xf8, 0xcc, 0x3d, 0x3d, 0x0d, 0x07, 0x5e, 0x67, 0x14, 0x85, 0x34, - 0x44, 0x75, 0xfe, 0xaf, 0x33, 0xde, 0x6c, 0xaf, 0xf5, 0xc3, 0xb0, 0x3f, 0x20, 0x5d, 0x77, 0xe4, - 0x77, 0xdd, 0x20, 0x08, 0xa9, 0x4b, 0xfd, 0x30, 0x88, 0x05, 0xae, 0xfd, 0xb6, 0x1c, 0xe5, 0xad, - 0x93, 0xe4, 0xb4, 0x4b, 0xfd, 0x21, 0x89, 0xa9, 0x3b, 0x1c, 0x49, 0xc0, 0x8d, 0x3c, 0x80, 0x0c, - 0x47, 0x74, 0x22, 0x07, 0x97, 0x48, 0x90, 0x0c, 0xe3, 0x2e, 0xff, 0x2b, 0xba, 0x9c, 0x4f, 0xa0, - 0x79, 0x44, 0x5d, 0x4a, 0x30, 0x89, 0x47, 0x61, 0x10, 0x13, 0xf4, 0x1e, 0x58, 0x31, 0xeb, 0x68, - 0x95, 0xd6, 0x4b, 0xb7, 0x1b, 0x9b, 0x57, 0x3b, 0xca, 0xb2, 0x8e, 0xc0, 0x89, 0x51, 0x67, 0x0d, - 0xea, 0xa9, 0xc8, 0x22, 0x54, 0x86, 0x71, 0x9f, 0x0b, 0xd8, 0x98, 0x7d, 0x3a, 0x37, 0xa1, 0x86, - 0xc9, 0x2f, 0x12, 0x12, 0x53, 0x84, 0x60, 0x2e, 0x70, 0x87, 0x44, 0x8e, 0xf2, 0x6f, 0xe7, 0x9f, - 0x73, 0x60, 0x71, 0x6d, 0xe8, 0xfb, 0x00, 0x27, 0x89, 0x3f, 0xf0, 0x8e, 0xb4, 0x29, 0xaf, 0x65, - 0x53, 0xee, 0xa4, 0x63, 0x58, 0xc3, 0xa1, 0x7b, 0xd0, 0xf0, 0xc8, 0x68, 0x10, 0x4e, 0x84, 0x58, - 0x99, 0x8b, 0x5d, 0xcf, 0xc4, 0x1e, 0x64, 0x83, 0x58, 0x47, 0xa2, 0x47, 0xb0, 0x70, 0x1a, 0x46, - 0xdf, 0xb8, 0x91, 0x47, 0xbc, 0x2f, 0xc2, 0x88, 0xc6, 0xad, 0xca, 0x7a, 0xe5, 0x76, 0x63, 0xf3, - 0x9d, 0x9c, 0x97, 0x9d, 0x87, 0x06, 0x6a, 0x2f, 0xa0, 0xd1, 0x04, 0xe7, 0x44, 0xd1, 0x43, 0x58, - 0x64, 0xb1, 0x48, 0xe2, 0xdd, 0x17, 0xa4, 0x77, 0x26, 0x4c, 0x99, 0xe3, 0xa6, 0xb4, 0x4d, 0x75, - 0x3a, 0x02, 0x17, 0x64, 0xd0, 0x16, 0x34, 0x4f, 0xfd, 0x01, 0x39, 0x9a, 0x04, 0x3d, 0xa1, 0xc4, - 0xe2, 0x4a, 0x56, 0x33, 0x25, 0x0f, 0xf5, 0x61, 0x6c, 0xa2, 0xd1, 0x11, 0x2c, 0x7b, 0xe4, 0x24, - 0xe9, 0xf7, 0xfd, 0xa0, 0xbf, 0x1b, 0x06, 0xd4, 0xf5, 0x03, 0x12, 0xc5, 0xad, 0x2a, 0x77, 0xec, - 0x96, 0x1e, 0x94, 0x3c, 0x68, 0x6f, 0x4c, 0x02, 0x8a, 0xa7, 0x49, 0xa3, 0x0e, 0xd4, 0x87, 0x84, - 0xba, 0x9e, 0x4b, 0xdd, 0x56, 0x8d, 0x9b, 0x83, 0x32, 0x4d, 0x3f, 0x96, 0x23, 0x38, 0xc5, 0xa0, - 0x0d, 0xb0, 0x29, 0x89, 0xa9, 0xb0, 0xbf, 0xce, 0x05, 0x96, 0x33, 0x81, 0x63, 0x35, 0x84, 0x33, - 0x54, 0xfb, 0x6b, 0x58, 0x9e, 0x12, 0x65, 0x96, 0x4c, 0x67, 0x64, 0xc2, 0x53, 0xc1, 0xc2, 0xec, - 0x13, 0xdd, 0x01, 0x6b, 0xec, 0x0e, 0x12, 0xb5, 0xce, 0x5a, 0x70, 0x99, 0x98, 0xd4, 0x21, 0x7c, - 0x11, 0xc0, 0xfb, 0xe5, 0x4f, 0x4b, 0xce, 0x1f, 0xcb, 0x50, 0x57, 0x86, 0xa2, 0x8f, 0xc1, 0xe2, - 0xe9, 0x23, 0x33, 0x6c, 0x35, 0x97, 0x61, 0xa9, 0x43, 0x02, 0x85, 0xee, 0x40, 0x55, 0x64, 0x8d, - 0x9c, 0xb2, 0x95, 0x4f, 0xad, 0x54, 0x40, 0xe2, 0xd0, 0x07, 0x30, 0xc7, 0x3c, 0x6b, 0x55, 0x38, - 0x7e, 0xc5, 0x74, 0x3d, 0x45, 0x73, 0x0c, 0xba, 0x06, 0x56, 0x94, 0x04, 0x87, 0x0f, 0x78, 0xb2, - 0xd8, 0x58, 0x34, 0xd0, 0x0e, 0x80, 0xeb, 0x79, 0x3e, 0xdb, 0xec, 0xee, 0xa0, 0xd5, 0xe3, 0xab, - 0xe7, 0x14, 0x63, 0xde, 0xd9, 0x4e, 0x41, 0x22, 0x2b, 0x35, 0xa9, 0xf6, 0x16, 0x5c, 0xcd, 0x0d, - 0xeb, 0xe1, 0xb4, 0x45, 0x38, 0xaf, 0xe9, 0xe1, 0xb4, 0xf5, 0x90, 0xfd, 0xb5, 0x0c, 0x4d, 0x23, - 0x1e, 0xe8, 0x33, 0xb0, 0xdd, 0x88, 0xfa, 0xa7, 0x6e, 0x8f, 0xc6, 0xad, 0x12, 0xb7, 0x69, 0x7d, - 0x46, 0xec, 0x3a, 0xdb, 0x12, 0x88, 0x33, 0x11, 0x1e, 0x96, 0xc9, 0x48, 0x4c, 0xb5, 0x90, 0x86, - 0x45, 0xd4, 0x1f, 0x2e, 0x7d, 0x3c, 0x19, 0x11, 0xcc, 0x31, 0x68, 0x7f, 0x4a, 0x00, 0xbe, 0x37, - 0x73, 0xb2, 0x97, 0x44, 0xe1, 0x31, 0xd4, 0x95, 0x2d, 0xe8, 0x23, 0x69, 0x40, 0x89, 0x1b, 0xd0, - 0x2a, 0x1a, 0x40, 0x22, 0xcd, 0x04, 0x55, 0xab, 0xca, 0x59, 0xad, 0x7a, 0xdd, 0x98, 0x7e, 0x5b, - 0x82, 0x79, 0x3d, 0x07, 0xd0, 0x3d, 0xa8, 0xb1, 0x36, 0xdb, 0xa2, 0x22, 0xa0, 0x37, 0xa7, 0x27, - 0x4b, 0x47, 0xa0, 0xb0, 0x42, 0xb7, 0x1f, 0x41, 0x55, 0x7c, 0xa2, 0x0f, 0x0d, 0xa7, 0x56, 0x0d, - 0xa7, 0x04, 0x44, 0xf3, 0xe9, 0x1a, 0x58, 0xbd, 0x30, 0x09, 0x28, 0x37, 0xcd, 0xc2, 0xa2, 0xe1, - 0xfc, 0xbd, 0x04, 0x0b, 0x66, 0x2a, 0xa3, 0xcf, 0xc1, 0x16, 0xc9, 0x9c, 0x99, 0x76, 0x6b, 0x56, - 0xde, 0xcb, 0x26, 0x89, 0x70, 0x26, 0x83, 0x36, 0xa1, 0xd6, 0x1b, 0x24, 0x6c, 0x7a, 0xb9, 0xde, - 0x66, 0xb8, 0x77, 0xc5, 0x18, 0x37, 0x4d, 0x01, 0xdb, 0x4f, 0xa1, 0xae, 0x54, 0xa1, 0x8f, 0x0d, - 0xb7, 0xbe, 0x63, 0x08, 0x2b, 0xd0, 0xb9, 0x8e, 0xfd, 0xbb, 0x04, 0x90, 0x9d, 0x1a, 0x68, 0xbb, - 0x98, 0xc0, 0xef, 0x4c, 0x3b, 0x5e, 0xd2, 0xec, 0x95, 0xb5, 0x5e, 0xcb, 0xe1, 0x75, 0x68, 0xb8, - 0x09, 0x0d, 0x8f, 0x23, 0xbf, 0xdf, 0x97, 0xae, 0xd5, 0xb1, 0xde, 0x85, 0xee, 0x01, 0xc8, 0xa2, - 0x1e, 0x7a, 0x84, 0x97, 0x80, 0xfc, 0xaa, 0x1c, 0xa5, 0xc3, 0x58, 0x83, 0xb6, 0x7f, 0x08, 0x0b, - 0xe6, 0xbc, 0x97, 0x4a, 0xad, 0x9f, 0x83, 0x9d, 0x16, 0x56, 0xb4, 0x02, 0x55, 0xa1, 0x58, 0xca, - 0xca, 0x56, 0xce, 0xb6, 0xf2, 0x85, 0x6d, 0x73, 0x7e, 0x55, 0x82, 0x86, 0x76, 0x8e, 0xce, 0x9c, - 0xe0, 0xcd, 0x85, 0xc7, 0xf9, 0x4f, 0x09, 0x16, 0xf3, 0xe7, 0xe7, 0x4c, 0x3b, 0xf6, 0xc1, 0x8e, - 0x48, 0x1c, 0x26, 0x51, 0x8f, 0xc4, 0xad, 0x32, 0x5f, 0xe9, 0xf7, 0x67, 0x1f, 0xc3, 0x1d, 0xac, - 0xb0, 0x72, 0xbd, 0x53, 0xd9, 0xd7, 0x5a, 0x4d, 0x53, 0xeb, 0xa5, 0x56, 0xf3, 0x10, 0x9a, 0xc6, - 0x31, 0xff, 0xea, 0x01, 0x77, 0xfe, 0x54, 0x03, 0x8b, 0x9f, 0x87, 0xe8, 0x53, 0xb0, 0x53, 0x82, - 0x28, 0xcf, 0xbe, 0x76, 0x47, 0x30, 0xc4, 0x8e, 0x62, 0x88, 0x9d, 0x63, 0x85, 0xc0, 0x19, 0x18, - 0xdd, 0x05, 0x9b, 0x1d, 0xee, 0x5c, 0x8d, 0x3c, 0x05, 0x97, 0xcd, 0xd3, 0x88, 0x0f, 0x1d, 0x5c, - 0xc1, 0x19, 0x0e, 0x1d, 0xc0, 0xa2, 0xe2, 0xb5, 0x8f, 0xc3, 0xbe, 0x90, 0xad, 0x14, 0x18, 0x51, - 0x0e, 0x71, 0x70, 0x05, 0x17, 0xa4, 0xd0, 0x33, 0x58, 0x76, 0x47, 0xa3, 0x81, 0xdf, 0xe3, 0xec, - 0x37, 0x55, 0x26, 0xe8, 0x95, 0x56, 0x31, 0xb7, 0x8b, 0xa0, 0x83, 0x2b, 0x78, 0x9a, 0x2c, 0xf3, - 0x88, 0xba, 0xf1, 0x99, 0x50, 0x64, 0x15, 0x28, 0x8a, 0x1a, 0x62, 0x1e, 0xa5, 0x38, 0xf4, 0x08, - 0x96, 0x04, 0xef, 0x4c, 0x4e, 0x32, 0xe1, 0x2a, 0x17, 0xbe, 0x91, 0xaf, 0x23, 0x1a, 0xe4, 0xe0, - 0x0a, 0x2e, 0xca, 0xa1, 0x27, 0x80, 0x24, 0x19, 0xd5, 0xb5, 0x09, 0x7a, 0xb5, 0x56, 0x60, 0xaf, - 0xa6, 0xba, 0x29, 0x92, 0xe8, 0x3e, 0xd8, 0xa3, 0x30, 0xa2, 0x42, 0x4d, 0xfd, 0x3c, 0x72, 0xc4, - 0x1c, 0x4b, 0xe1, 0xe8, 0x6b, 0x58, 0xd5, 0x89, 0xa8, 0x6e, 0x90, 0xcd, 0x35, 0xdd, 0x9a, 0xbe, - 0x79, 0x4c, 0xab, 0x66, 0xe9, 0x40, 0x9f, 0x67, 0x9c, 0x56, 0x28, 0x85, 0x59, 0x9c, 0x56, 0xa9, - 0x32, 0xf1, 0xcc, 0x3e, 0x6f, 0x3a, 0x61, 0x6d, 0x35, 0xf2, 0xf6, 0xcd, 0x60, 0xb6, 0xcc, 0xbe, - 0x19, 0x3a, 0x58, 0xa6, 0x52, 0x12, 0x0d, 0xfd, 0x80, 0xe7, 0x88, 0xd0, 0x3b, 0x9f, 0x8f, 0xe0, - 0x71, 0x0e, 0xc1, 0x32, 0x35, 0x2f, 0xc5, 0x16, 0x81, 0xb1, 0x3a, 0xa1, 0xa2, 0x59, 0x54, 0x11, - 0xd3, 0x5c, 0xcc, 0x32, 0xf8, 0xce, 0x3c, 0x00, 0x61, 0x1f, 0xcf, 0xd9, 0x81, 0xe6, 0x7c, 0x09, - 0x8b, 0xf9, 0x19, 0x67, 0x16, 0x81, 0xf7, 0xa1, 0x42, 0xa2, 0x48, 0x6e, 0x4c, 0x2d, 0xaa, 0xdb, - 0x3d, 0x4e, 0x54, 0x4e, 0x06, 0x64, 0x2f, 0x8a, 0x30, 0xc3, 0x30, 0x06, 0xd2, 0x34, 0xba, 0xd1, - 0x06, 0xd4, 0x48, 0x14, 0xf1, 0xf2, 0x56, 0x7a, 0x79, 0x79, 0x53, 0x38, 0xd4, 0x82, 0xda, 0x90, - 0xc4, 0xb1, 0xdb, 0x57, 0x95, 0x4b, 0x35, 0xd1, 0x27, 0xd0, 0x88, 0x93, 0x7e, 0x9f, 0xc4, 0xfc, - 0x9a, 0x2a, 0xef, 0x53, 0xda, 0x15, 0xee, 0x28, 0x1d, 0xc4, 0x3a, 0xd0, 0x79, 0x06, 0x76, 0x5a, - 0x45, 0x58, 0x59, 0x24, 0xac, 0x62, 0x4a, 0x2f, 0x45, 0xc3, 0xb8, 0x84, 0x94, 0xcf, 0xbf, 0x84, - 0x38, 0x7f, 0x60, 0xe7, 0x45, 0xbe, 0x92, 0xac, 0x42, 0x8d, 0x45, 0xff, 0xb9, 0xef, 0xa9, 0x10, - 0xb2, 0xe6, 0xa1, 0x87, 0x6e, 0x02, 0xc4, 0x62, 0x65, 0xd8, 0x98, 0xf0, 0xca, 0x96, 0x3d, 0x87, - 0x1e, 0x8b, 0x7c, 0x18, 0xf9, 0x7d, 0x3f, 0xe0, 0x15, 0xcc, 0xc6, 0xb2, 0x85, 0x3e, 0x04, 0x6b, - 0x40, 0xc6, 0x64, 0xc0, 0x6b, 0xd1, 0x42, 0x7a, 0xeb, 0x14, 0xa1, 0x7b, 0x1c, 0xf6, 0x1f, 0xb3, - 0x41, 0x2c, 0x30, 0x7a, 0xd8, 0x2c, 0x23, 0x6c, 0x4e, 0x08, 0xcb, 0x53, 0x6a, 0x17, 0x7a, 0x17, - 0x9a, 0x3d, 0x95, 0xa9, 0x4f, 0xb2, 0x6b, 0xb3, 0xd9, 0xc9, 0xd4, 0x8e, 0x42, 0xef, 0x49, 0x46, - 0x55, 0x55, 0x53, 0x9f, 0xb0, 0x62, 0x4e, 0xf8, 0x97, 0x12, 0xd8, 0x69, 0x91, 0x43, 0x0b, 0x50, - 0x4e, 0x03, 0x52, 0xf6, 0x3d, 0xc6, 0x7c, 0x99, 0xdf, 0x8a, 0xf9, 0xb2, 0x6f, 0x76, 0xd0, 0x78, - 0x24, 0xee, 0x45, 0xfe, 0x88, 0x99, 0x28, 0xf5, 0xe9, 0x5d, 0x68, 0x0d, 0x6c, 0x9f, 0x92, 0x88, - 0xbb, 0xc0, 0xe3, 0x61, 0xe1, 0xac, 0x43, 0xcb, 0x5d, 0xcb, 0xc8, 0xdd, 0x2d, 0x68, 0xba, 0x7a, - 0x3e, 0xca, 0x7a, 0x3a, 0x33, 0x8b, 0x4d, 0xb4, 0xf3, 0xe7, 0x12, 0x2c, 0x15, 0x0a, 0x6e, 0xc1, - 0x21, 0x6d, 0xd9, 0xcb, 0xc6, 0xb2, 0xb7, 0xa1, 0xae, 0xb8, 0x9d, 0x74, 0x29, 0x6d, 0xb3, 0x28, - 0xc4, 0x94, 0x8c, 0xe4, 0xc5, 0x8c, 0x7f, 0xbf, 0x29, 0x2f, 0x7e, 0x5b, 0x62, 0xbb, 0xdd, 0x2c, - 0x0e, 0x17, 0x77, 0x22, 0x33, 0xaa, 0xf2, 0x72, 0xa3, 0xe6, 0x2e, 0x65, 0xd4, 0xb7, 0x25, 0x40, - 0xc5, 0xd3, 0xe7, 0xff, 0x6e, 0xd6, 0x6f, 0xca, 0xb0, 0x3a, 0xe3, 0x0c, 0xba, 0xd4, 0xba, 0x2b, - 0x8e, 0xa7, 0xd6, 0x5d, 0xb5, 0x35, 0xbb, 0xe7, 0x0c, 0xbb, 0x67, 0x6e, 0xdf, 0x1c, 0x49, 0xac, - 0x5e, 0x98, 0x24, 0x16, 0x43, 0x51, 0xbb, 0x54, 0x28, 0xfe, 0x5b, 0x86, 0xc5, 0xfc, 0xc1, 0x7e, - 0xf1, 0x18, 0xac, 0x81, 0x3d, 0x08, 0x7b, 0xee, 0x80, 0x69, 0xe0, 0x41, 0xb0, 0x70, 0xd6, 0xa1, - 0x57, 0x95, 0x39, 0xb3, 0xaa, 0x14, 0xaa, 0x92, 0x35, 0xad, 0x2a, 0xad, 0x81, 0xcd, 0x6e, 0xcc, - 0xf1, 0xc8, 0xed, 0x89, 0x90, 0xd8, 0x38, 0xeb, 0x60, 0xf1, 0x67, 0xec, 0x83, 0x8b, 0xd7, 0x44, - 0xfc, 0x55, 0x1b, 0x39, 0x30, 0xaf, 0xd6, 0x82, 0x5d, 0xf0, 0x38, 0x97, 0xb1, 0xb1, 0xd1, 0xa7, - 0x63, 0xb8, 0x0e, 0xdb, 0xc4, 0xa8, 0xea, 0xe7, 0x7a, 0x5e, 0x44, 0xe2, 0x98, 0xf3, 0x0d, 0x1b, - 0xab, 0x26, 0xfa, 0x01, 0x00, 0x75, 0xa3, 0x3e, 0xa1, 0xdc, 0xf5, 0x46, 0xfe, 0xc1, 0xf0, 0x30, - 0xa0, 0x4f, 0xa3, 0x23, 0x1a, 0xf9, 0x41, 0x1f, 0x6b, 0x40, 0x56, 0x6b, 0x9a, 0x06, 0x51, 0xb9, - 0x54, 0xac, 0x19, 0xa3, 0xd9, 0xe5, 0x57, 0x54, 0x19, 0xeb, 0xb4, 0x83, 0x1d, 0x78, 0xfe, 0x90, - 0xe5, 0x95, 0x7c, 0x03, 0xe2, 0x8d, 0x37, 0x55, 0x6b, 0x7e, 0x5f, 0x81, 0xd5, 0x19, 0x1c, 0xe9, - 0xf5, 0xf7, 0xf6, 0x1b, 0xcf, 0x9a, 0xb4, 0x5a, 0xd7, 0x72, 0xd5, 0xba, 0x05, 0xb5, 0x28, 0x09, - 0xd8, 0x95, 0x45, 0x26, 0x8c, 0x6a, 0xa2, 0xb7, 0x00, 0xbe, 0x09, 0xa3, 0x33, 0x3f, 0xe8, 0x3f, - 0xf0, 0x23, 0x99, 0x29, 0x5a, 0x0f, 0x7a, 0x06, 0xc0, 0x89, 0xa1, 0x78, 0x02, 0x06, 0x4e, 0x59, - 0x36, 0xce, 0xe5, 0x93, 0xa2, 0x5f, 0x7b, 0x10, 0xd6, 0x94, 0xb4, 0xb7, 0xe0, 0x6a, 0x6e, 0xf8, - 0xbc, 0xdb, 0x5f, 0x53, 0xbf, 0xfd, 0x6d, 0xc1, 0xd2, 0x97, 0x31, 0x89, 0x0e, 0x03, 0x4a, 0x02, - 0xaa, 0x9e, 0xce, 0x6f, 0x43, 0xd5, 0xe7, 0x1d, 0xf2, 0xea, 0xb6, 0x68, 0x24, 0x2c, 0x03, 0xca, - 0x71, 0xe7, 0x33, 0x58, 0x90, 0x97, 0x3f, 0x25, 0xfb, 0x91, 0xf9, 0x8c, 0xaf, 0xbf, 0x48, 0x0a, - 0xa0, 0xf1, 0x9a, 0xbf, 0x01, 0xf3, 0x7a, 0x37, 0x6a, 0x43, 0x8d, 0xf0, 0xf4, 0x11, 0xa9, 0x51, - 0x3f, 0xb8, 0x82, 0x55, 0xc7, 0x8e, 0x05, 0x95, 0xb1, 0x3b, 0x70, 0x7e, 0x04, 0x55, 0x61, 0x04, - 0xf3, 0x2a, 0x7b, 0x5c, 0xad, 0xab, 0x37, 0x54, 0x76, 0x96, 0x4e, 0x82, 0x9e, 0xbc, 0x9f, 0xf2, - 0x6f, 0x96, 0x43, 0xf2, 0x5d, 0xb5, 0xc2, 0x7b, 0x65, 0xcb, 0xf1, 0x01, 0x32, 0x9a, 0x88, 0x76, - 0x61, 0x21, 0x23, 0x8a, 0x1a, 0x4b, 0xbd, 0x61, 0xd6, 0x57, 0x03, 0x82, 0x73, 0x22, 0x6c, 0x2a, - 0xb1, 0x09, 0x54, 0x1a, 0x8b, 0x96, 0xf3, 0x0c, 0x1a, 0xda, 0x66, 0xe7, 0xbc, 0x47, 0xbd, 0x39, - 0x59, 0xf2, 0x61, 0x69, 0x85, 0x87, 0xfd, 0x2b, 0x77, 0x20, 0x5f, 0x96, 0x64, 0x4b, 0xec, 0x80, - 0x88, 0xf5, 0xa7, 0x3b, 0x80, 0xb5, 0x36, 0xff, 0x61, 0xc1, 0x92, 0xa2, 0x9d, 0x5f, 0x6d, 0x1e, - 0x91, 0x68, 0xec, 0xf7, 0x08, 0x7a, 0x08, 0xf5, 0x7d, 0xa2, 0x1e, 0x67, 0x0a, 0x77, 0xee, 0xbd, - 0xe1, 0x88, 0x4e, 0xda, 0xf9, 0x1f, 0x57, 0x9c, 0xa5, 0x5f, 0xff, 0xed, 0x5f, 0xbf, 0x2b, 0x37, - 0x90, 0xdd, 0x1d, 0x6f, 0x76, 0xf9, 0xd2, 0xa0, 0x7d, 0xa8, 0xf2, 0xec, 0x8b, 0x2f, 0xa2, 0x85, - 0x23, 0x1d, 0xc4, 0xb5, 0xcc, 0x23, 0x60, 0x5a, 0xf8, 0x05, 0x23, 0xbe, 0x53, 0x42, 0x3f, 0x81, - 0xab, 0x26, 0xe3, 0xbc, 0x84, 0xc6, 0x1b, 0x5c, 0xe3, 0x75, 0xb4, 0xcc, 0x34, 0x9a, 0x97, 0x6b, - 0xa6, 0xfa, 0x67, 0x50, 0xdb, 0xfb, 0x25, 0xe9, 0x25, 0x94, 0x20, 0xed, 0x56, 0x5c, 0x48, 0xe8, - 0xf6, 0x8c, 0xf9, 0x94, 0x7a, 0xa7, 0xc1, 0x0d, 0x16, 0x9a, 0xee, 0xcb, 0xdc, 0x46, 0x1e, 0xd8, - 0xdb, 0x09, 0x0d, 0x39, 0xe5, 0x43, 0xad, 0x42, 0x1e, 0x9f, 0xa7, 0xfb, 0x3d, 0xae, 0xfb, 0xed, - 0xf6, 0x0a, 0xd3, 0xcd, 0x53, 0xb3, 0xeb, 0x26, 0x34, 0x7c, 0xae, 0xa6, 0x11, 0x3b, 0x00, 0x9d, - 0x40, 0x9d, 0xcd, 0xc2, 0x0a, 0xfd, 0x2b, 0x4c, 0xf2, 0x2e, 0x9f, 0xe4, 0xad, 0xf6, 0x75, 0xbe, - 0x6e, 0x93, 0xa0, 0x37, 0x75, 0x8e, 0x53, 0x00, 0x36, 0x87, 0x60, 0x58, 0xaf, 0x30, 0xcb, 0x77, - 0xf9, 0x2c, 0xeb, 0xed, 0x55, 0x36, 0x8b, 0xd8, 0x3a, 0x53, 0xe7, 0x79, 0x0a, 0xd5, 0x03, 0x37, - 0xf0, 0x06, 0x04, 0xe5, 0x17, 0x72, 0xa6, 0xea, 0x35, 0xae, 0x7a, 0xc5, 0x59, 0xca, 0x52, 0xa6, - 0xfb, 0x82, 0xeb, 0xb8, 0x5f, 0xfa, 0x60, 0xe7, 0xee, 0x4f, 0x37, 0xfa, 0x3e, 0x7d, 0x91, 0x9c, - 0x74, 0x7a, 0xe1, 0xb0, 0xbb, 0xcf, 0x35, 0xa4, 0xb5, 0xf1, 0x38, 0x0c, 0x07, 0x71, 0xfa, 0x7b, - 0xa6, 0xf8, 0xe1, 0xb1, 0x3b, 0xde, 0xfc, 0xa2, 0x72, 0x52, 0xe5, 0xdf, 0x77, 0xff, 0x17, 0x00, - 0x00, 0xff, 0xff, 0x95, 0xac, 0xf0, 0xa8, 0xf0, 0x1c, 0x00, 0x00, + 0x3c, 0x52, 0x0c, 0xf4, 0x4f, 0x60, 0xac, 0xb8, 0x23, 0x7a, 0x21, 0x72, 0x97, 0xdd, 0x9d, 0x55, + 0xca, 0x5b, 0xd1, 0x53, 0xcf, 0x6d, 0x3e, 0x40, 0xaf, 0xbd, 0xf5, 0x50, 0xa0, 0x1f, 0xa0, 0x40, + 0xef, 0x45, 0x81, 0xde, 0x0b, 0xf4, 0x50, 0x14, 0xfd, 0x10, 0xc5, 0xfc, 0xdb, 0x9d, 0xd9, 0x25, + 0x2d, 0xc9, 0xae, 0x91, 0x8b, 0xb4, 0x33, 0xf3, 0x7b, 0x6f, 0xde, 0x7b, 0xf3, 0xe6, 0xcd, 0x6f, + 0x86, 0xb0, 0x78, 0xb6, 0xd1, 0x8d, 0x4f, 0xdd, 0x93, 0x93, 0x70, 0xe0, 0x75, 0x46, 0x51, 0x48, + 0x43, 0x54, 0xe7, 0xff, 0x3a, 0x67, 0x1b, 0xed, 0xd5, 0x7e, 0x18, 0xf6, 0x07, 0xa4, 0xeb, 0x8e, + 0xfc, 0xae, 0x1b, 0x04, 0x21, 0x75, 0xa9, 0x1f, 0x06, 0xb1, 0xc0, 0xb5, 0xdf, 0x96, 0xa3, 0xbc, + 0x75, 0x9c, 0x9c, 0x74, 0xa9, 0x3f, 0x24, 0x31, 0x75, 0x87, 0x23, 0x09, 0xb8, 0x9e, 0x07, 0x90, + 0xe1, 0x88, 0x8e, 0xe5, 0xe0, 0x22, 0x09, 0x92, 0x61, 0xdc, 0xe5, 0x7f, 0x45, 0x97, 0xf3, 0x09, + 0x34, 0x0f, 0xa9, 0x4b, 0x09, 0x26, 0xf1, 0x28, 0x0c, 0x62, 0x82, 0xde, 0x03, 0x2b, 0x66, 0x1d, + 0xad, 0xd2, 0x5a, 0xe9, 0x56, 0x63, 0xe3, 0x4a, 0x47, 0x59, 0xd6, 0x11, 0x38, 0x31, 0xea, 0xac, + 0x42, 0x3d, 0x15, 0x59, 0x80, 0xca, 0x30, 0xee, 0x73, 0x01, 0x1b, 0xb3, 0x4f, 0xe7, 0x06, 0xd4, + 0x30, 0xf9, 0x45, 0x42, 0x62, 0x8a, 0x10, 0xcc, 0x06, 0xee, 0x90, 0xc8, 0x51, 0xfe, 0xed, 0xfc, + 0x73, 0x16, 0x2c, 0xae, 0x0d, 0x7d, 0x1f, 0xe0, 0x38, 0xf1, 0x07, 0xde, 0xa1, 0x36, 0xe5, 0xd5, + 0x6c, 0xca, 0xed, 0x74, 0x0c, 0x6b, 0x38, 0x74, 0x17, 0x1a, 0x1e, 0x19, 0x0d, 0xc2, 0xb1, 0x10, + 0x2b, 0x73, 0xb1, 0x6b, 0x99, 0xd8, 0xfd, 0x6c, 0x10, 0xeb, 0x48, 0xf4, 0x10, 0xe6, 0x4f, 0xc2, + 0xe8, 0x6b, 0x37, 0xf2, 0x88, 0xf7, 0x45, 0x18, 0xd1, 0xb8, 0x55, 0x59, 0xab, 0xdc, 0x6a, 0x6c, + 0xbc, 0x93, 0xf3, 0xb2, 0xf3, 0xc0, 0x40, 0xed, 0x06, 0x34, 0x1a, 0xe3, 0x9c, 0x28, 0x7a, 0x00, + 0x0b, 0x2c, 0x16, 0x49, 0xbc, 0xf3, 0x82, 0xf4, 0x4e, 0x85, 0x29, 0xb3, 0xdc, 0x94, 0xb6, 0xa9, + 0x4e, 0x47, 0xe0, 0x82, 0x0c, 0xda, 0x84, 0xe6, 0x89, 0x3f, 0x20, 0x87, 0xe3, 0xa0, 0x27, 0x94, + 0x58, 0x5c, 0xc9, 0x4a, 0xa6, 0xe4, 0x81, 0x3e, 0x8c, 0x4d, 0x34, 0x3a, 0x84, 0x25, 0x8f, 0x1c, + 0x27, 0xfd, 0xbe, 0x1f, 0xf4, 0x77, 0xc2, 0x80, 0xba, 0x7e, 0x40, 0xa2, 0xb8, 0x55, 0xe5, 0x8e, + 0xdd, 0xd4, 0x83, 0x92, 0x07, 0xed, 0x9e, 0x91, 0x80, 0xe2, 0x49, 0xd2, 0xa8, 0x03, 0xf5, 0x21, + 0xa1, 0xae, 0xe7, 0x52, 0xb7, 0x55, 0xe3, 0xe6, 0xa0, 0x4c, 0xd3, 0x8f, 0xe5, 0x08, 0x4e, 0x31, + 0x68, 0x1d, 0x6c, 0x4a, 0x62, 0x2a, 0xec, 0xaf, 0x73, 0x81, 0xa5, 0x4c, 0xe0, 0x48, 0x0d, 0xe1, + 0x0c, 0xd5, 0xfe, 0x0a, 0x96, 0x26, 0x44, 0x99, 0x25, 0xd3, 0x29, 0x19, 0xf3, 0x54, 0xb0, 0x30, + 0xfb, 0x44, 0xb7, 0xc1, 0x3a, 0x73, 0x07, 0x89, 0x5a, 0x67, 0x2d, 0xb8, 0x4c, 0x4c, 0xea, 0x10, + 0xbe, 0x08, 0xe0, 0xbd, 0xf2, 0xa7, 0x25, 0xe7, 0x8f, 0x65, 0xa8, 0x2b, 0x43, 0xd1, 0xc7, 0x60, + 0xf1, 0xf4, 0x91, 0x19, 0xb6, 0x92, 0xcb, 0xb0, 0xd4, 0x21, 0x81, 0x42, 0xb7, 0xa1, 0x2a, 0xb2, + 0x46, 0x4e, 0xd9, 0xca, 0xa7, 0x56, 0x2a, 0x20, 0x71, 0xe8, 0x03, 0x98, 0x65, 0x9e, 0xb5, 0x2a, + 0x1c, 0xbf, 0x6c, 0xba, 0x9e, 0xa2, 0x39, 0x06, 0x5d, 0x05, 0x2b, 0x4a, 0x82, 0x83, 0xfb, 0x3c, + 0x59, 0x6c, 0x2c, 0x1a, 0x68, 0x1b, 0xc0, 0xf5, 0x3c, 0x9f, 0x6d, 0x76, 0x77, 0xd0, 0xea, 0xf1, + 0xd5, 0x73, 0x8a, 0x31, 0xef, 0x6c, 0xa5, 0x20, 0x91, 0x95, 0x9a, 0x54, 0x7b, 0x13, 0xae, 0xe4, + 0x86, 0xf5, 0x70, 0xda, 0x22, 0x9c, 0x57, 0xf5, 0x70, 0xda, 0x7a, 0xc8, 0xfe, 0x56, 0x86, 0xa6, + 0x11, 0x0f, 0xf4, 0x19, 0xd8, 0x6e, 0x44, 0xfd, 0x13, 0xb7, 0x47, 0xe3, 0x56, 0x89, 0xdb, 0xb4, + 0x36, 0x25, 0x76, 0x9d, 0x2d, 0x09, 0xc4, 0x99, 0x08, 0x0f, 0xcb, 0x78, 0x24, 0xa6, 0x9a, 0x4f, + 0xc3, 0x22, 0xea, 0x0f, 0x97, 0x3e, 0x1a, 0x8f, 0x08, 0xe6, 0x18, 0xb4, 0x37, 0x21, 0x00, 0xdf, + 0x9b, 0x3a, 0xd9, 0x4b, 0xa2, 0xf0, 0x08, 0xea, 0xca, 0x16, 0xf4, 0x91, 0x34, 0xa0, 0xc4, 0x0d, + 0x68, 0x15, 0x0d, 0x20, 0x91, 0x66, 0x82, 0xaa, 0x55, 0xe5, 0xac, 0x56, 0xbd, 0x6e, 0x4c, 0xbf, + 0x29, 0xc1, 0x9c, 0x9e, 0x03, 0xe8, 0x2e, 0xd4, 0x58, 0x9b, 0x6d, 0x51, 0x11, 0xd0, 0x1b, 0x93, + 0x93, 0xa5, 0x23, 0x50, 0x58, 0xa1, 0xdb, 0x0f, 0xa1, 0x2a, 0x3e, 0xd1, 0x87, 0x86, 0x53, 0x2b, + 0x86, 0x53, 0x02, 0xa2, 0xf9, 0x74, 0x15, 0xac, 0x5e, 0x98, 0x04, 0x94, 0x9b, 0x66, 0x61, 0xd1, + 0x70, 0xfe, 0x51, 0x82, 0x79, 0x33, 0x95, 0xd1, 0xe7, 0x60, 0x8b, 0x64, 0xce, 0x4c, 0xbb, 0x39, + 0x2d, 0xef, 0x65, 0x93, 0x44, 0x38, 0x93, 0x41, 0x1b, 0x50, 0xeb, 0x0d, 0x12, 0x36, 0xbd, 0x5c, + 0x6f, 0x33, 0xdc, 0x3b, 0x62, 0x8c, 0x9b, 0xa6, 0x80, 0xed, 0x27, 0x50, 0x57, 0xaa, 0xd0, 0xc7, + 0x86, 0x5b, 0xdf, 0x31, 0x84, 0x15, 0xe8, 0x5c, 0xc7, 0xfe, 0x5d, 0x02, 0xc8, 0x4e, 0x0d, 0xb4, + 0x55, 0x4c, 0xe0, 0x77, 0x26, 0x1d, 0x2f, 0x69, 0xf6, 0xca, 0x5a, 0xaf, 0xe5, 0xf0, 0x1a, 0x34, + 0xdc, 0x84, 0x86, 0x47, 0x91, 0xdf, 0xef, 0x4b, 0xd7, 0xea, 0x58, 0xef, 0x42, 0x77, 0x01, 0x64, + 0x51, 0x0f, 0x3d, 0xc2, 0x4b, 0x40, 0x7e, 0x55, 0x0e, 0xd3, 0x61, 0xac, 0x41, 0xdb, 0x3f, 0x84, + 0x79, 0x73, 0xde, 0x4b, 0xa5, 0xd6, 0xcf, 0xc1, 0x4e, 0x0b, 0x2b, 0x5a, 0x86, 0xaa, 0x50, 0x2c, + 0x65, 0x65, 0x2b, 0x67, 0x5b, 0xf9, 0xc2, 0xb6, 0x39, 0xbf, 0x2a, 0x41, 0x43, 0x3b, 0x47, 0xa7, + 0x4e, 0xf0, 0xe6, 0xc2, 0xe3, 0xfc, 0xa7, 0x04, 0x0b, 0xf9, 0xf3, 0x73, 0xaa, 0x1d, 0x7b, 0x60, + 0x47, 0x24, 0x0e, 0x93, 0xa8, 0x47, 0xe2, 0x56, 0x99, 0xaf, 0xf4, 0xfb, 0xd3, 0x8f, 0xe1, 0x0e, + 0x56, 0x58, 0xb9, 0xde, 0xa9, 0xec, 0x6b, 0xad, 0xa6, 0xa9, 0xf5, 0x52, 0xab, 0x79, 0x00, 0x4d, + 0xe3, 0x98, 0x7f, 0xf5, 0x80, 0x3b, 0x7f, 0xaa, 0x81, 0xc5, 0xcf, 0x43, 0xf4, 0x29, 0xd8, 0x29, + 0x41, 0x94, 0x67, 0x5f, 0xbb, 0x23, 0x18, 0x62, 0x47, 0x31, 0xc4, 0xce, 0x91, 0x42, 0xe0, 0x0c, + 0x8c, 0xee, 0x80, 0xcd, 0x0e, 0x77, 0xae, 0x46, 0x9e, 0x82, 0x4b, 0xe6, 0x69, 0xc4, 0x87, 0xf6, + 0x67, 0x70, 0x86, 0x43, 0xfb, 0xb0, 0xa0, 0x78, 0xed, 0xa3, 0xb0, 0x2f, 0x64, 0x2b, 0x05, 0x46, + 0x94, 0x43, 0xec, 0xcf, 0xe0, 0x82, 0x14, 0x7a, 0x0a, 0x4b, 0xee, 0x68, 0x34, 0xf0, 0x7b, 0x9c, + 0xfd, 0xa6, 0xca, 0x04, 0xbd, 0xd2, 0x2a, 0xe6, 0x56, 0x11, 0xb4, 0x3f, 0x83, 0x27, 0xc9, 0x32, + 0x8f, 0xa8, 0x1b, 0x9f, 0x0a, 0x45, 0x56, 0x81, 0xa2, 0xa8, 0x21, 0xe6, 0x51, 0x8a, 0x43, 0x0f, + 0x61, 0x51, 0xf0, 0xce, 0xe4, 0x38, 0x13, 0xae, 0x72, 0xe1, 0xeb, 0xf9, 0x3a, 0xa2, 0x41, 0xf6, + 0x67, 0x70, 0x51, 0x0e, 0x3d, 0x06, 0x24, 0xc9, 0xa8, 0xae, 0x4d, 0xd0, 0xab, 0xd5, 0x02, 0x7b, + 0x35, 0xd5, 0x4d, 0x90, 0x44, 0xf7, 0xc0, 0x1e, 0x85, 0x11, 0x15, 0x6a, 0xea, 0xe7, 0x91, 0x23, + 0xe6, 0x58, 0x0a, 0x47, 0x5f, 0xc1, 0x8a, 0x4e, 0x44, 0x75, 0x83, 0x6c, 0xae, 0xe9, 0xe6, 0xe4, + 0xcd, 0x63, 0x5a, 0x35, 0x4d, 0x07, 0xfa, 0x3c, 0xe3, 0xb4, 0x42, 0x29, 0x4c, 0xe3, 0xb4, 0x4a, + 0x95, 0x89, 0x67, 0xf6, 0x79, 0x93, 0x09, 0x6b, 0xab, 0x91, 0xb7, 0x6f, 0x0a, 0xb3, 0x65, 0xf6, + 0x4d, 0xd1, 0xc1, 0x32, 0x95, 0x92, 0x68, 0xe8, 0x07, 0x3c, 0x47, 0x84, 0xde, 0xb9, 0x7c, 0x04, + 0x8f, 0x72, 0x08, 0x96, 0xa9, 0x79, 0x29, 0xb6, 0x08, 0x8c, 0xd5, 0x09, 0x15, 0xcd, 0xa2, 0x8a, + 0x98, 0xe6, 0x62, 0x96, 0xc1, 0xb7, 0xe7, 0x00, 0x08, 0xfb, 0x78, 0xce, 0x0e, 0x34, 0xe7, 0x4b, + 0x58, 0xc8, 0xcf, 0x38, 0xb5, 0x08, 0xbc, 0x0f, 0x15, 0x12, 0x45, 0x72, 0x63, 0x6a, 0x51, 0xdd, + 0xea, 0x71, 0xa2, 0x72, 0x3c, 0x20, 0xbb, 0x51, 0x84, 0x19, 0x86, 0x31, 0x90, 0xa6, 0xd1, 0x8d, + 0xd6, 0xa1, 0x46, 0xa2, 0x88, 0x97, 0xb7, 0xd2, 0xcb, 0xcb, 0x9b, 0xc2, 0xa1, 0x16, 0xd4, 0x86, + 0x24, 0x8e, 0xdd, 0xbe, 0xaa, 0x5c, 0xaa, 0x89, 0x3e, 0x81, 0x46, 0x9c, 0xf4, 0xfb, 0x24, 0xe6, + 0xd7, 0x54, 0x79, 0x9f, 0xd2, 0xae, 0x70, 0x87, 0xe9, 0x20, 0xd6, 0x81, 0xce, 0x53, 0xb0, 0xd3, + 0x2a, 0xc2, 0xca, 0x22, 0x61, 0x15, 0x53, 0x7a, 0x29, 0x1a, 0xc6, 0x25, 0xa4, 0x7c, 0xfe, 0x25, + 0xc4, 0xf9, 0x03, 0x3b, 0x2f, 0xf2, 0x95, 0x64, 0x05, 0x6a, 0x2c, 0xfa, 0xcf, 0x7d, 0x4f, 0x85, + 0x90, 0x35, 0x0f, 0x3c, 0x74, 0x03, 0x20, 0x16, 0x2b, 0xc3, 0xc6, 0x84, 0x57, 0xb6, 0xec, 0x39, + 0xf0, 0x58, 0xe4, 0xc3, 0xc8, 0xef, 0xfb, 0x01, 0xaf, 0x60, 0x36, 0x96, 0x2d, 0xf4, 0x21, 0x58, + 0x03, 0x72, 0x46, 0x06, 0xbc, 0x16, 0xcd, 0xa7, 0xb7, 0x4e, 0x11, 0xba, 0x47, 0x61, 0xff, 0x11, + 0x1b, 0xc4, 0x02, 0xa3, 0x87, 0xcd, 0x32, 0xc2, 0xe6, 0x84, 0xb0, 0x34, 0xa1, 0x76, 0xa1, 0x77, + 0xa1, 0xd9, 0x53, 0x99, 0xfa, 0x38, 0xbb, 0x36, 0x9b, 0x9d, 0x4c, 0xed, 0x28, 0xf4, 0x1e, 0x67, + 0x54, 0x55, 0x35, 0xf5, 0x09, 0x2b, 0xe6, 0x84, 0x7f, 0x2d, 0x81, 0x9d, 0x16, 0x39, 0x34, 0x0f, + 0xe5, 0x34, 0x20, 0x65, 0xdf, 0x63, 0xcc, 0x97, 0xf9, 0xad, 0x98, 0x2f, 0xfb, 0x66, 0x07, 0x8d, + 0x47, 0xe2, 0x5e, 0xe4, 0x8f, 0x98, 0x89, 0x52, 0x9f, 0xde, 0x85, 0x56, 0xc1, 0xf6, 0x29, 0x89, + 0xb8, 0x0b, 0x3c, 0x1e, 0x16, 0xce, 0x3a, 0xb4, 0xdc, 0xb5, 0x8c, 0xdc, 0xdd, 0x84, 0xa6, 0xab, + 0xe7, 0xa3, 0xac, 0xa7, 0x53, 0xb3, 0xd8, 0x44, 0x3b, 0x7f, 0x29, 0xc1, 0x62, 0xa1, 0xe0, 0x16, + 0x1c, 0xd2, 0x96, 0xbd, 0x6c, 0x2c, 0x7b, 0x1b, 0xea, 0x8a, 0xdb, 0x49, 0x97, 0xd2, 0x36, 0x8b, + 0x42, 0x4c, 0xc9, 0x48, 0x5e, 0xcc, 0xf8, 0xf7, 0x9b, 0xf2, 0xe2, 0xb7, 0x25, 0xb6, 0xdb, 0xcd, + 0xe2, 0x70, 0x71, 0x27, 0x32, 0xa3, 0x2a, 0x2f, 0x37, 0x6a, 0xf6, 0x52, 0x46, 0x7d, 0x53, 0x02, + 0x54, 0x3c, 0x7d, 0xbe, 0x75, 0xb3, 0x7e, 0x53, 0x86, 0x95, 0x29, 0x67, 0xd0, 0xa5, 0xd6, 0x5d, + 0x71, 0x3c, 0xb5, 0xee, 0xaa, 0xad, 0xd9, 0x3d, 0x6b, 0xd8, 0x3d, 0x75, 0xfb, 0xe6, 0x48, 0x62, + 0xf5, 0xc2, 0x24, 0xb1, 0x18, 0x8a, 0xda, 0xa5, 0x42, 0xf1, 0xdf, 0x32, 0x2c, 0xe4, 0x0f, 0xf6, + 0x8b, 0xc7, 0x60, 0x15, 0xec, 0x41, 0xd8, 0x73, 0x07, 0x4c, 0x03, 0x0f, 0x82, 0x85, 0xb3, 0x0e, + 0xbd, 0xaa, 0xcc, 0x9a, 0x55, 0xa5, 0x50, 0x95, 0xac, 0x49, 0x55, 0x69, 0x15, 0x6c, 0x76, 0x63, + 0x8e, 0x47, 0x6e, 0x4f, 0x84, 0xc4, 0xc6, 0x59, 0x07, 0x8b, 0x3f, 0x63, 0x1f, 0x5c, 0xbc, 0x26, + 0xe2, 0xaf, 0xda, 0xc8, 0x81, 0x39, 0xb5, 0x16, 0xec, 0x82, 0xc7, 0xb9, 0x8c, 0x8d, 0x8d, 0x3e, + 0x1d, 0xc3, 0x75, 0xd8, 0x26, 0x46, 0x55, 0x3f, 0xd7, 0xf3, 0x22, 0x12, 0xc7, 0x9c, 0x6f, 0xd8, + 0x58, 0x35, 0xd1, 0x0f, 0x00, 0xa8, 0x1b, 0xf5, 0x09, 0xe5, 0xae, 0x37, 0xf2, 0x0f, 0x86, 0x07, + 0x01, 0x7d, 0x12, 0x1d, 0xd2, 0xc8, 0x0f, 0xfa, 0x58, 0x03, 0xb2, 0x5a, 0xd3, 0x34, 0x88, 0xca, + 0xa5, 0x62, 0xcd, 0x18, 0xcd, 0x0e, 0xbf, 0xa2, 0xca, 0x58, 0xa7, 0x1d, 0xec, 0xc0, 0xf3, 0x87, + 0x2c, 0xaf, 0xe4, 0x1b, 0x10, 0x6f, 0xbc, 0xa9, 0x5a, 0xf3, 0xfb, 0x0a, 0xac, 0x4c, 0xe1, 0x48, + 0xaf, 0xbf, 0xb7, 0xdf, 0x78, 0xd6, 0xa4, 0xd5, 0xba, 0x96, 0xab, 0xd6, 0x2d, 0xa8, 0x45, 0x49, + 0xc0, 0xae, 0x2c, 0x32, 0x61, 0x54, 0x13, 0xbd, 0x05, 0xf0, 0x75, 0x18, 0x9d, 0xfa, 0x41, 0xff, + 0xbe, 0x1f, 0xc9, 0x4c, 0xd1, 0x7a, 0xd0, 0x53, 0x00, 0x4e, 0x0c, 0xc5, 0x13, 0x30, 0x70, 0xca, + 0xb2, 0x7e, 0x2e, 0x9f, 0x14, 0xfd, 0xda, 0x83, 0xb0, 0xa6, 0xa4, 0xbd, 0x09, 0x57, 0x72, 0xc3, + 0xe7, 0xdd, 0xfe, 0x9a, 0xfa, 0xed, 0x6f, 0x13, 0x16, 0xbf, 0x8c, 0x49, 0x74, 0x10, 0x50, 0x12, + 0x50, 0xf5, 0x74, 0x7e, 0x0b, 0xaa, 0x3e, 0xef, 0x90, 0x57, 0xb7, 0x05, 0x23, 0x61, 0x19, 0x50, + 0x8e, 0x3b, 0x9f, 0xc1, 0xbc, 0xbc, 0xfc, 0x29, 0xd9, 0x8f, 0xcc, 0x67, 0x7c, 0xfd, 0x45, 0x52, + 0x00, 0x8d, 0xd7, 0xfc, 0x75, 0x98, 0xd3, 0xbb, 0x51, 0x1b, 0x6a, 0x84, 0xa7, 0x8f, 0x48, 0x8d, + 0xfa, 0xfe, 0x0c, 0x56, 0x1d, 0xdb, 0x16, 0x54, 0xce, 0xdc, 0x81, 0xf3, 0x23, 0xa8, 0x0a, 0x23, + 0x98, 0x57, 0xd9, 0xe3, 0x6a, 0x5d, 0xbd, 0xa1, 0xb2, 0xb3, 0x74, 0x1c, 0xf4, 0xe4, 0xfd, 0x94, + 0x7f, 0xb3, 0x1c, 0x92, 0xef, 0xaa, 0x15, 0xde, 0x2b, 0x5b, 0x8e, 0x0f, 0x90, 0xd1, 0x44, 0xb4, + 0x03, 0xf3, 0x19, 0x51, 0xd4, 0x58, 0xea, 0x75, 0xb3, 0xbe, 0x1a, 0x10, 0x9c, 0x13, 0x61, 0x53, + 0x89, 0x4d, 0xa0, 0xd2, 0x58, 0xb4, 0x9c, 0xa7, 0xd0, 0xd0, 0x36, 0x3b, 0xe7, 0x3d, 0xea, 0xcd, + 0xc9, 0x92, 0x0f, 0x4b, 0xcb, 0x3c, 0xec, 0xcf, 0xdc, 0x81, 0x7c, 0x59, 0x92, 0x2d, 0xb1, 0x03, + 0x22, 0xd6, 0x9f, 0xee, 0x00, 0xd6, 0xda, 0xf8, 0x73, 0x15, 0x16, 0x15, 0xed, 0x7c, 0xb6, 0x71, + 0x48, 0xa2, 0x33, 0xbf, 0x47, 0xd0, 0x03, 0xa8, 0xef, 0x11, 0xf5, 0x38, 0x53, 0xb8, 0x73, 0xef, + 0x0e, 0x47, 0x74, 0xdc, 0xce, 0xff, 0xb8, 0xe2, 0x2c, 0xfe, 0xfa, 0xef, 0xff, 0xfa, 0x5d, 0xb9, + 0x81, 0xec, 0xee, 0xd9, 0x46, 0x97, 0x2f, 0x0d, 0xda, 0x83, 0x2a, 0xcf, 0xbe, 0xf8, 0x22, 0x5a, + 0x38, 0xd2, 0x41, 0x5c, 0xcb, 0x1c, 0x02, 0xa6, 0x85, 0x5f, 0x30, 0xe2, 0xdb, 0x25, 0xf4, 0x13, + 0xb8, 0x62, 0x32, 0xce, 0x4b, 0x68, 0xbc, 0xce, 0x35, 0x5e, 0x43, 0x4b, 0x4c, 0xa3, 0x79, 0xb9, + 0x66, 0xaa, 0x9f, 0xc1, 0x9c, 0xc6, 0xbb, 0xff, 0x7f, 0x7a, 0x7f, 0x06, 0xb5, 0xdd, 0x5f, 0x92, + 0x5e, 0x42, 0x09, 0xd2, 0x6e, 0xdb, 0x85, 0x8d, 0xd2, 0x9e, 0x32, 0x9f, 0x52, 0xef, 0x34, 0x78, + 0x20, 0x84, 0xa6, 0x7b, 0x72, 0xcf, 0x20, 0x0f, 0xec, 0xad, 0x84, 0x86, 0x9c, 0x4a, 0xa2, 0x56, + 0x61, 0x7f, 0x9c, 0xa7, 0xfb, 0x3d, 0xae, 0xfb, 0xed, 0xf6, 0x32, 0xd3, 0xcd, 0x53, 0xbe, 0xeb, + 0x26, 0x34, 0x7c, 0xae, 0xa6, 0x11, 0x3b, 0x0b, 0x1d, 0x43, 0x9d, 0xcd, 0xc2, 0x0e, 0x90, 0x57, + 0x98, 0xe4, 0x5d, 0x3e, 0xc9, 0x5b, 0xed, 0x6b, 0x3c, 0x1f, 0xc6, 0x41, 0x6f, 0xe2, 0x1c, 0x27, + 0x00, 0x6c, 0x0e, 0xc1, 0xdc, 0x5e, 0x61, 0x96, 0xef, 0xf2, 0x59, 0xd6, 0xda, 0x2b, 0x6c, 0x16, + 0xb1, 0x25, 0x27, 0xce, 0xf3, 0x04, 0xaa, 0xfb, 0x6e, 0xe0, 0x0d, 0x08, 0xca, 0x2f, 0xe4, 0x54, + 0xd5, 0xab, 0x5c, 0xf5, 0xb2, 0xb3, 0x98, 0xa5, 0x62, 0xf7, 0x05, 0xd7, 0x71, 0xaf, 0xf4, 0xc1, + 0xf6, 0x9d, 0x9f, 0xae, 0xf7, 0x7d, 0xfa, 0x22, 0x39, 0xee, 0xf4, 0xc2, 0x61, 0x77, 0x8f, 0x6b, + 0x48, 0x6b, 0xee, 0x51, 0x18, 0x0e, 0xe2, 0xf4, 0x77, 0x52, 0xf1, 0x83, 0x66, 0xf7, 0x6c, 0xe3, + 0x8b, 0xca, 0x71, 0x95, 0x7f, 0xdf, 0xf9, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xae, 0x78, 0xa4, + 0xac, 0x48, 0x1d, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -2880,6 +2881,7 @@ type SkaffoldV2ServiceClient interface { // Returns all the events of the current Skaffold execution from the start Events(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (SkaffoldV2Service_EventsClient, error) ApplicationLogs(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (SkaffoldV2Service_ApplicationLogsClient, error) + SkaffoldLogs(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (SkaffoldV2Service_SkaffoldLogsClient, error) // Allows for a single execution of some or all of the phases (build, sync, deploy) in case autoBuild, autoDeploy or autoSync are disabled. Execute(ctx context.Context, in *UserIntentRequest, opts ...grpc.CallOption) (*empty.Empty, error) // Allows for enabling or disabling automatic build trigger @@ -2973,6 +2975,38 @@ func (x *skaffoldV2ServiceApplicationLogsClient) Recv() (*Event, error) { return m, nil } +func (c *skaffoldV2ServiceClient) SkaffoldLogs(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (SkaffoldV2Service_SkaffoldLogsClient, error) { + stream, err := c.cc.NewStream(ctx, &_SkaffoldV2Service_serviceDesc.Streams[2], "/proto.v2.SkaffoldV2Service/SkaffoldLogs", opts...) + if err != nil { + return nil, err + } + x := &skaffoldV2ServiceSkaffoldLogsClient{stream} + if err := x.ClientStream.SendMsg(in); err != nil { + return nil, err + } + if err := x.ClientStream.CloseSend(); err != nil { + return nil, err + } + return x, nil +} + +type SkaffoldV2Service_SkaffoldLogsClient interface { + Recv() (*Event, error) + grpc.ClientStream +} + +type skaffoldV2ServiceSkaffoldLogsClient struct { + grpc.ClientStream +} + +func (x *skaffoldV2ServiceSkaffoldLogsClient) Recv() (*Event, error) { + m := new(Event) + if err := x.ClientStream.RecvMsg(m); err != nil { + return nil, err + } + return m, nil +} + func (c *skaffoldV2ServiceClient) Execute(ctx context.Context, in *UserIntentRequest, opts ...grpc.CallOption) (*empty.Empty, error) { out := new(empty.Empty) err := c.cc.Invoke(ctx, "/proto.v2.SkaffoldV2Service/Execute", in, out, opts...) @@ -3025,6 +3059,7 @@ type SkaffoldV2ServiceServer interface { // Returns all the events of the current Skaffold execution from the start Events(*empty.Empty, SkaffoldV2Service_EventsServer) error ApplicationLogs(*empty.Empty, SkaffoldV2Service_ApplicationLogsServer) error + SkaffoldLogs(*empty.Empty, SkaffoldV2Service_SkaffoldLogsServer) error // Allows for a single execution of some or all of the phases (build, sync, deploy) in case autoBuild, autoDeploy or autoSync are disabled. Execute(context.Context, *UserIntentRequest) (*empty.Empty, error) // Allows for enabling or disabling automatic build trigger @@ -3050,6 +3085,9 @@ func (*UnimplementedSkaffoldV2ServiceServer) Events(req *empty.Empty, srv Skaffo func (*UnimplementedSkaffoldV2ServiceServer) ApplicationLogs(req *empty.Empty, srv SkaffoldV2Service_ApplicationLogsServer) error { return status.Errorf(codes.Unimplemented, "method ApplicationLogs not implemented") } +func (*UnimplementedSkaffoldV2ServiceServer) SkaffoldLogs(req *empty.Empty, srv SkaffoldV2Service_SkaffoldLogsServer) error { + return status.Errorf(codes.Unimplemented, "method SkaffoldLogs not implemented") +} func (*UnimplementedSkaffoldV2ServiceServer) Execute(ctx context.Context, req *UserIntentRequest) (*empty.Empty, error) { return nil, status.Errorf(codes.Unimplemented, "method Execute not implemented") } @@ -3130,6 +3168,27 @@ func (x *skaffoldV2ServiceApplicationLogsServer) Send(m *Event) error { return x.ServerStream.SendMsg(m) } +func _SkaffoldV2Service_SkaffoldLogs_Handler(srv interface{}, stream grpc.ServerStream) error { + m := new(empty.Empty) + if err := stream.RecvMsg(m); err != nil { + return err + } + return srv.(SkaffoldV2ServiceServer).SkaffoldLogs(m, &skaffoldV2ServiceSkaffoldLogsServer{stream}) +} + +type SkaffoldV2Service_SkaffoldLogsServer interface { + Send(*Event) error + grpc.ServerStream +} + +type skaffoldV2ServiceSkaffoldLogsServer struct { + grpc.ServerStream +} + +func (x *skaffoldV2ServiceSkaffoldLogsServer) Send(m *Event) error { + return x.ServerStream.SendMsg(m) +} + func _SkaffoldV2Service_Execute_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(UserIntentRequest) if err := dec(in); err != nil { @@ -3260,6 +3319,11 @@ var _SkaffoldV2Service_serviceDesc = grpc.ServiceDesc{ Handler: _SkaffoldV2Service_ApplicationLogs_Handler, ServerStreams: true, }, + { + StreamName: "SkaffoldLogs", + Handler: _SkaffoldV2Service_SkaffoldLogs_Handler, + ServerStreams: true, + }, }, Metadata: "v2/skaffold.proto", } diff --git a/proto/v2/skaffold.pb.gw.go b/proto/v2/skaffold.pb.gw.go index 4df46e76d47..c7841cd2c2b 100644 --- a/proto/v2/skaffold.pb.gw.go +++ b/proto/v2/skaffold.pb.gw.go @@ -86,6 +86,23 @@ func request_SkaffoldV2Service_ApplicationLogs_0(ctx context.Context, marshaler } +func request_SkaffoldV2Service_SkaffoldLogs_0(ctx context.Context, marshaler runtime.Marshaler, client SkaffoldV2ServiceClient, req *http.Request, pathParams map[string]string) (SkaffoldV2Service_SkaffoldLogsClient, runtime.ServerMetadata, error) { + var protoReq empty.Empty + var metadata runtime.ServerMetadata + + stream, err := client.SkaffoldLogs(ctx, &protoReq) + if err != nil { + return nil, metadata, err + } + header, err := stream.Header() + if err != nil { + return nil, metadata, err + } + metadata.HeaderMD = header + return stream, metadata, nil + +} + func request_SkaffoldV2Service_Execute_0(ctx context.Context, marshaler runtime.Marshaler, client SkaffoldV2ServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq UserIntentRequest var metadata runtime.ServerMetadata @@ -299,6 +316,13 @@ func RegisterSkaffoldV2ServiceHandlerServer(ctx context.Context, mux *runtime.Se return }) + mux.Handle("GET", pattern_SkaffoldV2Service_SkaffoldLogs_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + err := status.Error(codes.Unimplemented, "streaming calls are not yet supported in the in-process transport") + _, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + }) + mux.Handle("POST", pattern_SkaffoldV2Service_Execute_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() @@ -515,6 +539,26 @@ func RegisterSkaffoldV2ServiceHandlerClient(ctx context.Context, mux *runtime.Se }) + mux.Handle("GET", pattern_SkaffoldV2Service_SkaffoldLogs_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := request_SkaffoldV2Service_SkaffoldLogs_0(rctx, inboundMarshaler, client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_SkaffoldV2Service_SkaffoldLogs_0(ctx, mux, outboundMarshaler, w, req, func() (proto.Message, error) { return resp.Recv() }, mux.GetForwardResponseOptions()...) + + }) + mux.Handle("POST", pattern_SkaffoldV2Service_Execute_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() @@ -625,6 +669,8 @@ var ( pattern_SkaffoldV2Service_ApplicationLogs_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v2", "applicationLogs"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_SkaffoldV2Service_SkaffoldLogs_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v2", "applicationLogs"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_SkaffoldV2Service_Execute_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v2", "execute"}, "", runtime.AssumeColonVerbOpt(true))) pattern_SkaffoldV2Service_AutoBuild_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"v2", "build", "auto_execute"}, "", runtime.AssumeColonVerbOpt(true))) @@ -643,6 +689,8 @@ var ( forward_SkaffoldV2Service_ApplicationLogs_0 = runtime.ForwardResponseStream + forward_SkaffoldV2Service_SkaffoldLogs_0 = runtime.ForwardResponseStream + forward_SkaffoldV2Service_Execute_0 = runtime.ForwardResponseMessage forward_SkaffoldV2Service_AutoBuild_0 = runtime.ForwardResponseMessage diff --git a/proto/v2/skaffold.proto b/proto/v2/skaffold.proto index a12601ad944..eb25e64b3ae 100644 --- a/proto/v2/skaffold.proto +++ b/proto/v2/skaffold.proto @@ -323,12 +323,20 @@ service SkaffoldV2Service { }; } + // Returns all the user application logs of the current Skaffold execution rpc ApplicationLogs (google.protobuf.Empty) returns (stream Event) { option (google.api.http) = { get: "/v2/applicationLogs" }; } + // Returns all the skaffold output of the current Skaffold execution + rpc SkaffoldLogs (google.protobuf.Empty) returns (stream Event) { + option (google.api.http) = { + get: "/v2/skaffoldLogs" + }; + } + // Allows for a single execution of some or all of the phases (build, sync, deploy) in case autoBuild, autoDeploy or autoSync are disabled. rpc Execute (UserIntentRequest) returns (google.protobuf.Empty) { option (google.api.http) = {