github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #6821 from kzys/remove-std-time

Browse Source 
Remove gogoproto.stdtime
This commit is contained in:
Phil Estes 2022-04-19 16:37:07 +01:00 committed by GitHub
commit 184883b0a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
71 changed files with 1803 additions and 1594 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

171
api/events/task.pb.go
View File

@ -9,21 +9,18 @@ import (
_ "github.com/containerd/containerd/protobuf/plugin"
_ "github.com/gogo/protobuf/gogoproto"
proto "github.com/gogo/protobuf/proto"
_ "github.com/gogo/protobuf/types"
github_com_gogo_protobuf_types "github.com/gogo/protobuf/types"
types1 "github.com/gogo/protobuf/types"
io "io"
math "math"
math_bits "math/bits"
reflect "reflect"
strings "strings"
time "time"
)
// Reference imports to suppress errors if they are not otherwise used.
var _ = proto.Marshal
var _ = fmt.Errorf
var _ = math.Inf
var _ = time.Kitchen
// This is a compile-time assertion to ensure that this generated file
// is compatible with the proto package it is being compiled against.
@ -116,10 +113,10 @@ func (m *TaskStart) XXX_DiscardUnknown() {
var xxx_messageInfo_TaskStart proto.InternalMessageInfo
type TaskDelete struct {
ContainerID string `protobuf:"bytes,1,opt,name=container_id,json=containerId,proto3" json:"container_id,omitempty"`
Pid uint32 `protobuf:"varint,2,opt,name=pid,proto3" json:"pid,omitempty"`
ExitStatus uint32 `protobuf:"varint,3,opt,name=exit_status,json=exitStatus,proto3" json:"exit_status,omitempty"`
ExitedAt time.Time `protobuf:"bytes,4,opt,name=exited_at,json=exitedAt,proto3,stdtime" json:"exited_at"`
ContainerID string `protobuf:"bytes,1,opt,name=container_id,json=containerId,proto3" json:"container_id,omitempty"`
Pid uint32 `protobuf:"varint,2,opt,name=pid,proto3" json:"pid,omitempty"`
ExitStatus uint32 `protobuf:"varint,3,opt,name=exit_status,json=exitStatus,proto3" json:"exit_status,omitempty"`
ExitedAt *types1.Timestamp `protobuf:"bytes,4,opt,name=exited_at,json=exitedAt,proto3" json:"exited_at,omitempty"`
// id is the specific exec. By default if omitted will be `""` thus matches
// the init exec of the task matching `container_id`.
ID string `protobuf:"bytes,5,opt,name=id,proto3" json:"id,omitempty"`
@ -203,14 +200,14 @@ func (m *TaskIO) XXX_DiscardUnknown() {
var xxx_messageInfo_TaskIO proto.InternalMessageInfo
type TaskExit struct {
ContainerID string `protobuf:"bytes,1,opt,name=container_id,json=containerId,proto3" json:"container_id,omitempty"`
ID string `protobuf:"bytes,2,opt,name=id,proto3" json:"id,omitempty"`
Pid uint32 `protobuf:"varint,3,opt,name=pid,proto3" json:"pid,omitempty"`
ExitStatus uint32 `protobuf:"varint,4,opt,name=exit_status,json=exitStatus,proto3" json:"exit_status,omitempty"`
ExitedAt time.Time `protobuf:"bytes,5,opt,name=exited_at,json=exitedAt,proto3,stdtime" json:"exited_at"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
ContainerID string `protobuf:"bytes,1,opt,name=container_id,json=containerId,proto3" json:"container_id,omitempty"`
ID string `protobuf:"bytes,2,opt,name=id,proto3" json:"id,omitempty"`
Pid uint32 `protobuf:"varint,3,opt,name=pid,proto3" json:"pid,omitempty"`
ExitStatus uint32 `protobuf:"varint,4,opt,name=exit_status,json=exitStatus,proto3" json:"exit_status,omitempty"`
ExitedAt *types1.Timestamp `protobuf:"bytes,5,opt,name=exited_at,json=exitedAt,proto3" json:"exited_at,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *TaskExit) Reset() { *m = TaskExit{} }
@ -502,47 +499,47 @@ func init() {
}
var fileDescriptor_8db0813f7adfb63c = []byte{
// 639 bytes of a gzipped FileDescriptorProto
// 629 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x95, 0xcd, 0x6e, 0xd3, 0x40,
0x10, 0xc7, 0x6b, 0xa7, 0x75, 0xd3, 0x09, 0x55, 0x8b, 0x55, 0x95, 0x90, 0x83, 0x1d, 0x99, 0x4b,
0x4e, 0xb6, 0x08, 0x12, 0x17, 0x84, 0xd4, 0xa4, 0xe1, 0x90, 0x43, 0x95, 0xe2, 0xf6, 0xc4, 0x25,
0xda, 0x64, 0x37, 0xc9, 0xd2, 0xc4, 0x6b, 0xd9, 0x63, 0x54, 0x24, 0x0e, 0x3c, 0x02, 0x8f, 0xc0,
0xe3, 0xf4, 0x80, 0x10, 0x47, 0x4e, 0x81, 0xfa, 0x01, 0x38, 0xf1, 0x00, 0x68, 0xbd, 0x8e, 0xdb,
0x52, 0xf1, 0x65, 0x89, 0x53, 0x76, 0x66, 0x67, 0xff, 0xb3, 0xf3, 0xdb, 0xf1, 0x04, 0x1e, 0x4f,
0x39, 0xce, 0x92, 0x91, 0x3b, 0x16, 0x0b, 0x6f, 0x2c, 0x02, 0x24, 0x3c, 0x60, 0x11, 0xbd, 0xbe,
0x24, 0x21, 0xf7, 0xd8, 0x2b, 0x16, 0x60, 0xec, 0x21, 0x89, 0xcf, 0xdc, 0x30, 0x12, 0x28, 0xcc,
0xbb, 0x57, 0x11, 0xae, 0xda, 0x6d, 0xec, 0x4d, 0xc5, 0x54, 0x64, 0xbb, 0x9e, 0x5c, 0xa9, 0xc0,
0x86, 0x3d, 0x15, 0x62, 0x3a, 0x67, 0x5e, 0x66, 0x8d, 0x92, 0x89, 0x87, 0x7c, 0xc1, 0x62, 0x24,
0x8b, 0x30, 0x0f, 0xf8, 0xbb, 0x1b, 0xe0, 0xeb, 0x90, 0xc5, 0xde, 0x42, 0x24, 0x01, 0xe6, 0xe7,
0x0e, 0xfe, 0x78, 0xae, 0x48, 0x19, 0xce, 0x93, 0x29, 0x0f, 0xbc, 0x09, 0x67, 0x73, 0x1a, 0x12,
0x9c, 0x29, 0x05, 0xe7, 0x9b, 0x06, 0x70, 0x4a, 0xe2, 0xb3, 0xc3, 0x88, 0x11, 0x64, 0x66, 0x1b,
0xee, 0x14, 0x87, 0x87, 0x9c, 0xd6, 0xb5, 0xa6, 0xd6, 0xda, 0xea, 0xee, 0xa4, 0x4b, 0xbb, 0x76,
0xb8, 0xf2, 0xf7, 0x7b, 0x7e, 0xad, 0x08, 0xea, 0x53, 0x73, 0x1f, 0x8c, 0x51, 0x12, 0xd0, 0x39,
0xab, 0xeb, 0x32, 0xda, 0xcf, 0x2d, 0xd3, 0x03, 0x23, 0x12, 0x02, 0x27, 0x71, 0xbd, 0xd2, 0xac,
0xb4, 0x6a, 0xed, 0x7b, 0xee, 0x35, 0x5e, 0x59, 0x2d, 0xee, 0x91, 0xac, 0xc5, 0xcf, 0xc3, 0xcc,
0x87, 0xa0, 0x73, 0x51, 0x5f, 0x6f, 0x6a, 0xad, 0x5a, 0xfb, 0xbe, 0x7b, 0x0b, 0xae, 0x2b, 0xef,
0xd9, 0x1f, 0x74, 0x8d, 0x74, 0x69, 0xeb, 0xfd, 0x81, 0xaf, 0x73, 0x61, 0x5a, 0x00, 0xe3, 0x19,
0x1b, 0x9f, 0x85, 0x82, 0x07, 0x58, 0xdf, 0xc8, 0xf2, 0x5f, 0xf3, 0x98, 0xbb, 0x50, 0x09, 0x39,
0xad, 0x1b, 0x4d, 0xad, 0xb5, 0xed, 0xcb, 0xa5, 0xf3, 0x1c, 0xb6, 0xa4, 0xce, 0x09, 0x92, 0x08,
0x4b, 0x95, 0x9b, 0x4b, 0xea, 0x57, 0x92, 0x1f, 0x73, 0x86, 0x3d, 0x36, 0x67, 0x25, 0x19, 0xde,
0x12, 0x35, 0x6d, 0xa8, 0xb1, 0x73, 0x8e, 0xc3, 0x18, 0x09, 0x26, 0x12, 0xa1, 0xdc, 0x01, 0xe9,
0x3a, 0xc9, 0x3c, 0x66, 0x07, 0xb6, 0xa4, 0xc5, 0xe8, 0x90, 0x60, 0x0e, 0xad, 0xe1, 0xaa, 0x46,
0x73, 0x57, 0xaf, 0xee, 0x9e, 0xae, 0x1a, 0xad, 0x5b, 0xbd, 0x58, 0xda, 0x6b, 0xef, 0xbe, 0xd8,
0x9a, 0x5f, 0x55, 0xc7, 0x3a, 0x68, 0xee, 0x83, 0xce, 0xa9, 0xa2, 0x96, 0x53, 0xed, 0xf9, 0x3a,
0xa7, 0xce, 0x4b, 0x30, 0x14, 0x6b, 0x73, 0x0f, 0x36, 0x62, 0xa4, 0x3c, 0x50, 0x45, 0xf8, 0xca,
0x90, 0x2f, 0x1e, 0x23, 0x15, 0x09, 0xae, 0x5e, 0x5c, 0x59, 0xb9, 0x9f, 0x45, 0x51, 0x76, 0x5d,
0xe5, 0x67, 0x51, 0x64, 0x36, 0xa0, 0x8a, 0x2c, 0x5a, 0xf0, 0x80, 0xcc, 0xb3, 0x9b, 0x56, 0xfd,
0xc2, 0x76, 0x3e, 0x68, 0x50, 0x95, 0xc9, 0x9e, 0x9d, 0x73, 0x2c, 0xd9, 0x7e, 0x7a, 0x4e, 0xee,
0x46, 0x11, 0x2b, 0xa4, 0x95, 0x5f, 0x22, 0x5d, 0xff, 0x3d, 0xd2, 0x8d, 0x32, 0x48, 0x9d, 0xa7,
0xb0, 0x29, 0xab, 0x19, 0x0c, 0x8e, 0xca, 0x14, 0xe3, 0xcc, 0x60, 0x5b, 0xc1, 0x60, 0xe3, 0x0e,
0xa5, 0x8c, 0x96, 0x22, 0xf2, 0x00, 0x36, 0xd9, 0x39, 0x1b, 0x0f, 0x0b, 0x2c, 0x90, 0x2e, 0x6d,
0x43, 0x6a, 0xf6, 0x7b, 0xbe, 0x21, 0xb7, 0xfa, 0xd4, 0x79, 0x03, 0x3b, 0xab, 0x4c, 0xd9, 0xb7,
0xf0, 0x1f, 0x73, 0xdd, 0x7e, 0x0a, 0xe7, 0x40, 0x7d, 0x31, 0xc7, 0x24, 0x89, 0xcb, 0x25, 0x76,
0x3a, 0x50, 0x93, 0x0a, 0x3e, 0x8b, 0x93, 0x45, 0x49, 0x89, 0x09, 0xec, 0x66, 0xa3, 0xaf, 0x18,
0x17, 0x25, 0x19, 0xdc, 0x1c, 0x42, 0xfa, 0xcf, 0x43, 0xa8, 0x7b, 0x7c, 0x71, 0x69, 0xad, 0x7d,
0xbe, 0xb4, 0xd6, 0xde, 0xa6, 0x96, 0x76, 0x91, 0x5a, 0xda, 0xa7, 0xd4, 0xd2, 0xbe, 0xa6, 0x96,
0xf6, 0xfe, 0xbb, 0xa5, 0xbd, 0x68, 0xff, 0xc3, 0xbf, 0xcf, 0x13, 0xf5, 0x33, 0x32, 0xb2, 0x6e,
0x7c, 0xf4, 0x23, 0x00, 0x00, 0xff, 0xff, 0xd3, 0xf0, 0x6e, 0x00, 0xba, 0x06, 0x00, 0x00,
0x10, 0xc7, 0x6b, 0xa7, 0x75, 0xd3, 0x09, 0x55, 0xcb, 0xaa, 0x2a, 0x21, 0x07, 0x27, 0x32, 0x97,
0x9c, 0x6c, 0x11, 0x24, 0x38, 0x20, 0xa4, 0x7e, 0x84, 0x43, 0x0e, 0x55, 0x8a, 0xdb, 0x13, 0x97,
0x68, 0x93, 0xdd, 0x24, 0x4b, 0x13, 0xaf, 0x65, 0x8f, 0x51, 0x91, 0x38, 0xf0, 0x28, 0x3c, 0x0b,
0xe2, 0xd0, 0x23, 0x47, 0x4e, 0x15, 0xf5, 0x03, 0x70, 0xe2, 0x01, 0xd0, 0x7a, 0x1d, 0xb7, 0x25,
0x02, 0x8a, 0x25, 0x4e, 0xd9, 0x99, 0x9d, 0xfd, 0xcf, 0xcc, 0x6f, 0x27, 0x6b, 0x78, 0x3a, 0x11,
0x38, 0x4d, 0x86, 0xee, 0x48, 0xce, 0xbd, 0x91, 0x0c, 0x90, 0x8a, 0x80, 0x47, 0xec, 0xe6, 0x92,
0x86, 0xc2, 0xe3, 0x6f, 0x79, 0x80, 0xb1, 0x87, 0x34, 0x3e, 0x73, 0xc3, 0x48, 0xa2, 0x24, 0xf7,
0xaf, 0x23, 0x5c, 0xbd, 0xdb, 0xd8, 0x99, 0xc8, 0x89, 0xcc, 0x76, 0x3d, 0xb5, 0xd2, 0x81, 0x8d,
0xe6, 0x44, 0xca, 0xc9, 0x8c, 0x7b, 0x99, 0x35, 0x4c, 0xc6, 0x1e, 0x8a, 0x39, 0x8f, 0x91, 0xce,
0xc3, 0x3c, 0xe0, 0x6e, 0x15, 0xe0, 0xbb, 0x90, 0xc7, 0xde, 0x5c, 0x26, 0x01, 0xe6, 0xe7, 0xf6,
0xfe, 0x7a, 0xae, 0x48, 0x19, 0xce, 0x92, 0x89, 0x08, 0xbc, 0xb1, 0xe0, 0x33, 0x16, 0x52, 0x9c,
0x6a, 0x05, 0xe7, 0xbb, 0x01, 0x70, 0x4a, 0xe3, 0xb3, 0xc3, 0x88, 0x53, 0xe4, 0xa4, 0x03, 0xf7,
0x8a, 0xc3, 0x03, 0xc1, 0xea, 0x46, 0xcb, 0x68, 0x6f, 0x1c, 0x6c, 0xa5, 0x97, 0xcd, 0xda, 0xe1,
0xc2, 0xdf, 0xeb, 0xfa, 0xb5, 0x22, 0xa8, 0xc7, 0xc8, 0x2e, 0x58, 0xc3, 0x24, 0x60, 0x33, 0x5e,
0x37, 0x55, 0xb4, 0x9f, 0x5b, 0xc4, 0x03, 0x2b, 0x92, 0x12, 0xc7, 0x71, 0xbd, 0xd2, 0xaa, 0xb4,
0x6b, 0x9d, 0x07, 0xee, 0x0d, 0x5e, 0x59, 0x2f, 0xee, 0x91, 0xea, 0xc5, 0xcf, 0xc3, 0xc8, 0x63,
0x30, 0x85, 0xac, 0xaf, 0xb6, 0x8c, 0x76, 0xad, 0xf3, 0xd0, 0x5d, 0x82, 0xeb, 0xaa, 0x3a, 0x7b,
0xfd, 0x03, 0x2b, 0xbd, 0x6c, 0x9a, 0xbd, 0xbe, 0x6f, 0x0a, 0x49, 0x6c, 0x80, 0xd1, 0x94, 0x8f,
0xce, 0x42, 0x29, 0x02, 0xac, 0xaf, 0x65, 0xf9, 0x6f, 0x78, 0xc8, 0x36, 0x54, 0x42, 0xc1, 0xea,
0x56, 0xcb, 0x68, 0x6f, 0xfa, 0x6a, 0xe9, 0xbc, 0x82, 0x0d, 0xa5, 0x73, 0x82, 0x34, 0xc2, 0x52,
0xed, 0xe6, 0x92, 0xe6, 0xb5, 0xe4, 0xe7, 0x9c, 0x61, 0x97, 0xcf, 0x78, 0x49, 0x86, 0x4b, 0xa2,
0xa4, 0x09, 0x35, 0x7e, 0x2e, 0x70, 0x10, 0x23, 0xc5, 0x44, 0x21, 0x54, 0x3b, 0xa0, 0x5c, 0x27,
0x99, 0x87, 0x3c, 0x83, 0x0d, 0x65, 0x71, 0x36, 0xa0, 0x98, 0x43, 0x6b, 0xb8, 0x7a, 0xd0, 0xdc,
0xc5, 0xad, 0xbb, 0xa7, 0x8b, 0x41, 0xf3, 0xab, 0x3a, 0x78, 0x1f, 0xc9, 0x2e, 0x98, 0x82, 0x69,
0x56, 0x39, 0xcb, 0xae, 0x6f, 0x0a, 0xe6, 0xbc, 0x01, 0x4b, 0x13, 0x26, 0x3b, 0xb0, 0x16, 0x23,
0x13, 0x81, 0x2e, 0xdd, 0xd7, 0x86, 0xba, 0xe7, 0x18, 0x99, 0x4c, 0x70, 0x71, 0xcf, 0xda, 0xca,
0xfd, 0x3c, 0x8a, 0xb2, 0x22, 0xb5, 0x9f, 0x47, 0x11, 0x69, 0x40, 0x15, 0x79, 0x34, 0x17, 0x01,
0x9d, 0x65, 0xf5, 0x55, 0xfd, 0xc2, 0x76, 0x3e, 0x19, 0x50, 0x55, 0xc9, 0x5e, 0x9e, 0x0b, 0x2c,
0x39, 0x74, 0x66, 0xce, 0xeb, 0x56, 0x13, 0x0b, 0x90, 0x95, 0xdf, 0x82, 0x5c, 0xfd, 0x33, 0xc8,
0xb5, 0xbb, 0x83, 0x74, 0x5e, 0xc0, 0xba, 0xea, 0xa1, 0xdf, 0x3f, 0x2a, 0xd3, 0x82, 0x33, 0x85,
0x4d, 0x8d, 0x80, 0x8f, 0xf6, 0x19, 0xe3, 0xac, 0x14, 0x87, 0x47, 0xb0, 0xce, 0xcf, 0xf9, 0x68,
0x50, 0xc0, 0x80, 0xf4, 0xb2, 0x69, 0x29, 0xcd, 0x5e, 0xd7, 0xb7, 0xd4, 0x56, 0x8f, 0x39, 0xef,
0x61, 0x6b, 0x91, 0x29, 0x9b, 0xfb, 0xff, 0x98, 0x6b, 0xf9, 0x02, 0x9c, 0x3d, 0xfd, 0xef, 0x38,
0xa6, 0x49, 0x5c, 0x2e, 0xb1, 0xb3, 0x0f, 0x35, 0xa5, 0xe0, 0xf3, 0x38, 0x99, 0x97, 0x94, 0x18,
0xc3, 0x76, 0xf6, 0xcc, 0x15, 0x4f, 0x43, 0x49, 0x06, 0xb7, 0x1f, 0x1c, 0xf3, 0xd7, 0x07, 0xe7,
0xe0, 0xf8, 0xe2, 0xca, 0x5e, 0xf9, 0x7a, 0x65, 0xaf, 0x7c, 0x48, 0x6d, 0xe3, 0x22, 0xb5, 0x8d,
0x2f, 0xa9, 0x6d, 0x7c, 0x4b, 0x6d, 0xe3, 0xe3, 0x0f, 0xdb, 0x78, 0xdd, 0xf9, 0x87, 0x2f, 0xcd,
0x73, 0xfd, 0x33, 0xb4, 0xb2, 0x19, 0x7c, 0xf2, 0x33, 0x00, 0x00, 0xff, 0xff, 0xfd, 0x3c, 0xdf,
0xcc, 0xa6, 0x06, 0x00, 0x00,
}
// Field returns the value for the given fieldpath as a string, if defined.
@ -889,14 +886,18 @@ func (m *TaskDelete) MarshalToSizedBuffer(dAtA []byte) (int, error) {
i--
dAtA[i] = 0x2a
}
n2, err2 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.ExitedAt, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.ExitedAt):])
if err2 != nil {
return 0, err2
if m.ExitedAt != nil {
{
size, err := m.ExitedAt.MarshalToSizedBuffer(dAtA[:i])
if err != nil {
return 0, err
}
i -= size
i = encodeVarintTask(dAtA, i, uint64(size))
}
i--
dAtA[i] = 0x22
}
i -= n2
i = encodeVarintTask(dAtA, i, uint64(n2))
i--
dAtA[i] = 0x22
if m.ExitStatus != 0 {
i = encodeVarintTask(dAtA, i, uint64(m.ExitStatus))
i--
@ -999,14 +1000,18 @@ func (m *TaskExit) MarshalToSizedBuffer(dAtA []byte) (int, error) {
i -= len(m.XXX_unrecognized)
copy(dAtA[i:], m.XXX_unrecognized)
}
n3, err3 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.ExitedAt, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.ExitedAt):])
if err3 != nil {
return 0, err3
if m.ExitedAt != nil {
{
size, err := m.ExitedAt.MarshalToSizedBuffer(dAtA[:i])
if err != nil {
return 0, err
}
i -= size
i = encodeVarintTask(dAtA, i, uint64(size))
}
i--
dAtA[i] = 0x2a
}
i -= n3
i = encodeVarintTask(dAtA, i, uint64(n3))
i--
dAtA[i] = 0x2a
if m.ExitStatus != 0 {
i = encodeVarintTask(dAtA, i, uint64(m.ExitStatus))
i--
@ -1347,8 +1352,10 @@ func (m *TaskDelete) Size() (n int) {
if m.ExitStatus != 0 {
n += 1 + sovTask(uint64(m.ExitStatus))
}
l = github_com_gogo_protobuf_types.SizeOfStdTime(m.ExitedAt)
n += 1 + l + sovTask(uint64(l))
if m.ExitedAt != nil {
l = m.ExitedAt.Size()
n += 1 + l + sovTask(uint64(l))
}
l = len(m.ID)
if l > 0 {
n += 1 + l + sovTask(uint64(l))
@ -1406,8 +1413,10 @@ func (m *TaskExit) Size() (n int) {
if m.ExitStatus != 0 {
n += 1 + sovTask(uint64(m.ExitStatus))
}
l = github_com_gogo_protobuf_types.SizeOfStdTime(m.ExitedAt)
n += 1 + l + sovTask(uint64(l))
if m.ExitedAt != nil {
l = m.ExitedAt.Size()
n += 1 + l + sovTask(uint64(l))
}
if m.XXX_unrecognized != nil {
n += len(m.XXX_unrecognized)
}
@ -1572,7 +1581,7 @@ func (this *TaskDelete) String() string {
`ContainerID:` + fmt.Sprintf("%v", this.ContainerID) + `,`,
`Pid:` + fmt.Sprintf("%v", this.Pid) + `,`,
`ExitStatus:` + fmt.Sprintf("%v", this.ExitStatus) + `,`,
`ExitedAt:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.ExitedAt), "Timestamp", "types1.Timestamp", 1), `&`, ``, 1) + `,`,
`ExitedAt:` + strings.Replace(fmt.Sprintf("%v", this.ExitedAt), "Timestamp", "types1.Timestamp", 1) + `,`,
`ID:` + fmt.Sprintf("%v", this.ID) + `,`,
`XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`,
`}`,
@ -1602,7 +1611,7 @@ func (this *TaskExit) String() string {
`ID:` + fmt.Sprintf("%v", this.ID) + `,`,
`Pid:` + fmt.Sprintf("%v", this.Pid) + `,`,
`ExitStatus:` + fmt.Sprintf("%v", this.ExitStatus) + `,`,
`ExitedAt:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.ExitedAt), "Timestamp", "types1.Timestamp", 1), `&`, ``, 1) + `,`,
`ExitedAt:` + strings.Replace(fmt.Sprintf("%v", this.ExitedAt), "Timestamp", "types1.Timestamp", 1) + `,`,
`XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`,
`}`,
}, "")
@ -2152,7 +2161,10 @@ func (m *TaskDelete) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.ExitedAt, dAtA[iNdEx:postIndex]); err != nil {
if m.ExitedAt == nil {
m.ExitedAt = &types1.Timestamp{}
}
if err := m.ExitedAt.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
@ -2537,7 +2549,10 @@ func (m *TaskExit) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.ExitedAt, dAtA[iNdEx:postIndex]); err != nil {
if m.ExitedAt == nil {
m.ExitedAt = &types1.Timestamp{}
}
if err := m.ExitedAt.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex

4
api/events/task.proto
View File

@ -44,7 +44,7 @@ message TaskDelete {
string container_id = 1;
uint32 pid = 2;
uint32 exit_status = 3;
google.protobuf.Timestamp exited_at = 4 [(gogoproto.stdtime) = true, (gogoproto.nullable) = false];
google.protobuf.Timestamp exited_at = 4;
// id is the specific exec. By default if omitted will be `""` thus matches
// the init exec of the task matching `container_id`.
string id = 5;
@ -62,7 +62,7 @@ message TaskExit {
string id = 2;
uint32 pid = 3;
uint32 exit_status = 4;
google.protobuf.Timestamp exited_at = 5 [(gogoproto.stdtime) = true, (gogoproto.nullable) = false];
google.protobuf.Timestamp exited_at = 5;
}
message TaskOOM {

100
api/next.pb.txt
View File

@ -608,10 +608,6 @@ file {
label: LABEL_OPTIONAL
type: TYPE_MESSAGE
type_name: ".google.protobuf.Timestamp"
options {
65010: 1
65001: 0
}
json_name: "exitedAt"
}
field {
@ -689,10 +685,6 @@ file {
label: LABEL_OPTIONAL
type: TYPE_MESSAGE
type_name: ".google.protobuf.Timestamp"
options {
65010: 1
65001: 0
}
json_name: "exitedAt"
}
}
@ -899,10 +891,6 @@ file {
label: LABEL_OPTIONAL
type: TYPE_MESSAGE
type_name: ".google.protobuf.Timestamp"
options {
65010: 1
65001: 0
}
json_name: "createdAt"
}
field {
@ -911,10 +899,6 @@ file {
label: LABEL_OPTIONAL
type: TYPE_MESSAGE
type_name: ".google.protobuf.Timestamp"
options {
65010: 1
65001: 0
}
json_name: "updatedAt"
}
field {
@ -1196,10 +1180,6 @@ file {
label: LABEL_OPTIONAL
type: TYPE_MESSAGE
type_name: ".google.protobuf.Timestamp"
options {
65010: 1
65001: 0
}
json_name: "createdAt"
}
field {
@ -1208,10 +1188,6 @@ file {
label: LABEL_OPTIONAL
type: TYPE_MESSAGE
type_name: ".google.protobuf.Timestamp"
options {
65010: 1
65001: 0
}
json_name: "updatedAt"
}
field {
@ -1386,10 +1362,6 @@ file {
label: LABEL_OPTIONAL
type: TYPE_MESSAGE
type_name: ".google.protobuf.Timestamp"
options {
65010: 1
65001: 0
}
json_name: "startedAt"
}
field {
@ -1398,10 +1370,6 @@ file {
label: LABEL_OPTIONAL
type: TYPE_MESSAGE
type_name: ".google.protobuf.Timestamp"
options {
65010: 1
65001: 0
}
json_name: "updatedAt"
}
field {
@ -1568,10 +1536,6 @@ file {
label: LABEL_OPTIONAL
type: TYPE_MESSAGE
type_name: ".google.protobuf.Timestamp"
options {
65010: 1
65001: 0
}
json_name: "startedAt"
}
field {
@ -1580,10 +1544,6 @@ file {
label: LABEL_OPTIONAL
type: TYPE_MESSAGE
type_name: ".google.protobuf.Timestamp"
options {
65010: 1
65001: 0
}
json_name: "updatedAt"
}
field {
@ -1962,10 +1922,6 @@ file {
label: LABEL_OPTIONAL
type: TYPE_MESSAGE
type_name: ".google.protobuf.Timestamp"
options {
65010: 1
65001: 0
}
json_name: "timestamp"
}
field {
@ -2060,10 +2016,6 @@ file {
label: LABEL_OPTIONAL
type: TYPE_MESSAGE
type_name: ".google.protobuf.Timestamp"
options {
65010: 1
65001: 0
}
json_name: "createdAt"
}
field {
@ -2072,10 +2024,6 @@ file {
label: LABEL_OPTIONAL
type: TYPE_MESSAGE
type_name: ".google.protobuf.Timestamp"
options {
65010: 1
65001: 0
}
json_name: "updatedAt"
}
nested_type {
@ -2494,10 +2442,6 @@ file {
label: LABEL_OPTIONAL
type: TYPE_MESSAGE
type_name: ".google.protobuf.Timestamp"
options {
65010: 1
65001: 0
}
json_name: "createdAt"
}
field {
@ -2987,10 +2931,6 @@ file {
label: LABEL_OPTIONAL
type: TYPE_MESSAGE
type_name: ".google.protobuf.Timestamp"
options {
65010: 1
65001: 0
}
json_name: "createdAt"
}
field {
@ -2999,10 +2939,6 @@ file {
label: LABEL_OPTIONAL
type: TYPE_MESSAGE
type_name: ".google.protobuf.Timestamp"
options {
65010: 1
65001: 0
}
json_name: "updatedAt"
}
field {
@ -3299,10 +3235,6 @@ file {
label: LABEL_OPTIONAL
type: TYPE_MESSAGE
type_name: ".google.protobuf.Timestamp"
options {
65010: 1
65001: 0
}
json_name: "exitedAt"
}
}
@ -3352,10 +3284,6 @@ file {
label: LABEL_OPTIONAL
type: TYPE_MESSAGE
type_name: ".google.protobuf.Timestamp"
options {
65010: 1
65001: 0
}
json_name: "exitedAt"
}
field {
@ -3702,10 +3630,6 @@ file {
label: LABEL_OPTIONAL
type: TYPE_MESSAGE
type_name: ".google.protobuf.Timestamp"
options {
65010: 1
65001: 0
}
json_name: "createdAt"
}
field {
@ -3714,10 +3638,6 @@ file {
label: LABEL_OPTIONAL
type: TYPE_MESSAGE
type_name: ".google.protobuf.Timestamp"
options {
65010: 1
65001: 0
}
json_name: "updatedAt"
}
field {
@ -3973,10 +3893,6 @@ file {
label: LABEL_OPTIONAL
type: TYPE_MESSAGE
type_name: ".google.protobuf.Timestamp"
options {
65010: 1
65001: 0
}
json_name: "timestamp"
}
field {
@ -4078,10 +3994,6 @@ file {
label: LABEL_OPTIONAL
type: TYPE_MESSAGE
type_name: ".google.protobuf.Timestamp"
options {
65010: 1
65001: 0
}
json_name: "exitedAt"
}
}
@ -4295,10 +4207,6 @@ file {
label: LABEL_OPTIONAL
type: TYPE_MESSAGE
type_name: ".google.protobuf.Timestamp"
options {
65010: 1
65001: 0
}
json_name: "exitedAt"
}
}
@ -4686,10 +4594,6 @@ file {
label: LABEL_OPTIONAL
type: TYPE_MESSAGE
type_name: ".google.protobuf.Timestamp"
options {
65010: 1
65001: 0
}
json_name: "exitedAt"
}
}
@ -4813,10 +4717,6 @@ file {
label: LABEL_OPTIONAL
type: TYPE_MESSAGE
type_name: ".google.protobuf.Timestamp"
options {
65010: 1
65001: 0
}
json_name: "timestamp"
}
field {

175
api/services/containers/v1/containers.pb.go
View File

@ -9,7 +9,6 @@ import (
_ "github.com/gogo/protobuf/gogoproto"
proto "github.com/gogo/protobuf/proto"
github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys"
github_com_gogo_protobuf_types "github.com/gogo/protobuf/types"
types "github.com/gogo/protobuf/types"
grpc "google.golang.org/grpc"
codes "google.golang.org/grpc/codes"
@ -19,14 +18,12 @@ import (
math_bits "math/bits"
reflect "reflect"
strings "strings"
time "time"
)
// Reference imports to suppress errors if they are not otherwise used.
var _ = proto.Marshal
var _ = fmt.Errorf
var _ = math.Inf
var _ = time.Kitchen
// This is a compile-time assertion to ensure that this generated file
// is compatible with the proto package it is being compiled against.
@ -69,9 +66,9 @@ type Container struct {
// This field may be updated.
SnapshotKey string `protobuf:"bytes,7,opt,name=snapshot_key,json=snapshotKey,proto3" json:"snapshot_key,omitempty"`
// CreatedAt is the time the container was first created.
CreatedAt time.Time `protobuf:"bytes,8,opt,name=created_at,json=createdAt,proto3,stdtime" json:"created_at"`
CreatedAt *types.Timestamp `protobuf:"bytes,8,opt,name=created_at,json=createdAt,proto3" json:"created_at,omitempty"`
// UpdatedAt is the last time the container was mutated.
UpdatedAt time.Time `protobuf:"bytes,9,opt,name=updated_at,json=updatedAt,proto3,stdtime" json:"updated_at"`
UpdatedAt *types.Timestamp `protobuf:"bytes,9,opt,name=updated_at,json=updatedAt,proto3" json:"updated_at,omitempty"`
// Extensions allow clients to provide zero or more blobs that are directly
// associated with the container. One may provide protobuf, json, or other
// encoding formats. The primary use of this is to further decorate the
@ -596,59 +593,59 @@ func init() {
}
var fileDescriptor_311afb8e15951042 = []byte{
// 832 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0xcb, 0x72, 0x1a, 0x47,
0x14, 0xd5, 0x00, 0x1a, 0xc4, 0x25, 0x55, 0x49, 0x75, 0x08, 0x99, 0x4c, 0xaa, 0x00, 0xb1, 0xa2,
0x52, 0xc9, 0x20, 0x91, 0x54, 0xf4, 0xca, 0x46, 0xe8, 0x55, 0x49, 0xa4, 0x94, 0x6a, 0x94, 0x6c,
0xe2, 0x85, 0x3c, 0x40, 0x0b, 0x8d, 0x99, 0x97, 0xa7, 0x1b, 0x4a, 0x94, 0x17, 0xb2, 0xff, 0xc0,
0x7f, 0xe1, 0xb5, 0xff, 0x42, 0x4b, 0x2f, 0xbd, 0x92, 0x2d, 0xca, 0x1f, 0xe2, 0xea, 0x9e, 0x1e,
0x66, 0xc4, 0xc3, 0x06, 0xc9, 0xda, 0xf5, 0xa5, 0xef, 0xb9, 0xf7, 0xf4, 0xb9, 0x7d, 0x7a, 0x80,
0xc3, 0xb6, 0x49, 0xcf, 0xbb, 0x0d, 0xad, 0xe9, 0xda, 0xd5, 0xa6, 0xeb, 0x50, 0xc3, 0x74, 0xb0,
0xdf, 0x8a, 0x2f, 0x0d, 0xcf, 0xac, 0x12, 0xec, 0xf7, 0xcc, 0x26, 0x26, 0xd1, 0xef, 0xa4, 0xda,
0x5b, 0x8d, 0x45, 0x9a, 0xe7, 0xbb, 0xd4, 0x45, 0xcb, 0x11, 0x4e, 0x0b, 0x31, 0x5a, 0x2c, 0xab,
0xb7, 0xaa, 0xe6, 0xda, 0x6e, 0xdb, 0xe5, 0xd9, 0x55, 0xb6, 0x0a, 0x80, 0xea, 0x0f, 0x6d, 0xd7,
0x6d, 0x5b, 0xb8, 0xca, 0xa3, 0x46, 0xf7, 0xac, 0x6a, 0x38, 0x7d, 0xb1, 0xf5, 0xe3, 0xe8, 0x16,
0xb6, 0x3d, 0x1a, 0x6e, 0x96, 0x46, 0x37, 0xcf, 0x4c, 0x6c, 0xb5, 0x4e, 0x6d, 0x83, 0x74, 0x44,
0x46, 0x71, 0x34, 0x83, 0x9a, 0x36, 0x26, 0xd4, 0xb0, 0xbd, 0x20, 0xa1, 0xfc, 0x5a, 0x86, 0xcc,
0x4e, 0x48, 0x11, 0xe5, 0x21, 0x61, 0xb6, 0x14, 0xa9, 0x24, 0x55, 0x32, 0x75, 0x79, 0x70, 0x5d,
0x4c, 0xfc, 0xb9, 0xab, 0x27, 0xcc, 0x16, 0x3a, 0x06, 0xd9, 0x32, 0x1a, 0xd8, 0x22, 0x4a, 0xa2,
0x94, 0xac, 0x64, 0x6b, 0xeb, 0xda, 0x67, 0x8f, 0xaa, 0x0d, 0xab, 0x6a, 0x87, 0x1c, 0xba, 0xe7,
0x50, 0xbf, 0xaf, 0x8b, 0x3a, 0x28, 0x07, 0x8b, 0xa6, 0x6d, 0xb4, 0xb1, 0x92, 0x64, 0xcd, 0xf4,
0x20, 0x40, 0xff, 0x40, 0xda, 0xef, 0x3a, 0x8c, 0xa3, 0x92, 0x2a, 0x49, 0x95, 0x6c, 0xed, 0xb7,
0xb9, 0x1a, 0xe9, 0x01, 0x56, 0x0f, 0x8b, 0xa0, 0x0a, 0xa4, 0x88, 0x87, 0x9b, 0xca, 0x22, 0x2f,
0x96, 0xd3, 0x02, 0x35, 0xb4, 0x50, 0x0d, 0x6d, 0xdb, 0xe9, 0xeb, 0x3c, 0x03, 0x95, 0x20, 0x4b,
0x1c, 0xc3, 0x23, 0xe7, 0x2e, 0xa5, 0xd8, 0x57, 0x64, 0xce, 0x2a, 0xfe, 0x13, 0x5a, 0x86, 0xaf,
0xc2, 0xf0, 0xb4, 0x83, 0xfb, 0x4a, 0xfa, 0x76, 0xca, 0xdf, 0xb8, 0x8f, 0x76, 0x00, 0x9a, 0x3e,
0x36, 0x28, 0x6e, 0x9d, 0x1a, 0x54, 0x59, 0xe2, 0x4d, 0xd5, 0xb1, 0xa6, 0xff, 0x86, 0x23, 0xa8,
0x2f, 0x5d, 0x5d, 0x17, 0x17, 0x5e, 0xbe, 0x2b, 0x4a, 0x7a, 0x46, 0xe0, 0xb6, 0x29, 0x2b, 0xd2,
0xf5, 0x5a, 0x61, 0x91, 0xcc, 0x3c, 0x45, 0x04, 0x6e, 0x9b, 0xa2, 0x06, 0x00, 0xbe, 0xa0, 0xd8,
0x21, 0xa6, 0xeb, 0x10, 0x05, 0xf8, 0xd0, 0xfe, 0x98, 0x4b, 0xcb, 0xbd, 0x21, 0x9c, 0x0f, 0xae,
0x9e, 0x62, 0x6d, 0xf4, 0x58, 0x55, 0xa4, 0x40, 0x9a, 0x18, 0x4e, 0xab, 0xe1, 0x5e, 0x28, 0x59,
0xae, 0x45, 0x18, 0xaa, 0x1b, 0x90, 0x8d, 0xcd, 0x1c, 0x7d, 0x03, 0x49, 0x26, 0x18, 0xbf, 0x56,
0x3a, 0x5b, 0xb2, 0xe9, 0xf7, 0x0c, 0xab, 0x8b, 0x95, 0x44, 0x30, 0x7d, 0x1e, 0x6c, 0x26, 0xd6,
0x25, 0xf5, 0x08, 0xd2, 0x62, 0x8a, 0x08, 0x41, 0xca, 0x31, 0x6c, 0x2c, 0x70, 0x7c, 0x8d, 0x34,
0x48, 0xbb, 0x1e, 0xe5, 0x87, 0x4a, 0x7c, 0x62, 0xa6, 0x61, 0x92, 0x7a, 0x02, 0x5f, 0x8f, 0x1c,
0x64, 0x02, 0x9b, 0x9f, 0xe2, 0x6c, 0xa6, 0x95, 0x8c, 0x38, 0x96, 0x7f, 0x81, 0x6f, 0x0f, 0x30,
0x1d, 0x4a, 0xa5, 0xe3, 0xa7, 0x5d, 0x4c, 0xe8, 0x34, 0xf3, 0x94, 0xcf, 0x21, 0x77, 0x3b, 0x9d,
0x78, 0xae, 0x43, 0x30, 0x3a, 0x86, 0xcc, 0x50, 0x7c, 0x0e, 0xcb, 0xd6, 0x7e, 0x9e, 0x67, 0x44,
0x62, 0x24, 0x51, 0x91, 0xf2, 0x2a, 0x7c, 0x77, 0x68, 0x92, 0xa8, 0x15, 0x09, 0xa9, 0x29, 0x90,
0x3e, 0x33, 0x2d, 0x8a, 0x7d, 0xa2, 0x48, 0xa5, 0x24, 0x1b, 0x95, 0x08, 0xcb, 0x16, 0xe4, 0x47,
0x21, 0x82, 0x9e, 0x0e, 0x10, 0x35, 0xe6, 0xb0, 0xbb, 0xf1, 0x8b, 0x55, 0x29, 0x3f, 0x81, 0xfc,
0x0e, 0xbf, 0xe8, 0x63, 0xe2, 0x7d, 0x79, 0x31, 0x3a, 0xf0, 0xfd, 0x58, 0xaf, 0x07, 0x53, 0xfe,
0x95, 0x04, 0xf9, 0xff, 0xb8, 0xfb, 0x1e, 0xfe, 0x64, 0x68, 0x0b, 0xb2, 0x81, 0xd3, 0xf9, 0x4b,
0x2f, 0x6e, 0xed, 0xf8, 0x13, 0xb1, 0xcf, 0x3e, 0x06, 0x47, 0x06, 0xe9, 0xe8, 0xe2, 0x41, 0x61,
0x6b, 0x26, 0xcb, 0x18, 0xd1, 0x07, 0x93, 0x65, 0x05, 0xf2, 0xbb, 0xd8, 0xc2, 0x13, 0x54, 0x99,
0x66, 0x96, 0x06, 0xe4, 0x6e, 0xdd, 0xc7, 0x23, 0x4c, 0x08, 0xfb, 0x32, 0xfc, 0x75, 0x4f, 0x6e,
0x31, 0x56, 0xb5, 0x0f, 0x8b, 0x00, 0xd1, 0x85, 0x47, 0x3d, 0x48, 0x1e, 0x60, 0x8a, 0x7e, 0x9f,
0xa1, 0xdc, 0x04, 0xdb, 0xab, 0x6b, 0x73, 0xe3, 0x84, 0xdc, 0xcf, 0x20, 0xc5, 0x8e, 0x8a, 0x66,
0xf9, 0x98, 0x4e, 0xb4, 0xb5, 0xba, 0x71, 0x07, 0xa4, 0x68, 0xfe, 0x42, 0x02, 0x60, 0x5b, 0x27,
0xd4, 0xc7, 0x86, 0x7d, 0x0f, 0x0e, 0x6b, 0xf3, 0x22, 0xc5, 0x44, 0x57, 0x24, 0x74, 0x09, 0x72,
0xe0, 0x50, 0x34, 0xcb, 0x41, 0x26, 0x3f, 0x1c, 0xea, 0xe6, 0x5d, 0xa0, 0x42, 0x84, 0x4b, 0x90,
0x03, 0x2f, 0xcc, 0x44, 0x60, 0xb2, 0xbf, 0x67, 0x22, 0x30, 0xcd, 0x71, 0x8f, 0x40, 0x0e, 0xfc,
0x31, 0x13, 0x81, 0xc9, 0x56, 0x52, 0xf3, 0x63, 0xce, 0xdf, 0x63, 0xff, 0x11, 0xeb, 0x8f, 0xaf,
0x6e, 0x0a, 0x0b, 0x6f, 0x6f, 0x0a, 0x0b, 0xcf, 0x07, 0x05, 0xe9, 0x6a, 0x50, 0x90, 0xde, 0x0c,
0x0a, 0xd2, 0xfb, 0x41, 0x41, 0xfa, 0x7f, 0xff, 0x1e, 0x7f, 0x7b, 0xb7, 0xa2, 0xa8, 0x21, 0xf3,
0x8e, 0xbf, 0x7e, 0x0c, 0x00, 0x00, 0xff, 0xff, 0xef, 0xe7, 0xe1, 0xb7, 0x47, 0x0b, 0x00, 0x00,
// 820 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0xcb, 0x6e, 0x13, 0x49,
0x14, 0x4d, 0xdb, 0x4e, 0x7b, 0x7c, 0x3d, 0xd2, 0x8c, 0x6a, 0x3c, 0x9e, 0x9e, 0x1e, 0xc9, 0x71,
0xbc, 0xb2, 0x46, 0xd0, 0x4e, 0x0c, 0x22, 0x2f, 0x36, 0x79, 0x0b, 0x48, 0x50, 0xd4, 0x81, 0x0d,
0x2c, 0x42, 0xdb, 0xae, 0x38, 0x8d, 0xfb, 0x45, 0x57, 0xd9, 0x8a, 0xc5, 0x22, 0xf0, 0x21, 0xac,
0xf9, 0x95, 0x2c, 0x59, 0xb2, 0x8a, 0x88, 0xc5, 0x87, 0xa0, 0xaa, 0xae, 0x76, 0x77, 0xfc, 0x20,
0x76, 0x42, 0x76, 0x75, 0x5d, 0xf7, 0xdc, 0x7b, 0xea, 0xdc, 0x3a, 0xe5, 0x86, 0xbd, 0xa6, 0x49,
0x4f, 0xda, 0x35, 0xad, 0xee, 0xda, 0x95, 0xba, 0xeb, 0x50, 0xc3, 0x74, 0xb0, 0xdf, 0x88, 0x2f,
0x0d, 0xcf, 0xac, 0x10, 0xec, 0x77, 0xcc, 0x3a, 0x26, 0xd1, 0xef, 0xa4, 0xd2, 0x59, 0x8c, 0x45,
0x9a, 0xe7, 0xbb, 0xd4, 0x45, 0xf3, 0x11, 0x4e, 0x0b, 0x31, 0x5a, 0x2c, 0xab, 0xb3, 0xa8, 0xe6,
0x9a, 0x6e, 0xd3, 0xe5, 0xd9, 0x15, 0xb6, 0x0a, 0x80, 0xea, 0xbf, 0x4d, 0xd7, 0x6d, 0x5a, 0xb8,
0xc2, 0xa3, 0x5a, 0xfb, 0xb8, 0x62, 0x38, 0x5d, 0xb1, 0xf5, 0xdf, 0xe0, 0x16, 0xb6, 0x3d, 0x1a,
0x6e, 0x16, 0x07, 0x37, 0x8f, 0x4d, 0x6c, 0x35, 0x8e, 0x6c, 0x83, 0xb4, 0x44, 0xc6, 0xdc, 0x60,
0x06, 0x35, 0x6d, 0x4c, 0xa8, 0x61, 0x7b, 0x41, 0x42, 0xe9, 0x93, 0x0c, 0x99, 0xcd, 0x90, 0x22,
0xca, 0x43, 0xc2, 0x6c, 0x28, 0x52, 0x51, 0x2a, 0x67, 0x36, 0xe4, 0xde, 0xc5, 0x5c, 0xe2, 0xc9,
0x96, 0x9e, 0x30, 0x1b, 0xe8, 0x00, 0x64, 0xcb, 0xa8, 0x61, 0x8b, 0x28, 0x89, 0x62, 0xb2, 0x9c,
0xad, 0x2e, 0x6b, 0xd7, 0x1e, 0x55, 0xeb, 0x57, 0xd5, 0xf6, 0x38, 0x74, 0xdb, 0xa1, 0x7e, 0x57,
0x17, 0x75, 0x50, 0x0e, 0x66, 0x4d, 0xdb, 0x68, 0x62, 0x25, 0xc9, 0x9a, 0xe9, 0x41, 0x80, 0x9e,
0x43, 0xda, 0x6f, 0x3b, 0x8c, 0xa3, 0x92, 0x2a, 0x4a, 0xe5, 0x6c, 0xf5, 0xe1, 0x54, 0x8d, 0xf4,
0x00, 0xab, 0x87, 0x45, 0x50, 0x19, 0x52, 0xc4, 0xc3, 0x75, 0x65, 0x96, 0x17, 0xcb, 0x69, 0x81,
0x1a, 0x5a, 0xa8, 0x86, 0xb6, 0xee, 0x74, 0x75, 0x9e, 0x81, 0x8a, 0x90, 0x25, 0x8e, 0xe1, 0x91,
0x13, 0x97, 0x52, 0xec, 0x2b, 0x32, 0x67, 0x15, 0xff, 0x09, 0xcd, 0xc3, 0xef, 0x61, 0x78, 0xd4,
0xc2, 0x5d, 0x25, 0x7d, 0x35, 0xe5, 0x19, 0xee, 0xa2, 0x15, 0x80, 0xba, 0x8f, 0x0d, 0x8a, 0x1b,
0x47, 0x06, 0x55, 0x7e, 0xe3, 0x4d, 0xd5, 0xa1, 0xa6, 0x2f, 0xc2, 0x11, 0xe8, 0x19, 0x91, 0xbd,
0x4e, 0x19, 0xb4, 0xed, 0x35, 0x42, 0x68, 0xe6, 0x7a, 0xa8, 0xc8, 0x5e, 0xa7, 0xa8, 0x06, 0x80,
0x4f, 0x29, 0x76, 0x88, 0xe9, 0x3a, 0x44, 0x01, 0x3e, 0xa0, 0xc7, 0x53, 0xe9, 0xb6, 0xdd, 0x87,
0xf3, 0x21, 0x6d, 0xa4, 0xce, 0x2f, 0xe6, 0x66, 0xf4, 0x58, 0x55, 0xa4, 0x40, 0x9a, 0x18, 0x4e,
0xa3, 0xe6, 0x9e, 0x2a, 0x59, 0x7e, 0xee, 0x30, 0x54, 0x57, 0x20, 0x1b, 0x9b, 0x2f, 0xfa, 0x13,
0x92, 0x4c, 0x1c, 0x7e, 0x85, 0x74, 0xb6, 0x64, 0x93, 0xee, 0x18, 0x56, 0x1b, 0x2b, 0x89, 0x60,
0xd2, 0x3c, 0x58, 0x4d, 0x2c, 0x4b, 0xea, 0x3e, 0xa4, 0xc5, 0xc4, 0x10, 0x82, 0x94, 0x63, 0xd8,
0x58, 0xe0, 0xf8, 0x1a, 0x69, 0x90, 0x76, 0x3d, 0xca, 0x0f, 0x95, 0xf8, 0xc9, 0xfc, 0xc2, 0x24,
0xf5, 0x10, 0xfe, 0x18, 0x38, 0xc8, 0x08, 0x36, 0xff, 0xc7, 0xd9, 0x8c, 0x2b, 0x19, 0x71, 0x2c,
0xdd, 0x87, 0xbf, 0x76, 0x31, 0xed, 0x4b, 0xa5, 0xe3, 0x77, 0x6d, 0x4c, 0xe8, 0x38, 0xa3, 0x94,
0x4e, 0x20, 0x77, 0x35, 0x9d, 0x78, 0xae, 0x43, 0x30, 0x3a, 0x80, 0x4c, 0x5f, 0x7c, 0x0e, 0xcb,
0x56, 0xef, 0x4d, 0x33, 0x22, 0x31, 0x92, 0xa8, 0x48, 0x69, 0x11, 0xfe, 0xde, 0x33, 0x49, 0xd4,
0x8a, 0x84, 0xd4, 0x14, 0x48, 0x1f, 0x9b, 0x16, 0xc5, 0x3e, 0x51, 0xa4, 0x62, 0x92, 0x8d, 0x4a,
0x84, 0x25, 0x0b, 0xf2, 0x83, 0x10, 0x41, 0x4f, 0x07, 0x88, 0x1a, 0x73, 0xd8, 0xcd, 0xf8, 0xc5,
0xaa, 0x94, 0xde, 0x42, 0x7e, 0x93, 0x5f, 0xef, 0x21, 0xf1, 0x7e, 0xbd, 0x18, 0x2d, 0xf8, 0x67,
0xa8, 0xd7, 0x9d, 0x29, 0xff, 0x59, 0x82, 0xfc, 0x4b, 0xee, 0xbe, 0xbb, 0x3f, 0x19, 0x5a, 0x83,
0x6c, 0xe0, 0x74, 0xfe, 0xaa, 0x8b, 0x5b, 0x3b, 0xfc, 0x30, 0xec, 0xb0, 0x87, 0x7f, 0xdf, 0x20,
0x2d, 0x5d, 0x3c, 0x23, 0x6c, 0xcd, 0x64, 0x19, 0x22, 0x7a, 0x67, 0xb2, 0x2c, 0x40, 0x7e, 0x0b,
0x5b, 0x78, 0x84, 0x2a, 0xe3, 0xcc, 0x52, 0x83, 0xdc, 0x95, 0xfb, 0xb8, 0x8f, 0x09, 0x61, 0xff,
0x02, 0x4f, 0x6f, 0xc9, 0x2d, 0xc6, 0xaa, 0xfa, 0x7d, 0x16, 0x20, 0xba, 0xf0, 0xa8, 0x03, 0xc9,
0x5d, 0x4c, 0xd1, 0xa3, 0x09, 0xca, 0x8d, 0xb0, 0xbd, 0xba, 0x34, 0x35, 0x4e, 0xc8, 0xfd, 0x1e,
0x52, 0xec, 0xa8, 0x68, 0x92, 0x3f, 0xce, 0x91, 0xb6, 0x56, 0x57, 0x6e, 0x80, 0x14, 0xcd, 0x3f,
0x4a, 0x00, 0x6c, 0xeb, 0x90, 0xfa, 0xd8, 0xb0, 0x6f, 0xc1, 0x61, 0x69, 0x5a, 0xa4, 0x98, 0xe8,
0x82, 0x84, 0xce, 0x40, 0x0e, 0x1c, 0x8a, 0x26, 0x39, 0xc8, 0xe8, 0x87, 0x43, 0x5d, 0xbd, 0x09,
0x54, 0x88, 0x70, 0x06, 0x72, 0xe0, 0x85, 0x89, 0x08, 0x8c, 0xf6, 0xf7, 0x44, 0x04, 0xc6, 0x39,
0xee, 0x35, 0xc8, 0x81, 0x3f, 0x26, 0x22, 0x30, 0xda, 0x4a, 0x6a, 0x7e, 0xc8, 0xf9, 0xdb, 0xec,
0x7b, 0x70, 0xe3, 0xcd, 0xf9, 0x65, 0x61, 0xe6, 0xeb, 0x65, 0x61, 0xe6, 0x43, 0xaf, 0x20, 0x9d,
0xf7, 0x0a, 0xd2, 0x97, 0x5e, 0x41, 0xfa, 0xd6, 0x2b, 0x48, 0xaf, 0x76, 0x6e, 0xf1, 0x89, 0xbb,
0x16, 0x45, 0x35, 0x99, 0x77, 0x7c, 0xf0, 0x23, 0x00, 0x00, 0xff, 0xff, 0xf1, 0x68, 0x0f, 0x41,
0x33, 0x0b, 0x00, 0x00,
}
// Reference imports to suppress errors if they are not otherwise used.
@ -994,22 +991,30 @@ func (m *Container) MarshalToSizedBuffer(dAtA []byte) (int, error) {
dAtA[i] = 0x52
}
}
n2, err2 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.UpdatedAt, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.UpdatedAt):])
if err2 != nil {
return 0, err2
if m.UpdatedAt != nil {
{
size, err := m.UpdatedAt.MarshalToSizedBuffer(dAtA[:i])
if err != nil {
return 0, err
}
i -= size
i = encodeVarintContainers(dAtA, i, uint64(size))
}
i--
dAtA[i] = 0x4a
}
i -= n2
i = encodeVarintContainers(dAtA, i, uint64(n2))
i--
dAtA[i] = 0x4a
n3, err3 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.CreatedAt, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.CreatedAt):])
if err3 != nil {
return 0, err3
if m.CreatedAt != nil {
{
size, err := m.CreatedAt.MarshalToSizedBuffer(dAtA[:i])
if err != nil {
return 0, err
}
i -= size
i = encodeVarintContainers(dAtA, i, uint64(size))
}
i--
dAtA[i] = 0x42
}
i -= n3
i = encodeVarintContainers(dAtA, i, uint64(n3))
i--
dAtA[i] = 0x42
if len(m.SnapshotKey) > 0 {
i -= len(m.SnapshotKey)
copy(dAtA[i:], m.SnapshotKey)
@ -1560,10 +1565,14 @@ func (m *Container) Size() (n int) {
if l > 0 {
n += 1 + l + sovContainers(uint64(l))
}
l = github_com_gogo_protobuf_types.SizeOfStdTime(m.CreatedAt)
n += 1 + l + sovContainers(uint64(l))
l = github_com_gogo_protobuf_types.SizeOfStdTime(m.UpdatedAt)
n += 1 + l + sovContainers(uint64(l))
if m.CreatedAt != nil {
l = m.CreatedAt.Size()
n += 1 + l + sovContainers(uint64(l))
}
if m.UpdatedAt != nil {
l = m.UpdatedAt.Size()
n += 1 + l + sovContainers(uint64(l))
}
if len(m.Extensions) > 0 {
for k, v := range m.Extensions {
_ = k
@ -1799,8 +1808,8 @@ func (this *Container) String() string {
`Spec:` + strings.Replace(fmt.Sprintf("%v", this.Spec), "Any", "types.Any", 1) + `,`,
`Snapshotter:` + fmt.Sprintf("%v", this.Snapshotter) + `,`,
`SnapshotKey:` + fmt.Sprintf("%v", this.SnapshotKey) + `,`,
`CreatedAt:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.CreatedAt), "Timestamp", "types.Timestamp", 1), `&`, ``, 1) + `,`,
`UpdatedAt:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.UpdatedAt), "Timestamp", "types.Timestamp", 1), `&`, ``, 1) + `,`,
`CreatedAt:` + strings.Replace(fmt.Sprintf("%v", this.CreatedAt), "Timestamp", "types.Timestamp", 1) + `,`,
`UpdatedAt:` + strings.Replace(fmt.Sprintf("%v", this.UpdatedAt), "Timestamp", "types.Timestamp", 1) + `,`,
`Extensions:` + mapStringForExtensions + `,`,
`Sandbox:` + fmt.Sprintf("%v", this.Sandbox) + `,`,
`XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`,
@ -2329,7 +2338,10 @@ func (m *Container) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.CreatedAt, dAtA[iNdEx:postIndex]); err != nil {
if m.CreatedAt == nil {
m.CreatedAt = &types.Timestamp{}
}
if err := m.CreatedAt.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
@ -2362,7 +2374,10 @@ func (m *Container) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.UpdatedAt, dAtA[iNdEx:postIndex]); err != nil {
if m.UpdatedAt == nil {
m.UpdatedAt = &types.Timestamp{}
}
if err := m.UpdatedAt.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex

4
api/services/containers/v1/containers.proto
View File

@ -99,10 +99,10 @@ message Container {
string snapshot_key = 7;
// CreatedAt is the time the container was first created.
google.protobuf.Timestamp created_at = 8 [(gogoproto.stdtime) = true, (gogoproto.nullable) = false];
google.protobuf.Timestamp created_at = 8;
// UpdatedAt is the last time the container was mutated.
google.protobuf.Timestamp updated_at = 9 [(gogoproto.stdtime) = true, (gogoproto.nullable) = false];
google.protobuf.Timestamp updated_at = 9;
// Extensions allow clients to provide zero or more blobs that are directly
// associated with the container. One may provide protobuf, json, or other

340
api/services/content/v1/content.pb.go
View File

@ -9,7 +9,6 @@ import (
_ "github.com/gogo/protobuf/gogoproto"
proto "github.com/gogo/protobuf/proto"
github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys"
github_com_gogo_protobuf_types "github.com/gogo/protobuf/types"
types "github.com/gogo/protobuf/types"
grpc "google.golang.org/grpc"
codes "google.golang.org/grpc/codes"
@ -19,14 +18,12 @@ import (
math_bits "math/bits"
reflect "reflect"
strings "strings"
time "time"
)
// Reference imports to suppress errors if they are not otherwise used.
var _ = proto.Marshal
var _ = fmt.Errorf
var _ = math.Inf
var _ = time.Kitchen
// This is a compile-time assertion to ensure that this generated file
// is compatible with the proto package it is being compiled against.
@ -84,9 +81,9 @@ type Info struct {
// Size is the total number of bytes in the blob.
Size_ int64 `protobuf:"varint,2,opt,name=size,proto3" json:"size,omitempty"`
// CreatedAt provides the time at which the blob was committed.
CreatedAt time.Time `protobuf:"bytes,3,opt,name=created_at,json=createdAt,proto3,stdtime" json:"created_at"`
CreatedAt *types.Timestamp `protobuf:"bytes,3,opt,name=created_at,json=createdAt,proto3" json:"created_at,omitempty"`
// UpdatedAt provides the time the info was last updated.
UpdatedAt time.Time `protobuf:"bytes,4,opt,name=updated_at,json=updatedAt,proto3,stdtime" json:"updated_at"`
UpdatedAt *types.Timestamp `protobuf:"bytes,4,opt,name=updated_at,json=updatedAt,proto3" json:"updated_at,omitempty"`
// Labels are arbitrary data on snapshots.
//
// The combined size of a key/value pair cannot exceed 4096 bytes.
@ -510,15 +507,15 @@ func (m *ReadContentResponse) XXX_DiscardUnknown() {
var xxx_messageInfo_ReadContentResponse proto.InternalMessageInfo
type Status struct {
StartedAt time.Time `protobuf:"bytes,1,opt,name=started_at,json=startedAt,proto3,stdtime" json:"started_at"`
UpdatedAt time.Time `protobuf:"bytes,2,opt,name=updated_at,json=updatedAt,proto3,stdtime" json:"updated_at"`
Ref string `protobuf:"bytes,3,opt,name=ref,proto3" json:"ref,omitempty"`
Offset int64 `protobuf:"varint,4,opt,name=offset,proto3" json:"offset,omitempty"`
Total int64 `protobuf:"varint,5,opt,name=total,proto3" json:"total,omitempty"`
Expected string `protobuf:"bytes,6,opt,name=expected,proto3" json:"expected,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
StartedAt *types.Timestamp `protobuf:"bytes,1,opt,name=started_at,json=startedAt,proto3" json:"started_at,omitempty"`
UpdatedAt *types.Timestamp `protobuf:"bytes,2,opt,name=updated_at,json=updatedAt,proto3" json:"updated_at,omitempty"`
Ref string `protobuf:"bytes,3,opt,name=ref,proto3" json:"ref,omitempty"`
Offset int64 `protobuf:"varint,4,opt,name=offset,proto3" json:"offset,omitempty"`
Total int64 `protobuf:"varint,5,opt,name=total,proto3" json:"total,omitempty"`
Expected string `protobuf:"bytes,6,opt,name=expected,proto3" json:"expected,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *Status) Reset() { *m = Status{} }
@ -810,12 +807,12 @@ type WriteContentResponse struct {
//
// This must be set for stat and commit write actions. All other write
// actions may omit this.
StartedAt time.Time `protobuf:"bytes,2,opt,name=started_at,json=startedAt,proto3,stdtime" json:"started_at"`
StartedAt *types.Timestamp `protobuf:"bytes,2,opt,name=started_at,json=startedAt,proto3" json:"started_at,omitempty"`
// UpdatedAt provides the last time of a successful write.
//
// This must be set for stat and commit write actions. All other write
// actions may omit this.
UpdatedAt time.Time `protobuf:"bytes,3,opt,name=updated_at,json=updatedAt,proto3,stdtime" json:"updated_at"`
UpdatedAt *types.Timestamp `protobuf:"bytes,3,opt,name=updated_at,json=updatedAt,proto3" json:"updated_at,omitempty"`
// Offset is the current committed size for the write.
Offset int64 `protobuf:"varint,4,opt,name=offset,proto3" json:"offset,omitempty"`
// Total provides the current, expected total size of the write.
@ -934,69 +931,68 @@ func init() {
}
var fileDescriptor_468430ba3e400391 = []byte{
// 989 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0xcf, 0x6e, 0x1b, 0x45,
0x18, 0xcf, 0xec, 0xae, 0x37, 0xf1, 0xe7, 0xb4, 0xb2, 0x26, 0x56, 0x65, 0x2d, 0x92, 0x63, 0x56,
0x80, 0x2c, 0x4a, 0xd7, 0xa9, 0xdb, 0x03, 0x50, 0x09, 0x70, 0x42, 0xaa, 0x46, 0x6a, 0x00, 0x6d,
0x5d, 0x82, 0x7a, 0x29, 0x63, 0x7b, 0x6c, 0x56, 0xb1, 0x77, 0xdd, 0x9d, 0xb1, 0x45, 0x38, 0xf1,
0x00, 0x1c, 0x78, 0x0f, 0xde, 0x01, 0x89, 0x5b, 0x8e, 0x1c, 0x39, 0x15, 0x9a, 0x07, 0xe0, 0x19,
0xd0, 0xcc, 0xce, 0xda, 0x5e, 0xff, 0x61, 0xd7, 0x69, 0x6e, 0x33, 0xe3, 0xef, 0xf7, 0xfd, 0xff,
0x7d, 0xdf, 0x1a, 0x1e, 0xf7, 0x3d, 0xfe, 0xc3, 0xb8, 0xed, 0x74, 0x82, 0x61, 0xbd, 0x13, 0xf8,
0x9c, 0x78, 0x3e, 0x0d, 0xbb, 0xf3, 0x47, 0x32, 0xf2, 0xea, 0x8c, 0x86, 0x13, 0xaf, 0x43, 0x99,
0x7c, 0xa7, 0x3e, 0xaf, 0x4f, 0xee, 0xc7, 0x47, 0x67, 0x14, 0x06, 0x3c, 0xc0, 0x95, 0x19, 0xc2,
0x89, 0xa5, 0x9d, 0x58, 0x64, 0x72, 0xdf, 0x2a, 0xf5, 0x83, 0x7e, 0x20, 0x45, 0xeb, 0xe2, 0x14,
0xa1, 0xac, 0x6a, 0x3f, 0x08, 0xfa, 0x03, 0x5a, 0x97, 0xb7, 0xf6, 0xb8, 0x57, 0xef, 0x79, 0x74,
0xd0, 0x7d, 0x39, 0x24, 0xec, 0x5c, 0x49, 0xec, 0x2f, 0x4a, 0x70, 0x6f, 0x48, 0x19, 0x27, 0xc3,
0x91, 0x12, 0x78, 0x67, 0x51, 0x80, 0x0e, 0x47, 0xfc, 0x22, 0xfa, 0xd1, 0xfe, 0x43, 0x03, 0xe3,
0xc4, 0xef, 0x05, 0xf8, 0x0e, 0x98, 0x5d, 0xaf, 0x4f, 0x19, 0x2f, 0xa3, 0x2a, 0xaa, 0xe5, 0x5d,
0x75, 0xc3, 0x18, 0x0c, 0xe6, 0xfd, 0x44, 0xcb, 0x5a, 0x15, 0xd5, 0x74, 0x57, 0x9e, 0xf1, 0x11,
0x40, 0x27, 0xa4, 0x84, 0xd3, 0xee, 0x4b, 0xc2, 0xcb, 0x7a, 0x15, 0xd5, 0x0a, 0x0d, 0xcb, 0x89,
0xcc, 0x38, 0xb1, 0x19, 0xa7, 0x15, 0xfb, 0x71, 0xb8, 0x73, 0xf9, 0x7a, 0x7f, 0xeb, 0xd7, 0xbf,
0xf7, 0x91, 0x9b, 0x57, 0xb8, 0x26, 0x17, 0x4a, 0xc6, 0xa3, 0x6e, 0xac, 0xc4, 0xd8, 0x44, 0x89,
0xc2, 0x35, 0x39, 0x7e, 0x02, 0xe6, 0x80, 0xb4, 0xe9, 0x80, 0x95, 0x73, 0x55, 0xbd, 0x56, 0x68,
0x1c, 0x38, 0xff, 0x9f, 0x65, 0x47, 0xc4, 0xea, 0x3c, 0x95, 0x90, 0x63, 0x9f, 0x87, 0x17, 0xae,
0xc2, 0x5b, 0x9f, 0x40, 0x61, 0xee, 0x19, 0x17, 0x41, 0x3f, 0xa7, 0x17, 0x2a, 0x17, 0xe2, 0x88,
0x4b, 0x90, 0x9b, 0x90, 0xc1, 0x38, 0xca, 0x44, 0xde, 0x8d, 0x2e, 0x9f, 0x6a, 0x1f, 0x23, 0xfb,
0x7d, 0x28, 0x08, 0xb5, 0x2e, 0x7d, 0x35, 0x16, 0x19, 0x5b, 0x93, 0x49, 0xfb, 0x2b, 0xd8, 0x8d,
0xc4, 0xd8, 0x28, 0xf0, 0x19, 0xc5, 0x9f, 0x81, 0xe1, 0xf9, 0xbd, 0x40, 0x4a, 0x15, 0x1a, 0xef,
0x65, 0xf1, 0xfc, 0xd0, 0x10, 0x49, 0x70, 0x25, 0xce, 0xfe, 0x05, 0xc1, 0xad, 0xe7, 0x32, 0x13,
0xb1, 0xe5, 0xb7, 0xd4, 0x88, 0x1f, 0x41, 0x21, 0x4a, 0xad, 0xec, 0x2f, 0x19, 0xe8, 0xaa, 0x9a,
0x3c, 0x16, 0x2d, 0x78, 0x4a, 0xd8, 0xb9, 0xab, 0x2a, 0x28, 0xce, 0xf6, 0x37, 0x70, 0x3b, 0xf6,
0xe6, 0x86, 0x02, 0x74, 0x00, 0x3f, 0xf5, 0x18, 0x3f, 0x8a, 0x44, 0xe2, 0x20, 0xcb, 0xb0, 0xdd,
0xf3, 0x06, 0x9c, 0x86, 0xac, 0x8c, 0xaa, 0x7a, 0x2d, 0xef, 0xc6, 0x57, 0xfb, 0x39, 0xec, 0x25,
0xe4, 0x97, 0xdc, 0xd0, 0xaf, 0xe9, 0x46, 0xe9, 0x4b, 0x3a, 0xa0, 0x9c, 0x2e, 0x38, 0xb2, 0xae,
0xce, 0xdf, 0x01, 0x76, 0x29, 0xe9, 0x66, 0x93, 0x16, 0xef, 0x41, 0xaf, 0xc7, 0x28, 0x57, 0x0c,
0x53, 0xb7, 0x29, 0xef, 0xf4, 0x19, 0xef, 0xec, 0x26, 0xec, 0x25, 0x34, 0xab, 0x00, 0x67, 0x2a,
0xd0, 0xa2, 0x8a, 0x2e, 0xe1, 0x44, 0x2a, 0xde, 0x75, 0xe5, 0xd9, 0xfe, 0x17, 0x81, 0xf9, 0x8c,
0x13, 0x3e, 0x66, 0x82, 0x80, 0x8c, 0x93, 0x50, 0x11, 0x10, 0x6d, 0x42, 0x40, 0x85, 0x5b, 0x62,
0xb1, 0x76, 0x3d, 0x16, 0x17, 0x41, 0x0f, 0x69, 0x4f, 0x86, 0x9a, 0x77, 0xc5, 0x71, 0x2e, 0x24,
0x23, 0x11, 0x52, 0x09, 0x72, 0x3c, 0xe0, 0x64, 0x50, 0xce, 0xc9, 0xe7, 0xe8, 0x82, 0x2d, 0xd8,
0xa1, 0x3f, 0x8e, 0x68, 0x87, 0xd3, 0x6e, 0xd9, 0x94, 0x4a, 0xa6, 0x77, 0xfb, 0x5d, 0xb8, 0x15,
0xc5, 0x1b, 0x17, 0x42, 0x19, 0x43, 0x53, 0x63, 0xa2, 0x73, 0x63, 0x91, 0x69, 0xcb, 0x98, 0x4c,
0xbe, 0xa8, 0xb4, 0x7c, 0x90, 0xd6, 0x34, 0x0a, 0xaf, 0x50, 0x76, 0x3d, 0xea, 0xc4, 0xe8, 0x95,
0xb2, 0xf4, 0xd6, 0xfd, 0x1e, 0x4a, 0x49, 0x80, 0x72, 0xe4, 0x09, 0xec, 0x30, 0xf5, 0xa6, 0xfa,
0x37, 0xa3, 0x2b, 0xaa, 0x83, 0xa7, 0x68, 0xfb, 0xb5, 0x06, 0x7b, 0x67, 0xa1, 0xb7, 0xd4, 0xc5,
0x47, 0x60, 0x92, 0x0e, 0xf7, 0x02, 0x5f, 0x86, 0x7a, 0xbb, 0x71, 0x37, 0x4d, 0xbf, 0x54, 0xd2,
0x94, 0x10, 0x57, 0x41, 0xe3, 0x9c, 0x6a, 0xb3, 0x02, 0x4e, 0x0b, 0xa5, 0xaf, 0x2b, 0x94, 0x91,
0x2c, 0xd4, 0x5c, 0xc9, 0x73, 0x2b, 0xbb, 0xd8, 0x9c, 0x75, 0x31, 0x3e, 0x9b, 0x8e, 0xfd, 0x6d,
0x99, 0x94, 0xcf, 0x33, 0x39, 0x9d, 0x8c, 0xfc, 0xa6, 0xb7, 0xc0, 0x6f, 0x1a, 0x94, 0x92, 0x66,
0x54, 0x0d, 0x6f, 0x24, 0xc3, 0x49, 0xb2, 0x6a, 0x37, 0x41, 0x56, 0xfd, 0x7a, 0x64, 0xdd, 0x8c,
0x9a, 0xb3, 0xb1, 0x67, 0x26, 0x86, 0x64, 0x15, 0x76, 0x9b, 0xed, 0x20, 0xe4, 0x6b, 0x59, 0xf9,
0xa1, 0x03, 0x85, 0xb9, 0x44, 0xe0, 0x1d, 0x30, 0x9e, 0xb5, 0x9a, 0xad, 0xe2, 0x16, 0xce, 0x43,
0xee, 0xcc, 0x3d, 0x69, 0x1d, 0x17, 0x11, 0x06, 0x30, 0x8f, 0xbe, 0x3e, 0x3d, 0x3d, 0x69, 0x15,
0xb5, 0xc6, 0xef, 0xdb, 0xb0, 0xad, 0x52, 0x8f, 0x89, 0xfa, 0xa8, 0xb9, 0x9b, 0x65, 0xd8, 0x2b,
0x17, 0xac, 0x8f, 0xb2, 0x09, 0xab, 0xaa, 0xf6, 0xc1, 0x8c, 0xd6, 0x1d, 0xbe, 0x97, 0x86, 0x4b,
0x2c, 0x69, 0xcb, 0xc9, 0x2a, 0xae, 0x0c, 0xbd, 0x02, 0x43, 0x8c, 0x06, 0xdc, 0x48, 0xc3, 0x2d,
0xef, 0x4a, 0xeb, 0xc1, 0x46, 0x98, 0xc8, 0xe0, 0x01, 0xc2, 0xdf, 0x82, 0x19, 0x6d, 0x3c, 0xfc,
0x30, 0x4d, 0xc1, 0xaa, 0xcd, 0x68, 0xdd, 0x59, 0xea, 0xa9, 0x63, 0xf1, 0xc9, 0x29, 0x42, 0x11,
0xfb, 0x2b, 0x3d, 0x94, 0xe5, 0xfd, 0x99, 0x1e, 0xca, 0x8a, 0xcd, 0x78, 0x80, 0x44, 0x99, 0xd4,
0xba, 0xbb, 0x97, 0x71, 0x86, 0x67, 0x2d, 0xd3, 0xc2, 0xca, 0xb8, 0x80, 0xdd, 0xf9, 0x09, 0x8e,
0x33, 0xa5, 0x7e, 0x61, 0x41, 0x58, 0x0f, 0x37, 0x03, 0x29, 0xd3, 0x13, 0xc8, 0x49, 0xa6, 0xa4,
0xdb, 0x5c, 0x31, 0x06, 0xd3, 0x6d, 0xae, 0x1a, 0x6a, 0x35, 0x74, 0x80, 0xf0, 0x29, 0xe4, 0x24,
0x87, 0x71, 0x2a, 0x73, 0xe6, 0xa9, 0xbe, 0xae, 0x3b, 0x0e, 0x5f, 0x5c, 0xbe, 0xa9, 0x6c, 0xfd,
0xf5, 0xa6, 0xb2, 0xf5, 0xf3, 0x55, 0x05, 0x5d, 0x5e, 0x55, 0xd0, 0x9f, 0x57, 0x15, 0xf4, 0xcf,
0x55, 0x05, 0xbd, 0xf8, 0xe2, 0xba, 0x7f, 0xc1, 0x1e, 0xa9, 0x63, 0xdb, 0x94, 0xb6, 0x1e, 0xfc,
0x17, 0x00, 0x00, 0xff, 0xff, 0x28, 0x66, 0x30, 0x0e, 0xcd, 0x0d, 0x00, 0x00,
// 976 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0xcd, 0x8e, 0xdb, 0x44,
0x1c, 0xdf, 0xb1, 0x1d, 0xef, 0xe6, 0x9f, 0x6d, 0x15, 0xcd, 0x46, 0x55, 0x64, 0xa4, 0x34, 0x58,
0x80, 0x22, 0x4a, 0x9d, 0x6d, 0xda, 0x03, 0xa5, 0x12, 0x90, 0x2e, 0x5b, 0x75, 0xa5, 0x2e, 0x20,
0x37, 0x65, 0x51, 0x2f, 0x65, 0x92, 0x4c, 0x82, 0xb5, 0x89, 0x9d, 0x7a, 0x26, 0x11, 0xcb, 0x89,
0x07, 0xe0, 0xce, 0x53, 0xf0, 0x0a, 0x9c, 0xf7, 0xc8, 0x11, 0x71, 0xa8, 0xd8, 0x3c, 0x09, 0x9a,
0xf1, 0x38, 0x89, 0xf3, 0x81, 0x9d, 0x65, 0x6f, 0x33, 0x93, 0xdf, 0xef, 0xff, 0xfd, 0xe1, 0xc0,
0xb3, 0xbe, 0xc7, 0x7f, 0x1c, 0xb7, 0x9d, 0x4e, 0x30, 0xac, 0x77, 0x02, 0x9f, 0x13, 0xcf, 0xa7,
0x61, 0x77, 0xf1, 0x48, 0x46, 0x5e, 0x9d, 0xd1, 0x70, 0xe2, 0x75, 0x28, 0x93, 0xef, 0xd4, 0xe7,
0xf5, 0xc9, 0x83, 0xf8, 0xe8, 0x8c, 0xc2, 0x80, 0x07, 0xb8, 0x32, 0x67, 0x38, 0x31, 0xda, 0x89,
0x21, 0x93, 0x07, 0x56, 0xa9, 0x1f, 0xf4, 0x03, 0x09, 0xad, 0x8b, 0x53, 0xc4, 0xb2, 0xaa, 0xfd,
0x20, 0xe8, 0x0f, 0x68, 0x5d, 0xde, 0xda, 0xe3, 0x5e, 0xbd, 0xe7, 0xd1, 0x41, 0xf7, 0xcd, 0x90,
0xb0, 0x73, 0x85, 0xb8, 0xbb, 0x8c, 0xe0, 0xde, 0x90, 0x32, 0x4e, 0x86, 0x23, 0x05, 0x78, 0x6f,
0x19, 0x40, 0x87, 0x23, 0x7e, 0x11, 0xfd, 0x68, 0xff, 0xae, 0x81, 0x71, 0xe2, 0xf7, 0x02, 0x7c,
0x07, 0xcc, 0xae, 0xd7, 0xa7, 0x8c, 0x97, 0x51, 0x15, 0xd5, 0xf2, 0xae, 0xba, 0x61, 0x0c, 0x06,
0xf3, 0x7e, 0xa6, 0x65, 0xad, 0x8a, 0x6a, 0xba, 0x2b, 0xcf, 0xf8, 0x31, 0x40, 0x27, 0xa4, 0x84,
0xd3, 0xee, 0x1b, 0xc2, 0xcb, 0x7a, 0x15, 0xd5, 0x0a, 0x0d, 0xcb, 0x89, 0xd4, 0x38, 0xb1, 0x1a,
0xa7, 0x15, 0xdb, 0xe1, 0xe6, 0x15, 0xba, 0xc9, 0x05, 0x75, 0x3c, 0xea, 0xc6, 0x54, 0x23, 0x9d,
0xaa, 0xd0, 0x4d, 0x8e, 0x9f, 0x83, 0x39, 0x20, 0x6d, 0x3a, 0x60, 0xe5, 0x5c, 0x55, 0xaf, 0x15,
0x1a, 0x87, 0xce, 0x7f, 0x47, 0xd4, 0x11, 0x7e, 0x39, 0x2f, 0x24, 0xe5, 0xd8, 0xe7, 0xe1, 0x85,
0xab, 0xf8, 0xd6, 0x63, 0x28, 0x2c, 0x3c, 0xe3, 0x22, 0xe8, 0xe7, 0xf4, 0x42, 0xf9, 0x2d, 0x8e,
0xb8, 0x04, 0xb9, 0x09, 0x19, 0x8c, 0x23, 0xaf, 0xf3, 0x6e, 0x74, 0xf9, 0x4c, 0xfb, 0x14, 0xd9,
0x1f, 0x42, 0x41, 0x88, 0x75, 0xe9, 0xdb, 0xb1, 0x88, 0xce, 0x86, 0xa8, 0xd9, 0x5f, 0xc3, 0x7e,
0x04, 0x63, 0xa3, 0xc0, 0x67, 0x14, 0x7f, 0x0e, 0x86, 0xe7, 0xf7, 0x02, 0x89, 0x2a, 0x34, 0x3e,
0xc8, 0x62, 0xf9, 0x53, 0xe3, 0xf2, 0xdd, 0xdd, 0x1d, 0x57, 0xf2, 0xec, 0x5f, 0x11, 0xdc, 0x7a,
0x25, 0x23, 0x11, 0x6b, 0xfe, 0x9f, 0x12, 0xf1, 0x13, 0x28, 0x44, 0xa1, 0x95, 0xb5, 0x24, 0x1d,
0x5d, 0x97, 0x89, 0x67, 0xa2, 0xdc, 0x4e, 0x09, 0x3b, 0x77, 0x55, 0xde, 0xc4, 0xd9, 0xfe, 0x16,
0x6e, 0xc7, 0xd6, 0xdc, 0x90, 0x83, 0x0e, 0xe0, 0x17, 0x1e, 0xe3, 0x47, 0x11, 0x24, 0x76, 0xb2,
0x0c, 0xbb, 0x3d, 0x6f, 0xc0, 0x69, 0xc8, 0xca, 0xa8, 0xaa, 0xd7, 0xf2, 0x6e, 0x7c, 0xb5, 0x5f,
0xc1, 0x41, 0x02, 0xbf, 0x62, 0x86, 0x7e, 0x4d, 0x33, 0x4a, 0x5f, 0xd1, 0x01, 0xe5, 0x74, 0xc9,
0x90, 0x4d, 0x79, 0xfe, 0x1e, 0xb0, 0x4b, 0x49, 0x37, 0x1b, 0x5a, 0xbc, 0x07, 0xbd, 0x1e, 0xa3,
0x5c, 0x75, 0x93, 0xba, 0xcd, 0x7a, 0x4c, 0x9f, 0xf7, 0x98, 0xdd, 0x84, 0x83, 0x84, 0x64, 0xe5,
0xe0, 0x5c, 0x04, 0x5a, 0x16, 0xd1, 0x25, 0x9c, 0x48, 0xc1, 0xfb, 0xae, 0x3c, 0xdb, 0x7f, 0x23,
0x30, 0x5f, 0x72, 0xc2, 0xc7, 0x4c, 0xb4, 0x1d, 0xe3, 0x24, 0x54, 0x6d, 0x87, 0xd2, 0xdb, 0x4e,
0xa1, 0x57, 0x3a, 0x56, 0xdb, 0xa6, 0x63, 0x8b, 0xa0, 0x87, 0xb4, 0x27, 0xdd, 0xca, 0xbb, 0xe2,
0xb8, 0x60, 0xbe, 0x91, 0x30, 0xbf, 0x04, 0x39, 0x1e, 0x70, 0x32, 0x28, 0xe7, 0xe4, 0x73, 0x74,
0xc1, 0x16, 0xec, 0xd1, 0x9f, 0x46, 0xb4, 0xc3, 0x69, 0xb7, 0x6c, 0x4a, 0x21, 0xb3, 0xbb, 0xfd,
0x3e, 0xdc, 0x8a, 0x7c, 0x8b, 0x83, 0xae, 0x94, 0xa1, 0x99, 0x32, 0x51, 0xa5, 0x31, 0x64, 0x56,
0x1e, 0x26, 0x93, 0x2f, 0x2a, 0x04, 0x1f, 0xa5, 0x15, 0x88, 0xe2, 0x2b, 0x96, 0x5d, 0x8f, 0xaa,
0x2e, 0x7a, 0xa5, 0x2c, 0xbd, 0x4c, 0x7f, 0x80, 0x52, 0x92, 0xa0, 0x0c, 0x79, 0x0e, 0x7b, 0x4c,
0xbd, 0xa9, 0x5a, 0xcd, 0x68, 0x8a, 0xaa, 0xd6, 0x19, 0xdb, 0x7e, 0xa7, 0xc1, 0xc1, 0x59, 0xe8,
0xad, 0x54, 0xec, 0x11, 0x98, 0xa4, 0xc3, 0xbd, 0xc0, 0x97, 0xae, 0xde, 0x6e, 0xdc, 0x4b, 0x93,
0x2f, 0x85, 0x34, 0x25, 0xc5, 0x55, 0xd4, 0x38, 0xa6, 0xda, 0x3c, 0x81, 0xb3, 0x44, 0xe9, 0x9b,
0x12, 0x65, 0x24, 0x13, 0xb5, 0x90, 0xf2, 0xdc, 0xda, 0x8a, 0x35, 0xe7, 0x15, 0x8b, 0xcf, 0x66,
0x23, 0x7e, 0x57, 0x06, 0xe5, 0x8b, 0x4c, 0x46, 0x27, 0x3d, 0xbf, 0xe9, 0x89, 0xff, 0x9b, 0x06,
0xa5, 0xa4, 0x1a, 0x95, 0xc3, 0x1b, 0x89, 0x70, 0xb2, 0x31, 0xb5, 0xeb, 0x37, 0xa6, 0xbe, 0x4d,
0x63, 0x6e, 0xd7, 0x86, 0xf3, 0x71, 0x66, 0x26, 0x86, 0x5f, 0x15, 0xf6, 0x9b, 0xed, 0x20, 0xe4,
0x1b, 0x3b, 0xf0, 0x63, 0x07, 0x0a, 0x0b, 0x4e, 0xe3, 0x3d, 0x30, 0x5e, 0xb6, 0x9a, 0xad, 0xe2,
0x0e, 0xce, 0x43, 0xee, 0xcc, 0x3d, 0x69, 0x1d, 0x17, 0x11, 0x06, 0x30, 0x8f, 0xbe, 0x39, 0x3d,
0x3d, 0x69, 0x15, 0xb5, 0xc6, 0x1f, 0xbb, 0xb0, 0xab, 0xc2, 0x8c, 0x89, 0xfa, 0x30, 0xb9, 0x97,
0x65, 0x88, 0x2b, 0x13, 0xac, 0x4f, 0xb2, 0x81, 0x55, 0x06, 0xfb, 0x60, 0x46, 0x6b, 0x0c, 0xdf,
0x4f, 0xe3, 0x25, 0x96, 0xaf, 0xe5, 0x64, 0x85, 0x2b, 0x45, 0x6f, 0xc1, 0x10, 0x63, 0x00, 0x37,
0xd2, 0x78, 0xab, 0x3b, 0xd0, 0x7a, 0xb8, 0x15, 0x27, 0x52, 0x78, 0x88, 0xf0, 0x77, 0x60, 0x46,
0x9b, 0x0c, 0x3f, 0x4a, 0x13, 0xb0, 0x6e, 0xe3, 0x59, 0x77, 0x56, 0x2a, 0xe9, 0x58, 0x7c, 0x36,
0x0a, 0x57, 0xc4, 0x5e, 0x4a, 0x77, 0x65, 0x75, 0x2f, 0xa6, 0xbb, 0xb2, 0x66, 0xe3, 0x1d, 0x22,
0x91, 0x26, 0xb5, 0xc6, 0xee, 0x67, 0x9c, 0xd7, 0x59, 0xd3, 0xb4, 0xb4, 0x1e, 0x2e, 0x60, 0x7f,
0x71, 0x5a, 0xe3, 0x4c, 0xa1, 0x5f, 0x5a, 0x06, 0xd6, 0xa3, 0xed, 0x48, 0x4a, 0xf5, 0x04, 0x72,
0xb2, 0x53, 0xd2, 0x75, 0xae, 0x19, 0x79, 0xe9, 0x3a, 0xd7, 0x0d, 0xb0, 0x1a, 0x3a, 0x44, 0xf8,
0x14, 0x72, 0xb2, 0x87, 0x71, 0x6a, 0xe7, 0x2c, 0xb6, 0xfa, 0xa6, 0xea, 0x78, 0xfa, 0xfa, 0xf2,
0xaa, 0xb2, 0xf3, 0xd7, 0x55, 0x65, 0xe7, 0x97, 0x69, 0x05, 0x5d, 0x4e, 0x2b, 0xe8, 0xcf, 0x69,
0x05, 0xfd, 0x33, 0xad, 0xa0, 0xd7, 0x5f, 0x5e, 0xf7, 0x6f, 0xd4, 0x13, 0x75, 0x6c, 0x9b, 0x52,
0xd7, 0xc3, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x54, 0x3b, 0xab, 0x0f, 0x91, 0x0d, 0x00, 0x00,
}
// Reference imports to suppress errors if they are not otherwise used.
@ -1585,22 +1581,30 @@ func (m *Info) MarshalToSizedBuffer(dAtA []byte) (int, error) {
dAtA[i] = 0x2a
}
}
n1, err1 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.UpdatedAt, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.UpdatedAt):])
if err1 != nil {
return 0, err1
if m.UpdatedAt != nil {
{
size, err := m.UpdatedAt.MarshalToSizedBuffer(dAtA[:i])
if err != nil {
return 0, err
}
i -= size
i = encodeVarintContent(dAtA, i, uint64(size))
}
i--
dAtA[i] = 0x22
}
i -= n1
i = encodeVarintContent(dAtA, i, uint64(n1))
i--
dAtA[i] = 0x22
n2, err2 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.CreatedAt, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.CreatedAt):])
if err2 != nil {
return 0, err2
if m.CreatedAt != nil {
{
size, err := m.CreatedAt.MarshalToSizedBuffer(dAtA[:i])
if err != nil {
return 0, err
}
i -= size
i = encodeVarintContent(dAtA, i, uint64(size))
}
i--
dAtA[i] = 0x1a
}
i -= n2
i = encodeVarintContent(dAtA, i, uint64(n2))
i--
dAtA[i] = 0x1a
if m.Size_ != 0 {
i = encodeVarintContent(dAtA, i, uint64(m.Size_))
i--
@ -2015,22 +2019,30 @@ func (m *Status) MarshalToSizedBuffer(dAtA []byte) (int, error) {
i--
dAtA[i] = 0x1a
}
n7, err7 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.UpdatedAt, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.UpdatedAt):])
if err7 != nil {
return 0, err7
if m.UpdatedAt != nil {
{
size, err := m.UpdatedAt.MarshalToSizedBuffer(dAtA[:i])
if err != nil {
return 0, err
}
i -= size
i = encodeVarintContent(dAtA, i, uint64(size))
}
i--
dAtA[i] = 0x12
}
i -= n7
i = encodeVarintContent(dAtA, i, uint64(n7))
i--
dAtA[i] = 0x12
n8, err8 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.StartedAt, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.StartedAt):])
if err8 != nil {
return 0, err8
if m.StartedAt != nil {
{
size, err := m.StartedAt.MarshalToSizedBuffer(dAtA[:i])
if err != nil {
return 0, err
}
i -= size
i = encodeVarintContent(dAtA, i, uint64(size))
}
i--
dAtA[i] = 0xa
}
i -= n8
i = encodeVarintContent(dAtA, i, uint64(n8))
i--
dAtA[i] = 0xa
return len(dAtA) - i, nil
}
@ -2307,22 +2319,30 @@ func (m *WriteContentResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
i--
dAtA[i] = 0x20
}
n10, err10 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.UpdatedAt, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.UpdatedAt):])
if err10 != nil {
return 0, err10
if m.UpdatedAt != nil {
{
size, err := m.UpdatedAt.MarshalToSizedBuffer(dAtA[:i])
if err != nil {
return 0, err
}
i -= size
i = encodeVarintContent(dAtA, i, uint64(size))
}
i--
dAtA[i] = 0x1a
}
i -= n10
i = encodeVarintContent(dAtA, i, uint64(n10))
i--
dAtA[i] = 0x1a
n11, err11 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.StartedAt, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.StartedAt):])
if err11 != nil {
return 0, err11
if m.StartedAt != nil {
{
size, err := m.StartedAt.MarshalToSizedBuffer(dAtA[:i])
if err != nil {
return 0, err
}
i -= size
i = encodeVarintContent(dAtA, i, uint64(size))
}
i--
dAtA[i] = 0x12
}
i -= n11
i = encodeVarintContent(dAtA, i, uint64(n11))
i--
dAtA[i] = 0x12
if m.Action != 0 {
i = encodeVarintContent(dAtA, i, uint64(m.Action))
i--
@ -2389,10 +2409,14 @@ func (m *Info) Size() (n int) {
if m.Size_ != 0 {
n += 1 + sovContent(uint64(m.Size_))
}
l = github_com_gogo_protobuf_types.SizeOfStdTime(m.CreatedAt)
n += 1 + l + sovContent(uint64(l))
l = github_com_gogo_protobuf_types.SizeOfStdTime(m.UpdatedAt)
n += 1 + l + sovContent(uint64(l))
if m.CreatedAt != nil {
l = m.CreatedAt.Size()
n += 1 + l + sovContent(uint64(l))
}
if m.UpdatedAt != nil {
l = m.UpdatedAt.Size()
n += 1 + l + sovContent(uint64(l))
}
if len(m.Labels) > 0 {
for k, v := range m.Labels {
_ = k
@ -2568,10 +2592,14 @@ func (m *Status) Size() (n int) {
}
var l int
_ = l
l = github_com_gogo_protobuf_types.SizeOfStdTime(m.StartedAt)
n += 1 + l + sovContent(uint64(l))
l = github_com_gogo_protobuf_types.SizeOfStdTime(m.UpdatedAt)
n += 1 + l + sovContent(uint64(l))
if m.StartedAt != nil {
l = m.StartedAt.Size()
n += 1 + l + sovContent(uint64(l))
}
if m.UpdatedAt != nil {
l = m.UpdatedAt.Size()
n += 1 + l + sovContent(uint64(l))
}
l = len(m.Ref)
if l > 0 {
n += 1 + l + sovContent(uint64(l))
@ -2710,10 +2738,14 @@ func (m *WriteContentResponse) Size() (n int) {
if m.Action != 0 {
n += 1 + sovContent(uint64(m.Action))
}
l = github_com_gogo_protobuf_types.SizeOfStdTime(m.StartedAt)
n += 1 + l + sovContent(uint64(l))
l = github_com_gogo_protobuf_types.SizeOfStdTime(m.UpdatedAt)
n += 1 + l + sovContent(uint64(l))
if m.StartedAt != nil {
l = m.StartedAt.Size()
n += 1 + l + sovContent(uint64(l))
}
if m.UpdatedAt != nil {
l = m.UpdatedAt.Size()
n += 1 + l + sovContent(uint64(l))
}
if m.Offset != 0 {
n += 1 + sovContent(uint64(m.Offset))
}
@ -2769,8 +2801,8 @@ func (this *Info) String() string {
s := strings.Join([]string{`&Info{`,
`Digest:` + fmt.Sprintf("%v", this.Digest) + `,`,
`Size_:` + fmt.Sprintf("%v", this.Size_) + `,`,
`CreatedAt:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.CreatedAt), "Timestamp", "types.Timestamp", 1), `&`, ``, 1) + `,`,
`UpdatedAt:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.UpdatedAt), "Timestamp", "types.Timestamp", 1), `&`, ``, 1) + `,`,
`CreatedAt:` + strings.Replace(fmt.Sprintf("%v", this.CreatedAt), "Timestamp", "types.Timestamp", 1) + `,`,
`UpdatedAt:` + strings.Replace(fmt.Sprintf("%v", this.UpdatedAt), "Timestamp", "types.Timestamp", 1) + `,`,
`Labels:` + mapStringForLabels + `,`,
`XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`,
`}`,
@ -2890,8 +2922,8 @@ func (this *Status) String() string {
return "nil"
}
s := strings.Join([]string{`&Status{`,
`StartedAt:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.StartedAt), "Timestamp", "types.Timestamp", 1), `&`, ``, 1) + `,`,
`UpdatedAt:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.UpdatedAt), "Timestamp", "types.Timestamp", 1), `&`, ``, 1) + `,`,
`StartedAt:` + strings.Replace(fmt.Sprintf("%v", this.StartedAt), "Timestamp", "types.Timestamp", 1) + `,`,
`UpdatedAt:` + strings.Replace(fmt.Sprintf("%v", this.UpdatedAt), "Timestamp", "types.Timestamp", 1) + `,`,
`Ref:` + fmt.Sprintf("%v", this.Ref) + `,`,
`Offset:` + fmt.Sprintf("%v", this.Offset) + `,`,
`Total:` + fmt.Sprintf("%v", this.Total) + `,`,
@ -2983,8 +3015,8 @@ func (this *WriteContentResponse) String() string {
}
s := strings.Join([]string{`&WriteContentResponse{`,
`Action:` + fmt.Sprintf("%v", this.Action) + `,`,
`StartedAt:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.StartedAt), "Timestamp", "types.Timestamp", 1), `&`, ``, 1) + `,`,
`UpdatedAt:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.UpdatedAt), "Timestamp", "types.Timestamp", 1), `&`, ``, 1) + `,`,
`StartedAt:` + strings.Replace(fmt.Sprintf("%v", this.StartedAt), "Timestamp", "types.Timestamp", 1) + `,`,
`UpdatedAt:` + strings.Replace(fmt.Sprintf("%v", this.UpdatedAt), "Timestamp", "types.Timestamp", 1) + `,`,
`Offset:` + fmt.Sprintf("%v", this.Offset) + `,`,
`Total:` + fmt.Sprintf("%v", this.Total) + `,`,
`Digest:` + fmt.Sprintf("%v", this.Digest) + `,`,
@ -3121,7 +3153,10 @@ func (m *Info) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.CreatedAt, dAtA[iNdEx:postIndex]); err != nil {
if m.CreatedAt == nil {
m.CreatedAt = &types.Timestamp{}
}
if err := m.CreatedAt.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
@ -3154,7 +3189,10 @@ func (m *Info) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.UpdatedAt, dAtA[iNdEx:postIndex]); err != nil {
if m.UpdatedAt == nil {
m.UpdatedAt = &types.Timestamp{}
}
if err := m.UpdatedAt.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
@ -4212,7 +4250,10 @@ func (m *Status) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.StartedAt, dAtA[iNdEx:postIndex]); err != nil {
if m.StartedAt == nil {
m.StartedAt = &types.Timestamp{}
}
if err := m.StartedAt.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
@ -4245,7 +4286,10 @@ func (m *Status) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.UpdatedAt, dAtA[iNdEx:postIndex]); err != nil {
if m.UpdatedAt == nil {
m.UpdatedAt = &types.Timestamp{}
}
if err := m.UpdatedAt.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
@ -5121,7 +5165,10 @@ func (m *WriteContentResponse) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.StartedAt, dAtA[iNdEx:postIndex]); err != nil {
if m.StartedAt == nil {
m.StartedAt = &types.Timestamp{}
}
if err := m.StartedAt.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
@ -5154,7 +5201,10 @@ func (m *WriteContentResponse) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.UpdatedAt, dAtA[iNdEx:postIndex]); err != nil {
if m.UpdatedAt == nil {
m.UpdatedAt = &types.Timestamp{}
}
if err := m.UpdatedAt.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex

12
api/services/content/v1/content.proto
View File

@ -98,10 +98,10 @@ message Info {
int64 size = 2;
// CreatedAt provides the time at which the blob was committed.
google.protobuf.Timestamp created_at = 3 [(gogoproto.stdtime) = true, (gogoproto.nullable) = false];
google.protobuf.Timestamp created_at = 3;
// UpdatedAt provides the time the info was last updated.
google.protobuf.Timestamp updated_at = 4 [(gogoproto.stdtime) = true, (gogoproto.nullable) = false];
google.protobuf.Timestamp updated_at = 4;
// Labels are arbitrary data on snapshots.
//
@ -179,8 +179,8 @@ message ReadContentResponse {
}
message Status {
google.protobuf.Timestamp started_at = 1 [(gogoproto.stdtime) = true, (gogoproto.nullable) = false];
google.protobuf.Timestamp updated_at = 2 [(gogoproto.stdtime) = true, (gogoproto.nullable) = false];
google.protobuf.Timestamp started_at = 1;
google.protobuf.Timestamp updated_at = 2;
string ref = 3;
int64 offset = 4;
int64 total = 5;
@ -301,13 +301,13 @@ message WriteContentResponse {
//
// This must be set for stat and commit write actions. All other write
// actions may omit this.
google.protobuf.Timestamp started_at = 2 [(gogoproto.stdtime) = true, (gogoproto.nullable) = false];
google.protobuf.Timestamp started_at = 2;
// UpdatedAt provides the last time of a successful write.
//
// This must be set for stat and commit write actions. All other write
// actions may omit this.
google.protobuf.Timestamp updated_at = 3 [(gogoproto.stdtime) = true, (gogoproto.nullable) = false];
google.protobuf.Timestamp updated_at = 3;
// Offset is the current committed size for the write.
int64 offset = 4;

106
api/services/events/v1/events.pb.go
View File

@ -10,7 +10,6 @@ import (
github_com_containerd_typeurl "github.com/containerd/typeurl"
_ "github.com/gogo/protobuf/gogoproto"
proto "github.com/gogo/protobuf/proto"
github_com_gogo_protobuf_types "github.com/gogo/protobuf/types"
types "github.com/gogo/protobuf/types"
grpc "google.golang.org/grpc"
codes "google.golang.org/grpc/codes"
@ -20,14 +19,12 @@ import (
math_bits "math/bits"
reflect "reflect"
strings "strings"
time "time"
)
// Reference imports to suppress errors if they are not otherwise used.
var _ = proto.Marshal
var _ = fmt.Errorf
var _ = math.Inf
var _ = time.Kitchen
// This is a compile-time assertion to ensure that this generated file
// is compatible with the proto package it is being compiled against.
@ -154,13 +151,13 @@ func (m *SubscribeRequest) XXX_DiscardUnknown() {
var xxx_messageInfo_SubscribeRequest proto.InternalMessageInfo
type Envelope struct {
Timestamp time.Time `protobuf:"bytes,1,opt,name=timestamp,proto3,stdtime" json:"timestamp"`
Namespace string `protobuf:"bytes,2,opt,name=namespace,proto3" json:"namespace,omitempty"`
Topic string `protobuf:"bytes,3,opt,name=topic,proto3" json:"topic,omitempty"`
Event *types.Any `protobuf:"bytes,4,opt,name=event,proto3" json:"event,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
Timestamp *types.Timestamp `protobuf:"bytes,1,opt,name=timestamp,proto3" json:"timestamp,omitempty"`
Namespace string `protobuf:"bytes,2,opt,name=namespace,proto3" json:"namespace,omitempty"`
Topic string `protobuf:"bytes,3,opt,name=topic,proto3" json:"topic,omitempty"`
Event *types.Any `protobuf:"bytes,4,opt,name=event,proto3" json:"event,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *Envelope) Reset() { *m = Envelope{} }
@ -207,36 +204,36 @@ func init() {
}
var fileDescriptor_43fcd20dc1642376 = []byte{
// 462 bytes of a gzipped FileDescriptorProto
// 452 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x93, 0xcd, 0x8e, 0xd3, 0x30,
0x14, 0x85, 0xeb, 0xf9, 0x6d, 0x3c, 0xd2, 0x08, 0x45, 0x15, 0x2a, 0x01, 0xd2, 0xaa, 0x1b, 0x2a,
0x04, 0x0e, 0x53, 0x76, 0x20, 0x21, 0x28, 0x94, 0xf5, 0x28, 0x80, 0x84, 0xd8, 0x25, 0xe9, 0x6d,
0x6a, 0x29, 0xb1, 0x4d, 0xec, 0x04, 0xcd, 0x6e, 0x1e, 0x81, 0x0d, 0x6f, 0xc2, 0x86, 0x37, 0xe8,
0x92, 0x25, 0x2b, 0x60, 0xfa, 0x24, 0xa8, 0x89, 0xdd, 0x30, 0x2d, 0x10, 0x34, 0xbb, 0x6b, 0xdf,
0xe3, 0xcf, 0xb9, 0xe7, 0x38, 0xf8, 0x45, 0x4c, 0xd5, 0x3c, 0x0f, 0x49, 0xc4, 0x53, 0x2f, 0xe2,
0x4c, 0x05, 0x94, 0x41, 0x36, 0xfd, 0xbd, 0x0c, 0x04, 0xf5, 0x24, 0x64, 0x05, 0x8d, 0x40, 0x7a,
0x50, 0x00, 0x53, 0xd2, 0x2b, 0x4e, 0x74, 0x45, 0x44, 0xc6, 0x15, 0xb7, 0x6f, 0xd7, 0x7a, 0x62,
0xb4, 0x44, 0x2b, 0x8a, 0x13, 0xe7, 0x69, 0xe3, 0x25, 0x25, 0x26, 0xcc, 0x67, 0x9e, 0x48, 0xf2,
0x98, 0x32, 0x6f, 0x46, 0x21, 0x99, 0x8a, 0x40, 0xcd, 0xab, 0x0b, 0x9c, 0x4e, 0xcc, 0x63, 0x5e,
0x96, 0xde, 0xaa, 0xd2, 0xbb, 0x37, 0x62, 0xce, 0xe3, 0x04, 0xea, 0xd3, 0x01, 0x3b, 0xd3, 0xad,
0x9b, 0x9b, 0x2d, 0x48, 0x85, 0x32, 0xcd, 0xde, 0x66, 0x53, 0xd1, 0x14, 0xa4, 0x0a, 0x52, 0x51,
0x09, 0x06, 0x3e, 0x3e, 0x3e, 0xcd, 0xc3, 0x84, 0xca, 0xb9, 0x0f, 0xef, 0x73, 0x90, 0xca, 0xee,
0xe0, 0x7d, 0xc5, 0x05, 0x8d, 0xba, 0xa8, 0x8f, 0x86, 0x96, 0x5f, 0x2d, 0xec, 0xbb, 0x78, 0xbf,
0x9c, 0xb2, 0xbb, 0xd3, 0x47, 0xc3, 0xa3, 0x51, 0x87, 0x54, 0x60, 0x62, 0xc0, 0xe4, 0x19, 0x3b,
0xf3, 0x2b, 0xc9, 0xe0, 0x0d, 0x3e, 0x7e, 0xc9, 0xb3, 0x0f, 0x41, 0x36, 0x35, 0xcc, 0xe7, 0xb8,
0x0d, 0xac, 0x80, 0x84, 0x0b, 0x28, 0xb1, 0x47, 0xa3, 0x3b, 0xe4, 0x9f, 0x46, 0x92, 0x89, 0x96,
0xfb, 0xeb, 0x83, 0x83, 0x7b, 0xf8, 0xda, 0xab, 0x3c, 0x94, 0x51, 0x46, 0x43, 0x30, 0xe0, 0x2e,
0x3e, 0x9c, 0xd1, 0x44, 0x41, 0x26, 0xbb, 0xa8, 0xbf, 0x3b, 0xb4, 0x7c, 0xb3, 0x1c, 0x7c, 0x46,
0xb8, 0x6d, 0x20, 0xf6, 0x18, 0x5b, 0xeb, 0xc1, 0xf5, 0x07, 0x38, 0x5b, 0x13, 0xbc, 0x36, 0x8a,
0x71, 0x7b, 0xf1, 0xbd, 0xd7, 0xfa, 0xf8, 0xa3, 0x87, 0xfc, 0xfa, 0x98, 0x7d, 0x0b, 0x5b, 0x2c,
0x48, 0x41, 0x8a, 0x20, 0x82, 0xd2, 0x05, 0xcb, 0xaf, 0x37, 0x6a, 0xd7, 0x76, 0xff, 0xe8, 0xda,
0x5e, 0xa3, 0x6b, 0x8f, 0xf6, 0xce, 0xbf, 0xf4, 0xd0, 0xe8, 0xd3, 0x0e, 0x3e, 0x98, 0x94, 0x2e,
0xd8, 0xa7, 0xf8, 0x50, 0x47, 0x63, 0xdf, 0x6f, 0x70, 0xeb, 0x72, 0x84, 0xce, 0xf5, 0xad, 0x7b,
0x26, 0xab, 0x37, 0xb1, 0x22, 0xea, 0x60, 0x1a, 0x89, 0x97, 0x03, 0xfc, 0x2b, 0x31, 0xc6, 0xd6,
0x3a, 0x13, 0xdb, 0x6b, 0x60, 0x6e, 0xa6, 0xe7, 0xfc, 0xef, 0x23, 0x78, 0x80, 0xc6, 0x6f, 0x17,
0x17, 0x6e, 0xeb, 0xdb, 0x85, 0xdb, 0x3a, 0x5f, 0xba, 0x68, 0xb1, 0x74, 0xd1, 0xd7, 0xa5, 0x8b,
0x7e, 0x2e, 0x5d, 0xf4, 0xee, 0xc9, 0x15, 0xff, 0xeb, 0xc7, 0x55, 0x15, 0x1e, 0x94, 0x23, 0x3d,
0xfc, 0x15, 0x00, 0x00, 0xff, 0xff, 0x1c, 0x38, 0x37, 0x72, 0x20, 0x04, 0x00, 0x00,
0x14, 0x85, 0xc7, 0xf3, 0x1f, 0x8f, 0x34, 0x42, 0x51, 0x85, 0x4a, 0x80, 0x4c, 0xd5, 0x0d, 0x15,
0x02, 0x87, 0x29, 0x1b, 0x04, 0x12, 0xe2, 0xaf, 0xac, 0x47, 0x06, 0x24, 0xc4, 0xce, 0x49, 0x6f,
0x53, 0x4b, 0x89, 0x6d, 0x62, 0x27, 0x68, 0x76, 0xf3, 0x12, 0xbc, 0x04, 0x6f, 0xc0, 0x1b, 0xcc,
0x92, 0x25, 0x4b, 0xa6, 0x4f, 0x82, 0x9a, 0xd8, 0x0d, 0xd3, 0x01, 0x82, 0xd8, 0x5d, 0xfb, 0x1e,
0x7f, 0xb7, 0xe7, 0x9e, 0x06, 0xbf, 0x4a, 0xb9, 0x99, 0x97, 0x31, 0x49, 0x64, 0x1e, 0x25, 0x52,
0x18, 0xc6, 0x05, 0x14, 0xd3, 0x5f, 0x4b, 0xa6, 0x78, 0xa4, 0xa1, 0xa8, 0x78, 0x02, 0x3a, 0x82,
0x0a, 0x84, 0xd1, 0x51, 0x75, 0x6c, 0x2b, 0xa2, 0x0a, 0x69, 0xa4, 0x7f, 0xbb, 0xd5, 0x13, 0xa7,
0x25, 0x56, 0x51, 0x1d, 0x07, 0xcf, 0x3a, 0x87, 0xd4, 0x98, 0xb8, 0x9c, 0x45, 0x2a, 0x2b, 0x53,
0x2e, 0xa2, 0x19, 0x87, 0x6c, 0xaa, 0x98, 0x99, 0x37, 0x03, 0x82, 0x5e, 0x2a, 0x53, 0x59, 0x97,
0xd1, 0xb2, 0xb2, 0xb7, 0x37, 0x52, 0x29, 0xd3, 0x0c, 0xda, 0xd7, 0x4c, 0x9c, 0xda, 0xd6, 0xcd,
0xf5, 0x16, 0xe4, 0xca, 0xb8, 0xe6, 0xd1, 0x7a, 0xd3, 0xf0, 0x1c, 0xb4, 0x61, 0xb9, 0x6a, 0x04,
0x43, 0x8a, 0x0f, 0x4f, 0xca, 0x38, 0xe3, 0x7a, 0x4e, 0xe1, 0x63, 0x09, 0xda, 0xf8, 0x3d, 0xbc,
0x63, 0xa4, 0xe2, 0x49, 0x1f, 0x0d, 0xd0, 0xc8, 0xa3, 0xcd, 0xc1, 0xbf, 0x8b, 0x77, 0x6a, 0x97,
0xfd, 0xcd, 0x01, 0x1a, 0x1d, 0x8c, 0x7b, 0xa4, 0x01, 0x13, 0x07, 0x26, 0xcf, 0xc5, 0x29, 0x6d,
0x24, 0xc3, 0x77, 0xf8, 0xf0, 0xb5, 0x2c, 0x3e, 0xb1, 0x62, 0xea, 0x98, 0x2f, 0xf1, 0x3e, 0x88,
0x0a, 0x32, 0xa9, 0xa0, 0xc6, 0x1e, 0x8c, 0xef, 0x90, 0xbf, 0x2e, 0x92, 0x4c, 0xac, 0x9c, 0xae,
0x1e, 0x0e, 0xef, 0xe1, 0x6b, 0x6f, 0xca, 0x58, 0x27, 0x05, 0x8f, 0xc1, 0x81, 0xfb, 0x78, 0x6f,
0xc6, 0x33, 0x03, 0x85, 0xee, 0xa3, 0xc1, 0xd6, 0xc8, 0xa3, 0xee, 0x38, 0xfc, 0x82, 0xf0, 0xbe,
0x83, 0xf8, 0x8f, 0xb0, 0xb7, 0x32, 0x6e, 0x7f, 0x40, 0x70, 0xc5, 0xc1, 0x5b, 0xa7, 0xa0, 0xad,
0xd8, 0xbf, 0x85, 0x3d, 0xc1, 0x72, 0xd0, 0x8a, 0x25, 0x50, 0x7b, 0xf7, 0x68, 0x7b, 0xd1, 0xee,
0x6a, 0xeb, 0xb7, 0xbb, 0xda, 0xee, 0xdc, 0xd5, 0xe3, 0xed, 0xb3, 0xaf, 0x47, 0x68, 0xfc, 0x79,
0x13, 0xef, 0x4e, 0x6a, 0xef, 0xfe, 0x09, 0xde, 0xb3, 0x81, 0xf8, 0xf7, 0x3b, 0x76, 0x74, 0x39,
0xb8, 0xe0, 0xfa, 0x95, 0x39, 0x93, 0xe5, 0x3f, 0x61, 0x49, 0xb4, 0x71, 0x74, 0x12, 0x2f, 0xc7,
0xf6, 0x47, 0x62, 0x8a, 0xbd, 0x55, 0x12, 0x7e, 0xd4, 0xc1, 0x5c, 0xcf, 0x2c, 0xf8, 0xd7, 0xe8,
0x1f, 0xa0, 0x17, 0xef, 0xcf, 0x2f, 0xc2, 0x8d, 0xef, 0x17, 0xe1, 0xc6, 0xd9, 0x22, 0x44, 0xe7,
0x8b, 0x10, 0x7d, 0x5b, 0x84, 0xe8, 0xc7, 0x22, 0x44, 0x1f, 0x9e, 0xfe, 0xe7, 0xd7, 0xfc, 0xa4,
0xa9, 0xe2, 0xdd, 0xda, 0xd2, 0xc3, 0x9f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x1b, 0x68, 0x58, 0xa9,
0x16, 0x04, 0x00, 0x00,
}
// Field returns the value for the given fieldpath as a string, if defined.
@ -650,14 +647,18 @@ func (m *Envelope) MarshalToSizedBuffer(dAtA []byte) (int, error) {
i--
dAtA[i] = 0x12
}
n4, err4 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Timestamp, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamp):])
if err4 != nil {
return 0, err4
if m.Timestamp != nil {
{
size, err := m.Timestamp.MarshalToSizedBuffer(dAtA[:i])
if err != nil {
return 0, err
}
i -= size
i = encodeVarintEvents(dAtA, i, uint64(size))
}
i--
dAtA[i] = 0xa
}
i -= n4
i = encodeVarintEvents(dAtA, i, uint64(n4))
i--
dAtA[i] = 0xa
return len(dAtA) - i, nil
}
@ -732,8 +733,10 @@ func (m *Envelope) Size() (n int) {
}
var l int
_ = l
l = github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamp)
n += 1 + l + sovEvents(uint64(l))
if m.Timestamp != nil {
l = m.Timestamp.Size()
n += 1 + l + sovEvents(uint64(l))
}
l = len(m.Namespace)
if l > 0 {
n += 1 + l + sovEvents(uint64(l))
@ -797,7 +800,7 @@ func (this *Envelope) String() string {
return "nil"
}
s := strings.Join([]string{`&Envelope{`,
`Timestamp:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Timestamp), "Timestamp", "types.Timestamp", 1), `&`, ``, 1) + `,`,
`Timestamp:` + strings.Replace(fmt.Sprintf("%v", this.Timestamp), "Timestamp", "types.Timestamp", 1) + `,`,
`Namespace:` + fmt.Sprintf("%v", this.Namespace) + `,`,
`Topic:` + fmt.Sprintf("%v", this.Topic) + `,`,
`Event:` + strings.Replace(fmt.Sprintf("%v", this.Event), "Any", "types.Any", 1) + `,`,
@ -1161,7 +1164,10 @@ func (m *Envelope) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.Timestamp, dAtA[iNdEx:postIndex]); err != nil {
if m.Timestamp == nil {
m.Timestamp = &types.Timestamp{}
}
if err := m.Timestamp.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex

2
api/services/events/v1/events.proto
View File

@ -65,7 +65,7 @@ message SubscribeRequest {
message Envelope {
option (containerd.plugin.fieldpath) = true;
google.protobuf.Timestamp timestamp = 1 [(gogoproto.stdtime) = true, (gogoproto.nullable) = false];
google.protobuf.Timestamp timestamp = 1;
string namespace = 2;
string topic = 3;
google.protobuf.Any event = 4;

160
api/services/images/v1/images.pb.go
View File

@ -10,7 +10,6 @@ import (
_ "github.com/gogo/protobuf/gogoproto"
proto "github.com/gogo/protobuf/proto"
github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys"
github_com_gogo_protobuf_types "github.com/gogo/protobuf/types"
types1 "github.com/gogo/protobuf/types"
grpc "google.golang.org/grpc"
codes "google.golang.org/grpc/codes"
@ -20,14 +19,12 @@ import (
math_bits "math/bits"
reflect "reflect"
strings "strings"
time "time"
)
// Reference imports to suppress errors if they are not otherwise used.
var _ = proto.Marshal
var _ = fmt.Errorf
var _ = math.Inf
var _ = time.Kitchen
// This is a compile-time assertion to ensure that this generated file
// is compatible with the proto package it is being compiled against.
@ -49,12 +46,12 @@ type Image struct {
// Target describes the content entry point of the image.
Target types.Descriptor `protobuf:"bytes,3,opt,name=target,proto3" json:"target"`
// CreatedAt is the time the image was first created.
CreatedAt time.Time `protobuf:"bytes,7,opt,name=created_at,json=createdAt,proto3,stdtime" json:"created_at"`
CreatedAt *types1.Timestamp `protobuf:"bytes,7,opt,name=created_at,json=createdAt,proto3" json:"created_at,omitempty"`
// UpdatedAt is the last time the image was mutated.
UpdatedAt time.Time `protobuf:"bytes,8,opt,name=updated_at,json=updatedAt,proto3,stdtime" json:"updated_at"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
UpdatedAt *types1.Timestamp `protobuf:"bytes,8,opt,name=updated_at,json=updatedAt,proto3" json:"updated_at,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *Image) Reset() { *m = Image{} }
@ -480,49 +477,48 @@ func init() {
}
var fileDescriptor_8666fa071128ae5f = []byte{
// 657 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0xcd, 0x6e, 0xd3, 0x40,
0x10, 0xae, 0x93, 0xd4, 0x6d, 0x27, 0x07, 0xca, 0x52, 0x21, 0xcb, 0x40, 0x1a, 0x45, 0x20, 0xe5,
0xc2, 0x9a, 0x86, 0x0b, 0xb4, 0x08, 0xd1, 0xb4, 0xa5, 0x20, 0x15, 0x0e, 0xe6, 0xaf, 0xe2, 0x52,
0x6d, 0x92, 0x89, 0xb1, 0x62, 0xc7, 0xc6, 0xbb, 0x89, 0x94, 0x1b, 0x8f, 0x80, 0x04, 0x0f, 0xd5,
0x23, 0x47, 0x4e, 0x40, 0x73, 0xe0, 0x39, 0x90, 0x77, 0x37, 0x34, 0x4d, 0x22, 0xdc, 0x94, 0xde,
0x66, 0xed, 0xef, 0x9b, 0x9f, 0x6f, 0x66, 0x76, 0x61, 0xd7, 0xf3, 0xc5, 0x87, 0x5e, 0x83, 0x36,
0xa3, 0xd0, 0x69, 0x46, 0x5d, 0xc1, 0xfc, 0x2e, 0x26, 0xad, 0x71, 0x93, 0xc5, 0xbe, 0xc3, 0x31,
0xe9, 0xfb, 0x4d, 0xe4, 0x8e, 0x1f, 0x32, 0x0f, 0xb9, 0xd3, 0xdf, 0xd0, 0x16, 0x8d, 0x93, 0x48,
0x44, 0xe4, 0xd6, 0x29, 0x9e, 0x8e, 0xb0, 0x54, 0x23, 0xfa, 0x1b, 0xf6, 0x9a, 0x17, 0x79, 0x91,
0x44, 0x3a, 0xa9, 0xa5, 0x48, 0xf6, 0x0d, 0x2f, 0x8a, 0xbc, 0x00, 0x1d, 0x79, 0x6a, 0xf4, 0xda,
0x0e, 0x86, 0xb1, 0x18, 0xe8, 0x9f, 0xe5, 0xc9, 0x9f, 0x6d, 0x1f, 0x83, 0xd6, 0x51, 0xc8, 0x78,
0x47, 0x23, 0xd6, 0x27, 0x11, 0xc2, 0x0f, 0x91, 0x0b, 0x16, 0xc6, 0x1a, 0xb0, 0x75, 0xae, 0xd2,
0xc4, 0x20, 0x46, 0xee, 0xb4, 0x90, 0x37, 0x13, 0x3f, 0x16, 0x51, 0xa2, 0xc8, 0x95, 0xdf, 0x39,
0x58, 0x7c, 0x9e, 0x16, 0x40, 0x08, 0x14, 0xba, 0x2c, 0x44, 0xcb, 0x28, 0x1b, 0xd5, 0x15, 0x57,
0xda, 0xe4, 0x19, 0x98, 0x01, 0x6b, 0x60, 0xc0, 0xad, 0x5c, 0x39, 0x5f, 0x2d, 0xd6, 0xee, 0xd1,
0x7f, 0x0a, 0x40, 0xa5, 0x27, 0x7a, 0x20, 0x29, 0x7b, 0x5d, 0x91, 0x0c, 0x5c, 0xcd, 0x27, 0x9b,
0x60, 0x0a, 0x96, 0x78, 0x28, 0xac, 0x7c, 0xd9, 0xa8, 0x16, 0x6b, 0x37, 0xc7, 0x3d, 0xc9, 0xdc,
0xe8, 0xee, 0xdf, 0xdc, 0xea, 0x85, 0xe3, 0x1f, 0xeb, 0x0b, 0xae, 0x66, 0x90, 0x1d, 0x80, 0x66,
0x82, 0x4c, 0x60, 0xeb, 0x88, 0x09, 0x6b, 0x49, 0xf2, 0x6d, 0xaa, 0x64, 0xa1, 0x23, 0x59, 0xe8,
0xeb, 0x91, 0x2c, 0xf5, 0xe5, 0x94, 0xfd, 0xf9, 0xe7, 0xba, 0xe1, 0xae, 0x68, 0xde, 0xb6, 0x74,
0xd2, 0x8b, 0x5b, 0x23, 0x27, 0xcb, 0xf3, 0x38, 0xd1, 0xbc, 0x6d, 0x61, 0x3f, 0x84, 0xe2, 0x58,
0x71, 0x64, 0x15, 0xf2, 0x1d, 0x1c, 0x68, 0xc5, 0x52, 0x93, 0xac, 0xc1, 0x62, 0x9f, 0x05, 0x3d,
0xb4, 0x72, 0xf2, 0x9b, 0x3a, 0x6c, 0xe6, 0x1e, 0x18, 0x95, 0x3b, 0x70, 0x65, 0x1f, 0x85, 0x14,
0xc8, 0xc5, 0x8f, 0x3d, 0xe4, 0x62, 0x96, 0xe2, 0x95, 0x97, 0xb0, 0x7a, 0x0a, 0xe3, 0x71, 0xd4,
0xe5, 0x48, 0x36, 0x61, 0x51, 0x4a, 0x2c, 0x81, 0xc5, 0xda, 0xed, 0xf3, 0x34, 0xc1, 0x55, 0x94,
0xca, 0x5b, 0x20, 0x3b, 0x52, 0x83, 0x33, 0x91, 0x9f, 0x5c, 0xc0, 0xa3, 0x6e, 0x8a, 0xf6, 0xfb,
0x0e, 0xae, 0x9d, 0xf1, 0xab, 0x53, 0xfd, 0x7f, 0xc7, 0x5f, 0x0c, 0x20, 0x6f, 0xa4, 0xe0, 0x97,
0x9b, 0x31, 0xd9, 0x82, 0xa2, 0x6a, 0xa4, 0x5c, 0x2e, 0xd9, 0xa0, 0x59, 0x13, 0xf0, 0x34, 0xdd,
0xbf, 0x17, 0x8c, 0x77, 0x5c, 0x3d, 0x2f, 0xa9, 0x9d, 0x96, 0x7b, 0x26, 0xa9, 0x4b, 0x2b, 0xf7,
0x2e, 0x5c, 0x3d, 0xf0, 0xb9, 0x6a, 0x38, 0x1f, 0x15, 0x6b, 0xc1, 0x52, 0xdb, 0x0f, 0x04, 0x26,
0xdc, 0x32, 0xca, 0xf9, 0xea, 0x8a, 0x3b, 0x3a, 0x56, 0x0e, 0x81, 0x8c, 0xc3, 0x75, 0x1a, 0x75,
0x30, 0x55, 0x10, 0x09, 0x9f, 0x2f, 0x0f, 0xcd, 0xac, 0x3c, 0x02, 0xb2, 0x8b, 0x01, 0x4e, 0xc8,
0x3e, 0xeb, 0x52, 0x20, 0x50, 0xe0, 0x83, 0x6e, 0x53, 0x2a, 0xb8, 0xec, 0x4a, 0xbb, 0xf6, 0xb5,
0x00, 0xa6, 0x4a, 0x8a, 0xb4, 0x21, 0xbf, 0x8f, 0x82, 0xd0, 0x8c, 0x1c, 0x26, 0x96, 0xc1, 0x76,
0xce, 0x8d, 0xd7, 0x45, 0x77, 0xa0, 0x90, 0x4a, 0x41, 0xb2, 0xee, 0xa4, 0x29, 0x79, 0xed, 0x8d,
0x39, 0x18, 0x3a, 0x58, 0x04, 0xa6, 0x1a, 0x77, 0x92, 0x45, 0x9e, 0xde, 0x36, 0xbb, 0x36, 0x0f,
0xe5, 0x34, 0xa0, 0x1a, 0xb8, 0xcc, 0x80, 0xd3, 0xcb, 0x92, 0x19, 0x70, 0xd6, 0x28, 0xbf, 0x02,
0x53, 0xf5, 0x3f, 0x33, 0xe0, 0xf4, 0x98, 0xd8, 0xd7, 0xa7, 0xd6, 0x68, 0x2f, 0x7d, 0xe3, 0xea,
0x87, 0xc7, 0x27, 0xa5, 0x85, 0xef, 0x27, 0xa5, 0x85, 0x4f, 0xc3, 0x92, 0x71, 0x3c, 0x2c, 0x19,
0xdf, 0x86, 0x25, 0xe3, 0xd7, 0xb0, 0x64, 0xbc, 0x7f, 0x7c, 0xc1, 0xf7, 0x78, 0x4b, 0x59, 0x0d,
0x53, 0x46, 0xba, 0xff, 0x27, 0x00, 0x00, 0xff, 0xff, 0xf9, 0x46, 0x4a, 0x83, 0xd8, 0x07, 0x00,
0x00,
// 647 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0x4d, 0x6f, 0xd3, 0x40,
0x10, 0xad, 0x93, 0xd4, 0x6d, 0x27, 0x07, 0xca, 0x52, 0x21, 0xcb, 0x40, 0x1a, 0x45, 0x20, 0xe5,
0xc2, 0x9a, 0x86, 0x0b, 0x6d, 0x11, 0xa2, 0xa5, 0xa5, 0x20, 0x15, 0x0e, 0xe6, 0xab, 0xe2, 0x52,
0x6d, 0x92, 0x89, 0xb1, 0x62, 0xc7, 0xc6, 0xbb, 0x89, 0x94, 0x1b, 0xff, 0x01, 0x7e, 0x54, 0x8f,
0x88, 0x13, 0x27, 0x44, 0xf3, 0x4b, 0x90, 0x77, 0xd7, 0x34, 0x4d, 0x22, 0xdc, 0x94, 0xde, 0x66,
0xed, 0xf7, 0x66, 0xde, 0xbc, 0xd9, 0xb1, 0x61, 0xcf, 0xf3, 0xc5, 0xa7, 0x7e, 0x93, 0xb6, 0xa2,
0xd0, 0x69, 0x45, 0x3d, 0xc1, 0xfc, 0x1e, 0x26, 0xed, 0xf1, 0x90, 0xc5, 0xbe, 0xc3, 0x31, 0x19,
0xf8, 0x2d, 0xe4, 0x8e, 0x1f, 0x32, 0x0f, 0xb9, 0x33, 0xd8, 0xd0, 0x11, 0x8d, 0x93, 0x48, 0x44,
0xe4, 0xce, 0x19, 0x9e, 0x66, 0x58, 0xaa, 0x11, 0x83, 0x0d, 0x7b, 0xcd, 0x8b, 0xbc, 0x48, 0x22,
0x9d, 0x34, 0x52, 0x24, 0xfb, 0x96, 0x17, 0x45, 0x5e, 0x80, 0x8e, 0x3c, 0x35, 0xfb, 0x1d, 0x07,
0xc3, 0x58, 0x0c, 0xf5, 0xcb, 0xea, 0xe4, 0xcb, 0x8e, 0x8f, 0x41, 0xfb, 0x38, 0x64, 0xbc, 0xab,
0x11, 0xeb, 0x93, 0x08, 0xe1, 0x87, 0xc8, 0x05, 0x0b, 0x63, 0x0d, 0xd8, 0xbe, 0x50, 0x6b, 0x62,
0x18, 0x23, 0x77, 0xda, 0xc8, 0x5b, 0x89, 0x1f, 0x8b, 0x28, 0x51, 0xe4, 0xda, 0x8f, 0x02, 0x2c,
0xbe, 0x4c, 0x1b, 0x20, 0x04, 0x4a, 0x3d, 0x16, 0xa2, 0x65, 0x54, 0x8d, 0xfa, 0x8a, 0x2b, 0x63,
0xf2, 0x02, 0xcc, 0x80, 0x35, 0x31, 0xe0, 0x56, 0xa1, 0x5a, 0xac, 0x97, 0x1b, 0x0f, 0xe8, 0x3f,
0x0d, 0xa0, 0x32, 0x13, 0x3d, 0x94, 0x94, 0xfd, 0x9e, 0x48, 0x86, 0xae, 0xe6, 0x93, 0x2d, 0x30,
0x05, 0x4b, 0x3c, 0x14, 0x56, 0xb1, 0x6a, 0xd4, 0xcb, 0x8d, 0xdb, 0xe3, 0x99, 0xa4, 0x36, 0xba,
0xf7, 0x57, 0xdb, 0x6e, 0xe9, 0xe4, 0xd7, 0xfa, 0x82, 0xab, 0x19, 0x64, 0x13, 0xa0, 0x95, 0x20,
0x13, 0xd8, 0x3e, 0x66, 0xc2, 0x5a, 0x92, 0x7c, 0x9b, 0x2a, 0x5b, 0x68, 0x66, 0x0b, 0x7d, 0x9b,
0xd9, 0xe2, 0xae, 0x68, 0xf4, 0x8e, 0xa4, 0xf6, 0xe3, 0x76, 0x46, 0x5d, 0xce, 0xa7, 0x6a, 0xf4,
0x8e, 0xb0, 0x37, 0xa1, 0x3c, 0xd6, 0x08, 0x59, 0x85, 0x62, 0x17, 0x87, 0xda, 0x9d, 0x34, 0x24,
0x6b, 0xb0, 0x38, 0x60, 0x41, 0x1f, 0xad, 0x82, 0x7c, 0xa6, 0x0e, 0x5b, 0x85, 0x47, 0x46, 0xed,
0x1e, 0x5c, 0x3b, 0x40, 0x21, 0xcd, 0x70, 0xf1, 0x73, 0x1f, 0xb9, 0x98, 0xe5, 0x6e, 0xed, 0x35,
0xac, 0x9e, 0xc1, 0x78, 0x1c, 0xf5, 0x38, 0x92, 0x2d, 0x58, 0x94, 0x76, 0x4a, 0x60, 0xb9, 0x71,
0xf7, 0x22, 0x86, 0xbb, 0x8a, 0x52, 0x7b, 0x0f, 0xe4, 0x99, 0xec, 0xfc, 0x5c, 0xe5, 0xa7, 0x97,
0xc8, 0xa8, 0x07, 0xa0, 0xf3, 0x7e, 0x80, 0x1b, 0xe7, 0xf2, 0x6a, 0xa9, 0xff, 0x9f, 0xf8, 0xab,
0x01, 0xe4, 0x9d, 0x34, 0xfc, 0x6a, 0x15, 0x93, 0x6d, 0x28, 0xab, 0x41, 0xca, 0x45, 0x92, 0x03,
0x9a, 0x35, 0xf7, 0xe7, 0xe9, 0xae, 0xbd, 0x62, 0xbc, 0xeb, 0xea, 0x5b, 0x92, 0xc6, 0x69, 0xbb,
0xe7, 0x44, 0x5d, 0x59, 0xbb, 0xf7, 0xe1, 0xfa, 0xa1, 0xcf, 0xd5, 0xc0, 0x79, 0xd6, 0xac, 0x05,
0x4b, 0x1d, 0x3f, 0x10, 0x98, 0x70, 0xcb, 0xa8, 0x16, 0xeb, 0x2b, 0x6e, 0x76, 0xac, 0x1d, 0x01,
0x19, 0x87, 0x6b, 0x19, 0xbb, 0x60, 0xaa, 0x22, 0x12, 0x3e, 0x9f, 0x0e, 0xcd, 0xac, 0x3d, 0x06,
0xb2, 0x87, 0x01, 0x4e, 0xd8, 0x3e, 0xeb, 0x03, 0x40, 0xa0, 0xc4, 0x87, 0xbd, 0x96, 0x74, 0x70,
0xd9, 0x95, 0x71, 0xe3, 0x5b, 0x09, 0x4c, 0x25, 0x8a, 0x74, 0xa0, 0x78, 0x80, 0x82, 0xd0, 0x1c,
0x0d, 0x13, 0xcb, 0x60, 0x3b, 0x17, 0xc6, 0xeb, 0xa6, 0xbb, 0x50, 0x4a, 0xad, 0x20, 0x79, 0xdf,
0x9f, 0x29, 0x7b, 0xed, 0x8d, 0x39, 0x18, 0xba, 0x58, 0x04, 0xa6, 0xba, 0xee, 0x24, 0x8f, 0x3c,
0xbd, 0x6d, 0x76, 0x63, 0x1e, 0xca, 0x59, 0x41, 0x75, 0xe1, 0x72, 0x0b, 0x4e, 0x2f, 0x4b, 0x6e,
0xc1, 0x59, 0x57, 0xf9, 0x0d, 0x98, 0x6a, 0xfe, 0xb9, 0x05, 0xa7, 0xaf, 0x89, 0x7d, 0x73, 0x6a,
0x8d, 0xf6, 0xd3, 0xff, 0xd9, 0xee, 0xd1, 0xc9, 0x69, 0x65, 0xe1, 0xe7, 0x69, 0x65, 0xe1, 0xcb,
0xa8, 0x62, 0x9c, 0x8c, 0x2a, 0xc6, 0xf7, 0x51, 0xc5, 0xf8, 0x3d, 0xaa, 0x18, 0x1f, 0x9f, 0x5c,
0xf2, 0xdf, 0xbb, 0xad, 0xa2, 0xa6, 0x29, 0x2b, 0x3d, 0xfc, 0x13, 0x00, 0x00, 0xff, 0xff, 0xa2,
0xd0, 0x9c, 0x61, 0xc4, 0x07, 0x00, 0x00,
}
// Reference imports to suppress errors if they are not otherwise used.
@ -789,22 +785,30 @@ func (m *Image) MarshalToSizedBuffer(dAtA []byte) (int, error) {
i -= len(m.XXX_unrecognized)
copy(dAtA[i:], m.XXX_unrecognized)
}
n1, err1 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.UpdatedAt, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.UpdatedAt):])
if err1 != nil {
return 0, err1
if m.UpdatedAt != nil {
{
size, err := m.UpdatedAt.MarshalToSizedBuffer(dAtA[:i])
if err != nil {
return 0, err
}
i -= size
i = encodeVarintImages(dAtA, i, uint64(size))
}
i--
dAtA[i] = 0x42
}
i -= n1
i = encodeVarintImages(dAtA, i, uint64(n1))
i--
dAtA[i] = 0x42
n2, err2 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.CreatedAt, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.CreatedAt):])
if err2 != nil {
return 0, err2
if m.CreatedAt != nil {
{
size, err := m.CreatedAt.MarshalToSizedBuffer(dAtA[:i])
if err != nil {
return 0, err
}
i -= size
i = encodeVarintImages(dAtA, i, uint64(size))
}
i--
dAtA[i] = 0x3a
}
i -= n2
i = encodeVarintImages(dAtA, i, uint64(n2))
i--
dAtA[i] = 0x3a
{
size, err := m.Target.MarshalToSizedBuffer(dAtA[:i])
if err != nil {
@ -1229,10 +1233,14 @@ func (m *Image) Size() (n int) {
}
l = m.Target.Size()
n += 1 + l + sovImages(uint64(l))
l = github_com_gogo_protobuf_types.SizeOfStdTime(m.CreatedAt)
n += 1 + l + sovImages(uint64(l))
l = github_com_gogo_protobuf_types.SizeOfStdTime(m.UpdatedAt)
n += 1 + l + sovImages(uint64(l))
if m.CreatedAt != nil {
l = m.CreatedAt.Size()
n += 1 + l + sovImages(uint64(l))
}
if m.UpdatedAt != nil {
l = m.UpdatedAt.Size()
n += 1 + l + sovImages(uint64(l))
}
if m.XXX_unrecognized != nil {
n += len(m.XXX_unrecognized)
}
@ -1410,8 +1418,8 @@ func (this *Image) String() string {
`Name:` + fmt.Sprintf("%v", this.Name) + `,`,
`Labels:` + mapStringForLabels + `,`,
`Target:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Target), "Descriptor", "types.Descriptor", 1), `&`, ``, 1) + `,`,
`CreatedAt:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.CreatedAt), "Timestamp", "types1.Timestamp", 1), `&`, ``, 1) + `,`,
`UpdatedAt:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.UpdatedAt), "Timestamp", "types1.Timestamp", 1), `&`, ``, 1) + `,`,
`CreatedAt:` + strings.Replace(fmt.Sprintf("%v", this.CreatedAt), "Timestamp", "types1.Timestamp", 1) + `,`,
`UpdatedAt:` + strings.Replace(fmt.Sprintf("%v", this.UpdatedAt), "Timestamp", "types1.Timestamp", 1) + `,`,
`XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`,
`}`,
}, "")
@ -1781,7 +1789,10 @@ func (m *Image) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.CreatedAt, dAtA[iNdEx:postIndex]); err != nil {
if m.CreatedAt == nil {
m.CreatedAt = &types1.Timestamp{}
}
if err := m.CreatedAt.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
@ -1814,7 +1825,10 @@ func (m *Image) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.UpdatedAt, dAtA[iNdEx:postIndex]); err != nil {
if m.UpdatedAt == nil {
m.UpdatedAt = &types1.Timestamp{}
}
if err := m.UpdatedAt.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex

4
api/services/images/v1/images.proto
View File

@ -74,10 +74,10 @@ message Image {
containerd.types.Descriptor target = 3 [(gogoproto.nullable) = false];
// CreatedAt is the time the image was first created.
google.protobuf.Timestamp created_at = 7 [(gogoproto.stdtime) = true, (gogoproto.nullable) = false];
google.protobuf.Timestamp created_at = 7;
// UpdatedAt is the last time the image was mutated.
google.protobuf.Timestamp updated_at = 8 [(gogoproto.stdtime) = true, (gogoproto.nullable) = false];
google.protobuf.Timestamp updated_at = 8;
}
message GetImageRequest {

119
api/services/leases/v1/leases.pb.go
View File

@ -9,7 +9,6 @@ import (
_ "github.com/gogo/protobuf/gogoproto"
proto "github.com/gogo/protobuf/proto"
github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys"
github_com_gogo_protobuf_types "github.com/gogo/protobuf/types"
types "github.com/gogo/protobuf/types"
grpc "google.golang.org/grpc"
codes "google.golang.org/grpc/codes"
@ -19,14 +18,12 @@ import (
math_bits "math/bits"
reflect "reflect"
strings "strings"
time "time"
)
// Reference imports to suppress errors if they are not otherwise used.
var _ = proto.Marshal
var _ = fmt.Errorf
var _ = math.Inf
var _ = time.Kitchen
// This is a compile-time assertion to ensure that this generated file
// is compatible with the proto package it is being compiled against.
@ -37,7 +34,7 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
// Lease is an object which retains resources while it exists.
type Lease struct {
ID string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
CreatedAt time.Time `protobuf:"bytes,2,opt,name=created_at,json=createdAt,proto3,stdtime" json:"created_at"`
CreatedAt *types.Timestamp `protobuf:"bytes,2,opt,name=created_at,json=createdAt,proto3" json:"created_at,omitempty"`
Labels map[string]string `protobuf:"bytes,3,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
@ -501,48 +498,47 @@ func init() {
}
var fileDescriptor_fefd70dfe8d93cbf = []byte{
// 642 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x55, 0xcd, 0x6e, 0xd3, 0x40,
0x10, 0xee, 0x26, 0xa9, 0x49, 0x26, 0xb4, 0x42, 0xab, 0xb6, 0x8a, 0x8c, 0x48, 0x22, 0x0b, 0xa9,
0x11, 0x3f, 0x36, 0x4d, 0x2b, 0x54, 0x5a, 0x84, 0xd4, 0xb4, 0x95, 0xa8, 0x88, 0x10, 0xb2, 0x38,
0x54, 0x1c, 0xa8, 0x1c, 0x7b, 0x1b, 0x2c, 0x9c, 0xd8, 0x78, 0x37, 0x41, 0xe9, 0x89, 0x47, 0xe0,
0x61, 0x78, 0x88, 0x1e, 0x39, 0x21, 0x4e, 0x85, 0xe6, 0xc6, 0x5b, 0x20, 0xef, 0x0f, 0x6d, 0x5a,
0xb5, 0x76, 0x10, 0xe2, 0x36, 0x1b, 0x7f, 0xdf, 0xcc, 0x37, 0x33, 0xdf, 0x6e, 0x60, 0xa7, 0xeb,
0xb3, 0x77, 0x83, 0x8e, 0xe9, 0x86, 0x3d, 0xcb, 0x0d, 0xfb, 0xcc, 0xf1, 0xfb, 0x24, 0xf6, 0xce,
0x87, 0x4e, 0xe4, 0x5b, 0x94, 0xc4, 0x43, 0xdf, 0x25, 0xd4, 0x0a, 0x88, 0x43, 0x09, 0xb5, 0x86,
0x2b, 0x32, 0x32, 0xa3, 0x38, 0x64, 0x21, 0xbe, 0x73, 0x86, 0x37, 0x15, 0xd6, 0x94, 0x88, 0xe1,
0x8a, 0xbe, 0xd0, 0x0d, 0xbb, 0x21, 0x47, 0x5a, 0x49, 0x24, 0x48, 0xfa, 0xed, 0x6e, 0x18, 0x76,
0x03, 0x62, 0xf1, 0x53, 0x67, 0x70, 0x68, 0x91, 0x5e, 0xc4, 0x46, 0xf2, 0x63, 0xed, 0xe2, 0x47,
0xe6, 0xf7, 0x08, 0x65, 0x4e, 0x2f, 0x12, 0x00, 0xe3, 0x17, 0x82, 0xd9, 0x76, 0x52, 0x01, 0x2f,
0x41, 0xce, 0xf7, 0x2a, 0xa8, 0x8e, 0x1a, 0xa5, 0x96, 0x36, 0x3e, 0xa9, 0xe5, 0xf6, 0x76, 0xec,
0x9c, 0xef, 0xe1, 0x6d, 0x00, 0x37, 0x26, 0x0e, 0x23, 0xde, 0x81, 0xc3, 0x2a, 0xb9, 0x3a, 0x6a,
0x94, 0x9b, 0xba, 0x29, 0xf2, 0x9a, 0x2a, 0xaf, 0xf9, 0x5a, 0xe5, 0x6d, 0x15, 0x8f, 0x4f, 0x6a,
0x33, 0x9f, 0x7f, 0xd4, 0x90, 0x5d, 0x92, 0xbc, 0x2d, 0x86, 0x9f, 0x83, 0x16, 0x38, 0x1d, 0x12,
0xd0, 0x4a, 0xbe, 0x9e, 0x6f, 0x94, 0x9b, 0x8f, 0xcc, 0x6b, 0x5b, 0x35, 0xb9, 0x24, 0xb3, 0xcd,
0x29, 0xbb, 0x7d, 0x16, 0x8f, 0x6c, 0xc9, 0xd7, 0x9f, 0x40, 0xf9, 0xdc, 0xcf, 0xf8, 0x16, 0xe4,
0xdf, 0x93, 0x91, 0x90, 0x6d, 0x27, 0x21, 0x5e, 0x80, 0xd9, 0xa1, 0x13, 0x0c, 0x08, 0x97, 0x5a,
0xb2, 0xc5, 0x61, 0x23, 0xb7, 0x8e, 0x8c, 0x2f, 0x08, 0xe6, 0xb6, 0xb9, 0x24, 0x9b, 0x7c, 0x18,
0x10, 0xca, 0xae, 0xec, 0xf9, 0xd5, 0x05, 0xb9, 0xeb, 0x29, 0x72, 0x27, 0xb2, 0xfe, 0x6b, 0xd9,
0x6d, 0x98, 0x57, 0xf9, 0x69, 0x14, 0xf6, 0x29, 0xc1, 0x1b, 0x30, 0xcb, 0x6b, 0x73, 0x7e, 0xb9,
0x79, 0x37, 0xcb, 0x30, 0x6d, 0x41, 0x31, 0x36, 0x61, 0x6e, 0x87, 0x04, 0x24, 0x7d, 0x06, 0x18,
0x0a, 0x74, 0xd4, 0x77, 0xb9, 0x9e, 0xa2, 0xcd, 0x63, 0x63, 0x19, 0xca, 0x6d, 0x9f, 0x32, 0x45,
0xad, 0xc0, 0x8d, 0x43, 0x3f, 0x60, 0x24, 0xa6, 0x15, 0x54, 0xcf, 0x37, 0x4a, 0xb6, 0x3a, 0x1a,
0x6d, 0xb8, 0x29, 0x80, 0x52, 0xf1, 0x53, 0xd0, 0x84, 0x1e, 0x0e, 0xcc, 0x2a, 0x59, 0x72, 0x8c,
0xc7, 0x50, 0xb4, 0x09, 0x0d, 0x07, 0xb1, 0x4b, 0xae, 0x93, 0xcb, 0x46, 0x91, 0x1a, 0x1f, 0x8f,
0x8d, 0x8f, 0x80, 0xb7, 0x3c, 0x4f, 0x51, 0xd3, 0x1a, 0xde, 0x83, 0x62, 0x2c, 0xa1, 0xd2, 0xe6,
0xcb, 0x29, 0x2a, 0x55, 0xe6, 0x56, 0x21, 0xf1, 0xbc, 0xfd, 0x87, 0x6e, 0x1c, 0xc1, 0xa2, 0x1a,
0xf2, 0x7f, 0xaf, 0x6d, 0xc2, 0x82, 0x1c, 0x3d, 0x3f, 0xd3, 0x94, 0xd2, 0x86, 0x07, 0x8b, 0x17,
0xf0, 0x72, 0x67, 0x2f, 0xa0, 0xa4, 0x92, 0xaa, 0xb5, 0x4d, 0x29, 0xea, 0x8c, 0xdf, 0xfc, 0x56,
0x00, 0x8d, 0x2f, 0x95, 0x62, 0x02, 0x9a, 0xf0, 0x33, 0x7e, 0x30, 0xcd, 0xb5, 0xd2, 0x1f, 0x66,
0x44, 0x4b, 0xf9, 0x2f, 0x41, 0x13, 0x3b, 0x48, 0x2d, 0x33, 0x71, 0x1f, 0xf4, 0xa5, 0x4b, 0x6f,
0xdb, 0x6e, 0xf2, 0xa0, 0xe2, 0x03, 0x28, 0x24, 0x73, 0xc2, 0xf7, 0xd2, 0xac, 0x7b, 0x76, 0x41,
0xf4, 0xfb, 0x99, 0xb0, 0x52, 0xf0, 0x3e, 0x94, 0xcf, 0xb9, 0x15, 0xaf, 0xa4, 0x70, 0x2f, 0x3b,
0xfb, 0x4a, 0xe9, 0x6f, 0x61, 0x7e, 0xd2, 0x8e, 0x78, 0x2d, 0xe3, 0x48, 0xb2, 0xe5, 0x3f, 0x82,
0xb9, 0x09, 0x0b, 0xe1, 0xd5, 0x6c, 0x7d, 0x4f, 0x18, 0x54, 0x5f, 0x9b, 0x8e, 0x24, 0xa6, 0xd6,
0xda, 0x3f, 0x3e, 0xad, 0xce, 0x7c, 0x3f, 0xad, 0xce, 0x7c, 0x1a, 0x57, 0xd1, 0xf1, 0xb8, 0x8a,
0xbe, 0x8e, 0xab, 0xe8, 0xe7, 0xb8, 0x8a, 0xde, 0x3c, 0xfb, 0xcb, 0xff, 0xe4, 0x4d, 0x11, 0x75,
0x34, 0xde, 0xe5, 0xea, 0xef, 0x00, 0x00, 0x00, 0xff, 0xff, 0xd4, 0xb1, 0x33, 0x0e, 0xdc, 0x07,
0x00, 0x00,
// 631 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x95, 0xdf, 0x6b, 0xd3, 0x50,
0x14, 0xc7, 0x97, 0xb6, 0x8b, 0xeb, 0x89, 0x1b, 0x72, 0xd9, 0x46, 0x89, 0x98, 0x95, 0x20, 0xac,
0xf8, 0x23, 0x71, 0xdd, 0x90, 0xfd, 0x10, 0x61, 0xb5, 0x03, 0x87, 0x45, 0x24, 0xf8, 0x30, 0x7c,
0x70, 0xa4, 0xc9, 0x5d, 0x0d, 0xa6, 0x4d, 0xcc, 0xbd, 0xad, 0x74, 0x4f, 0xfe, 0x51, 0xfe, 0x11,
0x7d, 0xf4, 0x49, 0x7c, 0x9a, 0xae, 0x7f, 0x89, 0xf4, 0xfe, 0xb0, 0x3f, 0xc6, 0x96, 0x54, 0xc4,
0xb7, 0x73, 0x9b, 0xef, 0xf7, 0x9c, 0xcf, 0x39, 0xf7, 0x24, 0x85, 0x7a, 0x2b, 0xa0, 0x1f, 0xba,
0x4d, 0xcb, 0x8b, 0xda, 0xb6, 0x17, 0x75, 0xa8, 0x1b, 0x74, 0x70, 0xe2, 0x4f, 0x86, 0x6e, 0x1c,
0xd8, 0x04, 0x27, 0xbd, 0xc0, 0xc3, 0xc4, 0x0e, 0xb1, 0x4b, 0x30, 0xb1, 0x7b, 0x5b, 0x22, 0xb2,
0xe2, 0x24, 0xa2, 0x11, 0xba, 0x37, 0xd6, 0x5b, 0x52, 0x6b, 0x09, 0x45, 0x6f, 0x4b, 0x5f, 0x6d,
0x45, 0xad, 0x88, 0x29, 0xed, 0x51, 0xc4, 0x4d, 0xfa, 0xdd, 0x56, 0x14, 0xb5, 0x42, 0x6c, 0xb3,
0x53, 0xb3, 0x7b, 0x66, 0xe3, 0x76, 0x4c, 0xfb, 0xe2, 0xe1, 0xc6, 0xec, 0x43, 0x1a, 0xb4, 0x31,
0xa1, 0x6e, 0x3b, 0xe6, 0x02, 0xf3, 0xa7, 0x02, 0x8b, 0x8d, 0x51, 0x05, 0xb4, 0x0e, 0xb9, 0xc0,
0x2f, 0x29, 0x65, 0xa5, 0x52, 0xac, 0xa9, 0xc3, 0x8b, 0x8d, 0xdc, 0x71, 0xdd, 0xc9, 0x05, 0x3e,
0xda, 0x03, 0xf0, 0x12, 0xec, 0x52, 0xec, 0x9f, 0xba, 0xb4, 0x94, 0x2b, 0x2b, 0x15, 0xad, 0xaa,
0x5b, 0x3c, 0xaf, 0x25, 0xf3, 0x5a, 0x6f, 0x65, 0x5e, 0xa7, 0x28, 0xd4, 0x87, 0x14, 0xbd, 0x04,
0x35, 0x74, 0x9b, 0x38, 0x24, 0xa5, 0x7c, 0x39, 0x5f, 0xd1, 0xaa, 0x4f, 0xac, 0x1b, 0x1b, 0xb4,
0x18, 0x88, 0xd5, 0x60, 0x96, 0xa3, 0x0e, 0x4d, 0xfa, 0x8e, 0xf0, 0xeb, 0x7b, 0xa0, 0x4d, 0xfc,
0x8c, 0xee, 0x40, 0xfe, 0x23, 0xee, 0x73, 0x58, 0x67, 0x14, 0xa2, 0x55, 0x58, 0xec, 0xb9, 0x61,
0x17, 0x33, 0xc0, 0xa2, 0xc3, 0x0f, 0xfb, 0xb9, 0x5d, 0xc5, 0xfc, 0xaa, 0xc0, 0xf2, 0x0b, 0x86,
0xe4, 0xe0, 0x4f, 0x5d, 0x4c, 0xe8, 0xb5, 0x9d, 0xbe, 0x99, 0xc1, 0xdd, 0x4d, 0xc1, 0x9d, 0xca,
0xfa, 0xaf, 0xb1, 0x1b, 0xb0, 0x22, 0xf3, 0x93, 0x38, 0xea, 0x10, 0x8c, 0xf6, 0x61, 0x91, 0xd5,
0x66, 0x7e, 0xad, 0x7a, 0x3f, 0xcb, 0x30, 0x1d, 0x6e, 0x31, 0x0f, 0x60, 0xb9, 0x8e, 0x43, 0x9c,
0x3e, 0x03, 0x04, 0x05, 0xd2, 0xef, 0x78, 0x8c, 0x67, 0xc9, 0x61, 0xb1, 0xb9, 0x09, 0x5a, 0x23,
0x20, 0x54, 0x5a, 0x4b, 0x70, 0xeb, 0x2c, 0x08, 0x29, 0x4e, 0x48, 0x49, 0x29, 0xe7, 0x2b, 0x45,
0x47, 0x1e, 0xcd, 0x06, 0xdc, 0xe6, 0x42, 0x41, 0xfc, 0x0c, 0x54, 0xce, 0xc3, 0x84, 0x59, 0x91,
0x85, 0xc7, 0x7c, 0x0a, 0x4b, 0x0e, 0x26, 0x51, 0x37, 0xf1, 0xf0, 0x4d, 0xb8, 0xb4, 0x1f, 0xcb,
0xf1, 0xb1, 0xd8, 0xfc, 0x0c, 0xe8, 0xd0, 0xf7, 0xa5, 0x35, 0xad, 0xe1, 0x63, 0x58, 0x4a, 0x84,
0x54, 0x2c, 0xf7, 0x66, 0x0a, 0xa5, 0xcc, 0x5c, 0x2b, 0x0c, 0x2e, 0x36, 0x16, 0x9c, 0x3f, 0x76,
0xf3, 0x1c, 0xd6, 0xe4, 0x90, 0xff, 0x7b, 0x6d, 0x0b, 0x56, 0xc5, 0xe8, 0xd9, 0x99, 0xa4, 0x94,
0x36, 0x7d, 0x58, 0x9b, 0xd1, 0x8b, 0x3b, 0x7b, 0x05, 0x45, 0x99, 0x54, 0x5e, 0xdb, 0x9c, 0x50,
0x63, 0x7f, 0xf5, 0x7b, 0x01, 0x54, 0x76, 0xa9, 0x04, 0x61, 0x50, 0xf9, 0x3e, 0xa3, 0x47, 0xf3,
0xbc, 0x56, 0xfa, 0xe3, 0x8c, 0x6a, 0x81, 0xff, 0x1a, 0x54, 0x7e, 0x07, 0xa9, 0x65, 0xa6, 0xde,
0x07, 0x7d, 0xfd, 0xca, 0x17, 0xed, 0x68, 0xf4, 0x19, 0x45, 0xa7, 0x50, 0x18, 0xcd, 0x09, 0x3d,
0x48, 0x5b, 0xdd, 0xf1, 0x0b, 0xa2, 0x3f, 0xcc, 0xa4, 0x15, 0xc0, 0x27, 0xa0, 0x4d, 0x6c, 0x2b,
0xda, 0x4a, 0xf1, 0x5e, 0xdd, 0xec, 0x6b, 0xd1, 0xdf, 0xc3, 0xca, 0xf4, 0x3a, 0xa2, 0x9d, 0x8c,
0x23, 0xc9, 0x96, 0xff, 0x1c, 0x96, 0xa7, 0x56, 0x08, 0x6d, 0x67, 0xeb, 0x7b, 0x6a, 0x41, 0xf5,
0x9d, 0xf9, 0x4c, 0x7c, 0x6a, 0xb5, 0x93, 0xc1, 0xa5, 0xb1, 0xf0, 0xe3, 0xd2, 0x58, 0xf8, 0x32,
0x34, 0x94, 0xc1, 0xd0, 0x50, 0xbe, 0x0d, 0x0d, 0xe5, 0xd7, 0xd0, 0x50, 0xde, 0x3d, 0xff, 0xcb,
0x7f, 0xe2, 0x03, 0x1e, 0x35, 0x55, 0xd6, 0xe5, 0xf6, 0xef, 0x00, 0x00, 0x00, 0xff, 0xff, 0x72,
0xbb, 0x87, 0xeb, 0xd2, 0x07, 0x00, 0x00,
}
// Reference imports to suppress errors if they are not otherwise used.
@ -868,14 +864,18 @@ func (m *Lease) MarshalToSizedBuffer(dAtA []byte) (int, error) {
dAtA[i] = 0x1a
}
}
n1, err1 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.CreatedAt, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.CreatedAt):])
if err1 != nil {
return 0, err1
if m.CreatedAt != nil {
{
size, err := m.CreatedAt.MarshalToSizedBuffer(dAtA[:i])
if err != nil {
return 0, err
}
i -= size
i = encodeVarintLeases(dAtA, i, uint64(size))
}
i--
dAtA[i] = 0x12
}
i -= n1
i = encodeVarintLeases(dAtA, i, uint64(n1))
i--
dAtA[i] = 0x12
if len(m.ID) > 0 {
i -= len(m.ID)
copy(dAtA[i:], m.ID)
@ -1324,8 +1324,10 @@ func (m *Lease) Size() (n int) {
if l > 0 {
n += 1 + l + sovLeases(uint64(l))
}
l = github_com_gogo_protobuf_types.SizeOfStdTime(m.CreatedAt)
n += 1 + l + sovLeases(uint64(l))
if m.CreatedAt != nil {
l = m.CreatedAt.Size()
n += 1 + l + sovLeases(uint64(l))
}
if len(m.Labels) > 0 {
for k, v := range m.Labels {
_ = k
@ -1547,7 +1549,7 @@ func (this *Lease) String() string {
mapStringForLabels += "}"
s := strings.Join([]string{`&Lease{`,
`ID:` + fmt.Sprintf("%v", this.ID) + `,`,
`CreatedAt:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.CreatedAt), "Timestamp", "types.Timestamp", 1), `&`, ``, 1) + `,`,
`CreatedAt:` + strings.Replace(fmt.Sprintf("%v", this.CreatedAt), "Timestamp", "types.Timestamp", 1) + `,`,
`Labels:` + mapStringForLabels + `,`,
`XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`,
`}`,
@ -1787,7 +1789,10 @@ func (m *Lease) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.CreatedAt, dAtA[iNdEx:postIndex]); err != nil {
if m.CreatedAt == nil {
m.CreatedAt = &types.Timestamp{}
}
if err := m.CreatedAt.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex

2
api/services/leases/v1/leases.proto
View File

@ -52,7 +52,7 @@ service Leases {
message Lease {
string id = 1;
google.protobuf.Timestamp created_at = 2 [(gogoproto.stdtime) = true, (gogoproto.nullable) = false];
google.protobuf.Timestamp created_at = 2;
map<string, string> labels = 3;
}

202
api/services/sandbox/v1/sandbox.pb.go
View File

@ -16,7 +16,6 @@ import (
fmt "fmt"
types "github.com/containerd/containerd/api/types"
proto "github.com/gogo/protobuf/proto"
github_com_gogo_protobuf_types "github.com/gogo/protobuf/types"
types1 "github.com/gogo/protobuf/types"
grpc "google.golang.org/grpc"
codes "google.golang.org/grpc/codes"
@ -26,14 +25,12 @@ import (
math_bits "math/bits"
reflect "reflect"
strings "strings"
time "time"
)
// Reference imports to suppress errors if they are not otherwise used.
var _ = proto.Marshal
var _ = fmt.Errorf
var _ = math.Inf
var _ = time.Kitchen
// This is a compile-time assertion to ensure that this generated file
// is compatible with the proto package it is being compiled against.
@ -630,11 +627,11 @@ func (m *ControllerWaitRequest) XXX_DiscardUnknown() {
var xxx_messageInfo_ControllerWaitRequest proto.InternalMessageInfo
type ControllerWaitResponse struct {
ExitStatus uint32 `protobuf:"varint,1,opt,name=exit_status,json=exitStatus,proto3" json:"exit_status,omitempty"`
ExitedAt time.Time `protobuf:"bytes,2,opt,name=exited_at,json=exitedAt,proto3,stdtime" json:"exited_at"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
ExitStatus uint32 `protobuf:"varint,1,opt,name=exit_status,json=exitStatus,proto3" json:"exit_status,omitempty"`
ExitedAt *types1.Timestamp `protobuf:"bytes,2,opt,name=exited_at,json=exitedAt,proto3" json:"exited_at,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *ControllerWaitResponse) Reset() { *m = ControllerWaitResponse{} }
@ -709,15 +706,15 @@ func (m *ControllerStatusRequest) XXX_DiscardUnknown() {
var xxx_messageInfo_ControllerStatusRequest proto.InternalMessageInfo
type ControllerStatusResponse struct {
ID string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
Pid uint32 `protobuf:"varint,2,opt,name=pid,proto3" json:"pid,omitempty"`
State string `protobuf:"bytes,3,opt,name=state,proto3" json:"state,omitempty"`
ExitStatus uint32 `protobuf:"varint,4,opt,name=exit_status,json=exitStatus,proto3" json:"exit_status,omitempty"`
ExitedAt time.Time `protobuf:"bytes,5,opt,name=exited_at,json=exitedAt,proto3,stdtime" json:"exited_at"`
Extra *types1.Any `protobuf:"bytes,6,opt,name=extra,proto3" json:"extra,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
ID string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
Pid uint32 `protobuf:"varint,2,opt,name=pid,proto3" json:"pid,omitempty"`
State string `protobuf:"bytes,3,opt,name=state,proto3" json:"state,omitempty"`
ExitStatus uint32 `protobuf:"varint,4,opt,name=exit_status,json=exitStatus,proto3" json:"exit_status,omitempty"`
ExitedAt *types1.Timestamp `protobuf:"bytes,5,opt,name=exited_at,json=exitedAt,proto3" json:"exited_at,omitempty"`
Extra *types1.Any `protobuf:"bytes,6,opt,name=extra,proto3" json:"extra,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *ControllerStatusResponse) Reset() { *m = ControllerStatusResponse{} }
@ -778,61 +775,60 @@ func init() {
}
var fileDescriptor_d6eb1ebcbc2879f1 = []byte{
// 859 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0xcd, 0x6e, 0xeb, 0x44,
0x14, 0xae, 0xf3, 0xe3, 0x36, 0x27, 0x54, 0x5c, 0x86, 0xde, 0x5e, 0xd7, 0x42, 0x49, 0xf1, 0xaa,
0x42, 0x57, 0xf6, 0x6d, 0x2a, 0xca, 0x2d, 0x2c, 0xa0, 0x69, 0x21, 0x54, 0x02, 0x81, 0x1c, 0x10,
0xd0, 0x4d, 0xe4, 0xc4, 0x93, 0xd4, 0xc2, 0xf1, 0x38, 0x9e, 0x71, 0x49, 0x05, 0x0b, 0x78, 0x03,
0xde, 0x82, 0x47, 0xe0, 0x15, 0xba, 0x64, 0xc9, 0xaa, 0xd0, 0x2c, 0x79, 0x08, 0x84, 0x3c, 0x1e,
0xd7, 0xf9, 0xa9, 0x8a, 0xed, 0xde, 0xdd, 0x78, 0x72, 0xbe, 0xef, 0x7c, 0xe7, 0xcc, 0xcc, 0x77,
0x02, 0x9f, 0x8c, 0x1c, 0x76, 0x11, 0xf6, 0xf5, 0x01, 0x19, 0x1b, 0x03, 0xe2, 0x31, 0xcb, 0xf1,
0x70, 0x60, 0xcf, 0x2f, 0x2d, 0xdf, 0x31, 0x28, 0x0e, 0x2e, 0x9d, 0x01, 0xa6, 0x06, 0xb5, 0x3c,
0xbb, 0x4f, 0xa6, 0xc6, 0xe5, 0x7e, 0xb2, 0xd4, 0xfd, 0x80, 0x30, 0x82, 0x1a, 0x29, 0x42, 0x4f,
0xa2, 0xf5, 0x24, 0xe4, 0x72, 0x5f, 0xdd, 0x19, 0x11, 0x32, 0x72, 0xb1, 0xc1, 0xa3, 0xfb, 0xe1,
0xd0, 0xb0, 0xbc, 0xab, 0x18, 0xaa, 0x36, 0x97, 0x7f, 0x62, 0xce, 0x18, 0x53, 0x66, 0x8d, 0x7d,
0x11, 0xb0, 0x35, 0x22, 0x23, 0xc2, 0x97, 0x46, 0xb4, 0x12, 0xbb, 0x2f, 0x33, 0x29, 0x67, 0x57,
0x7e, 0x2a, 0x5b, 0x20, 0x0f, 0x73, 0x20, 0xc7, 0x24, 0xf4, 0x58, 0x8c, 0xd3, 0xbe, 0x00, 0xd4,
0x65, 0x24, 0xc0, 0x27, 0x01, 0xb6, 0x18, 0x36, 0xf1, 0x24, 0xc4, 0x94, 0xa1, 0x23, 0x58, 0x17,
0xf4, 0x8a, 0xb4, 0x2b, 0xed, 0xd5, 0x5b, 0x3b, 0xfa, 0x5c, 0x2f, 0x38, 0x8b, 0xde, 0x8d, 0x03,
0xda, 0x95, 0xeb, 0x9b, 0xe6, 0x9a, 0x99, 0xc4, 0x6b, 0x5f, 0xc2, 0x9b, 0x0b, 0x84, 0xd4, 0x27,
0x1e, 0xc5, 0x8f, 0x61, 0x1c, 0x09, 0x89, 0x5f, 0xfb, 0xf6, 0x2b, 0x91, 0x88, 0xb6, 0x41, 0x1e,
0x3a, 0xd8, 0xb5, 0xa9, 0x52, 0xda, 0x2d, 0xef, 0xd5, 0x4c, 0xf1, 0x75, 0x27, 0x3d, 0x49, 0xf4,
0x78, 0xe9, 0x6d, 0x21, 0xfd, 0x14, 0xbb, 0x38, 0x95, 0xfe, 0x1c, 0x40, 0x04, 0xf4, 0x1c, 0x9b,
0x73, 0xd6, 0xda, 0x9b, 0xb3, 0x9b, 0x66, 0x4d, 0xb0, 0x9c, 0x9d, 0x9a, 0x35, 0x11, 0x70, 0x66,
0x6b, 0x4f, 0x85, 0xaa, 0x84, 0x23, 0x56, 0xa5, 0x3d, 0x87, 0x27, 0x7c, 0xfb, 0x33, 0x87, 0xb2,
0x84, 0x58, 0x81, 0xf5, 0xa1, 0xe3, 0x32, 0x1c, 0x50, 0x45, 0xe2, 0x95, 0x25, 0x9f, 0xda, 0xa7,
0xf0, 0xc6, 0x5c, 0xb4, 0x28, 0xec, 0x00, 0x2a, 0xae, 0x43, 0x19, 0x8f, 0xcd, 0x50, 0x15, 0x0f,
0xd6, 0x3e, 0x84, 0xd7, 0x39, 0x53, 0x07, 0xb3, 0x62, 0xf5, 0x74, 0x84, 0x70, 0x4e, 0x70, 0xa7,
0x24, 0x73, 0x8b, 0xd3, 0xe6, 0xfe, 0x26, 0xc1, 0xf6, 0x09, 0xf1, 0x58, 0x40, 0x5c, 0x17, 0x07,
0x5d, 0x66, 0x05, 0xc5, 0x14, 0x21, 0x03, 0xe4, 0x80, 0x10, 0x36, 0x8c, 0xef, 0x43, 0xbd, 0xf5,
0x6c, 0x35, 0xf9, 0xe7, 0xd1, 0x93, 0x31, 0x45, 0x18, 0xd2, 0x61, 0x9d, 0xf8, 0xcc, 0x21, 0x1e,
0x55, 0xca, 0x5c, 0xee, 0x96, 0x1e, 0xbf, 0x77, 0x3d, 0x79, 0xef, 0xfa, 0xb1, 0x77, 0x65, 0x26,
0x41, 0xda, 0x77, 0xf0, 0x6c, 0x45, 0xa8, 0xa8, 0x3c, 0x9f, 0xd2, 0x27, 0x50, 0xf6, 0x1d, 0x5b,
0x29, 0xed, 0x4a, 0x7b, 0x9b, 0x66, 0xb4, 0xd4, 0x5c, 0xd8, 0x99, 0xa3, 0xbe, 0x08, 0x99, 0x4d,
0x7e, 0xf0, 0x8a, 0xb5, 0xe1, 0x6d, 0x78, 0x2d, 0x72, 0x29, 0x12, 0xb2, 0x1e, 0xc5, 0x03, 0x2a,
0xb2, 0xd4, 0xc5, 0x5e, 0x17, 0x0f, 0xa8, 0xf6, 0x16, 0xa8, 0xf7, 0x65, 0x13, 0x57, 0xf2, 0x63,
0x78, 0x9a, 0xfe, 0xfa, 0x8d, 0xe5, 0x14, 0xbc, 0x20, 0x3f, 0xcd, 0x1f, 0x6b, 0x4c, 0x23, 0x9a,
0xd5, 0x84, 0x3a, 0x9e, 0x3a, 0xac, 0x47, 0x99, 0xc5, 0x42, 0xca, 0x89, 0x36, 0x4d, 0x88, 0xb6,
0xba, 0x7c, 0x07, 0x1d, 0x43, 0x2d, 0xfa, 0xc2, 0x76, 0xcf, 0x62, 0x5c, 0x7f, 0xbd, 0xa5, 0xae,
0x1c, 0xcd, 0x57, 0x89, 0x15, 0xb7, 0x37, 0xa2, 0x7b, 0xfd, 0xeb, 0x5f, 0x4d, 0xc9, 0xdc, 0x88,
0x61, 0xc7, 0x4c, 0xeb, 0x2c, 0x9d, 0x15, 0x0b, 0x69, 0xb1, 0x32, 0xfe, 0x91, 0x40, 0x59, 0x65,
0x12, 0x95, 0x6c, 0x43, 0xe9, 0x8e, 0x42, 0x9e, 0xdd, 0x34, 0x4b, 0x67, 0xa7, 0x66, 0xc9, 0xb9,
0xe7, 0x80, 0xd1, 0x16, 0x54, 0xa3, 0x72, 0x31, 0xbf, 0x69, 0x35, 0x33, 0xfe, 0x58, 0xee, 0x44,
0xe5, 0xe1, 0x4e, 0x54, 0x8b, 0x74, 0x02, 0xbd, 0x03, 0x55, 0x3c, 0x65, 0x81, 0xa5, 0xc8, 0x0f,
0xdc, 0xf1, 0x38, 0xa4, 0xf5, 0x7b, 0x05, 0xaa, 0xfc, 0x55, 0xa3, 0x09, 0xc8, 0xb1, 0xf5, 0xa3,
0x96, 0xfe, 0xf0, 0xfc, 0xd4, 0x57, 0x07, 0x8f, 0x7a, 0x90, 0x0b, 0x23, 0x9a, 0x39, 0x01, 0x39,
0xb6, 0xec, 0x8c, 0x29, 0x17, 0x06, 0x49, 0xc6, 0x94, 0x4b, 0x33, 0x61, 0x02, 0x72, 0xec, 0xc7,
0x19, 0x53, 0x2e, 0x0c, 0x80, 0x8c, 0x29, 0x17, 0x0d, 0x1f, 0x7d, 0x0f, 0x95, 0xc8, 0xbd, 0xd1,
0x8b, 0x4c, 0xe0, 0xb9, 0xb1, 0xa0, 0xee, 0xe7, 0x40, 0x88, 0x64, 0x17, 0x50, 0xee, 0x60, 0x86,
0x8c, 0x4c, 0xc8, 0x74, 0x14, 0xa8, 0x2f, 0xb2, 0x03, 0xe2, 0x4c, 0xad, 0x7f, 0xcb, 0x00, 0xe9,
0x33, 0x41, 0xd3, 0xe8, 0x1e, 0x59, 0x01, 0x43, 0x87, 0xff, 0xc7, 0x74, 0xbf, 0xf5, 0xab, 0xef,
0xe5, 0xc6, 0x89, 0x92, 0x7f, 0x91, 0x60, 0x23, 0xb1, 0x34, 0x74, 0x94, 0x83, 0x65, 0xd1, 0x74,
0xd5, 0xf7, 0x8b, 0x40, 0x85, 0x86, 0x10, 0x2a, 0x91, 0xe1, 0xa1, 0x77, 0xb3, 0x73, 0xcc, 0xf9,
0xac, 0x7a, 0x98, 0x17, 0x26, 0xd2, 0xfe, 0x08, 0xb2, 0xb0, 0x8d, 0x7c, 0xdd, 0x4b, 0xbd, 0x51,
0x7d, 0x99, 0x1f, 0x18, 0x27, 0x6f, 0x9f, 0x5f, 0xdf, 0x36, 0xd6, 0xfe, 0xbc, 0x6d, 0xac, 0xfd,
0x3c, 0x6b, 0x48, 0xd7, 0xb3, 0x86, 0xf4, 0xc7, 0xac, 0x21, 0xfd, 0x3d, 0x6b, 0x48, 0xe7, 0x1f,
0x15, 0xfd, 0x1f, 0xff, 0x81, 0x58, 0x7e, 0x5b, 0xea, 0xcb, 0xdc, 0xad, 0x0e, 0xfe, 0x0b, 0x00,
0x00, 0xff, 0xff, 0x36, 0x7e, 0xfa, 0xf8, 0x14, 0x0c, 0x00, 0x00,
// 844 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0xcb, 0x6e, 0xf3, 0x44,
0x18, 0xad, 0x73, 0x71, 0xff, 0x7c, 0xa1, 0xe2, 0x67, 0xe8, 0xdf, 0xba, 0x16, 0x4a, 0x8a, 0x57,
0x15, 0xaa, 0xec, 0x36, 0x15, 0xbd, 0xc0, 0x02, 0x9a, 0x16, 0x42, 0x25, 0x10, 0xc8, 0x01, 0x01,
0xdd, 0x44, 0x4e, 0x3c, 0x49, 0x2d, 0x1c, 0x8f, 0xe3, 0x19, 0x97, 0x54, 0x6c, 0xe0, 0x69, 0x78,
0x04, 0x5e, 0xa1, 0x4b, 0x96, 0xac, 0xaa, 0x36, 0x0f, 0x82, 0x90, 0xc7, 0xe3, 0x3a, 0x97, 0xaa,
0xd8, 0xe9, 0xbf, 0x1b, 0x4f, 0xce, 0x39, 0xdf, 0xf9, 0xe6, 0x72, 0x26, 0xf0, 0xe5, 0xc0, 0x61,
0x57, 0x61, 0x57, 0xef, 0x91, 0xa1, 0xd1, 0x23, 0x1e, 0xb3, 0x1c, 0x0f, 0x07, 0xf6, 0xf4, 0xd0,
0xf2, 0x1d, 0x83, 0xe2, 0xe0, 0xda, 0xe9, 0x61, 0x6a, 0x50, 0xcb, 0xb3, 0xbb, 0x64, 0x6c, 0x5c,
0xef, 0x27, 0x43, 0xdd, 0x0f, 0x08, 0x23, 0xa8, 0x96, 0x32, 0xf4, 0x04, 0xad, 0x27, 0x90, 0xeb,
0x7d, 0x75, 0x6b, 0x40, 0xc8, 0xc0, 0xc5, 0x06, 0x47, 0x77, 0xc3, 0xbe, 0x61, 0x79, 0x37, 0x31,
0x55, 0xad, 0xcf, 0xff, 0xc4, 0x9c, 0x21, 0xa6, 0xcc, 0x1a, 0xfa, 0x02, 0xb0, 0x3e, 0x20, 0x03,
0xc2, 0x87, 0x46, 0x34, 0x12, 0xb3, 0xc7, 0x99, 0x9c, 0xb3, 0x1b, 0x3f, 0xb5, 0x2d, 0x98, 0x87,
0x39, 0x98, 0x43, 0x12, 0x7a, 0x2c, 0xe6, 0x69, 0xdf, 0x02, 0x6a, 0x33, 0x12, 0xe0, 0xb3, 0x00,
0x5b, 0x0c, 0x9b, 0x78, 0x14, 0x62, 0xca, 0xd0, 0x09, 0xac, 0x0a, 0x79, 0x45, 0xda, 0x96, 0x76,
0xaa, 0x8d, 0x2d, 0x7d, 0x6a, 0x2d, 0xb8, 0x8a, 0xde, 0x8e, 0x01, 0xcd, 0xd2, 0xed, 0x5d, 0x7d,
0xc5, 0x4c, 0xf0, 0xda, 0x77, 0xf0, 0xfe, 0x8c, 0x20, 0xf5, 0x89, 0x47, 0xf1, 0x4b, 0x14, 0x07,
0xc2, 0xe2, 0x0f, 0xbe, 0xfd, 0x56, 0x2c, 0xa2, 0x0d, 0x90, 0xfb, 0x0e, 0x76, 0x6d, 0xaa, 0x14,
0xb6, 0x8b, 0x3b, 0x15, 0x53, 0x7c, 0x3d, 0x5a, 0x4f, 0x0a, 0xbd, 0xdc, 0x7a, 0x53, 0x58, 0x3f,
0xc7, 0x2e, 0x4e, 0xad, 0xef, 0x02, 0x08, 0x40, 0xc7, 0xb1, 0xb9, 0x66, 0xa5, 0xb9, 0x36, 0xb9,
0xab, 0x57, 0x84, 0xca, 0xc5, 0xb9, 0x59, 0x11, 0x80, 0x0b, 0x5b, 0x7b, 0x23, 0x5c, 0x25, 0x1a,
0xb1, 0x2b, 0x6d, 0x17, 0x5e, 0xf3, 0xe9, 0xaf, 0x1d, 0xca, 0x12, 0x61, 0x05, 0x56, 0xfb, 0x8e,
0xcb, 0x70, 0x40, 0x15, 0x89, 0x77, 0x96, 0x7c, 0x6a, 0x5f, 0xc1, 0x7b, 0x53, 0x68, 0xd1, 0xd8,
0x01, 0x94, 0x5c, 0x87, 0x32, 0x8e, 0xcd, 0xd0, 0x15, 0x07, 0x6b, 0x9f, 0xc1, 0xbb, 0x5c, 0xa9,
0x85, 0xd9, 0x72, 0xfd, 0xb4, 0x84, 0x71, 0x2e, 0xf0, 0xe8, 0x24, 0xf3, 0x12, 0xa7, 0x8b, 0xfb,
0xa7, 0x04, 0x1b, 0x67, 0xc4, 0x63, 0x01, 0x71, 0x5d, 0x1c, 0xb4, 0x99, 0x15, 0x2c, 0xe7, 0x08,
0x19, 0x20, 0x07, 0x84, 0xb0, 0x7e, 0x7c, 0x1e, 0xaa, 0x8d, 0xcd, 0xc5, 0xe2, 0xdf, 0x44, 0x57,
0xc6, 0x14, 0x30, 0xa4, 0xc3, 0x2a, 0xf1, 0x99, 0x43, 0x3c, 0xaa, 0x14, 0xb9, 0xdd, 0x75, 0x3d,
0xbe, 0xef, 0x7a, 0x72, 0xdf, 0xf5, 0x53, 0xef, 0xc6, 0x4c, 0x40, 0xda, 0xcf, 0xb0, 0xb9, 0x60,
0x54, 0x74, 0x9e, 0xcf, 0xe9, 0x6b, 0x28, 0xfa, 0x8e, 0xad, 0x14, 0xb6, 0xa5, 0x9d, 0x35, 0x33,
0x1a, 0x6a, 0x2e, 0x6c, 0x4d, 0x49, 0x5f, 0x85, 0xcc, 0x26, 0xbf, 0x7a, 0xcb, 0x2d, 0xc3, 0x87,
0xf0, 0x4e, 0x94, 0x52, 0x24, 0x64, 0x1d, 0x8a, 0x7b, 0x54, 0x54, 0xa9, 0x8a, 0xb9, 0x36, 0xee,
0x51, 0xed, 0x03, 0x50, 0x9f, 0xaa, 0x26, 0x8e, 0xe4, 0x17, 0xf0, 0x26, 0xfd, 0xf5, 0x47, 0xcb,
0x59, 0xf2, 0x80, 0x04, 0xd3, 0xdb, 0x1a, 0xcb, 0x88, 0xc5, 0xaa, 0x43, 0x15, 0x8f, 0x1d, 0xd6,
0xa1, 0xcc, 0x62, 0x21, 0xe5, 0x42, 0x6b, 0x26, 0x44, 0x53, 0x6d, 0x3e, 0x83, 0x8e, 0xa0, 0x12,
0x7d, 0x61, 0xbb, 0x63, 0x31, 0xee, 0xbf, 0xda, 0x50, 0x17, 0xb6, 0xe6, 0xfb, 0x24, 0x8a, 0xcd,
0x57, 0x31, 0xf8, 0x94, 0x69, 0xad, 0xb9, 0x1d, 0x62, 0x21, 0x5d, 0xce, 0xfc, 0xbd, 0x04, 0xca,
0xa2, 0x92, 0xf0, 0xbf, 0x01, 0x85, 0x47, 0x09, 0x79, 0x72, 0x57, 0x2f, 0x5c, 0x9c, 0x9b, 0x05,
0xe7, 0x89, 0x6d, 0x45, 0xeb, 0x50, 0x8e, 0x9a, 0xc4, 0xfc, 0x7c, 0x55, 0xcc, 0xf8, 0x63, 0xbe,
0xff, 0xd2, 0xf3, 0xfd, 0x97, 0xb3, 0xf7, 0x8f, 0x3e, 0x82, 0x32, 0x1e, 0xb3, 0xc0, 0x52, 0xe4,
0x67, 0xce, 0x73, 0x0c, 0x69, 0xfc, 0x55, 0x82, 0x32, 0xbf, 0xc1, 0x68, 0x04, 0x72, 0x1c, 0xf3,
0xa8, 0xa1, 0x3f, 0xff, 0x56, 0xea, 0x8b, 0x8f, 0x8c, 0x7a, 0x90, 0x8b, 0x23, 0x96, 0x70, 0x04,
0x72, 0x1c, 0xcf, 0x19, 0x4b, 0xce, 0x3c, 0x1a, 0x19, 0x4b, 0xce, 0xe5, 0xff, 0x08, 0xe4, 0x38,
0x7b, 0x33, 0x96, 0x9c, 0x09, 0xfb, 0x8c, 0x25, 0x67, 0xc3, 0x1d, 0xfd, 0x02, 0xa5, 0x28, 0xa9,
0xd1, 0x5e, 0x26, 0xf2, 0xd4, 0x13, 0xa0, 0xee, 0xe7, 0x60, 0x88, 0x62, 0x57, 0x50, 0x6c, 0x61,
0x86, 0x8c, 0x4c, 0xcc, 0x34, 0xf6, 0xd5, 0xbd, 0xec, 0x84, 0xb8, 0x52, 0xe3, 0xdf, 0x22, 0x40,
0x7a, 0x39, 0xd0, 0x38, 0x3a, 0x47, 0x56, 0xc0, 0xd0, 0xe1, 0xff, 0x29, 0x3d, 0x1d, 0xf3, 0xea,
0x51, 0x6e, 0x9e, 0x68, 0xf9, 0x0f, 0x09, 0x5e, 0x25, 0xf1, 0x85, 0x4e, 0x72, 0xa8, 0xcc, 0x06,
0xac, 0xfa, 0xc9, 0x32, 0x54, 0xe1, 0x21, 0x84, 0x52, 0x14, 0x6e, 0xe8, 0xe3, 0xec, 0x1a, 0x53,
0x99, 0xaa, 0x1e, 0xe6, 0xa5, 0x89, 0xb2, 0xbf, 0x81, 0x9c, 0x84, 0x45, 0xae, 0xd5, 0x4b, 0x13,
0x51, 0x3d, 0xce, 0x4f, 0x8c, 0x8b, 0x37, 0x2f, 0x6f, 0x1f, 0x6a, 0x2b, 0xff, 0x3c, 0xd4, 0x56,
0x7e, 0x9f, 0xd4, 0xa4, 0xdb, 0x49, 0x4d, 0xfa, 0x7b, 0x52, 0x93, 0xee, 0x27, 0x35, 0xe9, 0xf2,
0xf3, 0x65, 0xff, 0xb3, 0x7f, 0x2a, 0x86, 0x3f, 0x15, 0xba, 0x32, 0x4f, 0xab, 0x83, 0xff, 0x02,
0x00, 0x00, 0xff, 0xff, 0x49, 0x81, 0x1b, 0x40, 0x00, 0x0c, 0x00, 0x00,
}
// Reference imports to suppress errors if they are not otherwise used.
@ -1830,14 +1826,18 @@ func (m *ControllerWaitResponse) MarshalToSizedBuffer(dAtA []byte) (int, error)
i -= len(m.XXX_unrecognized)
copy(dAtA[i:], m.XXX_unrecognized)
}
n7, err7 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.ExitedAt, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.ExitedAt):])
if err7 != nil {
return 0, err7
if m.ExitedAt != nil {
{
size, err := m.ExitedAt.MarshalToSizedBuffer(dAtA[:i])
if err != nil {
return 0, err
}
i -= size
i = encodeVarintSandbox(dAtA, i, uint64(size))
}
i--
dAtA[i] = 0x12
}
i -= n7
i = encodeVarintSandbox(dAtA, i, uint64(n7))
i--
dAtA[i] = 0x12
if m.ExitStatus != 0 {
i = encodeVarintSandbox(dAtA, i, uint64(m.ExitStatus))
i--
@ -1916,14 +1916,18 @@ func (m *ControllerStatusResponse) MarshalToSizedBuffer(dAtA []byte) (int, error
i--
dAtA[i] = 0x32
}
n9, err9 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.ExitedAt, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.ExitedAt):])
if err9 != nil {
return 0, err9
if m.ExitedAt != nil {
{
size, err := m.ExitedAt.MarshalToSizedBuffer(dAtA[:i])
if err != nil {
return 0, err
}
i -= size
i = encodeVarintSandbox(dAtA, i, uint64(size))
}
i--
dAtA[i] = 0x2a
}
i -= n9
i = encodeVarintSandbox(dAtA, i, uint64(n9))
i--
dAtA[i] = 0x2a
if m.ExitStatus != 0 {
i = encodeVarintSandbox(dAtA, i, uint64(m.ExitStatus))
i--
@ -2221,8 +2225,10 @@ func (m *ControllerWaitResponse) Size() (n int) {
if m.ExitStatus != 0 {
n += 1 + sovSandbox(uint64(m.ExitStatus))
}
l = github_com_gogo_protobuf_types.SizeOfStdTime(m.ExitedAt)
n += 1 + l + sovSandbox(uint64(l))
if m.ExitedAt != nil {
l = m.ExitedAt.Size()
n += 1 + l + sovSandbox(uint64(l))
}
if m.XXX_unrecognized != nil {
n += len(m.XXX_unrecognized)
}
@ -2265,8 +2271,10 @@ func (m *ControllerStatusResponse) Size() (n int) {
if m.ExitStatus != 0 {
n += 1 + sovSandbox(uint64(m.ExitStatus))
}
l = github_com_gogo_protobuf_types.SizeOfStdTime(m.ExitedAt)
n += 1 + l + sovSandbox(uint64(l))
if m.ExitedAt != nil {
l = m.ExitedAt.Size()
n += 1 + l + sovSandbox(uint64(l))
}
if m.Extra != nil {
l = m.Extra.Size()
n += 1 + l + sovSandbox(uint64(l))
@ -2467,7 +2475,7 @@ func (this *ControllerWaitResponse) String() string {
}
s := strings.Join([]string{`&ControllerWaitResponse{`,
`ExitStatus:` + fmt.Sprintf("%v", this.ExitStatus) + `,`,
`ExitedAt:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.ExitedAt), "Timestamp", "types1.Timestamp", 1), `&`, ``, 1) + `,`,
`ExitedAt:` + strings.Replace(fmt.Sprintf("%v", this.ExitedAt), "Timestamp", "types1.Timestamp", 1) + `,`,
`XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`,
`}`,
}, "")
@ -2493,7 +2501,7 @@ func (this *ControllerStatusResponse) String() string {
`Pid:` + fmt.Sprintf("%v", this.Pid) + `,`,
`State:` + fmt.Sprintf("%v", this.State) + `,`,
`ExitStatus:` + fmt.Sprintf("%v", this.ExitStatus) + `,`,
`ExitedAt:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.ExitedAt), "Timestamp", "types1.Timestamp", 1), `&`, ``, 1) + `,`,
`ExitedAt:` + strings.Replace(fmt.Sprintf("%v", this.ExitedAt), "Timestamp", "types1.Timestamp", 1) + `,`,
`Extra:` + strings.Replace(fmt.Sprintf("%v", this.Extra), "Any", "types1.Any", 1) + `,`,
`XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`,
`}`,
@ -3916,7 +3924,10 @@ func (m *ControllerWaitResponse) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.ExitedAt, dAtA[iNdEx:postIndex]); err != nil {
if m.ExitedAt == nil {
m.ExitedAt = &types1.Timestamp{}
}
if err := m.ExitedAt.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
@ -4185,7 +4196,10 @@ func (m *ControllerStatusResponse) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.ExitedAt, dAtA[iNdEx:postIndex]); err != nil {
if m.ExitedAt == nil {
m.ExitedAt = &types1.Timestamp{}
}
if err := m.ExitedAt.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex

4
api/services/sandbox/v1/sandbox.proto
View File

@ -116,7 +116,7 @@ message ControllerWaitRequest {
message ControllerWaitResponse {
uint32 exit_status = 1;
google.protobuf.Timestamp exited_at = 2 [(gogoproto.stdtime) = true, (gogoproto.nullable) = false];
google.protobuf.Timestamp exited_at = 2;
}
message ControllerStatusRequest {
@ -128,6 +128,6 @@ message ControllerStatusResponse {
uint32 pid = 2;
string state = 3;
uint32 exit_status = 4;
google.protobuf.Timestamp exited_at = 5 [(gogoproto.stdtime) = true, (gogoproto.nullable) = false];
google.protobuf.Timestamp exited_at = 5;
google.protobuf.Any extra = 6;
}

194
api/services/snapshots/v1/snapshots.pb.go
View File

@ -10,7 +10,6 @@ import (
_ "github.com/gogo/protobuf/gogoproto"
proto "github.com/gogo/protobuf/proto"
github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys"
github_com_gogo_protobuf_types "github.com/gogo/protobuf/types"
types1 "github.com/gogo/protobuf/types"
grpc "google.golang.org/grpc"
codes "google.golang.org/grpc/codes"
@ -20,14 +19,12 @@ import (
math_bits "math/bits"
reflect "reflect"
strings "strings"
time "time"
)
// Reference imports to suppress errors if they are not otherwise used.
var _ = proto.Marshal
var _ = fmt.Errorf
var _ = math.Inf
var _ = time.Kitchen
// This is a compile-time assertion to ensure that this generated file
// is compatible with the proto package it is being compiled against.
@ -443,9 +440,9 @@ type Info struct {
Parent string `protobuf:"bytes,2,opt,name=parent,proto3" json:"parent,omitempty"`
Kind Kind `protobuf:"varint,3,opt,name=kind,proto3,enum=containerd.services.snapshots.v1.Kind" json:"kind,omitempty"`
// CreatedAt provides the time at which the snapshot was created.
CreatedAt time.Time `protobuf:"bytes,4,opt,name=created_at,json=createdAt,proto3,stdtime" json:"created_at"`
CreatedAt *types1.Timestamp `protobuf:"bytes,4,opt,name=created_at,json=createdAt,proto3" json:"created_at,omitempty"`
// UpdatedAt provides the time the info was last updated.
UpdatedAt time.Time `protobuf:"bytes,5,opt,name=updated_at,json=updatedAt,proto3,stdtime" json:"updated_at"`
UpdatedAt *types1.Timestamp `protobuf:"bytes,5,opt,name=updated_at,json=updatedAt,proto3" json:"updated_at,omitempty"`
// Labels are arbitrary data on snapshots.
//
// The combined size of a key/value pair cannot exceed 4096 bytes.
@ -851,69 +848,68 @@ func init() {
}
var fileDescriptor_cfc0ddf12791f168 = []byte{
// 978 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x57, 0xdd, 0x6e, 0xe3, 0x44,
0x14, 0xae, 0x13, 0x37, 0x6d, 0x4e, 0x68, 0x15, 0xcd, 0xa6, 0xdd, 0xc8, 0x48, 0x69, 0x94, 0x0b,
0x54, 0x71, 0x61, 0xef, 0x06, 0xb1, 0xdb, 0xdd, 0xde, 0x90, 0xa6, 0x01, 0xa5, 0xdd, 0x76, 0x91,
0xfb, 0xb3, 0x74, 0x41, 0xac, 0xdc, 0x66, 0x92, 0x5a, 0x89, 0x7f, 0xf0, 0x8c, 0x83, 0x02, 0x12,
0xe2, 0x11, 0x78, 0x1c, 0x1e, 0xa1, 0x97, 0x48, 0xdc, 0x70, 0x05, 0x6c, 0x5f, 0x82, 0x2b, 0x04,
0x9a, 0xf1, 0x38, 0x7f, 0xf5, 0x2a, 0x8e, 0x9b, 0xbd, 0x9b, 0xf1, 0xcc, 0x39, 0xe7, 0x3b, 0xdf,
0xf9, 0x1b, 0xc3, 0x41, 0xc7, 0xa4, 0xd7, 0xfe, 0xa5, 0x7a, 0xe5, 0x58, 0xda, 0x95, 0x63, 0x53,
0xc3, 0xb4, 0xb1, 0xd7, 0x1a, 0x5f, 0x1a, 0xae, 0xa9, 0x11, 0xec, 0xf5, 0xcd, 0x2b, 0x4c, 0x34,
0x62, 0x1b, 0x2e, 0xb9, 0x76, 0x28, 0xd1, 0xfa, 0x8f, 0x47, 0x1b, 0xd5, 0xf5, 0x1c, 0xea, 0xa0,
0xf2, 0x48, 0x4a, 0x0d, 0x25, 0xd4, 0xd1, 0xa5, 0xfe, 0x63, 0xa5, 0xd0, 0x71, 0x3a, 0x0e, 0xbf,
0xac, 0xb1, 0x55, 0x20, 0xa7, 0x7c, 0xd8, 0x71, 0x9c, 0x4e, 0x0f, 0x6b, 0x7c, 0x77, 0xe9, 0xb7,
0x35, 0x6c, 0xb9, 0x74, 0x20, 0x0e, 0xcb, 0xd3, 0x87, 0x6d, 0x13, 0xf7, 0x5a, 0x6f, 0x2c, 0x83,
0x74, 0xc5, 0x8d, 0xad, 0xe9, 0x1b, 0xd4, 0xb4, 0x30, 0xa1, 0x86, 0xe5, 0x8a, 0x0b, 0x4f, 0x62,
0xf9, 0x48, 0x07, 0x2e, 0x26, 0x9a, 0xe5, 0xf8, 0x36, 0x0d, 0xe4, 0x2a, 0xff, 0x4a, 0xb0, 0xf9,
0xa5, 0x87, 0x5d, 0xc3, 0xc3, 0x27, 0xc2, 0x0b, 0x1d, 0x7f, 0xe7, 0x63, 0x42, 0x51, 0x19, 0x72,
0xa1, 0x63, 0x14, 0x7b, 0x45, 0xa9, 0x2c, 0x6d, 0x67, 0xf5, 0xf1, 0x4f, 0x28, 0x0f, 0xe9, 0x2e,
0x1e, 0x14, 0x53, 0xfc, 0x84, 0x2d, 0xd1, 0x26, 0x64, 0x98, 0x2a, 0x9b, 0x16, 0xd3, 0xfc, 0xa3,
0xd8, 0xa1, 0x6f, 0x20, 0xd3, 0x33, 0x2e, 0x71, 0x8f, 0x14, 0xe5, 0x72, 0x7a, 0x3b, 0x57, 0xdd,
0x57, 0x67, 0xf1, 0xa8, 0x46, 0xa3, 0x52, 0x5f, 0x70, 0x35, 0x0d, 0x9b, 0x7a, 0x03, 0x5d, 0xe8,
0x54, 0x9e, 0x41, 0x6e, 0xec, 0x73, 0x08, 0x4b, 0x1a, 0xc1, 0x2a, 0xc0, 0x72, 0xdf, 0xe8, 0xf9,
0x58, 0x40, 0x0d, 0x36, 0xcf, 0x53, 0x3b, 0x52, 0xe5, 0x00, 0x1e, 0xde, 0x31, 0x44, 0x5c, 0xc7,
0x26, 0x18, 0x69, 0x90, 0xe1, 0x4c, 0x91, 0xa2, 0xc4, 0x31, 0x3f, 0x1c, 0xc7, 0xcc, 0x99, 0x54,
0x8f, 0xd8, 0xb9, 0x2e, 0xae, 0x55, 0xfe, 0x91, 0xe0, 0xc1, 0xb9, 0x89, 0xbf, 0x7f, 0x9f, 0x44,
0x5e, 0x4c, 0x11, 0x59, 0x9b, 0x4d, 0x64, 0x04, 0xa4, 0x45, 0xb3, 0xf8, 0x05, 0x14, 0x26, 0xad,
0x24, 0xa5, 0xb0, 0x0e, 0x6b, 0xfc, 0x03, 0xb9, 0x07, 0x77, 0x95, 0x1a, 0xac, 0x87, 0x4a, 0x92,
0xe2, 0x38, 0x84, 0x0d, 0x1d, 0x5b, 0x4e, 0x7f, 0x11, 0x45, 0xc1, 0xf2, 0x62, 0xa3, 0xee, 0x58,
0x96, 0x49, 0xe7, 0xd7, 0x86, 0x40, 0xb6, 0x0d, 0x2b, 0xa4, 0x9c, 0xaf, 0x43, 0x0b, 0xe9, 0x51,
0x64, 0xbe, 0x9e, 0xca, 0x8a, 0xfa, 0xec, 0xac, 0x88, 0x04, 0xb4, 0xe8, 0xbc, 0x68, 0xc2, 0x83,
0x13, 0x6a, 0xd0, 0x45, 0x90, 0xf8, 0x5f, 0x0a, 0xe4, 0xa6, 0xdd, 0x76, 0x86, 0x8c, 0x48, 0x63,
0x8c, 0x8c, 0xaa, 0x25, 0x35, 0x51, 0x2d, 0xcf, 0x41, 0xee, 0x9a, 0x76, 0x8b, 0x53, 0xb5, 0x5e,
0xfd, 0x68, 0x36, 0x2b, 0x87, 0xa6, 0xdd, 0xd2, 0xb9, 0x0c, 0xaa, 0x03, 0x5c, 0x79, 0xd8, 0xa0,
0xb8, 0xf5, 0xc6, 0xa0, 0x45, 0xb9, 0x2c, 0x6d, 0xe7, 0xaa, 0x8a, 0x1a, 0xf4, 0x61, 0x35, 0xec,
0xc3, 0xea, 0x69, 0xd8, 0x87, 0xf7, 0x56, 0x6f, 0xfe, 0xdc, 0x5a, 0xfa, 0xe5, 0xaf, 0x2d, 0x49,
0xcf, 0x0a, 0xb9, 0x1a, 0x65, 0x4a, 0x7c, 0xb7, 0x15, 0x2a, 0x59, 0x9e, 0x47, 0x89, 0x90, 0xab,
0x51, 0x74, 0x30, 0x8c, 0x6e, 0x86, 0x47, 0xb7, 0x3a, 0xdb, 0x0f, 0xc6, 0xd4, 0xa2, 0x83, 0xf9,
0x15, 0x14, 0x26, 0x83, 0x29, 0x8a, 0xeb, 0x33, 0x90, 0x4d, 0xbb, 0xed, 0x70, 0x25, 0xb9, 0x38,
0x24, 0x33, 0x70, 0x7b, 0x32, 0xf3, 0x54, 0xe7, 0x92, 0x95, 0x5f, 0x25, 0xd8, 0x38, 0xe3, 0xee,
0xce, 0x9f, 0x29, 0xa1, 0xf5, 0x54, 0x52, 0xeb, 0x68, 0x17, 0x72, 0x01, 0xd7, 0x7c, 0xe0, 0xf2,
0x5c, 0x89, 0x0a, 0xd2, 0xe7, 0x6c, 0x26, 0x1f, 0x19, 0xa4, 0xab, 0x8b, 0x90, 0xb2, 0x75, 0xe5,
0x35, 0x6c, 0x4e, 0x23, 0x5f, 0x18, 0x2d, 0x3a, 0x14, 0x5e, 0x98, 0x64, 0x48, 0xf8, 0x1c, 0x3d,
0xb1, 0x08, 0x2b, 0x6d, 0xb3, 0x47, 0xb1, 0x47, 0x8a, 0xa9, 0x72, 0x7a, 0x3b, 0xab, 0x87, 0xdb,
0xca, 0x05, 0x6c, 0x4c, 0xe9, 0xbc, 0x03, 0x37, 0x9d, 0x10, 0xee, 0x1e, 0x7c, 0x70, 0x46, 0x8c,
0x0e, 0xbe, 0x4f, 0x95, 0xef, 0xc2, 0x9a, 0xd0, 0x21, 0x60, 0x21, 0x90, 0x89, 0xf9, 0x43, 0x50,
0xed, 0x69, 0x9d, 0xaf, 0x59, 0xb5, 0x9b, 0xb6, 0xd3, 0xc2, 0x84, 0x4b, 0xa6, 0x75, 0xb1, 0xab,
0x54, 0x61, 0xbd, 0xde, 0xc3, 0x86, 0xed, 0xbb, 0xb1, 0x21, 0x7c, 0xbc, 0x03, 0x32, 0xab, 0x79,
0x94, 0x83, 0x95, 0xb3, 0xe3, 0xc3, 0xe3, 0x97, 0xaf, 0x8e, 0xf3, 0x4b, 0x68, 0x15, 0xe4, 0xf3,
0x66, 0xe3, 0x55, 0x5e, 0x42, 0x00, 0x99, 0x5a, 0xfd, 0xb4, 0x79, 0xde, 0xc8, 0xa7, 0xd0, 0x1a,
0x64, 0xeb, 0x2f, 0x8f, 0x8e, 0x9a, 0xa7, 0xa7, 0x8d, 0xfd, 0x7c, 0xba, 0xfa, 0xfb, 0x2a, 0x64,
0x87, 0x34, 0xa2, 0x9f, 0x60, 0x45, 0xbc, 0x23, 0xd0, 0x4e, 0xd2, 0xb7, 0x8d, 0xf2, 0x2c, 0x81,
0xa4, 0xe0, 0xc9, 0x07, 0x99, 0x4d, 0x60, 0xf4, 0x69, 0xa2, 0xf7, 0x80, 0xf2, 0x64, 0x5e, 0x31,
0x61, 0xb6, 0x0b, 0x99, 0x60, 0xd4, 0x22, 0x6d, 0xb6, 0x86, 0x89, 0xc9, 0xae, 0x3c, 0x8a, 0x2f,
0x20, 0x8c, 0x5d, 0x40, 0x26, 0x98, 0x5a, 0xe8, 0x69, 0xc2, 0xf9, 0xa6, 0x6c, 0xde, 0x29, 0xeb,
0x06, 0x7b, 0x87, 0x33, 0xd5, 0xc1, 0xbc, 0x8f, 0xa3, 0x3a, 0xf2, 0x65, 0xf0, 0x4e, 0xd5, 0x3e,
0xc8, 0xac, 0x6d, 0xc6, 0x89, 0x4c, 0xc4, 0xac, 0x8c, 0x13, 0x99, 0xc8, 0xae, 0xfc, 0x23, 0x64,
0x82, 0xc6, 0x14, 0xc7, 0xa3, 0xc8, 0xe6, 0xab, 0xec, 0xcc, 0x2f, 0x28, 0x8c, 0x0f, 0x40, 0x66,
0x5d, 0x06, 0xc5, 0x00, 0x1f, 0xd5, 0xe1, 0x94, 0xa7, 0x73, 0xcb, 0x05, 0x86, 0x1f, 0x49, 0xe8,
0x1a, 0x96, 0x79, 0x07, 0x41, 0x6a, 0x0c, 0xf4, 0x63, 0xed, 0x4a, 0xd1, 0x62, 0xdf, 0x17, 0x4e,
0x9e, 0xc0, 0x8a, 0x68, 0x37, 0x28, 0x46, 0x2e, 0x4f, 0x76, 0xa6, 0x77, 0x65, 0xcb, 0xde, 0xb7,
0x37, 0x6f, 0x4b, 0x4b, 0x7f, 0xbc, 0x2d, 0x2d, 0xfd, 0x7c, 0x5b, 0x92, 0x6e, 0x6e, 0x4b, 0xd2,
0x6f, 0xb7, 0x25, 0xe9, 0xef, 0xdb, 0x92, 0xf4, 0x7a, 0x3f, 0xf9, 0x5f, 0xec, 0xee, 0x70, 0x73,
0x99, 0xe1, 0xf6, 0x3e, 0xf9, 0x3f, 0x00, 0x00, 0xff, 0xff, 0xc9, 0x3f, 0xcb, 0xb9, 0x14, 0x0f,
0x00, 0x00,
// 968 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x57, 0x4b, 0x6f, 0xe3, 0x44,
0x1c, 0xaf, 0x63, 0xd7, 0xdd, 0xfc, 0x43, 0xab, 0x68, 0x36, 0xed, 0x46, 0x46, 0xca, 0x46, 0x39,
0xa0, 0x8a, 0x83, 0xbd, 0x1b, 0xc4, 0x6e, 0xbb, 0xbd, 0x90, 0xa6, 0x01, 0xa5, 0xdd, 0x76, 0x91,
0xfb, 0x58, 0xba, 0x20, 0x56, 0x6e, 0x33, 0x49, 0xad, 0xc4, 0x0f, 0x3c, 0xe3, 0xa0, 0x80, 0x84,
0xf8, 0x58, 0x7c, 0x84, 0x1e, 0x91, 0xb8, 0x70, 0x42, 0x6c, 0xae, 0x7c, 0x00, 0x4e, 0x48, 0xc8,
0xe3, 0x71, 0x5e, 0xf5, 0x2a, 0x8e, 0x9b, 0xbd, 0xcd, 0x78, 0xfe, 0x8f, 0xdf, 0xfc, 0xfe, 0xaf,
0x31, 0x1c, 0x76, 0x4c, 0x7a, 0xe3, 0x5f, 0xa9, 0xd7, 0x8e, 0xa5, 0x5d, 0x3b, 0x36, 0x35, 0x4c,
0x1b, 0x7b, 0xad, 0xc9, 0xa5, 0xe1, 0x9a, 0x1a, 0xc1, 0x5e, 0xdf, 0xbc, 0xc6, 0x44, 0x23, 0xb6,
0xe1, 0x92, 0x1b, 0x87, 0x12, 0xad, 0xff, 0x74, 0xbc, 0x51, 0x5d, 0xcf, 0xa1, 0x0e, 0x2a, 0x8f,
0xb5, 0xd4, 0x48, 0x43, 0x1d, 0x0b, 0xf5, 0x9f, 0x2a, 0x85, 0x8e, 0xd3, 0x71, 0x98, 0xb0, 0x16,
0xac, 0x42, 0x3d, 0xe5, 0xe3, 0x8e, 0xe3, 0x74, 0x7a, 0x58, 0x63, 0xbb, 0x2b, 0xbf, 0xad, 0x61,
0xcb, 0xa5, 0x03, 0x7e, 0x58, 0x9e, 0x3d, 0x6c, 0x9b, 0xb8, 0xd7, 0x7a, 0x6b, 0x19, 0xa4, 0xcb,
0x25, 0x1e, 0xcf, 0x4a, 0x50, 0xd3, 0xc2, 0x84, 0x1a, 0x96, 0xcb, 0x05, 0x9e, 0x25, 0xba, 0x23,
0x1d, 0xb8, 0x98, 0x68, 0x96, 0xe3, 0xdb, 0x34, 0xd4, 0xab, 0xfc, 0x27, 0xc0, 0xd6, 0xd7, 0x1e,
0x76, 0x0d, 0x0f, 0x9f, 0xf2, 0x5b, 0xe8, 0xf8, 0x07, 0x1f, 0x13, 0x8a, 0xca, 0x90, 0x8b, 0x2e,
0x46, 0xb1, 0x57, 0x14, 0xca, 0xc2, 0x76, 0x56, 0x9f, 0xfc, 0x84, 0xf2, 0x20, 0x76, 0xf1, 0xa0,
0x98, 0x61, 0x27, 0xc1, 0x12, 0x6d, 0x81, 0x1c, 0x98, 0xb2, 0x69, 0x51, 0x64, 0x1f, 0xf9, 0x0e,
0x7d, 0x07, 0x72, 0xcf, 0xb8, 0xc2, 0x3d, 0x52, 0x94, 0xca, 0xe2, 0x76, 0xae, 0x7a, 0xa0, 0xce,
0xe3, 0x51, 0x8d, 0x47, 0xa5, 0xbe, 0x64, 0x66, 0x1a, 0x36, 0xf5, 0x06, 0x3a, 0xb7, 0xa9, 0xec,
0x42, 0x6e, 0xe2, 0x73, 0x04, 0x4b, 0x18, 0xc3, 0x2a, 0xc0, 0x6a, 0xdf, 0xe8, 0xf9, 0x98, 0x43,
0x0d, 0x37, 0x2f, 0x32, 0x3b, 0x42, 0xe5, 0x10, 0x1e, 0xdd, 0x71, 0x44, 0x5c, 0xc7, 0x26, 0x18,
0x69, 0x20, 0x33, 0xa6, 0x48, 0x51, 0x60, 0x98, 0x1f, 0x4d, 0x62, 0x66, 0x4c, 0xaa, 0xc7, 0xc1,
0xb9, 0xce, 0xc5, 0x2a, 0xff, 0x0a, 0xf0, 0xf0, 0xc2, 0xc4, 0x3f, 0x7e, 0x48, 0x22, 0x2f, 0x67,
0x88, 0xac, 0xcd, 0x27, 0x32, 0x06, 0xd2, 0xb2, 0x59, 0xfc, 0x0a, 0x0a, 0xd3, 0x5e, 0xd2, 0x52,
0x58, 0x87, 0x75, 0xf6, 0x81, 0xdc, 0x83, 0xbb, 0x4a, 0x0d, 0x36, 0x22, 0x23, 0x69, 0x71, 0x1c,
0xc1, 0xa6, 0x8e, 0x2d, 0xa7, 0xbf, 0x8c, 0xa2, 0x08, 0xf2, 0x62, 0xb3, 0xee, 0x58, 0x96, 0x49,
0x17, 0xb7, 0x86, 0x40, 0xb2, 0x0d, 0x2b, 0xa2, 0x9c, 0xad, 0x23, 0x0f, 0xe2, 0x38, 0x32, 0xdf,
0xce, 0x64, 0x45, 0x7d, 0x7e, 0x56, 0xc4, 0x02, 0x5a, 0x76, 0x5e, 0x34, 0xe1, 0xe1, 0x29, 0x35,
0xe8, 0x32, 0x48, 0xfc, 0x27, 0x03, 0x52, 0xd3, 0x6e, 0x3b, 0x23, 0x46, 0x84, 0x09, 0x46, 0xc6,
0xd5, 0x92, 0x99, 0xaa, 0x96, 0x17, 0x20, 0x75, 0x4d, 0xbb, 0xc5, 0xa8, 0xda, 0xa8, 0x7e, 0x32,
0x9f, 0x95, 0x23, 0xd3, 0x6e, 0xe9, 0x4c, 0x07, 0xed, 0x02, 0x5c, 0x7b, 0xd8, 0xa0, 0xb8, 0xf5,
0xd6, 0xa0, 0x45, 0xa9, 0x2c, 0x6c, 0xe7, 0xaa, 0x8a, 0x1a, 0xf6, 0x61, 0x35, 0xea, 0xc3, 0xea,
0x59, 0xd4, 0x87, 0xf5, 0x2c, 0x97, 0xae, 0xd1, 0x40, 0xd5, 0x77, 0x5b, 0x91, 0xea, 0xea, 0x7c,
0x55, 0x2e, 0x5d, 0xa3, 0xe8, 0x70, 0x14, 0x49, 0x99, 0x45, 0xb2, 0x3a, 0x1f, 0x73, 0xc0, 0xca,
0xb2, 0x03, 0xf7, 0x0d, 0x14, 0xa6, 0x03, 0xc7, 0x0b, 0xe9, 0x0b, 0x90, 0x4c, 0xbb, 0xed, 0x30,
0x23, 0xb9, 0x24, 0x84, 0x06, 0xe0, 0xf6, 0xa5, 0xdb, 0xbf, 0x1e, 0xaf, 0xe8, 0x4c, 0xb3, 0xf2,
0x9b, 0x00, 0x9b, 0xe7, 0xec, 0xba, 0x8b, 0x67, 0x45, 0xe4, 0x3d, 0x93, 0xd6, 0x3b, 0xda, 0x83,
0x5c, 0xc8, 0x35, 0x1b, 0xae, 0x2c, 0x2f, 0xe2, 0x42, 0xf3, 0x65, 0x30, 0x7f, 0x8f, 0x0d, 0xd2,
0xd5, 0x79, 0x20, 0x83, 0x75, 0xe5, 0x0d, 0x6c, 0xcd, 0x22, 0x5f, 0x1a, 0x2d, 0x3a, 0x14, 0x5e,
0x9a, 0x64, 0x44, 0xf8, 0x02, 0xfd, 0xaf, 0x08, 0x6b, 0x6d, 0xb3, 0x47, 0xb1, 0x47, 0x8a, 0x99,
0xb2, 0xb8, 0x9d, 0xd5, 0xa3, 0x6d, 0xe5, 0x12, 0x36, 0x67, 0x6c, 0xde, 0x81, 0x2b, 0xa6, 0x84,
0xbb, 0x0f, 0x1f, 0x9d, 0x13, 0xa3, 0x83, 0xef, 0x53, 0xd1, 0x7b, 0xb0, 0xce, 0x6d, 0x70, 0x58,
0x08, 0x24, 0x62, 0xfe, 0x14, 0x56, 0xb6, 0xa8, 0xb3, 0x75, 0x50, 0xd9, 0xa6, 0xed, 0xb4, 0x30,
0x61, 0x9a, 0xa2, 0xce, 0x77, 0x95, 0x2a, 0x6c, 0xd4, 0x7b, 0xd8, 0xb0, 0x7d, 0x37, 0x31, 0x84,
0x4f, 0x77, 0x40, 0x0a, 0xea, 0x1b, 0xe5, 0x60, 0xed, 0xfc, 0xe4, 0xe8, 0xe4, 0xd5, 0xeb, 0x93,
0xfc, 0x0a, 0x7a, 0x00, 0xd2, 0x45, 0xb3, 0xf1, 0x3a, 0x2f, 0x20, 0x00, 0xb9, 0x56, 0x3f, 0x6b,
0x5e, 0x34, 0xf2, 0x19, 0xb4, 0x0e, 0xd9, 0xfa, 0xab, 0xe3, 0xe3, 0xe6, 0xd9, 0x59, 0xe3, 0x20,
0x2f, 0x56, 0xff, 0x78, 0x00, 0xd9, 0x11, 0x8d, 0xe8, 0x17, 0x58, 0xe3, 0x6f, 0x06, 0xb4, 0x93,
0xf6, 0x1d, 0xa3, 0xec, 0xa6, 0xd0, 0xe4, 0x3c, 0xf9, 0x20, 0x05, 0xd3, 0x16, 0x7d, 0x9e, 0x6a,
0xf6, 0x2b, 0xcf, 0x16, 0x55, 0xe3, 0x6e, 0xbb, 0x20, 0x87, 0x63, 0x15, 0x69, 0xf3, 0x2d, 0x4c,
0x4d, 0x71, 0xe5, 0x49, 0x72, 0x05, 0xee, 0xec, 0x12, 0xe4, 0x70, 0x42, 0xa1, 0xe7, 0x29, 0x67,
0x99, 0xb2, 0x75, 0xa7, 0xac, 0x1b, 0xc1, 0x9b, 0x3b, 0x30, 0x1d, 0xce, 0xf6, 0x24, 0xa6, 0x63,
0x5f, 0x01, 0xef, 0x35, 0xed, 0x83, 0x14, 0xb4, 0xcd, 0x24, 0x91, 0x89, 0x99, 0x8b, 0x49, 0x22,
0x13, 0xdb, 0x95, 0x7f, 0x06, 0x39, 0x6c, 0x4c, 0x49, 0x6e, 0x14, 0xdb, 0x7c, 0x95, 0x9d, 0xc5,
0x15, 0xb9, 0xf3, 0x01, 0x48, 0x41, 0x97, 0x41, 0x09, 0xc0, 0xc7, 0x75, 0x38, 0xe5, 0xf9, 0xc2,
0x7a, 0xa1, 0xe3, 0x27, 0x02, 0xba, 0x81, 0x55, 0xd6, 0x41, 0x90, 0x9a, 0x00, 0xfd, 0x44, 0xbb,
0x52, 0xb4, 0xc4, 0xf2, 0xfc, 0x92, 0xa7, 0xb0, 0xc6, 0xdb, 0x0d, 0x4a, 0x90, 0xcb, 0xd3, 0x9d,
0xe9, 0x7d, 0xd9, 0xb2, 0xff, 0xfd, 0xed, 0xbb, 0xd2, 0xca, 0x9f, 0xef, 0x4a, 0x2b, 0xbf, 0x0e,
0x4b, 0xc2, 0xed, 0xb0, 0x24, 0xfc, 0x3e, 0x2c, 0x09, 0x7f, 0x0f, 0x4b, 0xc2, 0x9b, 0x83, 0xf4,
0x7f, 0xac, 0x7b, 0xa3, 0xcd, 0x95, 0xcc, 0xfc, 0x7d, 0xf6, 0x7f, 0x00, 0x00, 0x00, 0xff, 0xff,
0x55, 0x78, 0x18, 0x98, 0x00, 0x0f, 0x00, 0x00,
}
// Reference imports to suppress errors if they are not otherwise used.
@ -1838,22 +1834,30 @@ func (m *Info) MarshalToSizedBuffer(dAtA []byte) (int, error) {
dAtA[i] = 0x32
}
}
n1, err1 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.UpdatedAt, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.UpdatedAt):])
if err1 != nil {
return 0, err1
if m.UpdatedAt != nil {
{
size, err := m.UpdatedAt.MarshalToSizedBuffer(dAtA[:i])
if err != nil {
return 0, err
}
i -= size
i = encodeVarintSnapshots(dAtA, i, uint64(size))
}
i--
dAtA[i] = 0x2a
}
i -= n1
i = encodeVarintSnapshots(dAtA, i, uint64(n1))
i--
dAtA[i] = 0x2a
n2, err2 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.CreatedAt, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.CreatedAt):])
if err2 != nil {
return 0, err2
if m.CreatedAt != nil {
{
size, err := m.CreatedAt.MarshalToSizedBuffer(dAtA[:i])
if err != nil {
return 0, err
}
i -= size
i = encodeVarintSnapshots(dAtA, i, uint64(size))
}
i--
dAtA[i] = 0x22
}
i -= n2
i = encodeVarintSnapshots(dAtA, i, uint64(n2))
i--
dAtA[i] = 0x22
if m.Kind != 0 {
i = encodeVarintSnapshots(dAtA, i, uint64(m.Kind))
i--
@ -2440,10 +2444,14 @@ func (m *Info) Size() (n int) {
if m.Kind != 0 {
n += 1 + sovSnapshots(uint64(m.Kind))
}
l = github_com_gogo_protobuf_types.SizeOfStdTime(m.CreatedAt)
n += 1 + l + sovSnapshots(uint64(l))
l = github_com_gogo_protobuf_types.SizeOfStdTime(m.UpdatedAt)
n += 1 + l + sovSnapshots(uint64(l))
if m.CreatedAt != nil {
l = m.CreatedAt.Size()
n += 1 + l + sovSnapshots(uint64(l))
}
if m.UpdatedAt != nil {
l = m.UpdatedAt.Size()
n += 1 + l + sovSnapshots(uint64(l))
}
if len(m.Labels) > 0 {
for k, v := range m.Labels {
_ = k
@ -2782,8 +2790,8 @@ func (this *Info) String() string {
`Name:` + fmt.Sprintf("%v", this.Name) + `,`,
`Parent:` + fmt.Sprintf("%v", this.Parent) + `,`,
`Kind:` + fmt.Sprintf("%v", this.Kind) + `,`,
`CreatedAt:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.CreatedAt), "Timestamp", "types1.Timestamp", 1), `&`, ``, 1) + `,`,
`UpdatedAt:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.UpdatedAt), "Timestamp", "types1.Timestamp", 1), `&`, ``, 1) + `,`,
`CreatedAt:` + strings.Replace(fmt.Sprintf("%v", this.CreatedAt), "Timestamp", "types1.Timestamp", 1) + `,`,
`UpdatedAt:` + strings.Replace(fmt.Sprintf("%v", this.UpdatedAt), "Timestamp", "types1.Timestamp", 1) + `,`,
`Labels:` + mapStringForLabels + `,`,
`XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`,
`}`,
@ -4459,7 +4467,10 @@ func (m *Info) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.CreatedAt, dAtA[iNdEx:postIndex]); err != nil {
if m.CreatedAt == nil {
m.CreatedAt = &types1.Timestamp{}
}
if err := m.CreatedAt.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
@ -4492,7 +4503,10 @@ func (m *Info) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.UpdatedAt, dAtA[iNdEx:postIndex]); err != nil {
if m.UpdatedAt == nil {
m.UpdatedAt = &types1.Timestamp{}
}
if err := m.UpdatedAt.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex

4
api/services/snapshots/v1/snapshots.proto
View File

@ -113,10 +113,10 @@ message Info {
Kind kind = 3;
// CreatedAt provides the time at which the snapshot was created.
google.protobuf.Timestamp created_at = 4 [(gogoproto.stdtime) = true, (gogoproto.nullable) = false];
google.protobuf.Timestamp created_at = 4;
// UpdatedAt provides the time the info was last updated.
google.protobuf.Timestamp updated_at = 5 [(gogoproto.stdtime) = true, (gogoproto.nullable) = false];
google.protobuf.Timestamp updated_at = 5;
// Labels are arbitrary data on snapshots.
//

263
api/services/tasks/v1/tasks.pb.go
View File

@ -11,7 +11,6 @@ import (
_ "github.com/gogo/protobuf/gogoproto"
proto "github.com/gogo/protobuf/proto"
github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys"
github_com_gogo_protobuf_types "github.com/gogo/protobuf/types"
types1 "github.com/gogo/protobuf/types"
grpc "google.golang.org/grpc"
codes "google.golang.org/grpc/codes"
@ -21,14 +20,12 @@ import (
math_bits "math/bits"
reflect "reflect"
strings "strings"
time "time"
)
// Reference imports to suppress errors if they are not otherwise used.
var _ = proto.Marshal
var _ = fmt.Errorf
var _ = math.Inf
var _ = time.Kitchen
// This is a compile-time assertion to ensure that this generated file
// is compatible with the proto package it is being compiled against.
@ -248,13 +245,13 @@ func (m *DeleteTaskRequest) XXX_DiscardUnknown() {
var xxx_messageInfo_DeleteTaskRequest proto.InternalMessageInfo
type DeleteResponse struct {
ID string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
Pid uint32 `protobuf:"varint,2,opt,name=pid,proto3" json:"pid,omitempty"`
ExitStatus uint32 `protobuf:"varint,3,opt,name=exit_status,json=exitStatus,proto3" json:"exit_status,omitempty"`
ExitedAt time.Time `protobuf:"bytes,4,opt,name=exited_at,json=exitedAt,proto3,stdtime" json:"exited_at"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
ID string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
Pid uint32 `protobuf:"varint,2,opt,name=pid,proto3" json:"pid,omitempty"`
ExitStatus uint32 `protobuf:"varint,3,opt,name=exit_status,json=exitStatus,proto3" json:"exit_status,omitempty"`
ExitedAt *types1.Timestamp `protobuf:"bytes,4,opt,name=exited_at,json=exitedAt,proto3" json:"exited_at,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *DeleteResponse) Reset() { *m = DeleteResponse{} }
@ -1095,11 +1092,11 @@ func (m *WaitRequest) XXX_DiscardUnknown() {
var xxx_messageInfo_WaitRequest proto.InternalMessageInfo
type WaitResponse struct {
ExitStatus uint32 `protobuf:"varint,1,opt,name=exit_status,json=exitStatus,proto3" json:"exit_status,omitempty"`
ExitedAt time.Time `protobuf:"bytes,2,opt,name=exited_at,json=exitedAt,proto3,stdtime" json:"exited_at"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
ExitStatus uint32 `protobuf:"varint,1,opt,name=exit_status,json=exitStatus,proto3" json:"exit_status,omitempty"`
ExitedAt *types1.Timestamp `protobuf:"bytes,2,opt,name=exited_at,json=exitedAt,proto3" json:"exited_at,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *WaitResponse) Reset() { *m = WaitResponse{} }
@ -1170,93 +1167,93 @@ func init() {
}
var fileDescriptor_310e7127b8a26f14 = []byte{
// 1372 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0xcb, 0x6e, 0xdb, 0x46,
0x17, 0x0e, 0x75, 0xd7, 0x91, 0x9d, 0xd8, 0xf3, 0x3b, 0xfe, 0x59, 0x36, 0xb0, 0x1c, 0x76, 0xa3,
0x3a, 0x0d, 0xd5, 0x28, 0x45, 0x10, 0x24, 0x41, 0x50, 0xdf, 0x6a, 0x08, 0x6d, 0x10, 0x87, 0x49,
0x2f, 0x08, 0x50, 0xb8, 0xb4, 0x34, 0x96, 0x06, 0x96, 0x48, 0x86, 0x33, 0x72, 0xa2, 0x6e, 0xda,
0x47, 0xc8, 0xb6, 0x9b, 0x76, 0xdb, 0x47, 0xc9, 0xb2, 0xcb, 0x2e, 0x0a, 0xb7, 0xd1, 0xb6, 0x4f,
0xd0, 0x5d, 0x31, 0x17, 0x52, 0xb4, 0x64, 0x5d, 0x6c, 0xc5, 0xdd, 0x18, 0x33, 0xc3, 0x73, 0xce,
0x9c, 0xf9, 0xce, 0xed, 0xb3, 0x60, 0xa3, 0x41, 0x58, 0xb3, 0xb3, 0x6f, 0xd5, 0xbc, 0x76, 0xb9,
0xe6, 0xb9, 0xcc, 0x21, 0x2e, 0x0e, 0xea, 0xf1, 0xa5, 0xe3, 0x93, 0x32, 0xc5, 0xc1, 0x11, 0xa9,
0x61, 0x5a, 0x66, 0x0e, 0x3d, 0xa4, 0xe5, 0xa3, 0x5b, 0x72, 0x61, 0xf9, 0x81, 0xc7, 0x3c, 0x74,
0xad, 0x2f, 0x6d, 0x85, 0x92, 0x96, 0x14, 0x38, 0xba, 0x65, 0xbc, 0xdf, 0xf0, 0xbc, 0x46, 0x0b,
0x97, 0x85, 0xec, 0x7e, 0xe7, 0xa0, 0x8c, 0xdb, 0x3e, 0xeb, 0x4a, 0x55, 0xe3, 0xbd, 0xc1, 0x8f,
0x8e, 0x1b, 0x7e, 0x5a, 0x6a, 0x78, 0x0d, 0x4f, 0x2c, 0xcb, 0x7c, 0xa5, 0x4e, 0xef, 0x4c, 0xe5,
0x2f, 0xeb, 0xfa, 0x98, 0x96, 0xdb, 0x5e, 0xc7, 0x65, 0x4a, 0xef, 0xee, 0x59, 0xf4, 0x30, 0x0b,
0x48, 0x4d, 0xbd, 0xce, 0xb8, 0x7f, 0x06, 0xcd, 0x3a, 0xa6, 0xb5, 0x80, 0xf8, 0xcc, 0x0b, 0x94,
0xf2, 0xbd, 0x33, 0x28, 0x73, 0xc4, 0xc4, 0x1f, 0xa5, 0x5b, 0x1c, 0xc4, 0x86, 0x91, 0x36, 0xa6,
0xcc, 0x69, 0xfb, 0x52, 0xc0, 0xfc, 0x3b, 0x01, 0x8b, 0x9b, 0x01, 0x76, 0x18, 0x7e, 0xe6, 0xd0,
0x43, 0x1b, 0xbf, 0xe8, 0x60, 0xca, 0x50, 0x05, 0xe6, 0x22, 0xf3, 0x7b, 0xa4, 0xae, 0x6b, 0xab,
0x5a, 0x29, 0xbf, 0x71, 0xa5, 0x77, 0x5c, 0x2c, 0x6c, 0x86, 0xe7, 0xd5, 0x2d, 0xbb, 0x10, 0x09,
0x55, 0xeb, 0xa8, 0x0c, 0x99, 0xc0, 0xf3, 0xd8, 0x01, 0xd5, 0x93, 0xab, 0xc9, 0x52, 0xa1, 0xf2,
0x7f, 0x2b, 0x16, 0x52, 0xe1, 0x9d, 0xf5, 0x88, 0x83, 0x69, 0x2b, 0x31, 0xb4, 0x04, 0x69, 0xca,
0xea, 0xc4, 0xd5, 0x53, 0xdc, 0xba, 0x2d, 0x37, 0x68, 0x19, 0x32, 0x94, 0xd5, 0xbd, 0x0e, 0xd3,
0xd3, 0xe2, 0x58, 0xed, 0xd4, 0x39, 0x0e, 0x02, 0x3d, 0x13, 0x9d, 0xe3, 0x20, 0x40, 0x06, 0xe4,
0x18, 0x0e, 0xda, 0xc4, 0x75, 0x5a, 0x7a, 0x76, 0x55, 0x2b, 0xe5, 0xec, 0x68, 0x8f, 0x1e, 0x00,
0xd4, 0x9a, 0xb8, 0x76, 0xe8, 0x7b, 0xc4, 0x65, 0x7a, 0x6e, 0x55, 0x2b, 0x15, 0x2a, 0xd7, 0x86,
0xdd, 0xda, 0x8a, 0x10, 0xb7, 0x63, 0xf2, 0xc8, 0x82, 0xac, 0xe7, 0x33, 0xe2, 0xb9, 0x54, 0xcf,
0x0b, 0xd5, 0x25, 0x4b, 0xa2, 0x69, 0x85, 0x68, 0x5a, 0xeb, 0x6e, 0xd7, 0x0e, 0x85, 0xd0, 0x75,
0x98, 0x0b, 0x3a, 0x2e, 0x07, 0x78, 0xcf, 0x77, 0x58, 0x53, 0x07, 0xe1, 0x67, 0x41, 0x9d, 0xed,
0x3a, 0xac, 0x69, 0x3e, 0x07, 0x14, 0x07, 0x9b, 0xfa, 0x9e, 0x4b, 0xf1, 0xb9, 0xd0, 0x5e, 0x80,
0xa4, 0x4f, 0xea, 0x7a, 0x62, 0x55, 0x2b, 0xcd, 0xdb, 0x7c, 0x69, 0x36, 0x60, 0xee, 0x29, 0x73,
0x02, 0x36, 0x4b, 0x0c, 0x3f, 0x80, 0x2c, 0x7e, 0x85, 0x6b, 0x7b, 0xca, 0x72, 0x7e, 0x03, 0x7a,
0xc7, 0xc5, 0xcc, 0xf6, 0x2b, 0x5c, 0xab, 0x6e, 0xd9, 0x19, 0xfe, 0xa9, 0x5a, 0x37, 0xaf, 0xc3,
0xbc, 0xba, 0x48, 0xf9, 0xaf, 0x7c, 0xd1, 0xfa, 0xbe, 0xec, 0xc0, 0xe2, 0x16, 0x6e, 0xe1, 0x99,
0x93, 0xca, 0xfc, 0x59, 0x83, 0xcb, 0xd2, 0x52, 0x74, 0xdb, 0x32, 0x24, 0x22, 0xe5, 0x4c, 0xef,
0xb8, 0x98, 0xa8, 0x6e, 0xd9, 0x09, 0x72, 0x0a, 0x22, 0xa8, 0x08, 0x05, 0xfc, 0x8a, 0xb0, 0x3d,
0xca, 0x1c, 0xd6, 0xe1, 0x69, 0xc9, 0xbf, 0x00, 0x3f, 0x7a, 0x2a, 0x4e, 0xd0, 0x3a, 0xe4, 0xf9,
0x0e, 0xd7, 0xf7, 0x1c, 0x26, 0xb2, 0xb0, 0x50, 0x31, 0x86, 0x62, 0xfc, 0x2c, 0xac, 0x98, 0x8d,
0xdc, 0x9b, 0xe3, 0xe2, 0xa5, 0xd7, 0x7f, 0x16, 0x35, 0x3b, 0x27, 0xd5, 0xd6, 0x99, 0xe9, 0xc1,
0x92, 0xf4, 0x6f, 0x37, 0xf0, 0x6a, 0x98, 0xd2, 0x0b, 0x47, 0x1f, 0x03, 0xec, 0xe0, 0x8b, 0x0f,
0xf2, 0x36, 0x14, 0xc4, 0x35, 0x0a, 0xf4, 0x3b, 0x90, 0xf5, 0xe5, 0x03, 0xc5, 0x15, 0x03, 0x65,
0x74, 0x74, 0x4b, 0x55, 0x52, 0x08, 0x42, 0x28, 0x6c, 0xae, 0xc1, 0xc2, 0x17, 0x84, 0x32, 0x9e,
0x06, 0x11, 0x34, 0xcb, 0x90, 0x39, 0x20, 0x2d, 0x86, 0x03, 0xe9, 0xad, 0xad, 0x76, 0x3c, 0x69,
0x62, 0xb2, 0x51, 0x6d, 0xa4, 0xc5, 0x14, 0xd0, 0x35, 0xd1, 0x54, 0xc6, 0x5f, 0x2b, 0x45, 0xcd,
0xd7, 0x1a, 0x14, 0x3e, 0x27, 0xad, 0xd6, 0x45, 0x83, 0x24, 0x7a, 0x12, 0x69, 0xf0, 0xce, 0x23,
0x73, 0x4b, 0xed, 0x78, 0x2a, 0x3a, 0xad, 0x96, 0xc8, 0xa8, 0x9c, 0xcd, 0x97, 0xe6, 0x3f, 0x1a,
0x20, 0xae, 0xfc, 0x0e, 0xb2, 0x24, 0x6a, 0x9b, 0x89, 0xd3, 0xdb, 0x66, 0x72, 0x44, 0xdb, 0x4c,
0x8d, 0x6c, 0x9b, 0xe9, 0x81, 0xb6, 0x59, 0x82, 0x14, 0xf5, 0x71, 0x4d, 0x34, 0xda, 0x51, 0x5d,
0x4f, 0x48, 0xc4, 0x51, 0xca, 0x8e, 0x4c, 0xa5, 0xab, 0xf0, 0xbf, 0x13, 0x4f, 0x97, 0x91, 0x35,
0x7f, 0xd2, 0x60, 0xc1, 0xc6, 0x94, 0x7c, 0x8f, 0x77, 0x59, 0xf7, 0xc2, 0x43, 0xb5, 0x04, 0xe9,
0x97, 0xa4, 0xce, 0x9a, 0x2a, 0x52, 0x72, 0xc3, 0xd1, 0x69, 0x62, 0xd2, 0x68, 0xca, 0xea, 0x9f,
0xb7, 0xd5, 0xce, 0xfc, 0x01, 0x2e, 0x6f, 0xb6, 0x3c, 0x8a, 0xab, 0x8f, 0xff, 0x0b, 0xc7, 0x64,
0x38, 0x93, 0x22, 0x0a, 0x72, 0x63, 0x7e, 0x06, 0x0b, 0xbb, 0x4e, 0x87, 0xce, 0xdc, 0x3f, 0x77,
0x60, 0xd1, 0xc6, 0xb4, 0xd3, 0x9e, 0xd9, 0xd0, 0x36, 0x5c, 0xe1, 0xc5, 0xb9, 0x4b, 0xea, 0xb3,
0x24, 0xaf, 0x69, 0xcb, 0x7e, 0x20, 0xcd, 0xa8, 0x12, 0x7f, 0x08, 0x79, 0xd5, 0x2e, 0x70, 0x58,
0xe6, 0xab, 0xe3, 0xca, 0xbc, 0xea, 0x1e, 0x78, 0x76, 0x5f, 0xc5, 0xfc, 0x55, 0x83, 0xab, 0x9b,
0xd1, 0xd8, 0x9e, 0x95, 0xc6, 0xdc, 0x80, 0x45, 0xdf, 0x09, 0xb0, 0xcb, 0xf6, 0x62, 0xd4, 0x41,
0x96, 0xda, 0x82, 0xfc, 0xb0, 0x79, 0x2a, 0x45, 0x48, 0x4e, 0x41, 0x11, 0xcc, 0x6f, 0x60, 0x79,
0xd0, 0xd3, 0x08, 0x84, 0x42, 0x9f, 0xf8, 0x9d, 0xda, 0xed, 0x86, 0xb8, 0x4a, 0x5c, 0xc1, 0xfc,
0x25, 0x01, 0x8b, 0x5f, 0xfa, 0xf5, 0x77, 0xc0, 0xe3, 0x2a, 0x90, 0x0f, 0x30, 0xf5, 0x3a, 0x41,
0x0d, 0x53, 0xf1, 0xf0, 0x51, 0xaf, 0xea, 0x8b, 0xa1, 0x7d, 0x28, 0x38, 0xae, 0xeb, 0x31, 0x27,
0xc4, 0x82, 0x7b, 0xff, 0xa9, 0x35, 0x8e, 0xd3, 0x5b, 0x43, 0xde, 0x5a, 0xeb, 0x7d, 0x13, 0xdb,
0x2e, 0x0b, 0xba, 0x76, 0xdc, 0xa8, 0xf1, 0x10, 0x16, 0x06, 0x05, 0x78, 0xa3, 0x3d, 0xc4, 0x5d,
0x35, 0x47, 0xf8, 0x92, 0x97, 0xd3, 0x91, 0xd3, 0xea, 0xe0, 0xb0, 0x3b, 0x8a, 0xcd, 0xbd, 0xc4,
0x5d, 0xcd, 0x5c, 0x83, 0xcb, 0x8f, 0x24, 0x29, 0x0f, 0xd1, 0xd1, 0x21, 0x2b, 0x47, 0x8f, 0xc4,
0x3b, 0x6f, 0x87, 0x5b, 0x9e, 0xed, 0x91, 0x6c, 0x34, 0x88, 0xb2, 0x8a, 0xd3, 0xab, 0xe0, 0xe8,
0xa7, 0xf0, 0x5b, 0x21, 0x60, 0x87, 0x82, 0xe6, 0x01, 0x14, 0xbe, 0x76, 0xc8, 0xc5, 0x0f, 0xeb,
0x00, 0xe6, 0xe4, 0x3d, 0xca, 0xd7, 0x01, 0xe2, 0xa3, 0x8d, 0x27, 0x3e, 0x89, 0xf3, 0x10, 0x9f,
0xca, 0x1f, 0x73, 0x90, 0x16, 0xa3, 0x1a, 0x1d, 0x42, 0x46, 0x92, 0x5a, 0x54, 0x1e, 0x1f, 0xf1,
0xa1, 0xff, 0x33, 0x8c, 0x8f, 0xa7, 0x57, 0x50, 0x4f, 0xfb, 0x0e, 0xd2, 0x82, 0x7c, 0xa2, 0xb5,
0xf1, 0xaa, 0x71, 0x2a, 0x6c, 0xdc, 0x98, 0x4a, 0x56, 0xdd, 0xd0, 0x80, 0x8c, 0x64, 0x74, 0x93,
0x9e, 0x33, 0xc4, 0x70, 0x8d, 0x8f, 0xa6, 0x51, 0x88, 0x2e, 0x7a, 0x01, 0xf3, 0x27, 0xa8, 0x23,
0xaa, 0x4c, 0xa3, 0x7e, 0x92, 0x41, 0x9c, 0xf1, 0xca, 0xe7, 0x90, 0xdc, 0xc1, 0x0c, 0x95, 0xc6,
0x2b, 0xf5, 0xf9, 0xa5, 0xf1, 0xe1, 0x14, 0x92, 0x11, 0x6e, 0x29, 0xde, 0xda, 0x91, 0x35, 0x5e,
0x65, 0x90, 0x0e, 0x1a, 0xe5, 0xa9, 0xe5, 0xd5, 0x45, 0x55, 0x48, 0x71, 0x76, 0x87, 0x26, 0xf8,
0x16, 0x63, 0x80, 0xc6, 0xf2, 0x50, 0x72, 0x6f, 0xb7, 0x7d, 0xd6, 0x45, 0xbb, 0x90, 0xe2, 0xa5,
0x84, 0x26, 0xe4, 0xe1, 0x30, 0x73, 0x1b, 0x69, 0xf1, 0x29, 0xe4, 0x23, 0x52, 0x33, 0x09, 0x8a,
0x41, 0xf6, 0x33, 0xd2, 0xe8, 0x63, 0xc8, 0x2a, 0x3a, 0x82, 0x26, 0xc4, 0xfb, 0x24, 0x6b, 0x19,
0x63, 0x30, 0x2d, 0xe8, 0xc5, 0x24, 0x0f, 0x07, 0x39, 0xc8, 0x48, 0x83, 0x4f, 0x20, 0x23, 0x79,
0xc6, 0xa4, 0xa2, 0x19, 0x62, 0x23, 0x23, 0x4d, 0x12, 0xc8, 0x85, 0x54, 0x01, 0xdd, 0x9c, 0x9c,
0x23, 0x31, 0x66, 0x62, 0x58, 0xd3, 0x8a, 0xab, 0x8c, 0x7a, 0x09, 0x10, 0x1b, 0xea, 0xb7, 0x27,
0x40, 0x7c, 0x1a, 0xd5, 0x30, 0x3e, 0x39, 0x9b, 0x92, 0xba, 0xf8, 0x09, 0x64, 0xe4, 0x18, 0x9c,
0x04, 0xdb, 0xd0, 0xb0, 0x1c, 0x09, 0xdb, 0x01, 0x64, 0xd5, 0xe8, 0x9a, 0x94, 0x2b, 0x27, 0xa7,
0xa1, 0x71, 0x73, 0x4a, 0x69, 0xe5, 0xfa, 0xb7, 0x90, 0xe2, 0x33, 0x67, 0x52, 0x15, 0xc6, 0xe6,
0x9f, 0xb1, 0x36, 0x8d, 0xa8, 0x34, 0xbf, 0xf1, 0xd5, 0x9b, 0xb7, 0x2b, 0x97, 0x7e, 0x7f, 0xbb,
0x72, 0xe9, 0xc7, 0xde, 0x8a, 0xf6, 0xa6, 0xb7, 0xa2, 0xfd, 0xd6, 0x5b, 0xd1, 0xfe, 0xea, 0xad,
0x68, 0xcf, 0x1f, 0x9c, 0xef, 0xd7, 0xc6, 0xfb, 0x62, 0xb1, 0x9f, 0x11, 0x70, 0xdd, 0xfe, 0x37,
0x00, 0x00, 0xff, 0xff, 0x1c, 0xab, 0x68, 0xe1, 0xb4, 0x14, 0x00, 0x00,
// 1363 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0xcd, 0x73, 0xdb, 0x44,
0x14, 0xaf, 0xfc, 0x19, 0x3f, 0x27, 0x6d, 0xb2, 0xa4, 0x41, 0x88, 0x4e, 0x92, 0x8a, 0x8b, 0x49,
0xa9, 0x4c, 0x5d, 0xa6, 0x74, 0xda, 0x4e, 0x87, 0xe6, 0x83, 0x8c, 0x07, 0x3a, 0x4d, 0xd5, 0xf2,
0x31, 0x9d, 0x61, 0x82, 0x62, 0x6f, 0xec, 0x9d, 0xd8, 0x92, 0xaa, 0x5d, 0xa7, 0x35, 0x17, 0xf8,
0x13, 0x38, 0x70, 0xe1, 0xc4, 0x95, 0x3f, 0xa5, 0x47, 0x8e, 0x1c, 0x98, 0x0c, 0xf5, 0x95, 0xbf,
0x80, 0x1b, 0xb3, 0x1f, 0x92, 0x15, 0x3b, 0xb6, 0x94, 0xa6, 0xe1, 0x92, 0xd9, 0x5d, 0xbd, 0xf7,
0xf6, 0xed, 0xef, 0x7d, 0xfd, 0x62, 0x58, 0x6f, 0x11, 0xd6, 0xee, 0xed, 0x59, 0x0d, 0xaf, 0x5b,
0x6d, 0x78, 0x2e, 0x73, 0x88, 0x8b, 0x83, 0x66, 0x7c, 0xe9, 0xf8, 0xa4, 0x4a, 0x71, 0x70, 0x48,
0x1a, 0x98, 0x56, 0x99, 0x43, 0x0f, 0x68, 0xf5, 0xf0, 0x86, 0x5c, 0x58, 0x7e, 0xe0, 0x31, 0x0f,
0x5d, 0x19, 0x4a, 0x5b, 0xa1, 0xa4, 0x25, 0x05, 0x0e, 0x6f, 0x18, 0xef, 0xb7, 0x3c, 0xaf, 0xd5,
0xc1, 0x55, 0x21, 0xbb, 0xd7, 0xdb, 0xaf, 0xe2, 0xae, 0xcf, 0xfa, 0x52, 0xd5, 0x78, 0x6f, 0xf4,
0xa3, 0xe3, 0x86, 0x9f, 0x16, 0x5b, 0x5e, 0xcb, 0x13, 0xcb, 0x2a, 0x5f, 0xa9, 0xd3, 0x5b, 0xa9,
0xfc, 0x65, 0x7d, 0x1f, 0xd3, 0x6a, 0xd7, 0xeb, 0xb9, 0x4c, 0xe9, 0xdd, 0x3e, 0x8d, 0x1e, 0x66,
0x01, 0x69, 0xa8, 0xd7, 0x19, 0x77, 0x4f, 0xa1, 0xd9, 0xc4, 0xb4, 0x11, 0x10, 0x9f, 0x79, 0x81,
0x52, 0xbe, 0x73, 0x0a, 0x65, 0x8e, 0x98, 0xf8, 0xa3, 0x74, 0x57, 0x46, 0xb1, 0x61, 0xa4, 0x8b,
0x29, 0x73, 0xba, 0xbe, 0x14, 0x30, 0xff, 0xc9, 0xc0, 0xc2, 0x46, 0x80, 0x1d, 0x86, 0x9f, 0x3a,
0xf4, 0xc0, 0xc6, 0xcf, 0x7b, 0x98, 0x32, 0x54, 0x83, 0xd9, 0xc8, 0xfc, 0x2e, 0x69, 0xea, 0xda,
0xaa, 0x56, 0x29, 0xad, 0x5f, 0x1a, 0x1c, 0xad, 0x94, 0x37, 0xc2, 0xf3, 0xfa, 0xa6, 0x5d, 0x8e,
0x84, 0xea, 0x4d, 0x54, 0x85, 0x42, 0xe0, 0x79, 0x6c, 0x9f, 0xea, 0xd9, 0xd5, 0x6c, 0xa5, 0x5c,
0x7b, 0xd7, 0x8a, 0x85, 0x54, 0x78, 0x67, 0x3d, 0xe4, 0x60, 0xda, 0x4a, 0x0c, 0x2d, 0x42, 0x9e,
0xb2, 0x26, 0x71, 0xf5, 0x1c, 0xb7, 0x6e, 0xcb, 0x0d, 0x5a, 0x82, 0x02, 0x65, 0x4d, 0xaf, 0xc7,
0xf4, 0xbc, 0x38, 0x56, 0x3b, 0x75, 0x8e, 0x83, 0x40, 0x2f, 0x44, 0xe7, 0x38, 0x08, 0x90, 0x01,
0x33, 0x0c, 0x07, 0x5d, 0xe2, 0x3a, 0x1d, 0xbd, 0xb8, 0xaa, 0x55, 0x66, 0xec, 0x68, 0x8f, 0xee,
0x01, 0x34, 0xda, 0xb8, 0x71, 0xe0, 0x7b, 0xc4, 0x65, 0xfa, 0xcc, 0xaa, 0x56, 0x29, 0xd7, 0xae,
0x8c, 0xbb, 0xb5, 0x19, 0x21, 0x6e, 0xc7, 0xe4, 0x91, 0x05, 0x45, 0xcf, 0x67, 0xc4, 0x73, 0xa9,
0x5e, 0x12, 0xaa, 0x8b, 0x96, 0x44, 0xd3, 0x0a, 0xd1, 0xb4, 0x1e, 0xb8, 0x7d, 0x3b, 0x14, 0x42,
0x57, 0x61, 0x36, 0xe8, 0xb9, 0x1c, 0xe0, 0x5d, 0xdf, 0x61, 0x6d, 0x1d, 0x84, 0x9f, 0x65, 0x75,
0xb6, 0xe3, 0xb0, 0xb6, 0xf9, 0x0c, 0x50, 0x1c, 0x6c, 0xea, 0x7b, 0x2e, 0xc5, 0x6f, 0x84, 0xf6,
0x3c, 0x64, 0x7d, 0xd2, 0xd4, 0x33, 0xab, 0x5a, 0x65, 0xce, 0xe6, 0x4b, 0xb3, 0x05, 0xb3, 0x4f,
0x98, 0x13, 0xb0, 0xb3, 0xc4, 0xf0, 0x03, 0x28, 0xe2, 0x97, 0xb8, 0xb1, 0xab, 0x2c, 0x97, 0xd6,
0x61, 0x70, 0xb4, 0x52, 0xd8, 0x7a, 0x89, 0x1b, 0xf5, 0x4d, 0xbb, 0xc0, 0x3f, 0xd5, 0x9b, 0xe6,
0x55, 0x98, 0x53, 0x17, 0x29, 0xff, 0x95, 0x2f, 0xda, 0xd0, 0x97, 0x6d, 0x58, 0xd8, 0xc4, 0x1d,
0x7c, 0xe6, 0xa4, 0x32, 0x7f, 0xd1, 0xe0, 0xa2, 0xb4, 0x14, 0xdd, 0xb6, 0x04, 0x99, 0x48, 0xb9,
0x30, 0x38, 0x5a, 0xc9, 0xd4, 0x37, 0xed, 0x0c, 0x39, 0x01, 0x11, 0xb4, 0x02, 0x65, 0xfc, 0x92,
0xb0, 0x5d, 0xca, 0x1c, 0xd6, 0xe3, 0x69, 0xc9, 0xbf, 0x00, 0x3f, 0x7a, 0x22, 0x4e, 0xd0, 0xa7,
0x50, 0xe2, 0x3b, 0xdc, 0xdc, 0x75, 0x98, 0xc8, 0xc2, 0x72, 0xcd, 0x18, 0x8b, 0xf1, 0xd3, 0xb0,
0x62, 0xec, 0x19, 0x29, 0xfc, 0x80, 0x99, 0x1e, 0x2c, 0x4a, 0xaf, 0x76, 0x02, 0xaf, 0x81, 0x29,
0x3d, 0x77, 0xcc, 0x31, 0xc0, 0x36, 0x3e, 0xff, 0xd0, 0x6e, 0x41, 0x59, 0x5c, 0xa3, 0xa0, 0xbe,
0x05, 0x45, 0x5f, 0x3e, 0x50, 0x5c, 0x31, 0x52, 0x3c, 0x87, 0x37, 0x54, 0xfd, 0x84, 0x20, 0x84,
0xc2, 0xe6, 0x1a, 0xcc, 0x7f, 0x49, 0x28, 0xe3, 0xc1, 0x8f, 0xa0, 0x59, 0x82, 0xc2, 0x3e, 0xe9,
0x30, 0x1c, 0x48, 0x6f, 0x6d, 0xb5, 0xe3, 0xa9, 0x12, 0x93, 0x8d, 0x2a, 0x22, 0x2f, 0x7a, 0xbf,
0xae, 0x89, 0x56, 0x32, 0xfd, 0x5a, 0x29, 0x6a, 0xfe, 0xac, 0x41, 0xf9, 0x0b, 0xd2, 0xe9, 0x9c,
0x37, 0x48, 0xa2, 0x13, 0x91, 0x16, 0xef, 0x37, 0x32, 0xa3, 0xd4, 0x8e, 0x27, 0xa0, 0xd3, 0xe9,
0x88, 0x3c, 0x9a, 0xb1, 0xf9, 0xd2, 0xfc, 0x57, 0x03, 0xc4, 0x95, 0xdf, 0x42, 0x96, 0x44, 0xcd,
0x32, 0x73, 0x72, 0xb3, 0xcc, 0x4e, 0x68, 0x96, 0xb9, 0x89, 0xcd, 0x32, 0x3f, 0xd2, 0x2c, 0x2b,
0x90, 0xa3, 0x3e, 0x6e, 0x88, 0xf6, 0x3a, 0xa9, 0xd7, 0x09, 0x89, 0x38, 0x4a, 0xc5, 0x89, 0xa9,
0x74, 0x19, 0xde, 0x39, 0xf6, 0x74, 0x19, 0x59, 0xf3, 0x57, 0x0d, 0xe6, 0x6d, 0x4c, 0xc9, 0x0f,
0x78, 0x87, 0xf5, 0xcf, 0x3d, 0x54, 0x8b, 0x90, 0x7f, 0x41, 0x9a, 0xac, 0xad, 0x22, 0x25, 0x37,
0x1c, 0x9d, 0x36, 0x26, 0xad, 0xb6, 0xac, 0xf9, 0x39, 0x5b, 0xed, 0xcc, 0x1f, 0xe1, 0xe2, 0x46,
0xc7, 0xa3, 0xb8, 0xfe, 0xe8, 0xff, 0x70, 0x4c, 0x86, 0x33, 0x2b, 0xa2, 0x20, 0x37, 0xe6, 0xe7,
0x30, 0xbf, 0xe3, 0xf4, 0xe8, 0x99, 0xbb, 0xe6, 0x36, 0x2c, 0xd8, 0x98, 0xf6, 0xba, 0x67, 0x36,
0xb4, 0x05, 0x97, 0x78, 0x71, 0xee, 0x90, 0xe6, 0x59, 0x92, 0xd7, 0xb4, 0x65, 0x3f, 0x90, 0x66,
0x54, 0x89, 0xdf, 0x87, 0x92, 0x6a, 0x17, 0x38, 0x2c, 0xf3, 0xd5, 0x69, 0x65, 0x5e, 0x77, 0xf7,
0x3d, 0x7b, 0xa8, 0x62, 0xfe, 0xae, 0xc1, 0xe5, 0x8d, 0x68, 0x58, 0x9f, 0x95, 0xbc, 0x5c, 0x83,
0x05, 0xdf, 0x09, 0xb0, 0xcb, 0x76, 0x63, 0x84, 0x41, 0x96, 0xda, 0xbc, 0xfc, 0xb0, 0x71, 0x22,
0x31, 0xc8, 0xa6, 0x20, 0x06, 0xe6, 0xb7, 0xb0, 0x34, 0xea, 0x69, 0x04, 0x42, 0x79, 0x48, 0xf7,
0x4e, 0xec, 0x76, 0x63, 0x0c, 0x25, 0xae, 0x60, 0xfe, 0x96, 0x81, 0x85, 0xaf, 0xfc, 0xe6, 0x5b,
0x60, 0x6f, 0x35, 0x28, 0x05, 0x98, 0x7a, 0xbd, 0xa0, 0x81, 0xa9, 0x78, 0xf8, 0xa4, 0x57, 0x0d,
0xc5, 0xd0, 0x1e, 0x94, 0x1d, 0xd7, 0xf5, 0x98, 0x13, 0x62, 0xc1, 0xbd, 0xff, 0xcc, 0x9a, 0xc6,
0xe4, 0xad, 0x31, 0x6f, 0xad, 0x07, 0x43, 0x13, 0x5b, 0x2e, 0x0b, 0xfa, 0x76, 0xdc, 0xa8, 0x71,
0x1f, 0xe6, 0x47, 0x05, 0x78, 0xa3, 0x3d, 0xc0, 0x7d, 0x35, 0x47, 0xf8, 0x92, 0x97, 0xd3, 0xa1,
0xd3, 0xe9, 0xe1, 0xb0, 0x3b, 0x8a, 0xcd, 0x9d, 0xcc, 0x6d, 0xcd, 0x5c, 0x83, 0x8b, 0x0f, 0x25,
0x15, 0x0f, 0xd1, 0xd1, 0xa1, 0x28, 0x47, 0x8f, 0xc4, 0xbb, 0x64, 0x87, 0x5b, 0x9e, 0xed, 0x91,
0x6c, 0x34, 0x88, 0x8a, 0x8a, 0xc9, 0xab, 0xe0, 0xe8, 0x27, 0xb0, 0x5a, 0x21, 0x60, 0x87, 0x82,
0xe6, 0x3e, 0x94, 0xbf, 0x71, 0xc8, 0xf9, 0x0f, 0xeb, 0x36, 0xcc, 0xca, 0x7b, 0x94, 0xaf, 0x23,
0x74, 0x47, 0x9b, 0x4e, 0x77, 0x32, 0xe9, 0xe9, 0x4e, 0xed, 0xaf, 0x59, 0xc8, 0x8b, 0x01, 0x8d,
0x0e, 0xa0, 0x20, 0x09, 0x2c, 0xaa, 0x4e, 0x8f, 0xf3, 0xd8, 0xff, 0x14, 0xc6, 0xc7, 0xe9, 0x15,
0xd4, 0x83, 0xbe, 0x87, 0xbc, 0x20, 0x9a, 0x68, 0x6d, 0xba, 0x6a, 0x9c, 0xf6, 0x1a, 0xd7, 0x52,
0xc9, 0xaa, 0x1b, 0x5a, 0x50, 0x90, 0x3c, 0x2e, 0xe9, 0x39, 0x63, 0x6c, 0xd6, 0xf8, 0x28, 0x8d,
0x42, 0x74, 0xd1, 0x73, 0x98, 0x3b, 0x46, 0x18, 0x51, 0x2d, 0x8d, 0xfa, 0x71, 0xde, 0x70, 0xca,
0x2b, 0x9f, 0x41, 0x76, 0x1b, 0x33, 0x54, 0x99, 0xae, 0x34, 0x64, 0x95, 0xc6, 0x87, 0x29, 0x24,
0x23, 0xdc, 0x72, 0xbc, 0xa1, 0x23, 0x6b, 0xba, 0xca, 0x28, 0x09, 0x34, 0xaa, 0xa9, 0xe5, 0xd5,
0x45, 0x75, 0xc8, 0x71, 0x4e, 0x87, 0x12, 0x7c, 0x8b, 0xf1, 0x3e, 0x63, 0x69, 0x2c, 0xa5, 0xb7,
0xba, 0x3e, 0xeb, 0xa3, 0x1d, 0xc8, 0xf1, 0x02, 0x42, 0x09, 0x79, 0x38, 0xce, 0xd7, 0x26, 0x5a,
0x7c, 0x02, 0xa5, 0x88, 0xca, 0x24, 0x41, 0x31, 0xca, 0x79, 0x26, 0x1a, 0x7d, 0x04, 0x45, 0x45,
0x42, 0x50, 0x42, 0xbc, 0x8f, 0x73, 0x95, 0x29, 0x06, 0xf3, 0x82, 0x54, 0x24, 0x79, 0x38, 0xca,
0x3c, 0x26, 0x1a, 0x7c, 0x0c, 0x05, 0xc9, 0x2e, 0x92, 0x8a, 0x66, 0x8c, 0x83, 0x4c, 0x34, 0x49,
0x60, 0x26, 0x24, 0x08, 0xe8, 0x7a, 0x72, 0x8e, 0xc4, 0xf8, 0x88, 0x61, 0xa5, 0x15, 0x57, 0x19,
0xf5, 0x02, 0x20, 0x36, 0xca, 0x6f, 0x26, 0x40, 0x7c, 0x12, 0xc1, 0x30, 0x3e, 0x39, 0x9d, 0x92,
0xba, 0xf8, 0x31, 0x14, 0xe4, 0xf0, 0x4b, 0x82, 0x6d, 0x6c, 0x44, 0x4e, 0x84, 0x6d, 0x1f, 0x8a,
0x6a, 0x60, 0x25, 0xe5, 0xca, 0xf1, 0x19, 0x68, 0x5c, 0x4f, 0x29, 0xad, 0x5c, 0xff, 0x0e, 0x72,
0x7c, 0xd2, 0x24, 0x55, 0x61, 0x6c, 0xea, 0x19, 0x6b, 0x69, 0x44, 0xa5, 0xf9, 0xf5, 0xaf, 0x5f,
0xbd, 0x5e, 0xbe, 0xf0, 0xe7, 0xeb, 0xe5, 0x0b, 0x3f, 0x0d, 0x96, 0xb5, 0x57, 0x83, 0x65, 0xed,
0x8f, 0xc1, 0xb2, 0xf6, 0xf7, 0x60, 0x59, 0x7b, 0x76, 0xef, 0xcd, 0x7e, 0x59, 0xbc, 0x2b, 0x16,
0x7b, 0x05, 0x01, 0xd7, 0xcd, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0x29, 0xf9, 0xc2, 0x30, 0xa0,
0x14, 0x00, 0x00,
}
// Reference imports to suppress errors if they are not otherwise used.
@ -2203,14 +2200,18 @@ func (m *DeleteResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
i -= len(m.XXX_unrecognized)
copy(dAtA[i:], m.XXX_unrecognized)
}
n3, err3 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.ExitedAt, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.ExitedAt):])
if err3 != nil {
return 0, err3
if m.ExitedAt != nil {
{
size, err := m.ExitedAt.MarshalToSizedBuffer(dAtA[:i])
if err != nil {
return 0, err
}
i -= size
i = encodeVarintTasks(dAtA, i, uint64(size))
}
i--
dAtA[i] = 0x22
}
i -= n3
i = encodeVarintTasks(dAtA, i, uint64(n3))
i--
dAtA[i] = 0x22
if m.ExitStatus != 0 {
i = encodeVarintTasks(dAtA, i, uint64(m.ExitStatus))
i--
@ -3140,14 +3141,18 @@ func (m *WaitResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
i -= len(m.XXX_unrecognized)
copy(dAtA[i:], m.XXX_unrecognized)
}
n8, err8 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.ExitedAt, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.ExitedAt):])
if err8 != nil {
return 0, err8
if m.ExitedAt != nil {
{
size, err := m.ExitedAt.MarshalToSizedBuffer(dAtA[:i])
if err != nil {
return 0, err
}
i -= size
i = encodeVarintTasks(dAtA, i, uint64(size))
}
i--
dAtA[i] = 0x12
}
i -= n8
i = encodeVarintTasks(dAtA, i, uint64(n8))
i--
dAtA[i] = 0x12
if m.ExitStatus != 0 {
i = encodeVarintTasks(dAtA, i, uint64(m.ExitStatus))
i--
@ -3302,8 +3307,10 @@ func (m *DeleteResponse) Size() (n int) {
if m.ExitStatus != 0 {
n += 1 + sovTasks(uint64(m.ExitStatus))
}
l = github_com_gogo_protobuf_types.SizeOfStdTime(m.ExitedAt)
n += 1 + l + sovTasks(uint64(l))
if m.ExitedAt != nil {
l = m.ExitedAt.Size()
n += 1 + l + sovTasks(uint64(l))
}
if m.XXX_unrecognized != nil {
n += len(m.XXX_unrecognized)
}
@ -3727,8 +3734,10 @@ func (m *WaitResponse) Size() (n int) {
if m.ExitStatus != 0 {
n += 1 + sovTasks(uint64(m.ExitStatus))
}
l = github_com_gogo_protobuf_types.SizeOfStdTime(m.ExitedAt)
n += 1 + l + sovTasks(uint64(l))
if m.ExitedAt != nil {
l = m.ExitedAt.Size()
n += 1 + l + sovTasks(uint64(l))
}
if m.XXX_unrecognized != nil {
n += len(m.XXX_unrecognized)
}
@ -3819,7 +3828,7 @@ func (this *DeleteResponse) String() string {
`ID:` + fmt.Sprintf("%v", this.ID) + `,`,
`Pid:` + fmt.Sprintf("%v", this.Pid) + `,`,
`ExitStatus:` + fmt.Sprintf("%v", this.ExitStatus) + `,`,
`ExitedAt:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.ExitedAt), "Timestamp", "types1.Timestamp", 1), `&`, ``, 1) + `,`,
`ExitedAt:` + strings.Replace(fmt.Sprintf("%v", this.ExitedAt), "Timestamp", "types1.Timestamp", 1) + `,`,
`XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`,
`}`,
}, "")
@ -4101,7 +4110,7 @@ func (this *WaitResponse) String() string {
}
s := strings.Join([]string{`&WaitResponse{`,
`ExitStatus:` + fmt.Sprintf("%v", this.ExitStatus) + `,`,
`ExitedAt:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.ExitedAt), "Timestamp", "types1.Timestamp", 1), `&`, ``, 1) + `,`,
`ExitedAt:` + strings.Replace(fmt.Sprintf("%v", this.ExitedAt), "Timestamp", "types1.Timestamp", 1) + `,`,
`XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`,
`}`,
}, "")
@ -4950,7 +4959,10 @@ func (m *DeleteResponse) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.ExitedAt, dAtA[iNdEx:postIndex]); err != nil {
if m.ExitedAt == nil {
m.ExitedAt = &types1.Timestamp{}
}
if err := m.ExitedAt.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
@ -7397,7 +7409,10 @@ func (m *WaitResponse) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.ExitedAt, dAtA[iNdEx:postIndex]); err != nil {
if m.ExitedAt == nil {
m.ExitedAt = &types1.Timestamp{}
}
if err := m.ExitedAt.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex

4
api/services/tasks/v1/tasks.proto
View File

@ -114,7 +114,7 @@ message DeleteResponse {
string id = 1;
uint32 pid = 2;
uint32 exit_status = 3;
google.protobuf.Timestamp exited_at = 4 [(gogoproto.stdtime) = true, (gogoproto.nullable) = false];
google.protobuf.Timestamp exited_at = 4;
}
message DeleteProcessRequest {
@ -224,5 +224,5 @@ message WaitRequest {
message WaitResponse {
uint32 exit_status = 1;
google.protobuf.Timestamp exited_at = 2 [(gogoproto.stdtime) = true, (gogoproto.nullable) = false];
google.protobuf.Timestamp exited_at = 2;
}

99
api/services/ttrpc/events/v1/events.pb.go
View File

@ -11,21 +11,18 @@ import (
github_com_containerd_typeurl "github.com/containerd/typeurl"
_ "github.com/gogo/protobuf/gogoproto"
proto "github.com/gogo/protobuf/proto"
github_com_gogo_protobuf_types "github.com/gogo/protobuf/types"
types "github.com/gogo/protobuf/types"
io "io"
math "math"
math_bits "math/bits"
reflect "reflect"
strings "strings"
time "time"
)
// Reference imports to suppress errors if they are not otherwise used.
var _ = proto.Marshal
var _ = fmt.Errorf
var _ = math.Inf
var _ = time.Kitchen
// This is a compile-time assertion to ensure that this generated file
// is compatible with the proto package it is being compiled against.
@ -73,13 +70,13 @@ func (m *ForwardRequest) XXX_DiscardUnknown() {
var xxx_messageInfo_ForwardRequest proto.InternalMessageInfo
type Envelope struct {
Timestamp time.Time `protobuf:"bytes,1,opt,name=timestamp,proto3,stdtime" json:"timestamp"`
Namespace string `protobuf:"bytes,2,opt,name=namespace,proto3" json:"namespace,omitempty"`
Topic string `protobuf:"bytes,3,opt,name=topic,proto3" json:"topic,omitempty"`
Event *types.Any `protobuf:"bytes,4,opt,name=event,proto3" json:"event,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
Timestamp *types.Timestamp `protobuf:"bytes,1,opt,name=timestamp,proto3" json:"timestamp,omitempty"`
Namespace string `protobuf:"bytes,2,opt,name=namespace,proto3" json:"namespace,omitempty"`
Topic string `protobuf:"bytes,3,opt,name=topic,proto3" json:"topic,omitempty"`
Event *types.Any `protobuf:"bytes,4,opt,name=event,proto3" json:"event,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *Envelope) Reset() { *m = Envelope{} }
@ -124,32 +121,31 @@ func init() {
}
var fileDescriptor_19f98672016720b5 = []byte{
// 392 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x52, 0xb1, 0xae, 0xd3, 0x30,
0x14, 0xad, 0xe1, 0xbd, 0x47, 0x6b, 0x24, 0x06, 0xab, 0x42, 0x21, 0xa0, 0xe4, 0xe9, 0xb1, 0x54,
0x48, 0xd8, 0x6a, 0xbb, 0xc1, 0x02, 0x15, 0x45, 0x82, 0x31, 0x42, 0x0c, 0x20, 0x21, 0xdc, 0xf4,
0x36, 0xb5, 0x94, 0xd8, 0x26, 0x71, 0x82, 0xba, 0xf5, 0x13, 0xf8, 0x18, 0x16, 0xfe, 0xa0, 0x23,
0x23, 0x13, 0xd0, 0x7c, 0x09, 0xaa, 0x93, 0x34, 0xd0, 0x0e, 0x54, 0x7a, 0xdb, 0xc9, 0x3d, 0xe7,
0xdc, 0x73, 0xef, 0x8d, 0xf1, 0xeb, 0x48, 0x98, 0x65, 0x3e, 0xa3, 0xa1, 0x4a, 0x58, 0xa8, 0xa4,
0xe1, 0x42, 0x42, 0x3a, 0xff, 0x1b, 0x72, 0x2d, 0x58, 0x06, 0x69, 0x21, 0x42, 0xc8, 0x98, 0x31,
0xa9, 0x0e, 0x19, 0x14, 0x20, 0x4d, 0xc6, 0x8a, 0x61, 0x8d, 0xa8, 0x4e, 0x95, 0x51, 0xe4, 0x61,
0xeb, 0xa2, 0x8d, 0x83, 0xd6, 0x0a, 0x6b, 0xa4, 0xc5, 0xd0, 0x7d, 0xf6, 0xdf, 0x40, 0xdb, 0x6c,
0x96, 0x2f, 0x98, 0x8e, 0xf3, 0x48, 0x48, 0xb6, 0x10, 0x10, 0xcf, 0x35, 0x37, 0xcb, 0x2a, 0xc6,
0xed, 0x47, 0x2a, 0x52, 0x16, 0xb2, 0x1d, 0xaa, 0xab, 0xf7, 0x22, 0xa5, 0xa2, 0x18, 0x5a, 0x37,
0x97, 0xab, 0x9a, 0xba, 0x7f, 0x48, 0x41, 0xa2, 0x4d, 0x43, 0xfa, 0x87, 0xa4, 0x11, 0x09, 0x64,
0x86, 0x27, 0xba, 0x12, 0x5c, 0xbd, 0xc7, 0x77, 0x5e, 0xaa, 0xf4, 0x33, 0x4f, 0xe7, 0x01, 0x7c,
0xca, 0x21, 0x33, 0xe4, 0x15, 0xee, 0x82, 0x2c, 0x20, 0x56, 0x1a, 0x1c, 0x74, 0x89, 0x06, 0xb7,
0x47, 0x8f, 0xe9, 0x09, 0xab, 0xd3, 0x69, 0x6d, 0x0a, 0xf6, 0xf6, 0xab, 0xaf, 0x08, 0x77, 0x9b,
0x32, 0x99, 0xe0, 0xde, 0x3e, 0xbc, 0x6e, 0xec, 0xd2, 0x6a, 0x3c, 0xda, 0x8c, 0x47, 0xdf, 0x34,
0x8a, 0x49, 0x77, 0xf3, 0xd3, 0xef, 0x7c, 0xf9, 0xe5, 0xa3, 0xa0, 0xb5, 0x91, 0x07, 0xb8, 0x27,
0x79, 0x02, 0x99, 0xe6, 0x21, 0x38, 0x37, 0x2e, 0xd1, 0xa0, 0x17, 0xb4, 0x05, 0xd2, 0xc7, 0xe7,
0x46, 0x69, 0x11, 0x3a, 0x37, 0x2d, 0x53, 0x7d, 0x90, 0x47, 0xf8, 0xdc, 0x8e, 0xea, 0x9c, 0xd9,
0xcc, 0xfe, 0x51, 0xe6, 0x73, 0xb9, 0x0a, 0x2a, 0xc9, 0x93, 0xb3, 0xf5, 0x37, 0x1f, 0x8d, 0x3e,
0xe2, 0x8b, 0xa9, 0x5d, 0x8e, 0xbc, 0xc5, 0xb7, 0xea, 0xeb, 0x90, 0xf1, 0x49, 0x47, 0xf8, 0xf7,
0x96, 0xee, 0xdd, 0xa3, 0xb0, 0xe9, 0xee, 0xe7, 0x4c, 0x3e, 0x6c, 0xb6, 0x5e, 0xe7, 0xc7, 0xd6,
0xeb, 0xac, 0x4b, 0x0f, 0x6d, 0x4a, 0x0f, 0x7d, 0x2f, 0x3d, 0xf4, 0xbb, 0xf4, 0xd0, 0xbb, 0x17,
0xd7, 0x7a, 0xb1, 0x4f, 0x2b, 0x34, 0xbb, 0xb0, 0x79, 0xe3, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff,
0x22, 0x5e, 0xcf, 0x4e, 0x00, 0x03, 0x00, 0x00,
// 379 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x52, 0xc1, 0x0e, 0xd2, 0x40,
0x10, 0x65, 0x15, 0x10, 0xd6, 0xc4, 0xc3, 0x86, 0x98, 0x5a, 0x4d, 0x21, 0x78, 0x21, 0x26, 0xee,
0x06, 0xb8, 0x18, 0xbd, 0xa8, 0x11, 0x13, 0x3d, 0x36, 0xc6, 0x83, 0x26, 0xc6, 0xa5, 0x0c, 0x65,
0x93, 0x76, 0x77, 0x6d, 0xb7, 0x35, 0xdc, 0xf8, 0x1e, 0xff, 0xc0, 0x3f, 0xe0, 0xe8, 0xd1, 0xa3,
0xf4, 0x4b, 0x0c, 0xdb, 0x96, 0x2a, 0x1c, 0x24, 0xf1, 0xf6, 0x3a, 0xef, 0xbd, 0x79, 0x33, 0xd3,
0xc5, 0x6f, 0x43, 0x61, 0x36, 0xd9, 0x92, 0x06, 0x2a, 0x66, 0x81, 0x92, 0x86, 0x0b, 0x09, 0xc9,
0xea, 0x4f, 0xc8, 0xb5, 0x60, 0x29, 0x24, 0xb9, 0x08, 0x20, 0x65, 0xc6, 0x24, 0x3a, 0x60, 0x90,
0x83, 0x34, 0x29, 0xcb, 0xa7, 0x15, 0xa2, 0x3a, 0x51, 0x46, 0x91, 0x87, 0x8d, 0x8b, 0xd6, 0x0e,
0x5a, 0x29, 0xac, 0x91, 0xe6, 0x53, 0xf7, 0xf9, 0x3f, 0x03, 0x6d, 0xb3, 0x65, 0xb6, 0x66, 0x3a,
0xca, 0x42, 0x21, 0xd9, 0x5a, 0x40, 0xb4, 0xd2, 0xdc, 0x6c, 0xca, 0x18, 0x77, 0x10, 0xaa, 0x50,
0x59, 0xc8, 0x8e, 0xa8, 0xaa, 0xde, 0x0b, 0x95, 0x0a, 0x23, 0x68, 0xdc, 0x5c, 0x6e, 0x2b, 0xea,
0xfe, 0x39, 0x05, 0xb1, 0x36, 0x35, 0x39, 0x3c, 0x27, 0x8d, 0x88, 0x21, 0x35, 0x3c, 0xd6, 0xa5,
0x60, 0xfc, 0x11, 0xdf, 0x79, 0xad, 0x92, 0xaf, 0x3c, 0x59, 0xf9, 0xf0, 0x25, 0x83, 0xd4, 0x90,
0x37, 0xb8, 0x07, 0x32, 0x87, 0x48, 0x69, 0x70, 0xd0, 0x08, 0x4d, 0x6e, 0xcf, 0x1e, 0xd3, 0x2b,
0x56, 0xa7, 0x8b, 0xca, 0xe4, 0x9f, 0xec, 0xe3, 0x6f, 0x08, 0xf7, 0xea, 0x32, 0x79, 0x82, 0xfb,
0xa7, 0xf0, 0xaa, 0xb1, 0x4b, 0xcb, 0xf1, 0x68, 0x3d, 0x1e, 0x7d, 0x57, 0x2b, 0xfc, 0x46, 0x4c,
0x1e, 0xe0, 0xbe, 0xe4, 0x31, 0xa4, 0x9a, 0x07, 0xe0, 0xdc, 0x18, 0xa1, 0x49, 0xdf, 0x6f, 0x0a,
0x64, 0x80, 0x3b, 0x46, 0x69, 0x11, 0x38, 0x37, 0x2d, 0x53, 0x7e, 0x90, 0x47, 0xb8, 0x63, 0x07,
0x74, 0xda, 0x36, 0x69, 0x70, 0x91, 0xf4, 0x42, 0x6e, 0xfd, 0x52, 0xf2, 0xb4, 0xbd, 0xfb, 0x3e,
0x44, 0xb3, 0xcf, 0xb8, 0xbb, 0xb0, 0x2b, 0x91, 0xf7, 0xf8, 0x56, 0x75, 0x13, 0x32, 0xbf, 0x6a,
0xf5, 0xbf, 0x2f, 0xe8, 0xde, 0xbd, 0x08, 0x5b, 0x1c, 0x7f, 0xc9, 0xcb, 0x4f, 0xfb, 0x83, 0xd7,
0xfa, 0x79, 0xf0, 0x5a, 0xbb, 0xc2, 0x43, 0xfb, 0xc2, 0x43, 0x3f, 0x0a, 0x0f, 0xfd, 0x2a, 0x3c,
0xf4, 0xe1, 0xd5, 0x7f, 0xbd, 0xd3, 0x67, 0x25, 0x5a, 0x76, 0x6d, 0xde, 0xfc, 0x77, 0x00, 0x00,
0x00, 0xff, 0xff, 0x87, 0xc7, 0x48, 0x3b, 0xf6, 0x02, 0x00, 0x00,
}
// Field returns the value for the given fieldpath as a string, if defined.
@ -268,14 +264,18 @@ func (m *Envelope) MarshalToSizedBuffer(dAtA []byte) (int, error) {
i--
dAtA[i] = 0x12
}
n3, err3 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Timestamp, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamp):])
if err3 != nil {
return 0, err3
if m.Timestamp != nil {
{
size, err := m.Timestamp.MarshalToSizedBuffer(dAtA[:i])
if err != nil {
return 0, err
}
i -= size
i = encodeVarintEvents(dAtA, i, uint64(size))
}
i--
dAtA[i] = 0xa
}
i -= n3
i = encodeVarintEvents(dAtA, i, uint64(n3))
i--
dAtA[i] = 0xa
return len(dAtA) - i, nil
}
@ -312,8 +312,10 @@ func (m *Envelope) Size() (n int) {
}
var l int
_ = l
l = github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamp)
n += 1 + l + sovEvents(uint64(l))
if m.Timestamp != nil {
l = m.Timestamp.Size()
n += 1 + l + sovEvents(uint64(l))
}
l = len(m.Namespace)
if l > 0 {
n += 1 + l + sovEvents(uint64(l))
@ -354,7 +356,7 @@ func (this *Envelope) String() string {
return "nil"
}
s := strings.Join([]string{`&Envelope{`,
`Timestamp:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Timestamp), "Timestamp", "types.Timestamp", 1), `&`, ``, 1) + `,`,
`Timestamp:` + strings.Replace(fmt.Sprintf("%v", this.Timestamp), "Timestamp", "types.Timestamp", 1) + `,`,
`Namespace:` + fmt.Sprintf("%v", this.Namespace) + `,`,
`Topic:` + fmt.Sprintf("%v", this.Topic) + `,`,
`Event:` + strings.Replace(fmt.Sprintf("%v", this.Event), "Any", "types.Any", 1) + `,`,
@ -550,7 +552,10 @@ func (m *Envelope) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.Timestamp, dAtA[iNdEx:postIndex]); err != nil {
if m.Timestamp == nil {
m.Timestamp = &types.Timestamp{}
}
if err := m.Timestamp.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex

2
api/services/ttrpc/events/v1/events.proto
View File

@ -41,7 +41,7 @@ message ForwardRequest {
message Envelope {
option (containerd.plugin.fieldpath) = true;
google.protobuf.Timestamp timestamp = 1 [(gogoproto.stdtime) = true, (gogoproto.nullable) = false];
google.protobuf.Timestamp timestamp = 1;
string namespace = 2;
string topic = 3;
google.protobuf.Any event = 4;

66
api/types/metrics.pb.go
View File

@ -7,21 +7,18 @@ import (
fmt "fmt"
_ "github.com/gogo/protobuf/gogoproto"
proto "github.com/gogo/protobuf/proto"
github_com_gogo_protobuf_types "github.com/gogo/protobuf/types"
types "github.com/gogo/protobuf/types"
io "io"
math "math"
math_bits "math/bits"
reflect "reflect"
strings "strings"
time "time"
)
// Reference imports to suppress errors if they are not otherwise used.
var _ = proto.Marshal
var _ = fmt.Errorf
var _ = math.Inf
var _ = time.Kitchen
// This is a compile-time assertion to ensure that this generated file
// is compatible with the proto package it is being compiled against.
@ -30,12 +27,12 @@ var _ = time.Kitchen
const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
type Metric struct {
Timestamp time.Time `protobuf:"bytes,1,opt,name=timestamp,proto3,stdtime" json:"timestamp"`
ID string `protobuf:"bytes,2,opt,name=id,proto3" json:"id,omitempty"`
Data *types.Any `protobuf:"bytes,3,opt,name=data,proto3" json:"data,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
Timestamp *types.Timestamp `protobuf:"bytes,1,opt,name=timestamp,proto3" json:"timestamp,omitempty"`
ID string `protobuf:"bytes,2,opt,name=id,proto3" json:"id,omitempty"`
Data *types.Any `protobuf:"bytes,3,opt,name=data,proto3" json:"data,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *Metric) Reset() { *m = Metric{} }
@ -79,7 +76,7 @@ func init() {
}
var fileDescriptor_8d594d87edf6e6bc = []byte{
// 256 bytes of a gzipped FileDescriptorProto
// 246 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xb2, 0x48, 0xcf, 0x2c, 0xc9,
0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0xcf, 0x2b, 0x49, 0xcc, 0xcc, 0x4b, 0x2d,
0x4a, 0x41, 0x66, 0x26, 0x16, 0x64, 0xea, 0x97, 0x54, 0x16, 0xa4, 0x16, 0xeb, 0xe7, 0xa6, 0x96,
@ -87,15 +84,15 @@ var fileDescriptor_8d594d87edf6e6bc = []byte{
0xe5, 0xa5, 0x44, 0xd2, 0xf3, 0xd3, 0xf3, 0xc1, 0x92, 0xfa, 0x20, 0x16, 0x44, 0x9d, 0x94, 0x64,
0x7a, 0x7e, 0x7e, 0x7a, 0x4e, 0xaa, 0x3e, 0x98, 0x97, 0x54, 0x9a, 0xa6, 0x9f, 0x98, 0x57, 0x09,
0x95, 0x92, 0x47, 0x97, 0x2a, 0xc9, 0xcc, 0x4d, 0x2d, 0x2e, 0x49, 0xcc, 0x2d, 0x80, 0x28, 0x50,
0xea, 0x63, 0xe4, 0x62, 0xf3, 0x05, 0xdb, 0x2a, 0xe4, 0xc4, 0xc5, 0x09, 0x97, 0x95, 0x60, 0x54,
0x60, 0xd4, 0xe0, 0x36, 0x92, 0xd2, 0x83, 0xe8, 0xd7, 0x83, 0xe9, 0xd7, 0x0b, 0x81, 0xa9, 0x70,
0xe2, 0x38, 0x71, 0x4f, 0x9e, 0x61, 0xc2, 0x7d, 0x79, 0xc6, 0x20, 0x84, 0x36, 0x21, 0x31, 0x2e,
0xa6, 0xcc, 0x14, 0x09, 0x26, 0x05, 0x46, 0x0d, 0x4e, 0x27, 0xb6, 0x47, 0xf7, 0xe4, 0x99, 0x3c,
0x5d, 0x82, 0x98, 0x32, 0x53, 0x84, 0x34, 0xb8, 0x58, 0x52, 0x12, 0x4b, 0x12, 0x25, 0x98, 0xc1,
0xc6, 0x8a, 0x60, 0x18, 0xeb, 0x98, 0x57, 0x19, 0x04, 0x56, 0xe1, 0xe4, 0x75, 0xe2, 0xa1, 0x1c,
0xc3, 0x8d, 0x87, 0x72, 0x0c, 0x0d, 0x8f, 0xe4, 0x18, 0x4f, 0x3c, 0x92, 0x63, 0xbc, 0xf0, 0x48,
0x8e, 0xf1, 0xc1, 0x23, 0x39, 0xc6, 0x28, 0x03, 0xe2, 0x03, 0xd2, 0x1a, 0x4c, 0x26, 0xb1, 0x81,
0xcd, 0x37, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0xf8, 0x51, 0x36, 0x74, 0x83, 0x01, 0x00, 0x00,
0x6a, 0x61, 0xe4, 0x62, 0xf3, 0x05, 0xdb, 0x2a, 0x64, 0xc1, 0xc5, 0x09, 0x97, 0x95, 0x60, 0x54,
0x60, 0xd4, 0xe0, 0x36, 0x92, 0xd2, 0x83, 0xe8, 0xd7, 0x83, 0xe9, 0xd7, 0x0b, 0x81, 0xa9, 0x08,
0x42, 0x28, 0x16, 0x12, 0xe3, 0x62, 0xca, 0x4c, 0x91, 0x60, 0x52, 0x60, 0xd4, 0xe0, 0x74, 0x62,
0x7b, 0x74, 0x4f, 0x9e, 0xc9, 0xd3, 0x25, 0x88, 0x29, 0x33, 0x45, 0x48, 0x83, 0x8b, 0x25, 0x25,
0xb1, 0x24, 0x51, 0x82, 0x19, 0x6c, 0x98, 0x08, 0x86, 0x61, 0x8e, 0x79, 0x95, 0x41, 0x60, 0x15,
0x4e, 0x5e, 0x27, 0x1e, 0xca, 0x31, 0xdc, 0x78, 0x28, 0xc7, 0xd0, 0xf0, 0x48, 0x8e, 0xf1, 0xc4,
0x23, 0x39, 0xc6, 0x0b, 0x8f, 0xe4, 0x18, 0x1f, 0x3c, 0x92, 0x63, 0x8c, 0x32, 0x20, 0x3e, 0xf8,
0xac, 0xc1, 0x64, 0x12, 0x1b, 0xd8, 0x7c, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0x6c, 0x28,
0x99, 0xa7, 0x79, 0x01, 0x00, 0x00,
}
func (m *Metric) Marshal() (dAtA []byte, err error) {
@ -141,14 +138,18 @@ func (m *Metric) MarshalToSizedBuffer(dAtA []byte) (int, error) {
i--
dAtA[i] = 0x12
}
n2, err2 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Timestamp, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamp):])
if err2 != nil {
return 0, err2
if m.Timestamp != nil {
{
size, err := m.Timestamp.MarshalToSizedBuffer(dAtA[:i])
if err != nil {
return 0, err
}
i -= size
i = encodeVarintMetrics(dAtA, i, uint64(size))
}
i--
dAtA[i] = 0xa
}
i -= n2
i = encodeVarintMetrics(dAtA, i, uint64(n2))
i--
dAtA[i] = 0xa
return len(dAtA) - i, nil
}
@ -169,8 +170,10 @@ func (m *Metric) Size() (n int) {
}
var l int
_ = l
l = github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamp)
n += 1 + l + sovMetrics(uint64(l))
if m.Timestamp != nil {
l = m.Timestamp.Size()
n += 1 + l + sovMetrics(uint64(l))
}
l = len(m.ID)
if l > 0 {
n += 1 + l + sovMetrics(uint64(l))
@ -196,7 +199,7 @@ func (this *Metric) String() string {
return "nil"
}
s := strings.Join([]string{`&Metric{`,
`Timestamp:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Timestamp), "Timestamp", "types.Timestamp", 1), `&`, ``, 1) + `,`,
`Timestamp:` + strings.Replace(fmt.Sprintf("%v", this.Timestamp), "Timestamp", "types.Timestamp", 1) + `,`,
`ID:` + fmt.Sprintf("%v", this.ID) + `,`,
`Data:` + strings.Replace(fmt.Sprintf("%v", this.Data), "Any", "types.Any", 1) + `,`,
`XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`,
@ -270,7 +273,10 @@ func (m *Metric) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.Timestamp, dAtA[iNdEx:postIndex]); err != nil {
if m.Timestamp == nil {
m.Timestamp = &types.Timestamp{}
}
if err := m.Timestamp.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex

2
api/types/metrics.proto
View File

@ -25,7 +25,7 @@ import "google/protobuf/timestamp.proto";
option go_package = "github.com/containerd/containerd/api/types;types";
message Metric {
google.protobuf.Timestamp timestamp = 1 [(gogoproto.stdtime) = true, (gogoproto.nullable) = false];
google.protobuf.Timestamp timestamp = 1;
string id = 2;
google.protobuf.Any data = 3;
}

128
api/types/sandbox.pb.go
View File

@ -7,21 +7,18 @@ import (
fmt "fmt"
proto "github.com/gogo/protobuf/proto"
github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys"
github_com_gogo_protobuf_types "github.com/gogo/protobuf/types"
types "github.com/gogo/protobuf/types"
io "io"
math "math"
math_bits "math/bits"
reflect "reflect"
strings "strings"
time "time"
)
// Reference imports to suppress errors if they are not otherwise used.
var _ = proto.Marshal
var _ = fmt.Errorf
var _ = math.Inf
var _ = time.Kitchen
// This is a compile-time assertion to ensure that this generated file
// is compatible with the proto package it is being compiled against.
@ -42,9 +39,9 @@ type Sandbox struct {
// Labels provides an area to include arbitrary data on containers.
Labels map[string]string `protobuf:"bytes,4,rep,name=labels,proto3" json:"labels" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
// CreatedAt is the time the container was first created.
CreatedAt time.Time `protobuf:"bytes,5,opt,name=created_at,json=createdAt,proto3,stdtime" json:"created_at"`
CreatedAt *types.Timestamp `protobuf:"bytes,5,opt,name=created_at,json=createdAt,proto3" json:"created_at,omitempty"`
// UpdatedAt is the last time the container was mutated.
UpdatedAt time.Time `protobuf:"bytes,6,opt,name=updated_at,json=updatedAt,proto3,stdtime" json:"updated_at"`
UpdatedAt *types.Timestamp `protobuf:"bytes,6,opt,name=updated_at,json=updatedAt,proto3" json:"updated_at,omitempty"`
// Extensions allow clients to provide optional blobs that can be handled by runtime.
Extensions map[string]types.Any `protobuf:"bytes,7,rep,name=extensions,proto3" json:"extensions" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
@ -139,36 +136,35 @@ func init() {
}
var fileDescriptor_f2257af6cf851f1c = []byte{
// 454 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x53, 0x4f, 0x8b, 0xd3, 0x40,
0x14, 0xef, 0xf4, 0x5f, 0xcc, 0x2b, 0xe2, 0x32, 0xf4, 0x10, 0x73, 0x48, 0xab, 0x20, 0x54, 0x91,
0x89, 0xac, 0x97, 0x55, 0x4f, 0xed, 0xba, 0x87, 0x15, 0x45, 0xc8, 0x7a, 0x10, 0x2f, 0xcb, 0xa4,
0x19, 0x63, 0xb0, 0x9d, 0x09, 0xc9, 0x44, 0x36, 0x37, 0x3f, 0x82, 0xdf, 0xc1, 0x2f, 0xd3, 0xa3,
0x47, 0x4f, 0xab, 0x9b, 0x4f, 0x22, 0x99, 0x99, 0xd8, 0x50, 0xad, 0xb8, 0x97, 0xf0, 0x86, 0xf7,
0xfb, 0xf7, 0xde, 0x23, 0x70, 0x14, 0x27, 0xf2, 0x43, 0x11, 0x92, 0xa5, 0x58, 0xfb, 0x4b, 0xc1,
0x25, 0x4d, 0x38, 0xcb, 0xa2, 0x76, 0x49, 0xd3, 0xc4, 0x97, 0x65, 0xca, 0x72, 0x3f, 0xa7, 0x3c,
0x0a, 0xc5, 0x05, 0x49, 0x33, 0x21, 0x05, 0x3e, 0xd8, 0x62, 0x88, 0xea, 0xbb, 0xe3, 0x58, 0xc4,
0x42, 0x35, 0xfd, 0xba, 0xd2, 0x38, 0xf7, 0x76, 0x2c, 0x44, 0xbc, 0x62, 0xbe, 0x7a, 0x85, 0xc5,
0x7b, 0x9f, 0xf2, 0xd2, 0xb4, 0x26, 0xbb, 0x2d, 0x99, 0xac, 0x59, 0x2e, 0xe9, 0x3a, 0xd5, 0x80,
0xbb, 0x5f, 0x07, 0x60, 0x9d, 0x69, 0x57, 0xfc, 0x10, 0xc0, 0x04, 0x38, 0x4f, 0x22, 0x07, 0x4d,
0xd1, 0xcc, 0x5e, 0xdc, 0xac, 0x2e, 0x27, 0xb6, 0x01, 0x9c, 0x3e, 0x0f, 0x6c, 0x03, 0x38, 0x8d,
0xf0, 0x1c, 0xac, 0xac, 0xe0, 0xb5, 0x9e, 0xd3, 0x9d, 0xa2, 0xd9, 0xe8, 0xf0, 0x0e, 0xd9, 0xcd,
0x4b, 0x0c, 0x91, 0x04, 0x1a, 0xb8, 0xe8, 0x6f, 0x2e, 0x27, 0x9d, 0xa0, 0xe1, 0xe1, 0x19, 0xf4,
0xf3, 0x94, 0x2d, 0x9d, 0x9e, 0xe2, 0x8f, 0x89, 0x0e, 0x4b, 0x9a, 0xb0, 0x64, 0xce, 0xcb, 0x40,
0x21, 0xf0, 0x31, 0x0c, 0x57, 0x34, 0x64, 0xab, 0xdc, 0xe9, 0x4f, 0x7b, 0xb3, 0xd1, 0xe1, 0xbd,
0xfd, 0x5e, 0x2f, 0x15, 0xee, 0x84, 0xcb, 0xac, 0x34, 0x7e, 0x86, 0x8a, 0x8f, 0x01, 0x96, 0x19,
0xa3, 0x92, 0x45, 0xe7, 0x54, 0x3a, 0x03, 0x65, 0xea, 0xfe, 0x61, 0xfa, 0xa6, 0xd9, 0xd0, 0xe2,
0x46, 0xcd, 0xfe, 0xf2, 0x63, 0x82, 0x02, 0xdb, 0xf0, 0xe6, 0xb2, 0x16, 0x29, 0xd2, 0xa8, 0x11,
0x19, 0x5e, 0x47, 0xc4, 0xf0, 0xe6, 0x12, 0xbf, 0x06, 0x60, 0x17, 0x92, 0xf1, 0x3c, 0x11, 0x3c,
0x77, 0x2c, 0x35, 0xd2, 0xfd, 0xfd, 0x23, 0x9d, 0xfc, 0xc6, 0xb6, 0xc7, 0x6a, 0x49, 0xb8, 0xaf,
0xc0, 0x32, 0x3b, 0xc6, 0x18, 0xfa, 0x9c, 0xae, 0x99, 0xbe, 0x5f, 0xa0, 0x6a, 0x4c, 0xc0, 0x12,
0xa9, 0x54, 0x66, 0xdd, 0x7f, 0xec, 0xba, 0x01, 0xb9, 0x4f, 0x60, 0xd4, 0x5a, 0x23, 0x3e, 0x80,
0xde, 0x47, 0x56, 0x1a, 0xc5, 0xba, 0xc4, 0x63, 0x18, 0x7c, 0xa2, 0xab, 0x42, 0x9f, 0xde, 0x0e,
0xf4, 0xe3, 0x69, 0xf7, 0x08, 0xb9, 0x67, 0x70, 0x6b, 0x27, 0xee, 0x5f, 0xe8, 0x0f, 0xda, 0xf4,
0x7d, 0x69, 0xb6, 0xa2, 0x8b, 0x17, 0x9b, 0x2b, 0xaf, 0xf3, 0xfd, 0xca, 0xeb, 0x7c, 0xae, 0x3c,
0xb4, 0xa9, 0x3c, 0xf4, 0xad, 0xf2, 0xd0, 0xcf, 0xca, 0x43, 0xef, 0x1e, 0xfd, 0xff, 0xdf, 0xf5,
0x4c, 0x7d, 0xdf, 0x76, 0xc2, 0xa1, 0xb2, 0x79, 0xfc, 0x2b, 0x00, 0x00, 0xff, 0xff, 0x90, 0x58,
0x3c, 0xe1, 0x9a, 0x03, 0x00, 0x00,
// 446 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x93, 0x4f, 0x8b, 0xd3, 0x40,
0x18, 0xc6, 0x3b, 0xfd, 0x17, 0xf2, 0x16, 0x71, 0x19, 0x7a, 0x88, 0x39, 0xa4, 0x55, 0x10, 0xaa,
0xc8, 0x44, 0xd6, 0xcb, 0xae, 0x9e, 0x5a, 0xdd, 0xc3, 0x8a, 0x22, 0x64, 0x3d, 0x88, 0x97, 0x65,
0xd2, 0x8c, 0x31, 0xd8, 0xcc, 0x84, 0x64, 0x22, 0x9b, 0x9b, 0xdf, 0xc0, 0xaf, 0xd5, 0xa3, 0x47,
0x4f, 0x8b, 0x9b, 0x4f, 0x22, 0x99, 0x99, 0xd8, 0x50, 0xad, 0x7a, 0x09, 0xef, 0xf0, 0xfe, 0x9e,
0xf7, 0x79, 0xf2, 0x0e, 0x03, 0x27, 0x71, 0x22, 0x3f, 0x96, 0x21, 0x59, 0x8b, 0xd4, 0x5f, 0x0b,
0x2e, 0x69, 0xc2, 0x59, 0x1e, 0x75, 0x4b, 0x9a, 0x25, 0xbe, 0xac, 0x32, 0x56, 0xf8, 0x05, 0xe5,
0x51, 0x28, 0xae, 0x48, 0x96, 0x0b, 0x29, 0xf0, 0xd1, 0x8e, 0x21, 0xaa, 0xef, 0x4e, 0x63, 0x11,
0x0b, 0xd5, 0xf4, 0x9b, 0x4a, 0x73, 0xee, 0x9d, 0x58, 0x88, 0x78, 0xc3, 0x7c, 0x75, 0x0a, 0xcb,
0x0f, 0x3e, 0xe5, 0x95, 0x69, 0xcd, 0xf6, 0x5b, 0x32, 0x49, 0x59, 0x21, 0x69, 0x9a, 0x69, 0xe0,
0xde, 0xd7, 0x11, 0x58, 0x17, 0xda, 0x15, 0x3f, 0x02, 0x30, 0x01, 0x2e, 0x93, 0xc8, 0x41, 0x73,
0xb4, 0xb0, 0x57, 0xb7, 0xea, 0xeb, 0x99, 0x6d, 0x80, 0xf3, 0x17, 0x81, 0x6d, 0x80, 0xf3, 0x08,
0x2f, 0xc1, 0xca, 0x4b, 0xde, 0xcc, 0x73, 0xfa, 0x73, 0xb4, 0x98, 0x1c, 0xdf, 0x25, 0xfb, 0x79,
0x89, 0x11, 0x92, 0x40, 0x83, 0xab, 0xe1, 0xf6, 0x7a, 0xd6, 0x0b, 0x5a, 0x1d, 0x5e, 0xc0, 0xb0,
0xc8, 0xd8, 0xda, 0x19, 0x28, 0xfd, 0x94, 0xe8, 0xb0, 0xa4, 0x0d, 0x4b, 0x96, 0xbc, 0x0a, 0x14,
0x81, 0x9f, 0xc3, 0x78, 0x43, 0x43, 0xb6, 0x29, 0x9c, 0xe1, 0x7c, 0xb0, 0x98, 0x1c, 0xdf, 0x3f,
0xec, 0xf5, 0x4a, 0x71, 0x67, 0x5c, 0xe6, 0x95, 0xf1, 0x33, 0x52, 0x7c, 0x0a, 0xb0, 0xce, 0x19,
0x95, 0x2c, 0xba, 0xa4, 0xd2, 0x19, 0x29, 0x53, 0xf7, 0x37, 0xd3, 0xb7, 0xed, 0x86, 0x02, 0xdb,
0xd0, 0x4b, 0xd9, 0x48, 0xcb, 0x2c, 0x6a, 0xa5, 0xe3, 0x7f, 0x4b, 0x0d, 0xbd, 0x94, 0xf8, 0x0d,
0x00, 0xbb, 0x92, 0x8c, 0x17, 0x89, 0xe0, 0x85, 0x63, 0xa9, 0xf8, 0x0f, 0x0e, 0xc7, 0x3f, 0xfb,
0xc5, 0x76, 0x7f, 0xa1, 0x33, 0xc2, 0x7d, 0x0d, 0x96, 0xd9, 0x27, 0xc6, 0x30, 0xe4, 0x34, 0x65,
0xfa, 0xae, 0x02, 0x55, 0x63, 0x02, 0x96, 0xc8, 0xa4, 0x32, 0xeb, 0xff, 0x65, 0xaf, 0x2d, 0xe4,
0x9e, 0xc2, 0xa4, 0xb3, 0x32, 0x7c, 0x04, 0x83, 0x4f, 0xac, 0x32, 0x13, 0x9b, 0x12, 0x4f, 0x61,
0xf4, 0x99, 0x6e, 0x4a, 0x7d, 0xcd, 0x76, 0xa0, 0x0f, 0x4f, 0xfb, 0x27, 0xc8, 0xbd, 0x80, 0xdb,
0x7b, 0x71, 0xff, 0x20, 0x7f, 0xd8, 0x95, 0x1f, 0x4a, 0xb3, 0x1b, 0xba, 0x7a, 0xb9, 0xbd, 0xf1,
0x7a, 0xdf, 0x6f, 0xbc, 0xde, 0x97, 0xda, 0x43, 0xdb, 0xda, 0x43, 0xdf, 0x6a, 0x0f, 0xfd, 0xa8,
0x3d, 0xf4, 0xfe, 0xf1, 0xff, 0xbf, 0xa4, 0x67, 0xea, 0xfb, 0xae, 0x17, 0x8e, 0x95, 0xcd, 0x93,
0x9f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x59, 0xb4, 0xf4, 0x66, 0x86, 0x03, 0x00, 0x00,
}
func (m *Sandbox) Marshal() (dAtA []byte, err error) {
@ -219,22 +215,30 @@ func (m *Sandbox) MarshalToSizedBuffer(dAtA []byte) (int, error) {
dAtA[i] = 0x3a
}
}
n2, err2 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.UpdatedAt, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.UpdatedAt):])
if err2 != nil {
return 0, err2
if m.UpdatedAt != nil {
{
size, err := m.UpdatedAt.MarshalToSizedBuffer(dAtA[:i])
if err != nil {
return 0, err
}
i -= size
i = encodeVarintSandbox(dAtA, i, uint64(size))
}
i--
dAtA[i] = 0x32
}
i -= n2
i = encodeVarintSandbox(dAtA, i, uint64(n2))
i--
dAtA[i] = 0x32
n3, err3 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.CreatedAt, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.CreatedAt):])
if err3 != nil {
return 0, err3
if m.CreatedAt != nil {
{
size, err := m.CreatedAt.MarshalToSizedBuffer(dAtA[:i])
if err != nil {
return 0, err
}
i -= size
i = encodeVarintSandbox(dAtA, i, uint64(size))
}
i--
dAtA[i] = 0x2a
}
i -= n3
i = encodeVarintSandbox(dAtA, i, uint64(n3))
i--
dAtA[i] = 0x2a
if len(m.Labels) > 0 {
for k := range m.Labels {
v := m.Labels[k]
@ -367,10 +371,14 @@ func (m *Sandbox) Size() (n int) {
n += mapEntrySize + 1 + sovSandbox(uint64(mapEntrySize))
}
}
l = github_com_gogo_protobuf_types.SizeOfStdTime(m.CreatedAt)
n += 1 + l + sovSandbox(uint64(l))
l = github_com_gogo_protobuf_types.SizeOfStdTime(m.UpdatedAt)
n += 1 + l + sovSandbox(uint64(l))
if m.CreatedAt != nil {
l = m.CreatedAt.Size()
n += 1 + l + sovSandbox(uint64(l))
}
if m.UpdatedAt != nil {
l = m.UpdatedAt.Size()
n += 1 + l + sovSandbox(uint64(l))
}
if len(m.Extensions) > 0 {
for k, v := range m.Extensions {
_ = k
@ -441,8 +449,8 @@ func (this *Sandbox) String() string {
`Runtime:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Runtime), "Sandbox_Runtime", "Sandbox_Runtime", 1), `&`, ``, 1) + `,`,
`Spec:` + strings.Replace(fmt.Sprintf("%v", this.Spec), "Any", "types.Any", 1) + `,`,
`Labels:` + mapStringForLabels + `,`,
`CreatedAt:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.CreatedAt), "Timestamp", "types.Timestamp", 1), `&`, ``, 1) + `,`,
`UpdatedAt:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.UpdatedAt), "Timestamp", "types.Timestamp", 1), `&`, ``, 1) + `,`,
`CreatedAt:` + strings.Replace(fmt.Sprintf("%v", this.CreatedAt), "Timestamp", "types.Timestamp", 1) + `,`,
`UpdatedAt:` + strings.Replace(fmt.Sprintf("%v", this.UpdatedAt), "Timestamp", "types.Timestamp", 1) + `,`,
`Extensions:` + mapStringForExtensions + `,`,
`XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`,
`}`,
@ -755,7 +763,10 @@ func (m *Sandbox) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.CreatedAt, dAtA[iNdEx:postIndex]); err != nil {
if m.CreatedAt == nil {
m.CreatedAt = &types.Timestamp{}
}
if err := m.CreatedAt.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
@ -788,7 +799,10 @@ func (m *Sandbox) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.UpdatedAt, dAtA[iNdEx:postIndex]); err != nil {
if m.UpdatedAt == nil {
m.UpdatedAt = &types.Timestamp{}
}
if err := m.UpdatedAt.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex

4
api/types/sandbox.proto
View File

@ -44,9 +44,9 @@ message Sandbox {
// Labels provides an area to include arbitrary data on containers.
map<string, string> labels = 4 [(gogoproto.nullable) = false];
// CreatedAt is the time the container was first created.
google.protobuf.Timestamp created_at = 5 [(gogoproto.stdtime) = true, (gogoproto.nullable) = false];
google.protobuf.Timestamp created_at = 5;
// UpdatedAt is the last time the container was mutated.
google.protobuf.Timestamp updated_at = 6 [(gogoproto.stdtime) = true, (gogoproto.nullable) = false];
google.protobuf.Timestamp updated_at = 6;
// Extensions allow clients to provide optional blobs that can be handled by runtime.
map<string, google.protobuf.Any> extensions = 7 [(gogoproto.nullable) = false];
}

121
api/types/task/task.pb.go
View File

@ -7,21 +7,18 @@ import (
fmt "fmt"
_ "github.com/gogo/protobuf/gogoproto"
proto "github.com/gogo/protobuf/proto"
github_com_gogo_protobuf_types "github.com/gogo/protobuf/types"
types "github.com/gogo/protobuf/types"
io "io"
math "math"
math_bits "math/bits"
reflect "reflect"
strings "strings"
time "time"
)
// Reference imports to suppress errors if they are not otherwise used.
var _ = proto.Marshal
var _ = fmt.Errorf
var _ = math.Inf
var _ = time.Kitchen
// This is a compile-time assertion to ensure that this generated file
// is compatible with the proto package it is being compiled against.
@ -67,19 +64,19 @@ func (Status) EnumDescriptor() ([]byte, []int) {
}
type Process struct {
ContainerID string `protobuf:"bytes,1,opt,name=container_id,json=containerId,proto3" json:"container_id,omitempty"`
ID string `protobuf:"bytes,2,opt,name=id,proto3" json:"id,omitempty"`
Pid uint32 `protobuf:"varint,3,opt,name=pid,proto3" json:"pid,omitempty"`
Status Status `protobuf:"varint,4,opt,name=status,proto3,enum=containerd.v1.types.Status" json:"status,omitempty"`
Stdin string `protobuf:"bytes,5,opt,name=stdin,proto3" json:"stdin,omitempty"`
Stdout string `protobuf:"bytes,6,opt,name=stdout,proto3" json:"stdout,omitempty"`
Stderr string `protobuf:"bytes,7,opt,name=stderr,proto3" json:"stderr,omitempty"`
Terminal bool `protobuf:"varint,8,opt,name=terminal,proto3" json:"terminal,omitempty"`
ExitStatus uint32 `protobuf:"varint,9,opt,name=exit_status,json=exitStatus,proto3" json:"exit_status,omitempty"`
ExitedAt time.Time `protobuf:"bytes,10,opt,name=exited_at,json=exitedAt,proto3,stdtime" json:"exited_at"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
ContainerID string `protobuf:"bytes,1,opt,name=container_id,json=containerId,proto3" json:"container_id,omitempty"`
ID string `protobuf:"bytes,2,opt,name=id,proto3" json:"id,omitempty"`
Pid uint32 `protobuf:"varint,3,opt,name=pid,proto3" json:"pid,omitempty"`
Status Status `protobuf:"varint,4,opt,name=status,proto3,enum=containerd.v1.types.Status" json:"status,omitempty"`
Stdin string `protobuf:"bytes,5,opt,name=stdin,proto3" json:"stdin,omitempty"`
Stdout string `protobuf:"bytes,6,opt,name=stdout,proto3" json:"stdout,omitempty"`
Stderr string `protobuf:"bytes,7,opt,name=stderr,proto3" json:"stderr,omitempty"`
Terminal bool `protobuf:"varint,8,opt,name=terminal,proto3" json:"terminal,omitempty"`
ExitStatus uint32 `protobuf:"varint,9,opt,name=exit_status,json=exitStatus,proto3" json:"exit_status,omitempty"`
ExitedAt *types.Timestamp `protobuf:"bytes,10,opt,name=exited_at,json=exitedAt,proto3" json:"exited_at,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *Process) Reset() { *m = Process{} }
@ -169,37 +166,36 @@ func init() {
}
var fileDescriptor_391ef18c8ab0dc16 = []byte{
// 470 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x90, 0x4f, 0x8f, 0xd2, 0x40,
0x18, 0xc6, 0x99, 0x02, 0x05, 0xa6, 0xfe, 0x69, 0x46, 0xb2, 0x19, 0x31, 0x69, 0xc9, 0x9e, 0x1a,
0x0f, 0x6d, 0x64, 0x6f, 0xde, 0x60, 0x4b, 0x4c, 0x63, 0xd2, 0x25, 0x03, 0xc4, 0x23, 0x29, 0x74,
0xa8, 0x13, 0x97, 0x4e, 0xd3, 0x0e, 0x46, 0x6e, 0x7e, 0x04, 0x3f, 0x16, 0x47, 0x8f, 0x9e, 0xd0,
0xed, 0x27, 0x31, 0x33, 0x2d, 0xac, 0x51, 0x2f, 0xcd, 0xfb, 0x3c, 0xef, 0xaf, 0x33, 0xcf, 0x3c,
0xf0, 0x6d, 0xc2, 0xc4, 0xc7, 0xfd, 0xda, 0xdd, 0xf0, 0x9d, 0xb7, 0xe1, 0xa9, 0x88, 0x58, 0x4a,
0xf3, 0xf8, 0xcf, 0x31, 0xca, 0x98, 0x27, 0x0e, 0x19, 0x2d, 0x3c, 0x11, 0x15, 0x9f, 0xd4, 0xc7,
0xcd, 0x72, 0x2e, 0x38, 0x7a, 0xf1, 0x48, 0xb9, 0x9f, 0xdf, 0xb8, 0x0a, 0x1a, 0xf4, 0x13, 0x9e,
0x70, 0xb5, 0xf7, 0xe4, 0x54, 0xa1, 0x03, 0x3b, 0xe1, 0x3c, 0xb9, 0xa7, 0x9e, 0x52, 0xeb, 0xfd,
0xd6, 0x13, 0x6c, 0x47, 0x0b, 0x11, 0xed, 0xb2, 0x1a, 0x78, 0xf9, 0x37, 0x10, 0xa5, 0x87, 0x6a,
0x75, 0x5d, 0x6a, 0xb0, 0x33, 0xcb, 0xf9, 0x86, 0x16, 0x05, 0x1a, 0xc1, 0x27, 0x97, 0x4b, 0x57,
0x2c, 0xc6, 0x60, 0x08, 0x9c, 0xde, 0xe4, 0x79, 0x79, 0xb2, 0x8d, 0xdb, 0xb3, 0x1f, 0xf8, 0xc4,
0xb8, 0x40, 0x41, 0x8c, 0xae, 0xa0, 0xc6, 0x62, 0xac, 0x29, 0x52, 0x2f, 0x4f, 0xb6, 0x16, 0xf8,
0x44, 0x63, 0x31, 0x32, 0x61, 0x33, 0x63, 0x31, 0x6e, 0x0e, 0x81, 0xf3, 0x94, 0xc8, 0x11, 0xdd,
0x40, 0xbd, 0x10, 0x91, 0xd8, 0x17, 0xb8, 0x35, 0x04, 0xce, 0xb3, 0xd1, 0x2b, 0xf7, 0x3f, 0x2f,
0x74, 0xe7, 0x0a, 0x21, 0x35, 0x8a, 0xfa, 0xb0, 0x5d, 0x88, 0x98, 0xa5, 0xb8, 0x2d, 0x6f, 0x20,
0x95, 0x40, 0x57, 0xf2, 0xa8, 0x98, 0xef, 0x05, 0xd6, 0x95, 0x5d, 0xab, 0xda, 0xa7, 0x79, 0x8e,
0x3b, 0x17, 0x9f, 0xe6, 0x39, 0x1a, 0xc0, 0xae, 0xa0, 0xf9, 0x8e, 0xa5, 0xd1, 0x3d, 0xee, 0x0e,
0x81, 0xd3, 0x25, 0x17, 0x8d, 0x6c, 0x68, 0xd0, 0x2f, 0x4c, 0xac, 0xea, 0x6c, 0x3d, 0x15, 0x18,
0x4a, 0xab, 0x8a, 0x82, 0xc6, 0xb0, 0x27, 0x15, 0x8d, 0x57, 0x91, 0xc0, 0x70, 0x08, 0x1c, 0x63,
0x34, 0x70, 0xab, 0x42, 0xdd, 0x73, 0xa1, 0xee, 0xe2, 0xdc, 0xf8, 0xa4, 0x7b, 0x3c, 0xd9, 0x8d,
0x6f, 0x3f, 0x6d, 0x40, 0xba, 0xd5, 0x6f, 0x63, 0x71, 0x1d, 0x40, 0xa3, 0xee, 0x38, 0x48, 0xb7,
0xfc, 0xdc, 0x0d, 0x78, 0xec, 0xc6, 0x81, 0x2d, 0x96, 0x6e, 0xb9, 0xea, 0xd1, 0x18, 0xf5, 0xff,
0x39, 0x7e, 0x9c, 0x1e, 0x88, 0x22, 0x5e, 0x2f, 0xa1, 0x5e, 0xe7, 0x32, 0x60, 0x67, 0x19, 0xbe,
0x0f, 0xef, 0x3e, 0x84, 0x66, 0x43, 0x8a, 0x5b, 0x32, 0x1d, 0x2f, 0xa6, 0xbe, 0x09, 0xa4, 0x20,
0xcb, 0x30, 0x0c, 0xc2, 0x77, 0xa6, 0x26, 0xc5, 0x7c, 0x71, 0x37, 0x9b, 0x4d, 0x7d, 0xb3, 0x89,
0x20, 0xd4, 0x67, 0xe3, 0xe5, 0x7c, 0xea, 0x9b, 0x2d, 0xb9, 0x90, 0xb3, 0xa4, 0xda, 0x13, 0x7c,
0x7c, 0xb0, 0x1a, 0x3f, 0x1e, 0xac, 0xc6, 0xd7, 0xd2, 0x02, 0xc7, 0xd2, 0x02, 0xdf, 0x4b, 0x0b,
0xfc, 0x2a, 0x2d, 0xb0, 0xd6, 0x55, 0x88, 0x9b, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0xa9, 0x54,
0x02, 0x74, 0xcc, 0x02, 0x00, 0x00,
// 461 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x90, 0x4f, 0x6b, 0xdb, 0x30,
0x18, 0xc6, 0x2b, 0x27, 0x71, 0x12, 0x79, 0x7f, 0x8c, 0x16, 0x8a, 0x96, 0x81, 0x63, 0x7a, 0x32,
0x3b, 0xd8, 0x2c, 0x3d, 0x0c, 0x76, 0x4b, 0xeb, 0x30, 0xcc, 0xc0, 0x0d, 0x4a, 0xc2, 0x8e, 0xc1,
0x89, 0x14, 0x4f, 0xac, 0xb1, 0x8c, 0xad, 0x8c, 0xe5, 0xb6, 0x8f, 0xd7, 0xe3, 0x8e, 0x3d, 0x95,
0xd5, 0x9f, 0x64, 0x48, 0x76, 0xd2, 0xb1, 0xed, 0x62, 0xde, 0xe7, 0x79, 0x7f, 0xe8, 0x7d, 0xfc,
0xc0, 0x0f, 0x29, 0x97, 0x5f, 0xf6, 0x6b, 0x7f, 0x23, 0x76, 0xc1, 0x46, 0x64, 0x32, 0xe1, 0x19,
0x2b, 0xe8, 0x9f, 0x63, 0x92, 0xf3, 0x40, 0x1e, 0x72, 0x56, 0x06, 0x32, 0x29, 0xbf, 0xea, 0x8f,
0x9f, 0x17, 0x42, 0x0a, 0xf4, 0xea, 0x89, 0xf2, 0xbf, 0xbd, 0xf3, 0x35, 0x34, 0x1c, 0xa4, 0x22,
0x15, 0x7a, 0x1f, 0xa8, 0xa9, 0x46, 0x87, 0xa3, 0x54, 0x88, 0xf4, 0x96, 0x05, 0x5a, 0xad, 0xf7,
0xdb, 0x40, 0xf2, 0x1d, 0x2b, 0x65, 0xb2, 0xcb, 0x1b, 0xe0, 0xf5, 0xdf, 0x40, 0x92, 0x1d, 0xea,
0xd5, 0xc5, 0xbd, 0x01, 0xbb, 0xb3, 0x42, 0x6c, 0x58, 0x59, 0xa2, 0x31, 0x7c, 0x76, 0x3a, 0xba,
0xe2, 0x14, 0x03, 0x17, 0x78, 0xfd, 0xab, 0x97, 0xd5, 0xc3, 0xc8, 0xba, 0x3e, 0xfa, 0x51, 0x48,
0xac, 0x13, 0x14, 0x51, 0x74, 0x0e, 0x0d, 0x4e, 0xb1, 0xa1, 0x49, 0xb3, 0x7a, 0x18, 0x19, 0x51,
0x48, 0x0c, 0x4e, 0x91, 0x0d, 0x5b, 0x39, 0xa7, 0xb8, 0xe5, 0x02, 0xef, 0x39, 0x51, 0x23, 0xba,
0x84, 0x66, 0x29, 0x13, 0xb9, 0x2f, 0x71, 0xdb, 0x05, 0xde, 0x8b, 0xf1, 0x1b, 0xff, 0x3f, 0x7f,
0xe8, 0xcf, 0x35, 0x42, 0x1a, 0x14, 0x0d, 0x60, 0xa7, 0x94, 0x94, 0x67, 0xb8, 0xa3, 0x2e, 0x90,
0x5a, 0xa0, 0x73, 0xf5, 0x14, 0x15, 0x7b, 0x89, 0x4d, 0x6d, 0x37, 0xaa, 0xf1, 0x59, 0x51, 0xe0,
0xee, 0xc9, 0x67, 0x45, 0x81, 0x86, 0xb0, 0x27, 0x59, 0xb1, 0xe3, 0x59, 0x72, 0x8b, 0x7b, 0x2e,
0xf0, 0x7a, 0xe4, 0xa4, 0xd1, 0x08, 0x5a, 0xec, 0x3b, 0x97, 0xab, 0x26, 0x5b, 0x5f, 0x07, 0x86,
0xca, 0xaa, 0xa3, 0xa0, 0xf7, 0xb0, 0xaf, 0x14, 0xa3, 0xab, 0x44, 0x62, 0xe8, 0x02, 0xcf, 0x1a,
0x0f, 0xfd, 0xba, 0x50, 0xff, 0x58, 0xa8, 0xbf, 0x38, 0x36, 0x4e, 0x7a, 0x35, 0x3c, 0x91, 0x17,
0x11, 0xb4, 0x9a, 0x66, 0xa3, 0x6c, 0x2b, 0x8e, 0x8d, 0x80, 0xa7, 0x46, 0x3c, 0xd8, 0xe6, 0xd9,
0x56, 0xe8, 0xf6, 0xac, 0xf1, 0xe0, 0x9f, 0x47, 0x27, 0xd9, 0x81, 0x68, 0xe2, 0xed, 0x12, 0x9a,
0x4d, 0x1a, 0x0b, 0x76, 0x97, 0xf1, 0xa7, 0xf8, 0xe6, 0x73, 0x6c, 0x9f, 0x29, 0x71, 0x4d, 0xa6,
0x93, 0xc5, 0x34, 0xb4, 0x81, 0x12, 0x64, 0x19, 0xc7, 0x51, 0xfc, 0xd1, 0x36, 0x94, 0x98, 0x2f,
0x6e, 0x66, 0xb3, 0x69, 0x68, 0xb7, 0x10, 0x84, 0xe6, 0x6c, 0xb2, 0x9c, 0x4f, 0x43, 0xbb, 0xad,
0x16, 0x6a, 0x56, 0x54, 0xe7, 0x0a, 0xdf, 0x3d, 0x3a, 0x67, 0xf7, 0x8f, 0xce, 0xd9, 0x8f, 0xca,
0x01, 0x77, 0x95, 0x03, 0x7e, 0x56, 0x0e, 0xf8, 0x55, 0x39, 0x60, 0x6d, 0xea, 0x10, 0x97, 0xbf,
0x03, 0x00, 0x00, 0xff, 0xff, 0x60, 0xe5, 0xd9, 0x31, 0xc2, 0x02, 0x00, 0x00,
}
func (m *Process) Marshal() (dAtA []byte, err error) {
@ -226,14 +222,18 @@ func (m *Process) MarshalToSizedBuffer(dAtA []byte) (int, error) {
i -= len(m.XXX_unrecognized)
copy(dAtA[i:], m.XXX_unrecognized)
}
n1, err1 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.ExitedAt, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.ExitedAt):])
if err1 != nil {
return 0, err1
if m.ExitedAt != nil {
{
size, err := m.ExitedAt.MarshalToSizedBuffer(dAtA[:i])
if err != nil {
return 0, err
}
i -= size
i = encodeVarintTask(dAtA, i, uint64(size))
}
i--
dAtA[i] = 0x52
}
i -= n1
i = encodeVarintTask(dAtA, i, uint64(n1))
i--
dAtA[i] = 0x52
if m.ExitStatus != 0 {
i = encodeVarintTask(dAtA, i, uint64(m.ExitStatus))
i--
@ -390,8 +390,10 @@ func (m *Process) Size() (n int) {
if m.ExitStatus != 0 {
n += 1 + sovTask(uint64(m.ExitStatus))
}
l = github_com_gogo_protobuf_types.SizeOfStdTime(m.ExitedAt)
n += 1 + l + sovTask(uint64(l))
if m.ExitedAt != nil {
l = m.ExitedAt.Size()
n += 1 + l + sovTask(uint64(l))
}
if m.XXX_unrecognized != nil {
n += len(m.XXX_unrecognized)
}
@ -437,7 +439,7 @@ func (this *Process) String() string {
`Stderr:` + fmt.Sprintf("%v", this.Stderr) + `,`,
`Terminal:` + fmt.Sprintf("%v", this.Terminal) + `,`,
`ExitStatus:` + fmt.Sprintf("%v", this.ExitStatus) + `,`,
`ExitedAt:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.ExitedAt), "Timestamp", "types.Timestamp", 1), `&`, ``, 1) + `,`,
`ExitedAt:` + strings.Replace(fmt.Sprintf("%v", this.ExitedAt), "Timestamp", "types.Timestamp", 1) + `,`,
`XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`,
`}`,
}, "")
@ -758,7 +760,10 @@ func (m *Process) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.ExitedAt, dAtA[iNdEx:postIndex]); err != nil {
if m.ExitedAt == nil {
m.ExitedAt = &types.Timestamp{}
}
if err := m.ExitedAt.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex

2
api/types/task/task.proto
View File

@ -41,7 +41,7 @@ message Process {
string stderr = 7;
bool terminal = 8;
uint32 exit_status = 9;
google.protobuf.Timestamp exited_at = 10 [(gogoproto.stdtime) = true, (gogoproto.nullable) = false];
google.protobuf.Timestamp exited_at = 10;
}
message ProcessInfo {

4
containerstore.go
View File

@ -191,8 +191,8 @@ func containerFromProto(containerpb *containersapi.Container) containers.Contain
Spec: containerpb.Spec,
Snapshotter: containerpb.Snapshotter,
SnapshotKey: containerpb.SnapshotKey,
CreatedAt: containerpb.CreatedAt,
UpdatedAt: containerpb.UpdatedAt,
CreatedAt: protobuf.FromTimestamp(containerpb.CreatedAt),
UpdatedAt: protobuf.FromTimestamp(containerpb.UpdatedAt),
Extensions: extensions,
SandboxID: containerpb.Sandbox,
}

17
content/proxy/content_store.go
View File

@ -23,6 +23,7 @@ import (
contentapi "github.com/containerd/containerd/api/services/content/v1"
"github.com/containerd/containerd/content"
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/protobuf"
protobuftypes "github.com/gogo/protobuf/types"
digest "github.com/opencontainers/go-digest"
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
@ -115,8 +116,8 @@ func (pcs *proxyContentStore) Status(ctx context.Context, ref string) (content.S
status := resp.Status
return content.Status{
Ref: status.Ref,
StartedAt: status.StartedAt,
UpdatedAt: status.UpdatedAt,
StartedAt: protobuf.FromTimestamp(status.StartedAt),
UpdatedAt: protobuf.FromTimestamp(status.UpdatedAt),
Offset: status.Offset,
Total: status.Total,
Expected: digest.Digest(status.Expected),
@ -148,8 +149,8 @@ func (pcs *proxyContentStore) ListStatuses(ctx context.Context, filters ...strin
for _, status := range resp.Statuses {
statuses = append(statuses, content.Status{
Ref: status.Ref,
StartedAt: status.StartedAt,
UpdatedAt: status.UpdatedAt,
StartedAt: protobuf.FromTimestamp(status.StartedAt),
UpdatedAt: protobuf.FromTimestamp(status.UpdatedAt),
Offset: status.Offset,
Total: status.Total,
Expected: digest.Digest(status.Expected),
@ -217,8 +218,8 @@ func infoToGRPC(info content.Info) contentapi.Info {
return contentapi.Info{
Digest: info.Digest.String(),
Size_: info.Size,
CreatedAt: info.CreatedAt,
UpdatedAt: info.UpdatedAt,
CreatedAt: protobuf.ToTimestamp(info.CreatedAt),
UpdatedAt: protobuf.ToTimestamp(info.UpdatedAt),
Labels: info.Labels,
}
}
@ -227,8 +228,8 @@ func infoFromGRPC(info contentapi.Info) content.Info {
return content.Info{
Digest: digest.Digest(info.Digest),
Size: info.Size_,
CreatedAt: info.CreatedAt,
UpdatedAt: info.UpdatedAt,
CreatedAt: protobuf.FromTimestamp(info.CreatedAt),
UpdatedAt: protobuf.FromTimestamp(info.UpdatedAt),
Labels: info.Labels,
}
}

5
content/proxy/content_writer.go
View File

@ -24,6 +24,7 @@ import (
contentapi "github.com/containerd/containerd/api/services/content/v1"
"github.com/containerd/containerd/content"
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/protobuf"
digest "github.com/opencontainers/go-digest"
)
@ -64,8 +65,8 @@ func (rw *remoteWriter) Status() (content.Status, error) {
Ref: rw.ref,
Offset: resp.Offset,
Total: resp.Total,
StartedAt: resp.StartedAt,
UpdatedAt: resp.UpdatedAt,
StartedAt: protobuf.FromTimestamp(resp.StartedAt),
UpdatedAt: protobuf.FromTimestamp(resp.UpdatedAt),
}, nil
}

9
contrib/snapshotservice/service.go
View File

@ -23,6 +23,7 @@ import (
"github.com/containerd/containerd/api/types"
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/mount"
"github.com/containerd/containerd/protobuf"
"github.com/containerd/containerd/snapshots"
ptypes "github.com/gogo/protobuf/types"
)
@ -191,8 +192,8 @@ func fromInfo(info snapshots.Info) snapshotsapi.Info {
Name: info.Name,
Parent: info.Parent,
Kind: fromKind(info.Kind),
CreatedAt: info.Created,
UpdatedAt: info.Updated,
CreatedAt: protobuf.ToTimestamp(info.Created),
UpdatedAt: protobuf.ToTimestamp(info.Updated),
Labels: info.Labels,
}
}
@ -214,8 +215,8 @@ func toInfo(info snapshotsapi.Info) snapshots.Info {
Name: info.Name,
Parent: info.Parent,
Kind: toKind(info.Kind),
Created: info.CreatedAt,
Updated: info.UpdatedAt,
Created: protobuf.FromTimestamp(info.CreatedAt),
Updated: protobuf.FromTimestamp(info.UpdatedAt),
Labels: info.Labels,
}
}

4
events.go
View File

@ -63,7 +63,7 @@ func (e *eventRemote) Publish(ctx context.Context, topic string, event events.Ev
func (e *eventRemote) Forward(ctx context.Context, envelope *events.Envelope) error {
req := &eventsapi.ForwardRequest{
Envelope: &eventsapi.Envelope{
Timestamp: envelope.Timestamp,
Timestamp: protobuf.ToTimestamp(envelope.Timestamp),
Namespace: envelope.Namespace,
Topic: envelope.Topic,
Event: protobuf.FromAny(envelope.Event),
@ -105,7 +105,7 @@ func (e *eventRemote) Subscribe(ctx context.Context, filters ...string) (ch <-ch
select {
case evq <- &events.Envelope{
Timestamp: ev.Timestamp,
Timestamp: protobuf.FromTimestamp(ev.Timestamp),
Namespace: ev.Namespace,
Topic: ev.Topic,
Event: ev.Event,

9
image_store.go
View File

@ -23,6 +23,7 @@ import (
"github.com/containerd/containerd/api/types"
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/images"
"github.com/containerd/containerd/protobuf"
ptypes "github.com/gogo/protobuf/types"
"github.com/opencontainers/go-digest"
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
@ -111,8 +112,8 @@ func imageToProto(image *images.Image) imagesapi.Image {
Name: image.Name,
Labels: image.Labels,
Target: descToProto(&image.Target),
CreatedAt: image.CreatedAt,
UpdatedAt: image.UpdatedAt,
CreatedAt: protobuf.ToTimestamp(image.CreatedAt),
UpdatedAt: protobuf.ToTimestamp(image.UpdatedAt),
}
}
@ -121,8 +122,8 @@ func imageFromProto(imagepb *imagesapi.Image) images.Image {
Name: imagepb.Name,
Labels: imagepb.Labels,
Target: descFromProto(&imagepb.Target),
CreatedAt: imagepb.CreatedAt,
UpdatedAt: imagepb.UpdatedAt,
CreatedAt: protobuf.FromTimestamp(imagepb.CreatedAt),
UpdatedAt: protobuf.FromTimestamp(imagepb.UpdatedAt),
}
}

3
integration/client/client_ttrpc_test.go
View File

@ -24,6 +24,7 @@ import (
v1 "github.com/containerd/containerd/api/services/ttrpc/events/v1"
"github.com/containerd/containerd/namespaces"
"github.com/containerd/containerd/pkg/ttrpcutil"
"github.com/containerd/containerd/protobuf"
"github.com/containerd/ttrpc"
"github.com/gogo/protobuf/types"
"github.com/stretchr/testify/assert"
@ -56,7 +57,7 @@ func TestClientTTRPC_Reconnect(t *testing.T) {
// Send test request to make sure its alive after reconnect
_, err = service.Forward(context.Background(), &v1.ForwardRequest{
Envelope: &v1.Envelope{
Timestamp: time.Now(),
Timestamp: protobuf.ToTimestamp(time.Now()),
Namespace: namespaces.Default,
Topic: "/test",
Event: &types.Any{},

5
leases/proxy/manager.go
View File

@ -22,6 +22,7 @@ import (
leasesapi "github.com/containerd/containerd/api/services/leases/v1"
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/leases"
"github.com/containerd/containerd/protobuf"
)
type proxyManager struct {
@ -53,7 +54,7 @@ func (pm *proxyManager) Create(ctx context.Context, opts ...leases.Opt) (leases.
return leases.Lease{
ID: resp.Lease.ID,
CreatedAt: resp.Lease.CreatedAt,
CreatedAt: protobuf.FromTimestamp(resp.Lease.CreatedAt),
Labels: resp.Lease.Labels,
}, nil
}
@ -84,7 +85,7 @@ func (pm *proxyManager) List(ctx context.Context, filters ...string) ([]leases.L
for i := range resp.Leases {
l[i] = leases.Lease{
ID: resp.Leases[i].ID,
CreatedAt: resp.Leases[i].CreatedAt,
CreatedAt: protobuf.FromTimestamp(resp.Leases[i].CreatedAt),
Labels: resp.Leases[i].Labels,
}
}

5
pkg/cri/server/container_stats_list_linux.go
View File

@ -23,6 +23,7 @@ import (
"github.com/containerd/containerd/api/types"
v1 "github.com/containerd/containerd/metrics/types/v1"
v2 "github.com/containerd/containerd/metrics/types/v2"
"github.com/containerd/containerd/protobuf"
"github.com/containerd/typeurl"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
@ -64,13 +65,13 @@ func (c *criService) containerMetrics(
return nil, fmt.Errorf("failed to extract container metrics: %w", err)
}
cpuStats, err := c.cpuContainerStats(meta.ID, false /* isSandbox */, s, stats.Timestamp)
cpuStats, err := c.cpuContainerStats(meta.ID, false /* isSandbox */, s, protobuf.FromTimestamp(stats.Timestamp))
if err != nil {
return nil, fmt.Errorf("failed to obtain cpu stats: %w", err)
}
cs.Cpu = cpuStats
memoryStats, err := c.memoryContainerStats(meta.ID, s, stats.Timestamp)
memoryStats, err := c.memoryContainerStats(meta.ID, s, protobuf.FromTimestamp(stats.Timestamp))
if err != nil {
return nil, fmt.Errorf("failed to obtain memory stats: %w", err)
}

3
pkg/cri/server/container_stop.go
View File

@ -28,6 +28,7 @@ import (
"github.com/containerd/containerd/log"
containerstore "github.com/containerd/containerd/pkg/cri/store/container"
ctrdutil "github.com/containerd/containerd/pkg/cri/util"
"github.com/containerd/containerd/protobuf"
"github.com/moby/sys/signal"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
@ -202,6 +203,6 @@ func cleanupUnknownContainer(ctx context.Context, id string, cntr containerstore
ID: id,
Pid: 0,
ExitStatus: unknownExitCode,
ExitedAt: time.Now(),
ExitedAt: protobuf.ToTimestamp(time.Now()),
}, cntr)
}

7
pkg/cri/server/events.go
View File

@ -32,6 +32,7 @@ import (
containerstore "github.com/containerd/containerd/pkg/cri/store/container"
sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox"
ctrdutil "github.com/containerd/containerd/pkg/cri/util"
"github.com/containerd/containerd/protobuf"
"github.com/containerd/typeurl"
"github.com/sirupsen/logrus"
"k8s.io/utils/clock"
@ -123,7 +124,7 @@ func (em *eventMonitor) startSandboxExitMonitor(ctx context.Context, id string,
ID: id,
Pid: pid,
ExitStatus: exitStatus,
ExitedAt: exitedAt,
ExitedAt: protobuf.ToTimestamp(exitedAt),
}
logrus.Debugf("received exit event %+v", e)
@ -174,7 +175,7 @@ func (em *eventMonitor) startContainerExitMonitor(ctx context.Context, id string
ID: id,
Pid: pid,
ExitStatus: exitStatus,
ExitedAt: exitedAt,
ExitedAt: protobuf.ToTimestamp(exitedAt),
}
logrus.Debugf("received exit event %+v", e)
@ -393,7 +394,7 @@ func handleContainerExit(ctx context.Context, e *eventtypes.TaskExit, cntr conta
err = cntr.Status.UpdateSync(func(status containerstore.Status) (containerstore.Status, error) {
if status.FinishedAt == 0 {
status.Pid = 0
status.FinishedAt = e.ExitedAt.UnixNano()
status.FinishedAt = protobuf.FromTimestamp(e.ExitedAt).UnixNano()
status.ExitCode = int32(e.ExitStatus)
}

3
pkg/cri/server/sandbox_stop.go
View File

@ -26,6 +26,7 @@ import (
eventtypes "github.com/containerd/containerd/api/events"
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/log"
"github.com/containerd/containerd/protobuf"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox"
@ -196,6 +197,6 @@ func cleanupUnknownSandbox(ctx context.Context, id string, sandbox sandboxstore.
ID: id,
Pid: 0,
ExitStatus: unknownExitCode,
ExitedAt: time.Now(),
ExitedAt: protobuf.ToTimestamp(time.Now()),
}, sandbox)
}

5
process.go
View File

@ -26,6 +26,7 @@ import (
"github.com/containerd/containerd/api/services/tasks/v1"
"github.com/containerd/containerd/cio"
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/protobuf"
)
// Process represents a system process
@ -164,7 +165,7 @@ func (p *process) Wait(ctx context.Context) (<-chan ExitStatus, error) {
}
c <- ExitStatus{
code: r.ExitStatus,
exitedAt: r.ExitedAt,
exitedAt: protobuf.FromTimestamp(r.ExitedAt),
}
}()
return c, nil
@ -224,7 +225,7 @@ func (p *process) Delete(ctx context.Context, opts ...ProcessDeleteOpts) (*ExitS
p.io.Wait()
p.io.Close()
}
return &ExitStatus{code: r.ExitStatus, exitedAt: r.ExitedAt}, nil
return &ExitStatus{code: r.ExitStatus, exitedAt: protobuf.FromTimestamp(r.ExitedAt)}, nil
}
func (p *process) Status(ctx context.Context) (Status, error) {

48
protobuf/timestamp.go Normal file
View File

@ -0,0 +1,48 @@
/*
Copyright The containerd Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package protobuf
import (
"time"
"github.com/gogo/protobuf/types"
)
// Once we migrate off from gogo/protobuf, we can use the function below, which don't return any errors.
// https://github.com/protocolbuffers/protobuf-go/blob/v1.28.0/types/known/timestamppb/timestamp.pb.go#L200-L208
// ToTimestamp creates protobuf's Timestamp from time.Time.
func ToTimestamp(from time.Time) *types.Timestamp {
pt, err := types.TimestampProto(from)
if err != nil {
panic(err)
}
return pt
}
// FromTimestamp creates time.Time from protobuf's Timestamp.
func FromTimestamp(from *types.Timestamp) time.Time {
if from == nil {
// Return time.Time's zero value as like timestamppb.
return time.Time{}.UTC()
}
tt, err := types.TimestampFromProto(from)
if err != nil {
panic(err)
}
return tt
}

5
runtime/v1/linux/process.go
View File

@ -26,6 +26,7 @@ import (
eventstypes "github.com/containerd/containerd/api/events"
"github.com/containerd/containerd/api/types/task"
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/protobuf"
"github.com/containerd/containerd/runtime"
shim "github.com/containerd/containerd/runtime/v1/shim/v1"
"github.com/containerd/ttrpc"
@ -150,7 +151,7 @@ func (p *Process) Wait(ctx context.Context) (*runtime.Exit, error) {
return nil, err
}
return &runtime.Exit{
Timestamp: r.ExitedAt,
Timestamp: protobuf.FromTimestamp(r.ExitedAt),
Status: r.ExitStatus,
}, nil
}
@ -165,7 +166,7 @@ func (p *Process) Delete(ctx context.Context) (*runtime.Exit, error) {
}
return &runtime.Exit{
Status: r.ExitStatus,
Timestamp: r.ExitedAt,
Timestamp: protobuf.FromTimestamp(r.ExitedAt),
Pid: r.Pid,
}, nil
}

4
runtime/v1/linux/runtime.go
View File

@ -463,7 +463,7 @@ func (r *Runtime) cleanupAfterDeadShim(ctx context.Context, bundle *bundle, ns,
ID: id,
Pid: uint32(pid),
ExitStatus: 128 + uint32(unix.SIGKILL),
ExitedAt: exitedAt,
ExitedAt: protobuf.ToTimestamp(exitedAt),
})
r.tasks.Delete(ctx, id)
@ -479,7 +479,7 @@ func (r *Runtime) cleanupAfterDeadShim(ctx context.Context, bundle *bundle, ns,
ContainerID: id,
Pid: uint32(pid),
ExitStatus: 128 + uint32(unix.SIGKILL),
ExitedAt: exitedAt,
ExitedAt: protobuf.ToTimestamp(exitedAt),
})
return nil

6
runtime/v1/linux/task.go
View File

@ -117,7 +117,7 @@ func (t *Task) Delete(ctx context.Context) (*runtime.Exit, error) {
})
return &runtime.Exit{
Status: rsp.ExitStatus,
Timestamp: rsp.ExitedAt,
Timestamp: protobuf.FromTimestamp(rsp.ExitedAt),
Pid: rsp.Pid,
}, nil
}
@ -173,7 +173,7 @@ func (t *Task) State(ctx context.Context) (runtime.State, error) {
Stderr: response.Stderr,
Terminal: response.Terminal,
ExitStatus: response.ExitStatus,
ExitedAt: response.ExitedAt,
ExitedAt: protobuf.FromTimestamp(response.ExitedAt),
}, nil
}
@ -348,7 +348,7 @@ func (t *Task) Wait(ctx context.Context) (*runtime.Exit, error) {
return nil, err
}
return &runtime.Exit{
Timestamp: r.ExitedAt,
Timestamp: protobuf.FromTimestamp(r.ExitedAt),
Status: r.ExitStatus,
}, nil
}

10
runtime/v1/shim/service.go
View File

@ -230,7 +230,7 @@ func (s *Service) Delete(ctx context.Context, r *ptypes.Empty) (*shimapi.DeleteR
s.platform.Close()
return &shimapi.DeleteResponse{
ExitStatus: uint32(p.ExitStatus()),
ExitedAt: p.ExitedAt(),
ExitedAt: protobuf.ToTimestamp(p.ExitedAt()),
Pid: uint32(p.Pid()),
}, nil
}
@ -252,7 +252,7 @@ func (s *Service) DeleteProcess(ctx context.Context, r *shimapi.DeleteProcessReq
s.mu.Unlock()
return &shimapi.DeleteResponse{
ExitStatus: uint32(p.ExitStatus()),
ExitedAt: p.ExitedAt(),
ExitedAt: protobuf.ToTimestamp(p.ExitedAt()),
Pid: uint32(p.Pid()),
}, nil
}
@ -344,7 +344,7 @@ func (s *Service) State(ctx context.Context, r *shimapi.StateRequest) (*shimapi.
Stderr: sio.Stderr,
Terminal: sio.Terminal,
ExitStatus: uint32(p.ExitStatus()),
ExitedAt: p.ExitedAt(),
ExitedAt: protobuf.ToTimestamp(p.ExitedAt()),
}, nil
}
@ -501,7 +501,7 @@ func (s *Service) Wait(ctx context.Context, r *shimapi.WaitRequest) (*shimapi.Wa
return &shimapi.WaitResponse{
ExitStatus: uint32(p.ExitStatus()),
ExitedAt: p.ExitedAt(),
ExitedAt: protobuf.ToTimestamp(p.ExitedAt()),
}, nil
}
@ -541,7 +541,7 @@ func (s *Service) checkProcesses(e runc.Exit) {
ID: p.ID(),
Pid: uint32(e.Pid),
ExitStatus: uint32(e.Status),
ExitedAt: p.ExitedAt(),
ExitedAt: protobuf.ToTimestamp(p.ExitedAt()),
}
}

287
runtime/v1/shim/v1/shim.pb.go
View File

@ -11,21 +11,18 @@ import (
github_com_containerd_ttrpc "github.com/containerd/ttrpc"
_ "github.com/gogo/protobuf/gogoproto"
proto "github.com/gogo/protobuf/proto"
github_com_gogo_protobuf_types "github.com/gogo/protobuf/types"
types1 "github.com/gogo/protobuf/types"
io "io"
math "math"
math_bits "math/bits"
reflect "reflect"
strings "strings"
time "time"
)
// Reference imports to suppress errors if they are not otherwise used.
var _ = proto.Marshal
var _ = fmt.Errorf
var _ = math.Inf
var _ = time.Kitchen
// This is a compile-time assertion to ensure that this generated file
// is compatible with the proto package it is being compiled against.
@ -122,12 +119,12 @@ func (m *CreateTaskResponse) XXX_DiscardUnknown() {
var xxx_messageInfo_CreateTaskResponse proto.InternalMessageInfo
type DeleteResponse struct {
Pid uint32 `protobuf:"varint,1,opt,name=pid,proto3" json:"pid,omitempty"`
ExitStatus uint32 `protobuf:"varint,2,opt,name=exit_status,json=exitStatus,proto3" json:"exit_status,omitempty"`
ExitedAt time.Time `protobuf:"bytes,3,opt,name=exited_at,json=exitedAt,proto3,stdtime" json:"exited_at"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
Pid uint32 `protobuf:"varint,1,opt,name=pid,proto3" json:"pid,omitempty"`
ExitStatus uint32 `protobuf:"varint,2,opt,name=exit_status,json=exitStatus,proto3" json:"exit_status,omitempty"`
ExitedAt *types1.Timestamp `protobuf:"bytes,3,opt,name=exited_at,json=exitedAt,proto3" json:"exited_at,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *DeleteResponse) Reset() { *m = DeleteResponse{} }
@ -364,19 +361,19 @@ func (m *StateRequest) XXX_DiscardUnknown() {
var xxx_messageInfo_StateRequest proto.InternalMessageInfo
type StateResponse struct {
ID string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
Bundle string `protobuf:"bytes,2,opt,name=bundle,proto3" json:"bundle,omitempty"`
Pid uint32 `protobuf:"varint,3,opt,name=pid,proto3" json:"pid,omitempty"`
Status task.Status `protobuf:"varint,4,opt,name=status,proto3,enum=containerd.v1.types.Status" json:"status,omitempty"`
Stdin string `protobuf:"bytes,5,opt,name=stdin,proto3" json:"stdin,omitempty"`
Stdout string `protobuf:"bytes,6,opt,name=stdout,proto3" json:"stdout,omitempty"`
Stderr string `protobuf:"bytes,7,opt,name=stderr,proto3" json:"stderr,omitempty"`
Terminal bool `protobuf:"varint,8,opt,name=terminal,proto3" json:"terminal,omitempty"`
ExitStatus uint32 `protobuf:"varint,9,opt,name=exit_status,json=exitStatus,proto3" json:"exit_status,omitempty"`
ExitedAt time.Time `protobuf:"bytes,10,opt,name=exited_at,json=exitedAt,proto3,stdtime" json:"exited_at"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
ID string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
Bundle string `protobuf:"bytes,2,opt,name=bundle,proto3" json:"bundle,omitempty"`
Pid uint32 `protobuf:"varint,3,opt,name=pid,proto3" json:"pid,omitempty"`
Status task.Status `protobuf:"varint,4,opt,name=status,proto3,enum=containerd.v1.types.Status" json:"status,omitempty"`
Stdin string `protobuf:"bytes,5,opt,name=stdin,proto3" json:"stdin,omitempty"`
Stdout string `protobuf:"bytes,6,opt,name=stdout,proto3" json:"stdout,omitempty"`
Stderr string `protobuf:"bytes,7,opt,name=stderr,proto3" json:"stderr,omitempty"`
Terminal bool `protobuf:"varint,8,opt,name=terminal,proto3" json:"terminal,omitempty"`
ExitStatus uint32 `protobuf:"varint,9,opt,name=exit_status,json=exitStatus,proto3" json:"exit_status,omitempty"`
ExitedAt *types1.Timestamp `protobuf:"bytes,10,opt,name=exited_at,json=exitedAt,proto3" json:"exited_at,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *StateResponse) Reset() { *m = StateResponse{} }
@ -807,11 +804,11 @@ func (m *WaitRequest) XXX_DiscardUnknown() {
var xxx_messageInfo_WaitRequest proto.InternalMessageInfo
type WaitResponse struct {
ExitStatus uint32 `protobuf:"varint,1,opt,name=exit_status,json=exitStatus,proto3" json:"exit_status,omitempty"`
ExitedAt time.Time `protobuf:"bytes,2,opt,name=exited_at,json=exitedAt,proto3,stdtime" json:"exited_at"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
ExitStatus uint32 `protobuf:"varint,1,opt,name=exit_status,json=exitStatus,proto3" json:"exit_status,omitempty"`
ExitedAt *types1.Timestamp `protobuf:"bytes,2,opt,name=exited_at,json=exitedAt,proto3" json:"exited_at,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *WaitResponse) Reset() { *m = WaitResponse{} }
@ -874,78 +871,77 @@ func init() {
}
var fileDescriptor_be1b2ef30ea3b8ef = []byte{
// 1131 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x57, 0x4f, 0x4f, 0x1b, 0x47,
0x14, 0x67, 0x8d, 0xff, 0x3e, 0xc7, 0x14, 0xa6, 0x84, 0x6e, 0x1c, 0xc9, 0x58, 0x2b, 0x35, 0xa2,
0xaa, 0xb2, 0x2e, 0xa6, 0x4a, 0xd2, 0x56, 0x42, 0x02, 0x12, 0x55, 0xa8, 0x8d, 0x82, 0x16, 0xd2,
0x54, 0xad, 0x2a, 0xb4, 0x78, 0x07, 0x7b, 0x84, 0xbd, 0xb3, 0xd9, 0x99, 0xa5, 0xd0, 0x53, 0x4f,
0x3d, 0xf7, 0xe3, 0xf4, 0x23, 0x70, 0xc8, 0xa1, 0xc7, 0x9e, 0xd2, 0x86, 0x7b, 0xbf, 0x43, 0x34,
0x7f, 0xcc, 0xae, 0x6d, 0x36, 0xbb, 0x70, 0xc1, 0xfb, 0x66, 0x7e, 0x6f, 0xe6, 0xcd, 0xfb, 0xfd,
0xe6, 0xbd, 0x01, 0x36, 0xfb, 0x84, 0x0f, 0xa2, 0x23, 0xbb, 0x47, 0x47, 0x9d, 0x1e, 0xf5, 0xb9,
0x4b, 0x7c, 0x1c, 0x7a, 0xc9, 0xcf, 0x30, 0xf2, 0x39, 0x19, 0xe1, 0xce, 0xe9, 0x7a, 0x87, 0x0d,
0xc8, 0x68, 0xfc, 0x6b, 0x07, 0x21, 0xe5, 0x14, 0xb5, 0x63, 0xa4, 0xad, 0x91, 0xf6, 0x90, 0xf8,
0xd1, 0x99, 0x2d, 0x41, 0xa7, 0xeb, 0xcd, 0x7b, 0x7d, 0x4a, 0xfb, 0x43, 0xdc, 0x91, 0xf8, 0xa3,
0xe8, 0xb8, 0xe3, 0xfa, 0xe7, 0xca, 0xb9, 0x79, 0x7f, 0x7a, 0x0a, 0x8f, 0x02, 0x3e, 0x9e, 0x5c,
0xee, 0xd3, 0x3e, 0x95, 0x9f, 0x1d, 0xf1, 0xa5, 0x47, 0x57, 0xa7, 0x5d, 0xc4, 0x8e, 0x8c, 0xbb,
0xa3, 0x40, 0x03, 0x1e, 0x65, 0x1e, 0xc8, 0x0d, 0x48, 0x87, 0x9f, 0x07, 0x98, 0x75, 0x46, 0x34,
0xf2, 0xb9, 0xf6, 0xfb, 0xfa, 0x06, 0x7e, 0xdc, 0x65, 0x27, 0xf2, 0x8f, 0xf2, 0xb5, 0xfe, 0x2f,
0xc0, 0xd2, 0x4e, 0x88, 0x5d, 0x8e, 0x0f, 0x5c, 0x76, 0xe2, 0xe0, 0xd7, 0x11, 0x66, 0x1c, 0xad,
0x40, 0x81, 0x78, 0xa6, 0xd1, 0x36, 0xd6, 0x6a, 0xdb, 0xe5, 0xcb, 0xb7, 0xab, 0x85, 0xdd, 0xa7,
0x4e, 0x81, 0x78, 0x68, 0x05, 0xca, 0x47, 0x91, 0xef, 0x0d, 0xb1, 0x59, 0x10, 0x73, 0x8e, 0xb6,
0x90, 0x09, 0x15, 0x9d, 0x41, 0x73, 0x5e, 0x4e, 0x8c, 0x4d, 0xd4, 0x81, 0x72, 0x48, 0x29, 0x3f,
0x66, 0x66, 0xb1, 0x3d, 0xbf, 0x56, 0xef, 0x7e, 0x62, 0x27, 0xb2, 0x2e, 0x43, 0xb2, 0x9f, 0x8b,
0xa3, 0x38, 0x1a, 0x86, 0x9a, 0x50, 0xe5, 0x38, 0x1c, 0x11, 0xdf, 0x1d, 0x9a, 0xa5, 0xb6, 0xb1,
0x56, 0x75, 0xae, 0x6c, 0xb4, 0x0c, 0x25, 0xc6, 0x3d, 0xe2, 0x9b, 0x65, 0xb9, 0x89, 0x32, 0x44,
0x50, 0x8c, 0x7b, 0x34, 0xe2, 0x66, 0x45, 0x05, 0xa5, 0x2c, 0x3d, 0x8e, 0xc3, 0xd0, 0xac, 0x5e,
0x8d, 0xe3, 0x30, 0x44, 0x2d, 0x80, 0xde, 0x00, 0xf7, 0x4e, 0x02, 0x4a, 0x7c, 0x6e, 0xd6, 0xe4,
0x5c, 0x62, 0x04, 0x7d, 0x0e, 0x4b, 0x81, 0x1b, 0x62, 0x9f, 0x1f, 0x26, 0x60, 0x20, 0x61, 0x8b,
0x6a, 0x62, 0x27, 0x06, 0xdb, 0x50, 0xa1, 0x01, 0x27, 0xd4, 0x67, 0x66, 0xbd, 0x6d, 0xac, 0xd5,
0xbb, 0xcb, 0xb6, 0xa2, 0xd9, 0x1e, 0xd3, 0x6c, 0x6f, 0xf9, 0xe7, 0xce, 0x18, 0x64, 0x3d, 0x00,
0x94, 0x4c, 0x37, 0x0b, 0xa8, 0xcf, 0x30, 0x5a, 0x84, 0xf9, 0x40, 0x27, 0xbc, 0xe1, 0x88, 0x4f,
0xeb, 0x0f, 0x03, 0x16, 0x9e, 0xe2, 0x21, 0xe6, 0x38, 0x1d, 0x84, 0x56, 0xa1, 0x8e, 0xcf, 0x08,
0x3f, 0x64, 0xdc, 0xe5, 0x11, 0x93, 0x9c, 0x34, 0x1c, 0x10, 0x43, 0xfb, 0x72, 0x04, 0x6d, 0x41,
0x4d, 0x58, 0xd8, 0x3b, 0x74, 0xb9, 0x64, 0xa6, 0xde, 0x6d, 0xce, 0xc4, 0x77, 0x30, 0x96, 0xe1,
0x76, 0xf5, 0xe2, 0xed, 0xea, 0xdc, 0x9f, 0xff, 0xae, 0x1a, 0x4e, 0x55, 0xb9, 0x6d, 0x71, 0xcb,
0x86, 0x65, 0x15, 0xc7, 0x5e, 0x48, 0x7b, 0x98, 0xb1, 0x0c, 0x89, 0x58, 0x7f, 0x19, 0x80, 0x9e,
0x9d, 0xe1, 0x5e, 0x3e, 0xf8, 0x04, 0xdd, 0x85, 0x34, 0xba, 0xe7, 0xaf, 0xa7, 0xbb, 0x98, 0x42,
0x77, 0x69, 0x82, 0xee, 0x35, 0x28, 0xb2, 0x00, 0xf7, 0xa4, 0x66, 0xd2, 0xe8, 0x91, 0x08, 0xeb,
0x2e, 0x7c, 0x3c, 0x11, 0xb9, 0xca, 0xbb, 0xf5, 0x23, 0x2c, 0x3a, 0x98, 0x91, 0xdf, 0xf0, 0x1e,
0x3f, 0xcf, 0x3a, 0xce, 0x32, 0x94, 0x7e, 0x25, 0x1e, 0x1f, 0x68, 0x2e, 0x94, 0x21, 0x42, 0x1b,
0x60, 0xd2, 0x1f, 0x28, 0x0e, 0x1a, 0x8e, 0xb6, 0xac, 0x07, 0x70, 0x47, 0x10, 0x85, 0xb3, 0x72,
0xfa, 0xa6, 0x00, 0x0d, 0x0d, 0xd4, 0x5a, 0xb8, 0xe9, 0x05, 0xd5, 0xda, 0x99, 0x8f, 0xb5, 0xb3,
0x21, 0xd2, 0x25, 0x65, 0x23, 0xd2, 0xb8, 0xd0, 0xbd, 0x9f, 0xbc, 0x98, 0xa7, 0xeb, 0xfa, 0x6e,
0x2a, 0x1d, 0x39, 0x1a, 0x1a, 0x33, 0x52, 0xba, 0x9e, 0x91, 0x72, 0x0a, 0x23, 0x95, 0x09, 0x46,
0x92, 0x9c, 0x57, 0xa7, 0x38, 0x9f, 0x92, 0x74, 0xed, 0xc3, 0x92, 0x86, 0x5b, 0x49, 0xfa, 0x05,
0xd4, 0xbf, 0x23, 0xc3, 0x61, 0x8e, 0x62, 0xc7, 0x48, 0x7f, 0x2c, 0xcc, 0x86, 0xa3, 0x2d, 0x91,
0x4b, 0x77, 0x38, 0x94, 0xb9, 0xac, 0x3a, 0xe2, 0xd3, 0xda, 0x84, 0x85, 0x9d, 0x21, 0x65, 0x78,
0xf7, 0x45, 0x0e, 0x7d, 0xa8, 0x04, 0x2a, 0xad, 0x2b, 0xc3, 0xfa, 0x0c, 0x3e, 0xfa, 0x9e, 0x30,
0xbe, 0x47, 0xbc, 0xcc, 0xeb, 0xe5, 0xc0, 0x62, 0x0c, 0xd5, 0x62, 0xd8, 0x84, 0x5a, 0xa0, 0x34,
0x8b, 0x99, 0x69, 0xc8, 0x32, 0xdb, 0xbe, 0x96, 0x4d, 0xad, 0xec, 0x5d, 0xff, 0x98, 0x3a, 0xb1,
0x8b, 0xf5, 0x33, 0xdc, 0x8d, 0x2b, 0x5a, 0xb2, 0x0d, 0x20, 0x28, 0x06, 0x2e, 0x1f, 0xa8, 0x30,
0x1c, 0xf9, 0x9d, 0x2c, 0x78, 0x85, 0x3c, 0x05, 0xef, 0x21, 0x2c, 0xee, 0x0f, 0xc8, 0x48, 0xee,
0x39, 0x0e, 0xf8, 0x1e, 0x54, 0x45, 0x8b, 0x3d, 0x8c, 0xcb, 0x59, 0x45, 0xd8, 0x7b, 0xc4, 0xb3,
0xbe, 0x85, 0xa5, 0x97, 0x81, 0x37, 0xd5, 0x8e, 0xba, 0x50, 0x0b, 0x31, 0xa3, 0x51, 0xd8, 0x93,
0x07, 0x4c, 0xdf, 0x35, 0x86, 0xe9, 0xbb, 0x15, 0xf2, 0xac, 0x84, 0x7e, 0x25, 0xaf, 0x96, 0xc0,
0x65, 0x5c, 0x2d, 0x7d, 0x85, 0x0a, 0x71, 0x8d, 0xfe, 0x14, 0xea, 0xaf, 0x5c, 0x92, 0xb9, 0x43,
0x08, 0x77, 0x14, 0x4c, 0x6f, 0x30, 0x25, 0x71, 0xe3, 0xc3, 0x12, 0x2f, 0xdc, 0x46, 0xe2, 0xdd,
0x37, 0x75, 0x28, 0x8a, 0xb4, 0xa3, 0x01, 0x94, 0x64, 0xe5, 0x40, 0xb6, 0x9d, 0xf5, 0xdc, 0xb1,
0x93, 0xb5, 0xa8, 0xd9, 0xc9, 0x8d, 0xd7, 0xc7, 0x62, 0x50, 0x56, 0x9d, 0x0d, 0x6d, 0x64, 0xbb,
0xce, 0x3c, 0x39, 0x9a, 0x5f, 0xde, 0xcc, 0x49, 0x6f, 0xaa, 0x8e, 0x17, 0xf2, 0x9c, 0xc7, 0xbb,
0x92, 0x43, 0xce, 0xe3, 0x25, 0x64, 0xe1, 0x40, 0x59, 0xf5, 0x41, 0xb4, 0x32, 0xc3, 0xc5, 0x33,
0xf1, 0xf6, 0x6b, 0x7e, 0x91, 0xbd, 0xe4, 0x54, 0x47, 0x3f, 0x87, 0xc6, 0x44, 0x6f, 0x45, 0x8f,
0xf2, 0x2e, 0x31, 0xd9, 0x5d, 0x6f, 0xb1, 0xf5, 0x6b, 0xa8, 0x8e, 0xeb, 0x08, 0x5a, 0xcf, 0xf6,
0x9e, 0x2a, 0x4f, 0xcd, 0xee, 0x4d, 0x5c, 0xf4, 0x96, 0x8f, 0xa1, 0xb4, 0xe7, 0x46, 0x2c, 0x3d,
0x81, 0x29, 0xe3, 0xe8, 0x09, 0x94, 0x1d, 0xcc, 0xa2, 0xd1, 0xcd, 0x3d, 0x7f, 0x01, 0x48, 0xbc,
0xd5, 0x1e, 0xe7, 0x90, 0xd8, 0x75, 0x75, 0x30, 0x75, 0xf9, 0xe7, 0x50, 0x14, 0x8d, 0x04, 0x3d,
0xcc, 0x5e, 0x38, 0xd1, 0x70, 0x52, 0x97, 0x3b, 0x80, 0xa2, 0x78, 0x7f, 0xa0, 0x1c, 0x57, 0x61,
0xf6, 0x85, 0x95, 0xba, 0xea, 0x2b, 0xa8, 0x5d, 0x3d, 0x5f, 0x50, 0x0e, 0xde, 0xa6, 0xdf, 0x3a,
0xa9, 0x0b, 0xef, 0x43, 0x45, 0x77, 0x3d, 0x94, 0x43, 0x7f, 0x93, 0x0d, 0x32, 0x75, 0xd1, 0x1f,
0xa0, 0x3a, 0x6e, 0x17, 0xa9, 0x6c, 0xe7, 0x38, 0xc4, 0x4c, 0xcb, 0x79, 0x09, 0x65, 0xd5, 0x57,
0xf2, 0x54, 0xa7, 0x99, 0x0e, 0x94, 0x1a, 0x2e, 0x86, 0xa2, 0xa8, 0xed, 0x79, 0x14, 0x90, 0x68,
0x15, 0x4d, 0x3b, 0x2f, 0x5c, 0x45, 0xbf, 0xed, 0x5c, 0xbc, 0x6b, 0xcd, 0xfd, 0xf3, 0xae, 0x35,
0xf7, 0xfb, 0x65, 0xcb, 0xb8, 0xb8, 0x6c, 0x19, 0x7f, 0x5f, 0xb6, 0x8c, 0xff, 0x2e, 0x5b, 0xc6,
0x4f, 0x4f, 0x6e, 0xf1, 0x4f, 0xf0, 0x37, 0xe2, 0xf7, 0xa8, 0x2c, 0x8f, 0xb2, 0xf1, 0x3e, 0x00,
0x00, 0xff, 0xff, 0x55, 0x9e, 0x8f, 0x1e, 0x47, 0x0f, 0x00, 0x00,
// 1119 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x57, 0xcf, 0x6f, 0x1b, 0x45,
0x14, 0xee, 0x3a, 0xfe, 0xf9, 0x5c, 0x87, 0x64, 0x48, 0xc3, 0xd6, 0x95, 0x1c, 0x6b, 0x25, 0xaa,
0x20, 0xd4, 0x35, 0x71, 0x50, 0x53, 0x40, 0x8a, 0xd4, 0xa6, 0x15, 0x8a, 0xa0, 0x6a, 0x34, 0x49,
0x29, 0x02, 0xa1, 0x68, 0xe3, 0x9d, 0xd8, 0xa3, 0xd8, 0x3b, 0xdb, 0x9d, 0xd9, 0x90, 0x20, 0x0e,
0xfc, 0x59, 0x9c, 0x39, 0xf5, 0xc0, 0x81, 0x23, 0x27, 0x44, 0x73, 0xe7, 0x7f, 0x40, 0xf3, 0xc3,
0xf1, 0xda, 0xce, 0x76, 0xd7, 0xbd, 0xc4, 0xfb, 0x66, 0xbe, 0x37, 0x33, 0xef, 0x7d, 0xdf, 0xbc,
0x37, 0x81, 0xdd, 0x3e, 0x15, 0x83, 0xf8, 0xc4, 0xed, 0xb1, 0x51, 0xa7, 0xc7, 0x02, 0xe1, 0xd1,
0x80, 0x44, 0x7e, 0xf2, 0x33, 0x8a, 0x03, 0x41, 0x47, 0xa4, 0x73, 0xbe, 0xd5, 0xe1, 0x03, 0x3a,
0x1a, 0xff, 0xba, 0x61, 0xc4, 0x04, 0x43, 0xed, 0x09, 0xd2, 0x35, 0x48, 0x77, 0x48, 0x83, 0xf8,
0xc2, 0x55, 0xa0, 0xf3, 0xad, 0xe6, 0xdd, 0x3e, 0x63, 0xfd, 0x21, 0xe9, 0x28, 0xfc, 0x49, 0x7c,
0xda, 0xf1, 0x82, 0x4b, 0xed, 0xdc, 0xbc, 0x37, 0x3b, 0x45, 0x46, 0xa1, 0x18, 0x4f, 0xae, 0xf5,
0x59, 0x9f, 0xa9, 0xcf, 0x8e, 0xfc, 0x32, 0xa3, 0x1b, 0xb3, 0x2e, 0x72, 0x47, 0x2e, 0xbc, 0x51,
0x68, 0x00, 0x0f, 0x33, 0x03, 0xf2, 0x42, 0xda, 0x11, 0x97, 0x21, 0xe1, 0x9d, 0x11, 0x8b, 0x03,
0x61, 0xfc, 0xbe, 0x5c, 0xc0, 0x4f, 0x78, 0xfc, 0x4c, 0xfd, 0xd1, 0xbe, 0xce, 0x7f, 0x05, 0x58,
0xdd, 0x8b, 0x88, 0x27, 0xc8, 0x91, 0xc7, 0xcf, 0x30, 0x79, 0x1d, 0x13, 0x2e, 0xd0, 0x3a, 0x14,
0xa8, 0x6f, 0x5b, 0x6d, 0x6b, 0xb3, 0xf6, 0xa4, 0x7c, 0xf5, 0xcf, 0x46, 0x61, 0xff, 0x29, 0x2e,
0x50, 0x1f, 0xad, 0x43, 0xf9, 0x24, 0x0e, 0xfc, 0x21, 0xb1, 0x0b, 0x72, 0x0e, 0x1b, 0x0b, 0xd9,
0x50, 0x31, 0x19, 0xb4, 0x97, 0xd4, 0xc4, 0xd8, 0x44, 0x1d, 0x28, 0x47, 0x8c, 0x89, 0x53, 0x6e,
0x17, 0xdb, 0x4b, 0x9b, 0xf5, 0xee, 0x47, 0x6e, 0x22, 0xeb, 0xea, 0x48, 0xee, 0x73, 0x19, 0x0a,
0x36, 0x30, 0xd4, 0x84, 0xaa, 0x20, 0xd1, 0x88, 0x06, 0xde, 0xd0, 0x2e, 0xb5, 0xad, 0xcd, 0x2a,
0xbe, 0xb6, 0xd1, 0x1a, 0x94, 0xb8, 0xf0, 0x69, 0x60, 0x97, 0xd5, 0x26, 0xda, 0x90, 0x87, 0xe2,
0xc2, 0x67, 0xb1, 0xb0, 0x2b, 0xfa, 0x50, 0xda, 0x32, 0xe3, 0x24, 0x8a, 0xec, 0xea, 0xf5, 0x38,
0x89, 0x22, 0xd4, 0x02, 0xe8, 0x0d, 0x48, 0xef, 0x2c, 0x64, 0x34, 0x10, 0x76, 0x4d, 0xcd, 0x25,
0x46, 0xd0, 0xa7, 0xb0, 0x1a, 0x7a, 0x11, 0x09, 0xc4, 0x71, 0x02, 0x06, 0x0a, 0xb6, 0xa2, 0x27,
0xf6, 0x26, 0x60, 0x17, 0x2a, 0x2c, 0x14, 0x94, 0x05, 0xdc, 0xae, 0xb7, 0xad, 0xcd, 0x7a, 0x77,
0xcd, 0xd5, 0x34, 0xbb, 0x63, 0x9a, 0xdd, 0xc7, 0xc1, 0x25, 0x1e, 0x83, 0x9c, 0xfb, 0x80, 0x92,
0xe9, 0xe6, 0x21, 0x0b, 0x38, 0x41, 0x2b, 0xb0, 0x14, 0x9a, 0x84, 0x37, 0xb0, 0xfc, 0x74, 0x7e,
0x85, 0xe5, 0xa7, 0x64, 0x48, 0x04, 0x49, 0xc7, 0xa0, 0x0d, 0xa8, 0x93, 0x0b, 0x2a, 0x8e, 0xb9,
0xf0, 0x44, 0xcc, 0x15, 0x25, 0x0d, 0x0c, 0x72, 0xe8, 0x50, 0x8d, 0xa0, 0x1d, 0xa8, 0x49, 0x8b,
0xf8, 0xc7, 0x9e, 0x50, 0xc4, 0xd4, 0xbb, 0xcd, 0xb9, 0xe3, 0x1d, 0x8d, 0x55, 0x88, 0xab, 0x1a,
0xfc, 0x58, 0x38, 0x2e, 0xac, 0xe9, 0xdd, 0x0f, 0x22, 0xd6, 0x23, 0x9c, 0x67, 0xe8, 0xc2, 0xf9,
0xdd, 0x02, 0xf4, 0xec, 0x82, 0xf4, 0xf2, 0xc1, 0xa7, 0x38, 0x2e, 0xa4, 0x71, 0xbc, 0x74, 0x33,
0xc7, 0xc5, 0x14, 0x8e, 0x4b, 0x53, 0x1c, 0x6f, 0x42, 0x91, 0x87, 0xa4, 0xa7, 0x84, 0x92, 0xc6,
0x89, 0x42, 0x38, 0x77, 0xe0, 0xc3, 0xa9, 0x93, 0xeb, 0x6c, 0x3b, 0xdf, 0xc3, 0x0a, 0x26, 0x9c,
0xfe, 0x42, 0x0e, 0xc4, 0x65, 0x56, 0x38, 0x6b, 0x50, 0xfa, 0x99, 0xfa, 0x62, 0x60, 0x18, 0xd0,
0x86, 0x3c, 0xda, 0x80, 0xd0, 0xfe, 0x40, 0x67, 0xbe, 0x81, 0x8d, 0xe5, 0xdc, 0x87, 0xdb, 0x92,
0x1e, 0x92, 0x95, 0xd3, 0x3f, 0x0a, 0xd0, 0x30, 0x40, 0xa3, 0x80, 0x45, 0x6f, 0xa5, 0x51, 0xcc,
0xd2, 0x44, 0x31, 0xdb, 0x32, 0x5d, 0x4a, 0x2c, 0x32, 0x8d, 0xcb, 0xdd, 0x7b, 0xc9, 0xdb, 0x78,
0xbe, 0x65, 0x2e, 0xa4, 0x56, 0x0f, 0x36, 0xd0, 0x09, 0x23, 0xa5, 0x9b, 0x19, 0x29, 0xa7, 0x30,
0x52, 0x99, 0x62, 0x24, 0xc9, 0x79, 0x75, 0x86, 0xf3, 0x19, 0x21, 0xd7, 0xde, 0x2d, 0x64, 0x58,
0x40, 0xc8, 0x2f, 0xa0, 0xfe, 0x0d, 0x1d, 0x0e, 0x73, 0xd4, 0x35, 0x4e, 0xfb, 0x63, 0x39, 0x36,
0xb0, 0xb1, 0x64, 0x06, 0xbd, 0xe1, 0x50, 0x65, 0xb0, 0x8a, 0xe5, 0xa7, 0xb3, 0x0b, 0xcb, 0x7b,
0x43, 0xc6, 0xc9, 0xfe, 0x8b, 0x1c, 0xaa, 0xd0, 0x69, 0xd3, 0x0a, 0xd7, 0x86, 0xf3, 0x09, 0x7c,
0xf0, 0x2d, 0xe5, 0xe2, 0x80, 0xfa, 0x99, 0x97, 0x0a, 0xc3, 0xca, 0x04, 0x6a, 0x24, 0xb0, 0x0b,
0xb5, 0x50, 0x2b, 0x95, 0x70, 0xdb, 0x52, 0x15, 0xb5, 0x7d, 0x23, 0x87, 0x46, 0xcf, 0xfb, 0xc1,
0x29, 0xc3, 0x13, 0x17, 0xe7, 0x47, 0xb8, 0x33, 0x29, 0x5e, 0xc9, 0x8a, 0x8f, 0xa0, 0x18, 0x7a,
0x62, 0xa0, 0x8f, 0x81, 0xd5, 0x77, 0xb2, 0xb6, 0x15, 0xf2, 0xd4, 0xb6, 0x07, 0xb0, 0x72, 0x38,
0xa0, 0x23, 0xb5, 0xe7, 0xf8, 0xc0, 0x77, 0xa1, 0x2a, 0xbb, 0xe9, 0xf1, 0xa4, 0x74, 0x55, 0xa4,
0x7d, 0x40, 0x7d, 0xe7, 0x6b, 0x58, 0x7d, 0x19, 0xfa, 0x33, 0x9d, 0xa7, 0x0b, 0xb5, 0x88, 0x70,
0x16, 0x47, 0x3d, 0x15, 0x60, 0xfa, 0xae, 0x13, 0x98, 0xb9, 0x51, 0x91, 0xc8, 0x4a, 0xe8, 0x17,
0xea, 0x42, 0x49, 0x5c, 0xc6, 0x85, 0x32, 0x17, 0xa7, 0x30, 0x29, 0xc7, 0x1f, 0x43, 0xfd, 0x95,
0x47, 0x33, 0x77, 0x18, 0xc0, 0x6d, 0x0d, 0x33, 0x1b, 0xcc, 0x08, 0xdb, 0x7a, 0xb7, 0xb0, 0x0b,
0xf9, 0x85, 0xdd, 0xfd, 0xb3, 0x0e, 0x45, 0x99, 0x6c, 0x34, 0x80, 0x92, 0xaa, 0x12, 0xc8, 0x75,
0xb3, 0xde, 0x33, 0x6e, 0xb2, 0xee, 0x34, 0x3b, 0xb9, 0xf1, 0x26, 0x18, 0x0e, 0x65, 0xdd, 0xba,
0xd0, 0x76, 0xb6, 0xeb, 0xdc, 0x9b, 0xa2, 0xf9, 0xf9, 0x62, 0x4e, 0x66, 0x53, 0x1d, 0x5e, 0x24,
0x72, 0x86, 0x77, 0x2d, 0x82, 0x9c, 0xe1, 0x25, 0xc4, 0x80, 0xa1, 0xac, 0x7b, 0x1e, 0x5a, 0x9f,
0x63, 0xe0, 0x99, 0x7c, 0xdc, 0x35, 0x3f, 0xcb, 0x5e, 0x72, 0xa6, 0x67, 0x5f, 0x42, 0x63, 0xaa,
0x8f, 0xa2, 0x87, 0x79, 0x97, 0x98, 0xee, 0xa4, 0xef, 0xb1, 0xf5, 0x6b, 0xa8, 0x8e, 0xab, 0x07,
0xda, 0xca, 0xf6, 0x9e, 0x29, 0x4a, 0xcd, 0xee, 0x22, 0x2e, 0x66, 0xcb, 0x1d, 0x28, 0x1d, 0x78,
0x31, 0x4f, 0x4f, 0x60, 0xca, 0x38, 0x7a, 0x04, 0x65, 0x4c, 0x78, 0x3c, 0x5a, 0xdc, 0xf3, 0x27,
0x80, 0xc4, 0x63, 0x6c, 0x27, 0x87, 0xc4, 0x6e, 0xaa, 0x7e, 0xa9, 0xcb, 0x3f, 0x87, 0xa2, 0x6c,
0x1f, 0xe8, 0x41, 0xf6, 0xc2, 0x89, 0x36, 0x93, 0xba, 0xdc, 0x11, 0x14, 0xe5, 0x5b, 0x03, 0xe5,
0xb8, 0x0a, 0xf3, 0xaf, 0xa9, 0xd4, 0x55, 0x5f, 0x41, 0xed, 0xfa, 0xa9, 0x82, 0x72, 0xf0, 0x36,
0xfb, 0xae, 0x49, 0x5d, 0xf8, 0x10, 0x2a, 0xa6, 0xd7, 0xa1, 0x1c, 0xfa, 0x9b, 0x6e, 0x8b, 0xa9,
0x8b, 0x7e, 0x07, 0xd5, 0x71, 0x93, 0x48, 0x65, 0x3b, 0x47, 0x10, 0x73, 0x8d, 0xe6, 0x25, 0x94,
0x75, 0x37, 0xc9, 0x53, 0x9d, 0xe6, 0xfa, 0x4e, 0xea, 0x71, 0x09, 0x14, 0x65, 0x45, 0xcf, 0xa3,
0x80, 0x44, 0x83, 0x68, 0xba, 0x79, 0xe1, 0xfa, 0xf4, 0x4f, 0xf0, 0x9b, 0xb7, 0xad, 0x5b, 0x7f,
0xbf, 0x6d, 0xdd, 0xfa, 0xed, 0xaa, 0x65, 0xbd, 0xb9, 0x6a, 0x59, 0x7f, 0x5d, 0xb5, 0xac, 0x7f,
0xaf, 0x5a, 0xd6, 0x0f, 0x8f, 0xde, 0xe3, 0xbf, 0xdc, 0xaf, 0xe4, 0xef, 0x49, 0x59, 0x85, 0xb2,
0xfd, 0x7f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xa7, 0xa2, 0xf6, 0xf8, 0x28, 0x0f, 0x00, 0x00,
}
func (m *CreateTaskRequest) Marshal() (dAtA []byte, err error) {
@ -1123,14 +1119,18 @@ func (m *DeleteResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
i -= len(m.XXX_unrecognized)
copy(dAtA[i:], m.XXX_unrecognized)
}
n2, err2 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.ExitedAt, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.ExitedAt):])
if err2 != nil {
return 0, err2
if m.ExitedAt != nil {
{
size, err := m.ExitedAt.MarshalToSizedBuffer(dAtA[:i])
if err != nil {
return 0, err
}
i -= size
i = encodeVarintShim(dAtA, i, uint64(size))
}
i--
dAtA[i] = 0x1a
}
i -= n2
i = encodeVarintShim(dAtA, i, uint64(n2))
i--
dAtA[i] = 0x1a
if m.ExitStatus != 0 {
i = encodeVarintShim(dAtA, i, uint64(m.ExitStatus))
i--
@ -1384,14 +1384,18 @@ func (m *StateResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
i -= len(m.XXX_unrecognized)
copy(dAtA[i:], m.XXX_unrecognized)
}
n4, err4 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.ExitedAt, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.ExitedAt):])
if err4 != nil {
return 0, err4
if m.ExitedAt != nil {
{
size, err := m.ExitedAt.MarshalToSizedBuffer(dAtA[:i])
if err != nil {
return 0, err
}
i -= size
i = encodeVarintShim(dAtA, i, uint64(size))
}
i--
dAtA[i] = 0x52
}
i -= n4
i = encodeVarintShim(dAtA, i, uint64(n4))
i--
dAtA[i] = 0x52
if m.ExitStatus != 0 {
i = encodeVarintShim(dAtA, i, uint64(m.ExitStatus))
i--
@ -1871,14 +1875,18 @@ func (m *WaitResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
i -= len(m.XXX_unrecognized)
copy(dAtA[i:], m.XXX_unrecognized)
}
n7, err7 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.ExitedAt, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.ExitedAt):])
if err7 != nil {
return 0, err7
if m.ExitedAt != nil {
{
size, err := m.ExitedAt.MarshalToSizedBuffer(dAtA[:i])
if err != nil {
return 0, err
}
i -= size
i = encodeVarintShim(dAtA, i, uint64(size))
}
i--
dAtA[i] = 0x12
}
i -= n7
i = encodeVarintShim(dAtA, i, uint64(n7))
i--
dAtA[i] = 0x12
if m.ExitStatus != 0 {
i = encodeVarintShim(dAtA, i, uint64(m.ExitStatus))
i--
@ -1982,8 +1990,10 @@ func (m *DeleteResponse) Size() (n int) {
if m.ExitStatus != 0 {
n += 1 + sovShim(uint64(m.ExitStatus))
}
l = github_com_gogo_protobuf_types.SizeOfStdTime(m.ExitedAt)
n += 1 + l + sovShim(uint64(l))
if m.ExitedAt != nil {
l = m.ExitedAt.Size()
n += 1 + l + sovShim(uint64(l))
}
if m.XXX_unrecognized != nil {
n += len(m.XXX_unrecognized)
}
@ -2129,8 +2139,10 @@ func (m *StateResponse) Size() (n int) {
if m.ExitStatus != 0 {
n += 1 + sovShim(uint64(m.ExitStatus))
}
l = github_com_gogo_protobuf_types.SizeOfStdTime(m.ExitedAt)
n += 1 + l + sovShim(uint64(l))
if m.ExitedAt != nil {
l = m.ExitedAt.Size()
n += 1 + l + sovShim(uint64(l))
}
if m.XXX_unrecognized != nil {
n += len(m.XXX_unrecognized)
}
@ -2323,8 +2335,10 @@ func (m *WaitResponse) Size() (n int) {
if m.ExitStatus != 0 {
n += 1 + sovShim(uint64(m.ExitStatus))
}
l = github_com_gogo_protobuf_types.SizeOfStdTime(m.ExitedAt)
n += 1 + l + sovShim(uint64(l))
if m.ExitedAt != nil {
l = m.ExitedAt.Size()
n += 1 + l + sovShim(uint64(l))
}
if m.XXX_unrecognized != nil {
n += len(m.XXX_unrecognized)
}
@ -2381,7 +2395,7 @@ func (this *DeleteResponse) String() string {
s := strings.Join([]string{`&DeleteResponse{`,
`Pid:` + fmt.Sprintf("%v", this.Pid) + `,`,
`ExitStatus:` + fmt.Sprintf("%v", this.ExitStatus) + `,`,
`ExitedAt:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.ExitedAt), "Timestamp", "types1.Timestamp", 1), `&`, ``, 1) + `,`,
`ExitedAt:` + strings.Replace(fmt.Sprintf("%v", this.ExitedAt), "Timestamp", "types1.Timestamp", 1) + `,`,
`XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`,
`}`,
}, "")
@ -2462,7 +2476,7 @@ func (this *StateResponse) String() string {
`Stderr:` + fmt.Sprintf("%v", this.Stderr) + `,`,
`Terminal:` + fmt.Sprintf("%v", this.Terminal) + `,`,
`ExitStatus:` + fmt.Sprintf("%v", this.ExitStatus) + `,`,
`ExitedAt:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.ExitedAt), "Timestamp", "types1.Timestamp", 1), `&`, ``, 1) + `,`,
`ExitedAt:` + strings.Replace(fmt.Sprintf("%v", this.ExitedAt), "Timestamp", "types1.Timestamp", 1) + `,`,
`XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`,
`}`,
}, "")
@ -2594,7 +2608,7 @@ func (this *WaitResponse) String() string {
}
s := strings.Join([]string{`&WaitResponse{`,
`ExitStatus:` + fmt.Sprintf("%v", this.ExitStatus) + `,`,
`ExitedAt:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.ExitedAt), "Timestamp", "types1.Timestamp", 1), `&`, ``, 1) + `,`,
`ExitedAt:` + strings.Replace(fmt.Sprintf("%v", this.ExitedAt), "Timestamp", "types1.Timestamp", 1) + `,`,
`XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`,
`}`,
}, "")
@ -3445,7 +3459,10 @@ func (m *DeleteResponse) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.ExitedAt, dAtA[iNdEx:postIndex]); err != nil {
if m.ExitedAt == nil {
m.ExitedAt = &types1.Timestamp{}
}
if err := m.ExitedAt.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
@ -4339,7 +4356,10 @@ func (m *StateResponse) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.ExitedAt, dAtA[iNdEx:postIndex]); err != nil {
if m.ExitedAt == nil {
m.ExitedAt = &types1.Timestamp{}
}
if err := m.ExitedAt.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
@ -5379,7 +5399,10 @@ func (m *WaitResponse) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.ExitedAt, dAtA[iNdEx:postIndex]); err != nil {
if m.ExitedAt == nil {
m.ExitedAt = &types1.Timestamp{}
}
if err := m.ExitedAt.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex

6
runtime/v1/shim/v1/shim.proto
View File

@ -88,7 +88,7 @@ message CreateTaskResponse {
message DeleteResponse {
uint32 pid = 1;
uint32 exit_status = 2;
google.protobuf.Timestamp exited_at = 3 [(gogoproto.stdtime) = true, (gogoproto.nullable) = false];
google.protobuf.Timestamp exited_at = 3;
}
message DeleteProcessRequest {
@ -127,7 +127,7 @@ message StateResponse {
string stderr = 7;
bool terminal = 8;
uint32 exit_status = 9;
google.protobuf.Timestamp exited_at = 10 [(gogoproto.stdtime) = true, (gogoproto.nullable) = false];
google.protobuf.Timestamp exited_at = 10;
}
message KillRequest {
@ -177,5 +177,5 @@ message WaitRequest {
message WaitResponse {
uint32 exit_status = 1;
google.protobuf.Timestamp exited_at = 2 [(gogoproto.stdtime) = true, (gogoproto.nullable) = false];
google.protobuf.Timestamp exited_at = 2;
}

3
runtime/v2/binary.go
View File

@ -28,6 +28,7 @@ import (
"github.com/containerd/containerd/log"
"github.com/containerd/containerd/namespaces"
"github.com/containerd/containerd/protobuf"
"github.com/containerd/containerd/runtime"
client "github.com/containerd/containerd/runtime/v2/shim"
"github.com/containerd/containerd/runtime/v2/task"
@ -192,7 +193,7 @@ func (b *binary) Delete(ctx context.Context) (*runtime.Exit, error) {
}
return &runtime.Exit{
Status: response.ExitStatus,
Timestamp: response.ExitedAt,
Timestamp: protobuf.FromTimestamp(response.ExitedAt),
Pid: response.Pid,
}, nil
}

7
runtime/v2/process.go
View File

@ -22,6 +22,7 @@ import (
tasktypes "github.com/containerd/containerd/api/types/task"
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/protobuf"
"github.com/containerd/containerd/runtime"
"github.com/containerd/containerd/runtime/v2/task"
"github.com/containerd/ttrpc"
@ -84,7 +85,7 @@ func (p *process) State(ctx context.Context) (runtime.State, error) {
Stderr: response.Stderr,
Terminal: response.Terminal,
ExitStatus: response.ExitStatus,
ExitedAt: response.ExitedAt,
ExitedAt: protobuf.FromTimestamp(response.ExitedAt),
}, nil
}
@ -137,7 +138,7 @@ func (p *process) Wait(ctx context.Context) (*runtime.Exit, error) {
return nil, errdefs.FromGRPC(err)
}
return &runtime.Exit{
Timestamp: response.ExitedAt,
Timestamp: protobuf.FromTimestamp(response.ExitedAt),
Status: response.ExitStatus,
}, nil
}
@ -152,7 +153,7 @@ func (p *process) Delete(ctx context.Context) (*runtime.Exit, error) {
}
return &runtime.Exit{
Status: response.ExitStatus,
Timestamp: response.ExitedAt,
Timestamp: protobuf.FromTimestamp(response.ExitedAt),
Pid: response.Pid,
}, nil
}

10
runtime/v2/runc/task/service.go
View File

@ -227,12 +227,12 @@ func (s *service) Delete(ctx context.Context, r *taskAPI.DeleteRequest) (*taskAP
ContainerID: container.ID,
Pid: uint32(p.Pid()),
ExitStatus: uint32(p.ExitStatus()),
ExitedAt: p.ExitedAt(),
ExitedAt: protobuf.ToTimestamp(p.ExitedAt()),
})
}
return &taskAPI.DeleteResponse{
ExitStatus: uint32(p.ExitStatus()),
ExitedAt: p.ExitedAt(),
ExitedAt: protobuf.ToTimestamp(p.ExitedAt()),
Pid: uint32(p.Pid()),
}, nil
}
@ -310,7 +310,7 @@ func (s *service) State(ctx context.Context, r *taskAPI.StateRequest) (*taskAPI.
Stderr: sio.Stderr,
Terminal: sio.Terminal,
ExitStatus: uint32(p.ExitStatus()),
ExitedAt: p.ExitedAt(),
ExitedAt: protobuf.ToTimestamp(p.ExitedAt()),
}, nil
}
@ -441,7 +441,7 @@ func (s *service) Wait(ctx context.Context, r *taskAPI.WaitRequest) (*taskAPI.Wa
return &taskAPI.WaitResponse{
ExitStatus: uint32(p.ExitStatus()),
ExitedAt: p.ExitedAt(),
ExitedAt: protobuf.ToTimestamp(p.ExitedAt()),
}, nil
}
@ -554,7 +554,7 @@ func (s *service) checkProcesses(e runcC.Exit) {
ID: p.ID(),
Pid: uint32(e.Pid),
ExitStatus: uint32(e.Status),
ExitedAt: p.ExitedAt(),
ExitedAt: protobuf.ToTimestamp(p.ExitedAt()),
})
return
}

12
runtime/v2/runc/v1/service.go
View File

@ -265,7 +265,7 @@ func (s *service) Cleanup(ctx context.Context) (*taskAPI.DeleteResponse, error)
}
return &taskAPI.DeleteResponse{
ExitedAt: time.Now(),
ExitedAt: protobuf.ToTimestamp(time.Now()),
ExitStatus: 128 + uint32(unix.SIGKILL),
Pid: uint32(pid),
}, nil
@ -361,12 +361,12 @@ func (s *service) Delete(ctx context.Context, r *taskAPI.DeleteRequest) (*taskAP
ContainerID: container.ID,
Pid: uint32(p.Pid()),
ExitStatus: uint32(p.ExitStatus()),
ExitedAt: p.ExitedAt(),
ExitedAt: protobuf.ToTimestamp(p.ExitedAt()),
})
}
return &taskAPI.DeleteResponse{
ExitStatus: uint32(p.ExitStatus()),
ExitedAt: p.ExitedAt(),
ExitedAt: protobuf.ToTimestamp(p.ExitedAt()),
Pid: uint32(p.Pid()),
}, nil
}
@ -440,7 +440,7 @@ func (s *service) State(ctx context.Context, r *taskAPI.StateRequest) (*taskAPI.
Stderr: sio.Stderr,
Terminal: sio.Terminal,
ExitStatus: uint32(p.ExitStatus()),
ExitedAt: p.ExitedAt(),
ExitedAt: protobuf.ToTimestamp(p.ExitedAt()),
}, nil
}
@ -571,7 +571,7 @@ func (s *service) Wait(ctx context.Context, r *taskAPI.WaitRequest) (*taskAPI.Wa
return &taskAPI.WaitResponse{
ExitStatus: uint32(p.ExitStatus()),
ExitedAt: p.ExitedAt(),
ExitedAt: protobuf.ToTimestamp(p.ExitedAt()),
}, nil
}
@ -659,7 +659,7 @@ func (s *service) checkProcesses(e runcC.Exit) {
ID: p.ID(),
Pid: uint32(e.Pid),
ExitStatus: uint32(e.Status),
ExitedAt: p.ExitedAt(),
ExitedAt: protobuf.ToTimestamp(p.ExitedAt()),
})
return
}

3
runtime/v2/runc/v2/service.go
View File

@ -23,6 +23,7 @@ import (
"context"
"github.com/containerd/containerd/pkg/shutdown"
"github.com/containerd/containerd/protobuf"
"github.com/containerd/containerd/runtime/v2/runc/manager"
"github.com/containerd/containerd/runtime/v2/runc/task"
"github.com/containerd/containerd/runtime/v2/shim"
@ -45,7 +46,7 @@ func (stm *shimTaskManager) Cleanup(ctx context.Context) (*shimapi.DeleteRespons
return &shimapi.DeleteResponse{
Pid: uint32(ss.Pid),
ExitStatus: uint32(ss.ExitStatus),
ExitedAt: ss.ExitedAt,
ExitedAt: protobuf.ToTimestamp(ss.ExitedAt),
}, nil
}

10
runtime/v2/shim.go
View File

@ -175,14 +175,14 @@ func cleanupAfterDeadShim(ctx context.Context, id, ns string, rt *runtime.TaskLi
ID: id,
Pid: pid,
ExitStatus: exitStatus,
ExitedAt: exitedAt,
ExitedAt: protobuf.ToTimestamp(exitedAt),
})
events.Publish(ctx, runtime.TaskDeleteEventTopic, &eventstypes.TaskDelete{
ContainerID: id,
Pid: pid,
ExitStatus: exitStatus,
ExitedAt: exitedAt,
ExitedAt: protobuf.ToTimestamp(exitedAt),
})
}
@ -333,7 +333,7 @@ func (s *shimTask) delete(ctx context.Context, sandboxed bool, removeTask func(c
return &runtime.Exit{
Status: response.ExitStatus,
Timestamp: response.ExitedAt,
Timestamp: protobuf.FromTimestamp(response.ExitedAt),
Pid: response.Pid,
}, nil
}
@ -483,7 +483,7 @@ func (s *shimTask) Wait(ctx context.Context) (*runtime.Exit, error) {
}
return &runtime.Exit{
Pid: taskPid,
Timestamp: response.ExitedAt,
Timestamp: protobuf.FromTimestamp(response.ExitedAt),
Status: response.ExitStatus,
}, nil
}
@ -550,6 +550,6 @@ func (s *shimTask) State(ctx context.Context) (runtime.State, error) {
Stderr: response.Stderr,
Terminal: response.Terminal,
ExitStatus: response.ExitStatus,
ExitedAt: response.ExitedAt,
ExitedAt: protobuf.FromTimestamp(response.ExitedAt),
}, nil
}

2
runtime/v2/shim/publisher.go
View File

@ -116,7 +116,7 @@ func (l *RemoteEventsPublisher) Publish(ctx context.Context, topic string, event
}
i := &item{
ev: &v1.Envelope{
Timestamp: time.Now(),
Timestamp: protobuf.ToTimestamp(time.Now()),
Namespace: ns,
Topic: topic,
Event: any,

5
runtime/v2/shim/shim.go
View File

@ -34,6 +34,7 @@ import (
"github.com/containerd/containerd/namespaces"
"github.com/containerd/containerd/pkg/shutdown"
"github.com/containerd/containerd/plugin"
"github.com/containerd/containerd/protobuf"
shimapi "github.com/containerd/containerd/runtime/v2/task"
"github.com/containerd/containerd/version"
"github.com/containerd/ttrpc"
@ -218,7 +219,7 @@ func (stm shimToManager) Stop(ctx context.Context, id string) (StopStatus, error
return StopStatus{
Pid: int(dr.Pid),
ExitStatus: int(dr.ExitStatus),
ExitedAt: dr.ExitedAt,
ExitedAt: protobuf.FromTimestamp(dr.ExitedAt),
}, nil
}
@ -314,7 +315,7 @@ func run(ctx context.Context, manager Manager, initFunc Init, name string, confi
data, err := proto.Marshal(&shimapi.DeleteResponse{
Pid: uint32(ss.Pid),
ExitStatus: uint32(ss.ExitStatus),
ExitedAt: ss.ExitedAt,
ExitedAt: protobuf.ToTimestamp(ss.ExitedAt),
})
if err != nil {
return err

194
runtime/v2/task/sandbox.pb.go
View File

@ -10,21 +10,18 @@ import (
github_com_containerd_ttrpc "github.com/containerd/ttrpc"
proto "github.com/gogo/protobuf/proto"
github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys"
github_com_gogo_protobuf_types "github.com/gogo/protobuf/types"
types1 "github.com/gogo/protobuf/types"
io "io"
math "math"
math_bits "math/bits"
reflect "reflect"
strings "strings"
time "time"
)
// Reference imports to suppress errors if they are not otherwise used.
var _ = proto.Marshal
var _ = fmt.Errorf
var _ = math.Inf
var _ = time.Kitchen
// This is a compile-time assertion to ensure that this generated file
// is compatible with the proto package it is being compiled against.
@ -272,11 +269,11 @@ func (m *WaitSandboxRequest) XXX_DiscardUnknown() {
var xxx_messageInfo_WaitSandboxRequest proto.InternalMessageInfo
type WaitSandboxResponse struct {
ExitStatus uint32 `protobuf:"varint,1,opt,name=exit_status,json=exitStatus,proto3" json:"exit_status,omitempty"`
ExitedAt time.Time `protobuf:"bytes,2,opt,name=exited_at,json=exitedAt,proto3,stdtime" json:"exited_at"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
ExitStatus uint32 `protobuf:"varint,1,opt,name=exit_status,json=exitStatus,proto3" json:"exit_status,omitempty"`
ExitedAt *types1.Timestamp `protobuf:"bytes,2,opt,name=exited_at,json=exitedAt,proto3" json:"exited_at,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *WaitSandboxResponse) Reset() { *m = WaitSandboxResponse{} }
@ -543,15 +540,15 @@ func (m *ResumeSandboxResponse) XXX_DiscardUnknown() {
var xxx_messageInfo_ResumeSandboxResponse proto.InternalMessageInfo
type SandboxStatusResponse struct {
ID string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
Pid uint32 `protobuf:"varint,2,opt,name=pid,proto3" json:"pid,omitempty"`
State string `protobuf:"bytes,3,opt,name=state,proto3" json:"state,omitempty"`
ExitStatus uint32 `protobuf:"varint,4,opt,name=exit_status,json=exitStatus,proto3" json:"exit_status,omitempty"`
ExitedAt time.Time `protobuf:"bytes,5,opt,name=exited_at,json=exitedAt,proto3,stdtime" json:"exited_at"`
Extra *types1.Any `protobuf:"bytes,6,opt,name=extra,proto3" json:"extra,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
ID string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
Pid uint32 `protobuf:"varint,2,opt,name=pid,proto3" json:"pid,omitempty"`
State string `protobuf:"bytes,3,opt,name=state,proto3" json:"state,omitempty"`
ExitStatus uint32 `protobuf:"varint,4,opt,name=exit_status,json=exitStatus,proto3" json:"exit_status,omitempty"`
ExitedAt *types1.Timestamp `protobuf:"bytes,5,opt,name=exited_at,json=exitedAt,proto3" json:"exited_at,omitempty"`
Extra *types1.Any `protobuf:"bytes,6,opt,name=extra,proto3" json:"extra,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *SandboxStatusResponse) Reset() { *m = SandboxStatusResponse{} }
@ -688,57 +685,56 @@ func init() {
}
var fileDescriptor_1a2e6d1f55947a07 = []byte{
// 790 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x54, 0x4f, 0x6b, 0xfb, 0x46,
0x10, 0x8d, 0xe4, 0xc4, 0x89, 0x47, 0x76, 0x09, 0x1b, 0x3b, 0x71, 0x75, 0xb0, 0x5c, 0x1d, 0x1a,
0xb7, 0x14, 0x09, 0x5c, 0x28, 0xfd, 0x03, 0x01, 0xbb, 0xe9, 0x21, 0x87, 0x82, 0x91, 0x5b, 0x5a,
0x28, 0xd4, 0xac, 0xad, 0x8d, 0x23, 0x12, 0x6b, 0x55, 0xed, 0x2a, 0xc4, 0xb7, 0x7e, 0x84, 0x42,
0xe9, 0x47, 0x2a, 0xe4, 0xd8, 0x63, 0x4f, 0x69, 0xe3, 0xcb, 0xef, 0x6b, 0xfc, 0x58, 0xef, 0x3a,
0x96, 0x9d, 0xcd, 0x1f, 0xe2, 0xdb, 0x6a, 0xf5, 0xf6, 0xcd, 0xcc, 0x9b, 0x79, 0x03, 0x27, 0xe3,
0x88, 0x5f, 0x64, 0x43, 0x6f, 0x44, 0x27, 0xfe, 0x88, 0xc6, 0x1c, 0x47, 0x31, 0x49, 0xc3, 0xfc,
0x31, 0xcd, 0x62, 0x1e, 0x4d, 0x88, 0x7f, 0xdd, 0xf6, 0x39, 0x66, 0x97, 0x3e, 0xc3, 0x71, 0x38,
0xa4, 0x37, 0x5e, 0x92, 0x52, 0x4e, 0x11, 0x5a, 0x22, 0x3d, 0xf1, 0xdb, 0xbb, 0x6e, 0xdb, 0x1f,
0x8e, 0x29, 0x1d, 0x5f, 0x11, 0x7f, 0x8e, 0x18, 0x66, 0xe7, 0x3e, 0x8e, 0xa7, 0x12, 0x6e, 0x3b,
0xeb, 0xbf, 0x04, 0x35, 0xe3, 0x78, 0x92, 0x28, 0x40, 0x75, 0x4c, 0xc7, 0x74, 0x7e, 0xf4, 0xc5,
0x49, 0xdd, 0x7e, 0xf1, 0x62, 0x96, 0x38, 0x89, 0x7c, 0x3e, 0x4d, 0x08, 0xf3, 0x27, 0x34, 0x8b,
0xb9, 0x7c, 0xe7, 0xfe, 0x6d, 0xc0, 0x41, 0x9f, 0xe3, 0x94, 0xf7, 0x65, 0xd2, 0x01, 0xf9, 0x2d,
0x23, 0x8c, 0xa3, 0xcf, 0x00, 0x54, 0x19, 0x83, 0x28, 0xac, 0x1b, 0x4d, 0xa3, 0x55, 0xea, 0x56,
0x66, 0x77, 0x4e, 0x49, 0xe1, 0xce, 0x4e, 0x83, 0x92, 0x02, 0x9c, 0x85, 0xc8, 0x01, 0x6b, 0x98,
0xc5, 0xe1, 0x15, 0x19, 0x24, 0x98, 0x5f, 0xd4, 0x4d, 0x01, 0x0f, 0x40, 0x5e, 0xf5, 0x30, 0xbf,
0x40, 0x3e, 0x14, 0x53, 0x4a, 0xf9, 0x39, 0xab, 0x17, 0x9a, 0x85, 0x96, 0xd5, 0x3e, 0xf2, 0xf2,
0xaa, 0x88, 0xac, 0xbc, 0xef, 0x45, 0x56, 0x81, 0x82, 0x21, 0x0f, 0x76, 0x69, 0xc2, 0x23, 0x1a,
0xb3, 0xfa, 0x76, 0xd3, 0x68, 0x59, 0xed, 0xaa, 0x27, 0x85, 0xf1, 0x16, 0xc2, 0x78, 0x9d, 0x78,
0x1a, 0x2c, 0x40, 0x6e, 0x0b, 0xaa, 0xab, 0x65, 0xb0, 0x84, 0xc6, 0x8c, 0xa0, 0x7d, 0x28, 0x24,
0xaa, 0x80, 0x4a, 0x20, 0x8e, 0x2e, 0x01, 0xd4, 0xe7, 0x34, 0xd9, 0xa8, 0xde, 0x8f, 0xa0, 0x2c,
0xda, 0x42, 0x33, 0x3e, 0x60, 0x64, 0xc4, 0xe6, 0x05, 0x57, 0x02, 0x4b, 0xdd, 0xf5, 0xc9, 0x88,
0xb9, 0x35, 0xa1, 0x6b, 0x2e, 0x8c, 0xcc, 0xc7, 0xfd, 0xcb, 0x84, 0xea, 0x8f, 0x49, 0x88, 0x39,
0xd9, 0x28, 0x81, 0x36, 0x94, 0x52, 0xc2, 0x68, 0x96, 0x8e, 0x88, 0x8c, 0xfe, 0x94, 0x40, 0x4b,
0x18, 0xfa, 0x05, 0x2c, 0x1c, 0xc7, 0x94, 0x63, 0x29, 0xab, 0x6c, 0xc4, 0x57, 0xde, 0xe3, 0xf1,
0xf4, 0x74, 0x09, 0x7a, 0x9d, 0xe5, 0xdb, 0xef, 0x62, 0x9e, 0x4e, 0x83, 0x3c, 0x9b, 0x7d, 0x02,
0xfb, 0xeb, 0x00, 0xa1, 0xfd, 0x25, 0x99, 0xca, 0x5a, 0x02, 0x71, 0x44, 0x55, 0xd8, 0xb9, 0xc6,
0x57, 0x19, 0x51, 0x13, 0x22, 0x3f, 0xbe, 0x36, 0xbf, 0x34, 0xdc, 0x2e, 0xa0, 0x9f, 0x70, 0xb4,
0xd1, 0x14, 0xba, 0x53, 0x38, 0x58, 0xe1, 0x50, 0x23, 0xe0, 0x80, 0x45, 0x6e, 0x22, 0x3e, 0x60,
0x1c, 0xf3, 0x8c, 0xa9, 0x51, 0x00, 0x71, 0xd5, 0x9f, 0xdf, 0xa0, 0x0e, 0x94, 0xc4, 0x17, 0x09,
0x07, 0x98, 0x2b, 0x31, 0xed, 0x47, 0x62, 0xfe, 0xb0, 0xb0, 0x61, 0x77, 0xef, 0xf6, 0xce, 0xd9,
0xfa, 0xe3, 0x3f, 0xc7, 0x08, 0xf6, 0xe4, 0xb3, 0x0e, 0x77, 0x8f, 0xa0, 0xb6, 0x26, 0x9a, 0xea,
0xf7, 0x29, 0x54, 0xd5, 0x95, 0x0c, 0xf6, 0xb6, 0xca, 0xbe, 0x85, 0x83, 0x1e, 0xce, 0xd8, 0x46,
0x33, 0xe3, 0x1e, 0x42, 0x75, 0x95, 0x64, 0x99, 0x62, 0x40, 0x58, 0x36, 0xd9, 0x8c, 0xfd, 0x08,
0x6a, 0x6b, 0x2c, 0x8a, 0xfe, 0x9d, 0x01, 0xb5, 0x35, 0x09, 0x54, 0x63, 0x0e, 0xc1, 0x7c, 0x20,
0x2e, 0xce, 0xee, 0x1c, 0xf3, 0xec, 0x34, 0x30, 0xa3, 0x70, 0xe1, 0x59, 0xf3, 0xc1, 0xb3, 0x62,
0x6e, 0x44, 0xf7, 0x48, 0xbd, 0x20, 0xe7, 0x66, 0xfe, 0xb1, 0xde, 0xd8, 0xed, 0xe7, 0x1b, 0xbb,
0xf3, 0x96, 0xc6, 0xa2, 0x4f, 0x61, 0x87, 0xdc, 0xf0, 0x14, 0xd7, 0x8b, 0xcf, 0x98, 0x4c, 0x42,
0xdc, 0x6f, 0xc0, 0xea, 0x45, 0xf1, 0xf8, 0x6d, 0xfa, 0x7d, 0x00, 0x65, 0xf9, 0x58, 0x8a, 0xd3,
0xfe, 0xb3, 0x08, 0xbb, 0x0a, 0x88, 0x30, 0x94, 0xf3, 0xcb, 0x0d, 0x1d, 0xeb, 0x4c, 0xab, 0xd9,
0xe2, 0x76, 0xeb, 0x65, 0xa0, 0xea, 0xc5, 0xaf, 0x60, 0xe5, 0xd6, 0x15, 0xfa, 0x58, 0xff, 0x70,
0x7d, 0x6d, 0xda, 0xc7, 0x2f, 0xe2, 0x96, 0xfc, 0x39, 0x6f, 0xea, 0xf9, 0x1f, 0x2f, 0x00, 0x3d,
0xbf, 0xce, 0xe4, 0x21, 0x54, 0x56, 0x0c, 0x88, 0x5a, 0xaf, 0x5d, 0x6c, 0xf6, 0x27, 0xaf, 0x40,
0xaa, 0x28, 0x18, 0xca, 0x79, 0x0b, 0xe9, 0x1b, 0xa1, 0x71, 0xaa, 0xbe, 0x11, 0x3a, 0x37, 0x8a,
0x42, 0x56, 0x7c, 0xa4, 0x2f, 0x44, 0x67, 0x58, 0x7d, 0x21, 0x5a, 0x53, 0x8a, 0x28, 0x2b, 0x9e,
0xd4, 0x47, 0xd1, 0x6d, 0x2e, 0x7d, 0x14, 0xbd, 0xc1, 0x7b, 0xd2, 0x10, 0x8b, 0x4a, 0x1c, 0xad,
0x08, 0x4b, 0xc7, 0xd8, 0xcd, 0xa7, 0x01, 0x92, 0xb1, 0x5b, 0xbf, 0xbd, 0x6f, 0x6c, 0xfd, 0x7b,
0xdf, 0xd8, 0xfa, 0x7d, 0xd6, 0x30, 0x6e, 0x67, 0x0d, 0xe3, 0x9f, 0x59, 0xc3, 0xf8, 0x7f, 0xd6,
0x30, 0x7e, 0x36, 0x87, 0xc5, 0xb9, 0x27, 0x3f, 0x7f, 0x1f, 0x00, 0x00, 0xff, 0xff, 0x6e, 0x96,
0x09, 0x90, 0xb1, 0x09, 0x00, 0x00,
// 780 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x54, 0xcf, 0x6b, 0xdb, 0x48,
0x14, 0x8e, 0xe4, 0xc4, 0x59, 0x3f, 0xd9, 0x4b, 0x98, 0xd8, 0x89, 0x57, 0x07, 0xdb, 0xab, 0xc3,
0xc6, 0xbb, 0x2c, 0x12, 0x78, 0x61, 0x77, 0xdb, 0x42, 0x20, 0x69, 0x7a, 0xc8, 0xa1, 0x60, 0xe4,
0x96, 0x16, 0x0a, 0x35, 0x63, 0x6b, 0xe2, 0x88, 0xc4, 0x1a, 0x55, 0x33, 0x0a, 0xf1, 0xad, 0xff,
0x43, 0xe9, 0x9f, 0x54, 0xc8, 0xb1, 0xc7, 0x5e, 0x1a, 0x1a, 0xff, 0x25, 0x65, 0x3c, 0xe3, 0x58,
0x76, 0x26, 0x3f, 0x88, 0x6f, 0xa3, 0xd1, 0x37, 0xdf, 0x7b, 0xef, 0x7b, 0xef, 0x7b, 0xb0, 0x3b,
0x08, 0xf9, 0x71, 0xda, 0x73, 0xfb, 0x74, 0xe8, 0xf5, 0x69, 0xc4, 0x71, 0x18, 0x91, 0x24, 0xc8,
0x1e, 0x93, 0x34, 0xe2, 0xe1, 0x90, 0x78, 0x67, 0x2d, 0x8f, 0x63, 0x76, 0xe2, 0x31, 0x1c, 0x05,
0x3d, 0x7a, 0xee, 0xc6, 0x09, 0xe5, 0x14, 0xa1, 0x19, 0xd2, 0x15, 0xbf, 0xdd, 0xb3, 0x96, 0xfd,
0xdb, 0x80, 0xd2, 0xc1, 0x29, 0xf1, 0x26, 0x88, 0x5e, 0x7a, 0xe4, 0xe1, 0x68, 0x24, 0xe1, 0x76,
0x7d, 0xf1, 0x97, 0xa0, 0x66, 0x1c, 0x0f, 0x63, 0x05, 0x28, 0x0f, 0xe8, 0x80, 0x4e, 0x8e, 0x9e,
0x38, 0xa9, 0xdb, 0x7f, 0xef, 0xcd, 0x12, 0xc7, 0xa1, 0xc7, 0x47, 0x31, 0x61, 0xde, 0x90, 0xa6,
0x11, 0x97, 0xef, 0x9c, 0x2f, 0x06, 0x6c, 0x76, 0x38, 0x4e, 0x78, 0x47, 0x26, 0xed, 0x93, 0x0f,
0x29, 0x61, 0x1c, 0xfd, 0x0d, 0xa0, 0xca, 0xe8, 0x86, 0x41, 0xd5, 0x68, 0x18, 0xcd, 0xc2, 0x7e,
0x69, 0x7c, 0x59, 0x2f, 0x28, 0xdc, 0xe1, 0x81, 0x5f, 0x50, 0x80, 0xc3, 0x00, 0xd5, 0xc1, 0xea,
0xa5, 0x51, 0x70, 0x4a, 0xba, 0x31, 0xe6, 0xc7, 0x55, 0x53, 0xc0, 0x7d, 0x90, 0x57, 0x6d, 0xcc,
0x8f, 0x91, 0x07, 0xf9, 0x84, 0x52, 0x7e, 0xc4, 0xaa, 0xb9, 0x46, 0xae, 0x69, 0xb5, 0xb6, 0xdd,
0xac, 0x2a, 0x22, 0x2b, 0xf7, 0xa5, 0xc8, 0xca, 0x57, 0x30, 0xe4, 0xc2, 0x3a, 0x8d, 0x79, 0x48,
0x23, 0x56, 0x5d, 0x6d, 0x18, 0x4d, 0xab, 0x55, 0x76, 0xa5, 0x30, 0xee, 0x54, 0x18, 0x77, 0x2f,
0x1a, 0xf9, 0x53, 0x90, 0xd3, 0x84, 0xf2, 0x7c, 0x19, 0x2c, 0xa6, 0x11, 0x23, 0x68, 0x03, 0x72,
0xb1, 0x2a, 0xa0, 0xe4, 0x8b, 0xa3, 0x43, 0x00, 0x75, 0x38, 0x8d, 0x97, 0xaa, 0xf7, 0x77, 0x28,
0x8a, 0xb6, 0xd0, 0x94, 0x77, 0x19, 0xe9, 0xb3, 0x49, 0xc1, 0x25, 0xdf, 0x52, 0x77, 0x1d, 0xd2,
0x67, 0x4e, 0x45, 0xe8, 0x9a, 0x09, 0x23, 0xf3, 0x71, 0x3e, 0x9b, 0x50, 0x7e, 0x1d, 0x07, 0x98,
0x93, 0xa5, 0x12, 0x68, 0x41, 0x21, 0x21, 0x8c, 0xa6, 0x49, 0x9f, 0xc8, 0xe8, 0xb7, 0x09, 0x34,
0x83, 0xa1, 0x77, 0x60, 0xe1, 0x28, 0xa2, 0x1c, 0x4b, 0x59, 0x65, 0x23, 0x9e, 0xb8, 0x37, 0xc7,
0xd3, 0xd5, 0x25, 0xe8, 0xee, 0xcd, 0xde, 0xbe, 0x88, 0x78, 0x32, 0xf2, 0xb3, 0x6c, 0xf6, 0x2e,
0x6c, 0x2c, 0x02, 0x84, 0xf6, 0x27, 0x64, 0x24, 0x6b, 0xf1, 0xc5, 0x11, 0x95, 0x61, 0xed, 0x0c,
0x9f, 0xa6, 0x44, 0x4d, 0x88, 0xfc, 0x78, 0x6a, 0xfe, 0x6f, 0x38, 0xfb, 0x80, 0xde, 0xe0, 0x70,
0xa9, 0x29, 0x74, 0x28, 0x6c, 0xce, 0x71, 0xa8, 0x11, 0xa8, 0x83, 0x45, 0xce, 0x43, 0xde, 0x65,
0x1c, 0xf3, 0x94, 0xa9, 0x51, 0x00, 0x71, 0xd5, 0x99, 0xdc, 0xa0, 0xff, 0xa0, 0x20, 0xbe, 0x48,
0xd0, 0xc5, 0x5c, 0x89, 0x69, 0xdf, 0x10, 0xf3, 0xd5, 0xd4, 0x86, 0xfe, 0x2f, 0x12, 0xbc, 0xc7,
0x9d, 0x6d, 0xa8, 0x2c, 0x48, 0xa5, 0xba, 0x7c, 0x00, 0x65, 0x75, 0x25, 0x43, 0x3c, 0xae, 0x9e,
0xe7, 0xb0, 0xd9, 0xc6, 0x29, 0x5b, 0x6a, 0x52, 0x9c, 0x2d, 0x28, 0xcf, 0x93, 0xcc, 0x52, 0xf4,
0x09, 0x4b, 0x87, 0xcb, 0xb1, 0x6f, 0x43, 0x65, 0x81, 0x45, 0xd1, 0x7f, 0x37, 0xa0, 0xb2, 0x20,
0x81, 0x6a, 0xc7, 0x16, 0x98, 0xd7, 0xc4, 0xf9, 0xf1, 0x65, 0xdd, 0x3c, 0x3c, 0xf0, 0xcd, 0x30,
0x98, 0x3a, 0xd5, 0xbc, 0x76, 0xaa, 0x98, 0x16, 0xd1, 0x33, 0x52, 0xcd, 0xc9, 0x69, 0x99, 0x7c,
0x2c, 0xb6, 0x73, 0xf5, 0xee, 0x76, 0xae, 0x3d, 0xbc, 0x9d, 0xe8, 0x2f, 0x58, 0x23, 0xe7, 0x3c,
0xc1, 0xd5, 0xfc, 0x1d, 0x86, 0x92, 0x10, 0xe7, 0x19, 0x58, 0xed, 0x30, 0x1a, 0x3c, 0x4e, 0xb5,
0x5f, 0xa1, 0x28, 0x1f, 0x4b, 0x49, 0x5a, 0x9f, 0xf2, 0xb0, 0xae, 0x80, 0x08, 0x43, 0x31, 0xbb,
0xc8, 0xd0, 0x8e, 0xce, 0xa0, 0x9a, 0x8d, 0x6d, 0x37, 0xef, 0x07, 0xaa, 0x0e, 0xbc, 0x07, 0x2b,
0xb3, 0x9a, 0xd0, 0x1f, 0xfa, 0x87, 0x8b, 0x2b, 0xd2, 0xde, 0xb9, 0x17, 0x37, 0xe3, 0xcf, 0xf8,
0x50, 0xcf, 0x7f, 0xd3, 0xec, 0x7a, 0x7e, 0x9d, 0xa1, 0x03, 0x28, 0xcd, 0xd9, 0x0e, 0x35, 0x1f,
0xba, 0xc4, 0xec, 0x3f, 0x1f, 0x80, 0x54, 0x51, 0x30, 0x14, 0xb3, 0xc6, 0xd1, 0x37, 0x42, 0xe3,
0x4f, 0x7d, 0x23, 0x74, 0x1e, 0x14, 0x85, 0xcc, 0xb9, 0x47, 0x5f, 0x88, 0xce, 0xa6, 0xfa, 0x42,
0xb4, 0x56, 0x14, 0x51, 0xe6, 0x9c, 0xa8, 0x8f, 0xa2, 0xdb, 0x57, 0xfa, 0x28, 0x7a, 0x5b, 0xb7,
0xa5, 0x21, 0xa6, 0x95, 0xd4, 0xb5, 0x22, 0xcc, 0x1c, 0x63, 0x37, 0x6e, 0x07, 0x48, 0xc6, 0xfd,
0xea, 0xc5, 0x55, 0x6d, 0xe5, 0xdb, 0x55, 0x6d, 0xe5, 0xe3, 0xb8, 0x66, 0x5c, 0x8c, 0x6b, 0xc6,
0xd7, 0x71, 0xcd, 0xf8, 0x31, 0xae, 0x19, 0x6f, 0xcd, 0x5e, 0x7e, 0xe2, 0xc9, 0x7f, 0x7e, 0x06,
0x00, 0x00, 0xff, 0xff, 0x27, 0x5f, 0x3e, 0xac, 0x9d, 0x09, 0x00, 0x00,
}
func (m *StartSandboxRequest) Marshal() (dAtA []byte, err error) {
@ -1029,14 +1025,18 @@ func (m *WaitSandboxResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
i -= len(m.XXX_unrecognized)
copy(dAtA[i:], m.XXX_unrecognized)
}
n3, err3 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.ExitedAt, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.ExitedAt):])
if err3 != nil {
return 0, err3
if m.ExitedAt != nil {
{
size, err := m.ExitedAt.MarshalToSizedBuffer(dAtA[:i])
if err != nil {
return 0, err
}
i -= size
i = encodeVarintSandbox(dAtA, i, uint64(size))
}
i--
dAtA[i] = 0x12
}
i -= n3
i = encodeVarintSandbox(dAtA, i, uint64(n3))
i--
dAtA[i] = 0x12
if m.ExitStatus != 0 {
i = encodeVarintSandbox(dAtA, i, uint64(m.ExitStatus))
i--
@ -1264,14 +1264,18 @@ func (m *SandboxStatusResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
i--
dAtA[i] = 0x32
}
n5, err5 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.ExitedAt, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.ExitedAt):])
if err5 != nil {
return 0, err5
if m.ExitedAt != nil {
{
size, err := m.ExitedAt.MarshalToSizedBuffer(dAtA[:i])
if err != nil {
return 0, err
}
i -= size
i = encodeVarintSandbox(dAtA, i, uint64(size))
}
i--
dAtA[i] = 0x2a
}
i -= n5
i = encodeVarintSandbox(dAtA, i, uint64(n5))
i--
dAtA[i] = 0x2a
if m.ExitStatus != 0 {
i = encodeVarintSandbox(dAtA, i, uint64(m.ExitStatus))
i--
@ -1500,8 +1504,10 @@ func (m *WaitSandboxResponse) Size() (n int) {
if m.ExitStatus != 0 {
n += 1 + sovSandbox(uint64(m.ExitStatus))
}
l = github_com_gogo_protobuf_types.SizeOfStdTime(m.ExitedAt)
n += 1 + l + sovSandbox(uint64(l))
if m.ExitedAt != nil {
l = m.ExitedAt.Size()
n += 1 + l + sovSandbox(uint64(l))
}
if m.XXX_unrecognized != nil {
n += len(m.XXX_unrecognized)
}
@ -1612,8 +1618,10 @@ func (m *SandboxStatusResponse) Size() (n int) {
if m.ExitStatus != 0 {
n += 1 + sovSandbox(uint64(m.ExitStatus))
}
l = github_com_gogo_protobuf_types.SizeOfStdTime(m.ExitedAt)
n += 1 + l + sovSandbox(uint64(l))
if m.ExitedAt != nil {
l = m.ExitedAt.Size()
n += 1 + l + sovSandbox(uint64(l))
}
if m.Extra != nil {
l = m.Extra.Size()
n += 1 + l + sovSandbox(uint64(l))
@ -1750,7 +1758,7 @@ func (this *WaitSandboxResponse) String() string {
}
s := strings.Join([]string{`&WaitSandboxResponse{`,
`ExitStatus:` + fmt.Sprintf("%v", this.ExitStatus) + `,`,
`ExitedAt:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.ExitedAt), "Timestamp", "types1.Timestamp", 1), `&`, ``, 1) + `,`,
`ExitedAt:` + strings.Replace(fmt.Sprintf("%v", this.ExitedAt), "Timestamp", "types1.Timestamp", 1) + `,`,
`XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`,
`}`,
}, "")
@ -1828,7 +1836,7 @@ func (this *SandboxStatusResponse) String() string {
`Pid:` + fmt.Sprintf("%v", this.Pid) + `,`,
`State:` + fmt.Sprintf("%v", this.State) + `,`,
`ExitStatus:` + fmt.Sprintf("%v", this.ExitStatus) + `,`,
`ExitedAt:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.ExitedAt), "Timestamp", "types1.Timestamp", 1), `&`, ``, 1) + `,`,
`ExitedAt:` + strings.Replace(fmt.Sprintf("%v", this.ExitedAt), "Timestamp", "types1.Timestamp", 1) + `,`,
`Extra:` + strings.Replace(fmt.Sprintf("%v", this.Extra), "Any", "types1.Any", 1) + `,`,
`XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`,
`}`,
@ -2824,7 +2832,10 @@ func (m *WaitSandboxResponse) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.ExitedAt, dAtA[iNdEx:postIndex]); err != nil {
if m.ExitedAt == nil {
m.ExitedAt = &types1.Timestamp{}
}
if err := m.ExitedAt.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
@ -3412,7 +3423,10 @@ func (m *SandboxStatusResponse) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.ExitedAt, dAtA[iNdEx:postIndex]); err != nil {
if m.ExitedAt == nil {
m.ExitedAt = &types1.Timestamp{}
}
if err := m.ExitedAt.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex

4
runtime/v2/task/sandbox.proto
View File

@ -84,7 +84,7 @@ message WaitSandboxRequest {
message WaitSandboxResponse {
uint32 exit_status = 1;
google.protobuf.Timestamp exited_at = 2 [(gogoproto.stdtime) = true, (gogoproto.nullable) = false];
google.protobuf.Timestamp exited_at = 2;
}
message UpdateSandboxResponse {}
@ -110,7 +110,7 @@ message SandboxStatusResponse {
uint32 pid = 2;
string state = 3;
uint32 exit_status = 4;
google.protobuf.Timestamp exited_at = 5 [(gogoproto.stdtime) = true, (gogoproto.nullable) = false];
google.protobuf.Timestamp exited_at = 5;
google.protobuf.Any extra = 6;
}

311
runtime/v2/task/shim.pb.go
View File

@ -12,21 +12,18 @@ import (
_ "github.com/gogo/protobuf/gogoproto"
proto "github.com/gogo/protobuf/proto"
github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys"
github_com_gogo_protobuf_types "github.com/gogo/protobuf/types"
types1 "github.com/gogo/protobuf/types"
io "io"
math "math"
math_bits "math/bits"
reflect "reflect"
strings "strings"
time "time"
)
// Reference imports to suppress errors if they are not otherwise used.
var _ = proto.Marshal
var _ = fmt.Errorf
var _ = math.Inf
var _ = time.Kitchen
// This is a compile-time assertion to ensure that this generated file
// is compatible with the proto package it is being compiled against.
@ -162,12 +159,12 @@ func (m *DeleteRequest) XXX_DiscardUnknown() {
var xxx_messageInfo_DeleteRequest proto.InternalMessageInfo
type DeleteResponse struct {
Pid uint32 `protobuf:"varint,1,opt,name=pid,proto3" json:"pid,omitempty"`
ExitStatus uint32 `protobuf:"varint,2,opt,name=exit_status,json=exitStatus,proto3" json:"exit_status,omitempty"`
ExitedAt time.Time `protobuf:"bytes,3,opt,name=exited_at,json=exitedAt,proto3,stdtime" json:"exited_at"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
Pid uint32 `protobuf:"varint,1,opt,name=pid,proto3" json:"pid,omitempty"`
ExitStatus uint32 `protobuf:"varint,2,opt,name=exit_status,json=exitStatus,proto3" json:"exit_status,omitempty"`
ExitedAt *types1.Timestamp `protobuf:"bytes,3,opt,name=exited_at,json=exitedAt,proto3" json:"exited_at,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *DeleteResponse) Reset() { *m = DeleteResponse{} }
@ -368,20 +365,20 @@ func (m *StateRequest) XXX_DiscardUnknown() {
var xxx_messageInfo_StateRequest proto.InternalMessageInfo
type StateResponse struct {
ID string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
Bundle string `protobuf:"bytes,2,opt,name=bundle,proto3" json:"bundle,omitempty"`
Pid uint32 `protobuf:"varint,3,opt,name=pid,proto3" json:"pid,omitempty"`
Status task.Status `protobuf:"varint,4,opt,name=status,proto3,enum=containerd.v1.types.Status" json:"status,omitempty"`
Stdin string `protobuf:"bytes,5,opt,name=stdin,proto3" json:"stdin,omitempty"`
Stdout string `protobuf:"bytes,6,opt,name=stdout,proto3" json:"stdout,omitempty"`
Stderr string `protobuf:"bytes,7,opt,name=stderr,proto3" json:"stderr,omitempty"`
Terminal bool `protobuf:"varint,8,opt,name=terminal,proto3" json:"terminal,omitempty"`
ExitStatus uint32 `protobuf:"varint,9,opt,name=exit_status,json=exitStatus,proto3" json:"exit_status,omitempty"`
ExitedAt time.Time `protobuf:"bytes,10,opt,name=exited_at,json=exitedAt,proto3,stdtime" json:"exited_at"`
ExecID string `protobuf:"bytes,11,opt,name=exec_id,json=execId,proto3" json:"exec_id,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
ID string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
Bundle string `protobuf:"bytes,2,opt,name=bundle,proto3" json:"bundle,omitempty"`
Pid uint32 `protobuf:"varint,3,opt,name=pid,proto3" json:"pid,omitempty"`
Status task.Status `protobuf:"varint,4,opt,name=status,proto3,enum=containerd.v1.types.Status" json:"status,omitempty"`
Stdin string `protobuf:"bytes,5,opt,name=stdin,proto3" json:"stdin,omitempty"`
Stdout string `protobuf:"bytes,6,opt,name=stdout,proto3" json:"stdout,omitempty"`
Stderr string `protobuf:"bytes,7,opt,name=stderr,proto3" json:"stderr,omitempty"`
Terminal bool `protobuf:"varint,8,opt,name=terminal,proto3" json:"terminal,omitempty"`
ExitStatus uint32 `protobuf:"varint,9,opt,name=exit_status,json=exitStatus,proto3" json:"exit_status,omitempty"`
ExitedAt *types1.Timestamp `protobuf:"bytes,10,opt,name=exited_at,json=exitedAt,proto3" json:"exited_at,omitempty"`
ExecID string `protobuf:"bytes,11,opt,name=exec_id,json=execId,proto3" json:"exec_id,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *StateResponse) Reset() { *m = StateResponse{} }
@ -779,11 +776,11 @@ func (m *WaitRequest) XXX_DiscardUnknown() {
var xxx_messageInfo_WaitRequest proto.InternalMessageInfo
type WaitResponse struct {
ExitStatus uint32 `protobuf:"varint,1,opt,name=exit_status,json=exitStatus,proto3" json:"exit_status,omitempty"`
ExitedAt time.Time `protobuf:"bytes,2,opt,name=exited_at,json=exitedAt,proto3,stdtime" json:"exited_at"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
ExitStatus uint32 `protobuf:"varint,1,opt,name=exit_status,json=exitStatus,proto3" json:"exit_status,omitempty"`
ExitedAt *types1.Timestamp `protobuf:"bytes,2,opt,name=exited_at,json=exitedAt,proto3" json:"exited_at,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *WaitResponse) Reset() { *m = WaitResponse{} }
@ -1129,89 +1126,88 @@ func init() {
}
var fileDescriptor_9202ee34bc3ad8ca = []byte{
// 1302 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x58, 0xcf, 0x6f, 0x1b, 0x45,
0x14, 0xee, 0xfa, 0xc7, 0xda, 0x7e, 0xae, 0xd3, 0x74, 0x48, 0xcb, 0xd6, 0x95, 0x6c, 0x77, 0x4b,
0x8b, 0x01, 0x69, 0x2d, 0x5c, 0x51, 0xa1, 0x46, 0x2a, 0x4a, 0xd2, 0x50, 0x99, 0x16, 0x12, 0x6d,
0x8b, 0x8a, 0xb8, 0x44, 0x1b, 0xef, 0xd4, 0x5e, 0xc5, 0xde, 0x59, 0x76, 0x66, 0xd3, 0x1a, 0x09,
0x89, 0x13, 0x07, 0x4e, 0xfc, 0x59, 0x3d, 0x22, 0x71, 0xe1, 0x42, 0xa1, 0xfe, 0x0f, 0x38, 0x72,
0x43, 0xf3, 0xc3, 0xf1, 0xda, 0xde, 0xb5, 0x9b, 0xca, 0x97, 0x68, 0xde, 0xce, 0x37, 0x6f, 0xde,
0xbc, 0xf9, 0xde, 0xf7, 0xc6, 0x81, 0xed, 0x9e, 0xc7, 0xfa, 0xd1, 0xb1, 0xd5, 0x25, 0xc3, 0x56,
0x97, 0xf8, 0xcc, 0xf1, 0x7c, 0x1c, 0xba, 0xf1, 0x61, 0x18, 0xf9, 0xcc, 0x1b, 0xe2, 0xd6, 0x69,
0xbb, 0xc5, 0x1c, 0x7a, 0xd2, 0xa2, 0x7d, 0x6f, 0x68, 0x05, 0x21, 0x61, 0x04, 0xa1, 0x29, 0xcc,
0xe2, 0x73, 0xd6, 0x69, 0xbb, 0x7a, 0xad, 0x47, 0x48, 0x6f, 0x80, 0x5b, 0x02, 0x71, 0x1c, 0x3d,
0x6f, 0x39, 0xfe, 0x48, 0xc2, 0xab, 0xd7, 0xe7, 0xa7, 0xf0, 0x30, 0x60, 0x93, 0xc9, 0xad, 0x1e,
0xe9, 0x11, 0x31, 0x6c, 0xf1, 0x91, 0xfa, 0x5a, 0x9f, 0x5f, 0xc2, 0x43, 0xa1, 0xcc, 0x19, 0x06,
0x0a, 0x70, 0x77, 0x65, 0xfc, 0x4e, 0xe0, 0xb5, 0xd8, 0x28, 0xc0, 0xb4, 0x35, 0x24, 0x91, 0xcf,
0xd4, 0xba, 0x7b, 0xe7, 0x58, 0x27, 0x8e, 0x2d, 0xce, 0x27, 0xd6, 0x9a, 0x7f, 0x64, 0xe0, 0xf2,
0x5e, 0x88, 0x1d, 0x86, 0x9f, 0x3a, 0xf4, 0xc4, 0xc6, 0x3f, 0x44, 0x98, 0x32, 0x74, 0x15, 0x32,
0x9e, 0x6b, 0x68, 0x0d, 0xad, 0x59, 0xda, 0xd5, 0xc7, 0xaf, 0xeb, 0x99, 0xce, 0x03, 0x3b, 0xe3,
0xb9, 0xe8, 0x2a, 0xe8, 0xc7, 0x91, 0xef, 0x0e, 0xb0, 0x91, 0xe1, 0x73, 0xb6, 0xb2, 0x50, 0x0b,
0xf4, 0x90, 0x10, 0xf6, 0x9c, 0x1a, 0xd9, 0x46, 0xb6, 0x59, 0x6e, 0xbf, 0x6f, 0xc5, 0xb3, 0xc9,
0x37, 0xb6, 0xbe, 0xe6, 0x01, 0xdb, 0x0a, 0x86, 0xaa, 0x50, 0x64, 0x38, 0x1c, 0x7a, 0xbe, 0x33,
0x30, 0x72, 0x0d, 0xad, 0x59, 0xb4, 0xcf, 0x6c, 0xb4, 0x05, 0x79, 0xca, 0x5c, 0xcf, 0x37, 0xf2,
0x62, 0x0f, 0x69, 0xf0, 0xad, 0x29, 0x73, 0x49, 0xc4, 0x0c, 0x5d, 0x6e, 0x2d, 0x2d, 0xf5, 0x1d,
0x87, 0xa1, 0x51, 0x38, 0xfb, 0x8e, 0xc3, 0x10, 0xd5, 0x00, 0xba, 0x7d, 0xdc, 0x3d, 0x09, 0x88,
0xe7, 0x33, 0xa3, 0x28, 0xe6, 0x62, 0x5f, 0xd0, 0x27, 0x70, 0x39, 0x70, 0x42, 0xec, 0xb3, 0xa3,
0x18, 0xac, 0x24, 0x60, 0x9b, 0x72, 0x62, 0x6f, 0x0a, 0xb6, 0xa0, 0x40, 0x02, 0xe6, 0x11, 0x9f,
0x1a, 0xd0, 0xd0, 0x9a, 0xe5, 0xf6, 0x96, 0x25, 0x2f, 0xd3, 0x9a, 0x5c, 0xa6, 0xb5, 0xe3, 0x8f,
0xec, 0x09, 0xc8, 0xbc, 0x0d, 0x28, 0x9e, 0x54, 0x1a, 0x10, 0x9f, 0x62, 0xb4, 0x09, 0xd9, 0x40,
0xa5, 0xb5, 0x62, 0xf3, 0xa1, 0xf9, 0x18, 0x2a, 0x0f, 0xf0, 0x00, 0x33, 0xbc, 0x2a, 0xf1, 0x37,
0xa1, 0x80, 0x5f, 0xe2, 0xee, 0x91, 0xe7, 0xca, 0xcc, 0xef, 0xc2, 0xf8, 0x75, 0x5d, 0xdf, 0x7f,
0x89, 0xbb, 0x9d, 0x07, 0xb6, 0xce, 0xa7, 0x3a, 0xae, 0xf9, 0x8b, 0x06, 0x1b, 0x13, 0x77, 0x69,
0x5b, 0xa2, 0x3a, 0x94, 0xf1, 0x4b, 0x8f, 0x1d, 0x51, 0xe6, 0xb0, 0x88, 0x0a, 0x6f, 0x15, 0x1b,
0xf8, 0xa7, 0x27, 0xe2, 0x0b, 0xda, 0x81, 0x12, 0xb7, 0xb0, 0x7b, 0xe4, 0x30, 0x23, 0x2b, 0x4e,
0x5b, 0x5d, 0x38, 0xed, 0xd3, 0x09, 0x75, 0x77, 0x8b, 0xaf, 0x5e, 0xd7, 0x2f, 0xfc, 0xf6, 0x77,
0x5d, 0xb3, 0x8b, 0x72, 0xd9, 0x0e, 0x33, 0xff, 0xd2, 0x00, 0xf1, 0xd8, 0x0e, 0x43, 0xd2, 0xc5,
0x94, 0xae, 0xe3, 0x70, 0x33, 0x8c, 0xc9, 0xa6, 0x31, 0x26, 0x97, 0xcc, 0x98, 0x7c, 0x0a, 0x63,
0xf4, 0x19, 0xc6, 0x34, 0x21, 0x47, 0x03, 0xdc, 0x15, 0x3c, 0x4a, 0xbb, 0x61, 0x81, 0x30, 0xaf,
0xc0, 0x7b, 0x33, 0xc7, 0x93, 0xc9, 0x36, 0x7f, 0x82, 0x4d, 0x1b, 0x53, 0xef, 0x47, 0x7c, 0xc8,
0x46, 0x6b, 0x39, 0xf3, 0x16, 0xe4, 0x5f, 0x78, 0x2e, 0xeb, 0x8b, 0x03, 0x57, 0x6c, 0x69, 0xf0,
0xf8, 0xfb, 0xd8, 0xeb, 0xf5, 0x99, 0x38, 0x6e, 0xc5, 0x56, 0x96, 0xf9, 0x08, 0x2e, 0xf2, 0x2b,
0x5c, 0x0f, 0x97, 0xfe, 0xcd, 0x40, 0x45, 0x79, 0x53, 0x54, 0x3a, 0xaf, 0x26, 0x28, 0xea, 0x65,
0xa7, 0xd4, 0xbb, 0xc3, 0x13, 0x2f, 0x58, 0xc7, 0x03, 0xdf, 0x68, 0x5f, 0x8f, 0xab, 0xc4, 0xe9,
0xa7, 0x4a, 0x28, 0x24, 0x0d, 0x6d, 0x05, 0x5d, 0x93, 0x1a, 0xc4, 0xd9, 0x53, 0x9c, 0x63, 0xcf,
0x5c, 0x45, 0x94, 0x96, 0x57, 0x04, 0xbc, 0x4b, 0x45, 0xc4, 0x73, 0x5e, 0x4e, 0xcd, 0x39, 0x83,
0xf2, 0x23, 0x6f, 0x30, 0x58, 0x0b, 0x75, 0x78, 0x22, 0xbc, 0xde, 0xa4, 0x58, 0x2a, 0xb6, 0xb2,
0xf8, 0xad, 0x38, 0x83, 0x89, 0xe6, 0xf2, 0xa1, 0xd9, 0x85, 0x8d, 0xbd, 0x01, 0xa1, 0xb8, 0x73,
0xb0, 0x2e, 0xce, 0xca, 0xfb, 0x92, 0x45, 0x2a, 0x0d, 0xf3, 0x16, 0x94, 0x0f, 0x3d, 0x77, 0x95,
0x12, 0x98, 0xdf, 0xc0, 0x45, 0x09, 0x53, 0x9c, 0xbb, 0x0f, 0xa5, 0x40, 0x16, 0x19, 0xa6, 0x86,
0x26, 0x5a, 0x4b, 0x23, 0x91, 0x34, 0xaa, 0x14, 0x3b, 0xfe, 0x73, 0x62, 0x4f, 0x97, 0x98, 0x14,
0xae, 0x4c, 0x55, 0xfc, 0x6d, 0x1a, 0x1c, 0x82, 0x5c, 0xe0, 0xb0, 0xbe, 0xa2, 0xb2, 0x18, 0xc7,
0xc5, 0x3f, 0xfb, 0x36, 0xe2, 0xff, 0x9f, 0x06, 0x97, 0xbf, 0x0d, 0xdc, 0xb7, 0x6c, 0xa9, 0x6d,
0x28, 0x85, 0x98, 0x92, 0x28, 0xec, 0x62, 0xa9, 0xc6, 0x69, 0xfe, 0xa7, 0x30, 0xf4, 0x1d, 0x94,
0x1d, 0xdf, 0x27, 0xcc, 0x99, 0x44, 0xc5, 0x13, 0x73, 0xd7, 0x5a, 0x7c, 0xc1, 0x58, 0x0b, 0x71,
0x58, 0x3b, 0xd3, 0x85, 0xfb, 0x3e, 0x0b, 0x47, 0x76, 0xdc, 0x55, 0xf5, 0x3e, 0x6c, 0xce, 0x03,
0x38, 0x65, 0x4e, 0xf0, 0x48, 0x86, 0x6e, 0xf3, 0x21, 0xbf, 0xe3, 0x53, 0x67, 0x10, 0x4d, 0x2a,
0x5e, 0x1a, 0xf7, 0x32, 0x9f, 0x6b, 0x4a, 0x83, 0x42, 0xb6, 0x16, 0x0d, 0xba, 0x21, 0x24, 0x88,
0x3b, 0x4b, 0x6d, 0xa0, 0x5f, 0x41, 0xf9, 0x99, 0xe3, 0xad, 0x67, 0xbb, 0x10, 0x2e, 0x4a, 0x5f,
0x6a, 0xb7, 0x39, 0x5d, 0xd0, 0x96, 0xeb, 0x42, 0xe6, 0x9d, 0x3a, 0xe5, 0x6d, 0xa9, 0xd9, 0x2b,
0x0b, 0x63, 0x5b, 0xaa, 0xf1, 0xb4, 0x32, 0x3e, 0xe6, 0x65, 0xe6, 0x30, 0x19, 0x56, 0x1a, 0x65,
0x24, 0xc4, 0x6c, 0xc2, 0xc6, 0x1e, 0xf1, 0x7d, 0xdc, 0x5d, 0x95, 0x27, 0xd3, 0x81, 0x4b, 0x67,
0x48, 0xb5, 0xd1, 0x35, 0x28, 0xf2, 0x57, 0xf2, 0xd1, 0x34, 0xf1, 0x05, 0x6e, 0x1f, 0x7a, 0x2e,
0x9f, 0xe2, 0x3c, 0x13, 0x53, 0xf2, 0x1d, 0x51, 0xe0, 0x36, 0x9f, 0x32, 0xa0, 0x70, 0x8a, 0x43,
0xea, 0x11, 0xa9, 0x03, 0x25, 0x7b, 0x62, 0x9a, 0xdb, 0x70, 0xe9, 0x49, 0x3f, 0x62, 0x2e, 0x79,
0xe1, 0xaf, 0xba, 0xb5, 0x4d, 0xc8, 0xfa, 0xe4, 0x85, 0x70, 0x5d, 0xb4, 0xf9, 0x90, 0xa7, 0xeb,
0xd0, 0x89, 0xe8, 0xaa, 0x16, 0x67, 0x7e, 0x08, 0x15, 0x1b, 0xd3, 0x68, 0xb8, 0x0a, 0xd8, 0xfe,
0x15, 0x20, 0xc7, 0xab, 0x03, 0x3d, 0x86, 0xbc, 0x68, 0x77, 0xa8, 0x91, 0x54, 0x46, 0xf1, 0xbe,
0x5a, 0xbd, 0xb1, 0x04, 0xa1, 0x92, 0xf6, 0x0c, 0x74, 0xf9, 0xfe, 0x43, 0xb7, 0x92, 0xc0, 0x0b,
0x0f, 0xee, 0xea, 0xed, 0x55, 0x30, 0xe5, 0x58, 0x86, 0x19, 0xb2, 0xd4, 0x30, 0xcf, 0x4a, 0x2f,
0x35, 0xcc, 0x58, 0x3d, 0x1d, 0x80, 0x2e, 0xdf, 0x8b, 0x28, 0x11, 0x3c, 0xf3, 0x34, 0xad, 0x9a,
0xcb, 0x20, 0xca, 0x61, 0x07, 0x72, 0x5c, 0xbf, 0x51, 0x3d, 0x09, 0x1b, 0x6b, 0x00, 0xd5, 0x46,
0x3a, 0x40, 0xb9, 0xda, 0x81, 0xbc, 0xb8, 0xea, 0xe4, 0x93, 0xc6, 0x59, 0x50, 0xbd, 0xba, 0x40,
0xfe, 0x7d, 0xfe, 0x63, 0x0c, 0xed, 0x81, 0x2e, 0x59, 0x90, 0x7c, 0xbc, 0x19, 0x86, 0xa4, 0x3a,
0x39, 0x00, 0x88, 0xfd, 0x10, 0xf8, 0x28, 0xf1, 0x9e, 0x92, 0x5a, 0x4c, 0xaa, 0xc3, 0x2f, 0x20,
0xc7, 0xbb, 0x7c, 0x72, 0x8e, 0x62, 0xfd, 0x3f, 0xd5, 0xc1, 0x97, 0x90, 0xe3, 0xca, 0x85, 0x12,
0x39, 0xb3, 0xf8, 0xec, 0x4e, 0xf5, 0xd3, 0x81, 0xd2, 0xd9, 0x73, 0x15, 0x7d, 0x90, 0x92, 0xa1,
0x99, 0xd7, 0x6c, 0xaa, 0xab, 0x7d, 0x28, 0xa8, 0x37, 0x04, 0x4a, 0xa4, 0xc9, 0xec, 0x03, 0x23,
0xd5, 0xcd, 0x43, 0xd0, 0x65, 0xc3, 0x4a, 0x2e, 0x9b, 0x85, 0x66, 0xb6, 0xe4, 0x68, 0x39, 0x2e,
0xe5, 0xc9, 0x39, 0x8e, 0x35, 0x8c, 0x64, 0x1e, 0xce, 0x74, 0x01, 0x25, 0x0c, 0x34, 0x5d, 0x18,
0xe8, 0x4a, 0x61, 0x98, 0xb2, 0xda, 0x86, 0x82, 0x12, 0xd8, 0x94, 0x44, 0xcd, 0xe8, 0x74, 0xf5,
0xe6, 0x52, 0x8c, 0xf2, 0xf9, 0x10, 0x8a, 0x13, 0x45, 0x45, 0x89, 0x0b, 0xe6, 0xf4, 0x36, 0x2d,
0x6b, 0xbb, 0x07, 0xaf, 0xde, 0xd4, 0x2e, 0xfc, 0xf9, 0xa6, 0x76, 0xe1, 0xe7, 0x71, 0x4d, 0x7b,
0x35, 0xae, 0x69, 0xbf, 0x8f, 0x6b, 0xda, 0x3f, 0xe3, 0x9a, 0xf6, 0xfd, 0x67, 0xe7, 0xfd, 0xcf,
0xca, 0x36, 0xff, 0x73, 0xac, 0x8b, 0x0d, 0xee, 0xfc, 0x1f, 0x00, 0x00, 0xff, 0xff, 0x3d, 0x67,
0x2f, 0x58, 0x99, 0x11, 0x00, 0x00,
// 1289 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x58, 0x4d, 0x6f, 0xdb, 0x46,
0x13, 0x0e, 0xf5, 0x41, 0x49, 0xa3, 0xc8, 0x71, 0xf6, 0x75, 0xf2, 0x32, 0x0a, 0x20, 0x2b, 0x4c,
0x93, 0xaa, 0x2d, 0x40, 0xa1, 0x0a, 0x9a, 0x16, 0x31, 0x90, 0xc2, 0xb1, 0xdd, 0x40, 0x4d, 0x5a,
0x1b, 0x4c, 0x8a, 0x14, 0xbd, 0x18, 0xb4, 0xb8, 0x96, 0x08, 0x4b, 0x5c, 0x96, 0xbb, 0xb4, 0xad,
0xa2, 0x05, 0x7a, 0xee, 0x2f, 0xcb, 0xb1, 0x40, 0x2f, 0xbd, 0x34, 0x68, 0x74, 0xe9, 0x6f, 0xe8,
0xad, 0xd8, 0x0f, 0x59, 0x94, 0x44, 0x4a, 0x36, 0xa0, 0x8b, 0xb1, 0xcb, 0x7d, 0x76, 0x76, 0x67,
0xf6, 0x99, 0x67, 0xc6, 0x82, 0xad, 0xae, 0xc7, 0x7a, 0xd1, 0x91, 0xd5, 0x21, 0x83, 0x66, 0x87,
0xf8, 0xcc, 0xf1, 0x7c, 0x1c, 0xba, 0xf1, 0x61, 0x18, 0xf9, 0xcc, 0x1b, 0xe0, 0xe6, 0x69, 0xab,
0xc9, 0x1c, 0x7a, 0xd2, 0xa4, 0x3d, 0x6f, 0x60, 0x05, 0x21, 0x61, 0x04, 0xa1, 0x09, 0xcc, 0xe2,
0x6b, 0xd6, 0x69, 0xab, 0x7a, 0xa7, 0x4b, 0x48, 0xb7, 0x8f, 0x9b, 0x02, 0x71, 0x14, 0x1d, 0x37,
0x1d, 0x7f, 0x28, 0xe1, 0xd5, 0xbb, 0xb3, 0x4b, 0x78, 0x10, 0xb0, 0xf1, 0xe2, 0x46, 0x97, 0x74,
0x89, 0x18, 0x36, 0xf9, 0x48, 0x7d, 0xdd, 0x9c, 0xdd, 0xc2, 0xaf, 0x42, 0x99, 0x33, 0x08, 0x14,
0xe0, 0xf1, 0xd2, 0xfb, 0x3b, 0x81, 0xd7, 0x64, 0xc3, 0x00, 0xd3, 0xe6, 0x80, 0x44, 0x3e, 0x53,
0xfb, 0x9e, 0x5c, 0x61, 0x9f, 0x70, 0x5b, 0xf8, 0x27, 0xf6, 0x9a, 0x7f, 0x64, 0xe0, 0xe6, 0x4e,
0x88, 0x1d, 0x86, 0x5f, 0x3b, 0xf4, 0xc4, 0xc6, 0x3f, 0x46, 0x98, 0x32, 0x74, 0x1b, 0x32, 0x9e,
0x6b, 0x68, 0x75, 0xad, 0x51, 0x7a, 0xa6, 0x8f, 0xde, 0x6d, 0x66, 0xda, 0xbb, 0x76, 0xc6, 0x73,
0xd1, 0x6d, 0xd0, 0x8f, 0x22, 0xdf, 0xed, 0x63, 0x23, 0xc3, 0xd7, 0x6c, 0x35, 0x43, 0x4d, 0xd0,
0x43, 0x42, 0xd8, 0x31, 0x35, 0xb2, 0xf5, 0x6c, 0xa3, 0xdc, 0xfa, 0xbf, 0x15, 0x8f, 0x26, 0x3f,
0xd8, 0xfa, 0x86, 0x5f, 0xd8, 0x56, 0x30, 0x54, 0x85, 0x22, 0xc3, 0xe1, 0xc0, 0xf3, 0x9d, 0xbe,
0x91, 0xab, 0x6b, 0x8d, 0xa2, 0x7d, 0x31, 0x47, 0x1b, 0x90, 0xa7, 0xcc, 0xf5, 0x7c, 0x23, 0x2f,
0xce, 0x90, 0x13, 0x7e, 0x34, 0x65, 0x2e, 0x89, 0x98, 0xa1, 0xcb, 0xa3, 0xe5, 0x4c, 0x7d, 0xc7,
0x61, 0x68, 0x14, 0x2e, 0xbe, 0xe3, 0x30, 0x44, 0x35, 0x80, 0x4e, 0x0f, 0x77, 0x4e, 0x02, 0xe2,
0xf9, 0xcc, 0x28, 0x8a, 0xb5, 0xd8, 0x17, 0xf4, 0x09, 0xdc, 0x0c, 0x9c, 0x10, 0xfb, 0xec, 0x30,
0x06, 0x2b, 0x09, 0xd8, 0xba, 0x5c, 0xd8, 0x99, 0x80, 0x2d, 0x28, 0x90, 0x80, 0x79, 0xc4, 0xa7,
0x06, 0xd4, 0xb5, 0x46, 0xb9, 0xb5, 0x61, 0xc9, 0xc7, 0xb4, 0xc6, 0x8f, 0x69, 0x6d, 0xfb, 0x43,
0x7b, 0x0c, 0x32, 0x1f, 0x02, 0x8a, 0x07, 0x95, 0x06, 0xc4, 0xa7, 0x18, 0xad, 0x43, 0x36, 0x50,
0x61, 0xad, 0xd8, 0x7c, 0x68, 0xbe, 0x84, 0xca, 0x2e, 0xee, 0x63, 0x86, 0x97, 0x05, 0xfe, 0x3e,
0x14, 0xf0, 0x39, 0xee, 0x1c, 0x7a, 0xae, 0x8c, 0xfc, 0x33, 0x18, 0xbd, 0xdb, 0xd4, 0xf7, 0xce,
0x71, 0xa7, 0xbd, 0x6b, 0xeb, 0x7c, 0xa9, 0xed, 0x9a, 0x3f, 0xc3, 0xda, 0xd8, 0x5a, 0xda, 0x89,
0x68, 0x13, 0xca, 0xf8, 0xdc, 0x63, 0x87, 0x94, 0x39, 0x2c, 0xa2, 0xc2, 0x58, 0xc5, 0x06, 0xfe,
0xe9, 0x95, 0xf8, 0x82, 0x3e, 0x87, 0x12, 0x9f, 0x61, 0xf7, 0xd0, 0x61, 0x46, 0x56, 0x38, 0x5b,
0x9d, 0x73, 0xf6, 0xf5, 0x98, 0xb9, 0x76, 0x51, 0x82, 0xb7, 0x99, 0xf9, 0x97, 0x06, 0x88, 0x5f,
0xe8, 0x20, 0x24, 0x1d, 0x4c, 0xe9, 0x2a, 0x3c, 0x9a, 0xa2, 0x49, 0x36, 0x8d, 0x26, 0xb9, 0x64,
0x9a, 0xe4, 0x53, 0x68, 0xa2, 0x4f, 0xd1, 0xa4, 0x01, 0x39, 0x1a, 0xe0, 0x8e, 0x20, 0x4f, 0xda,
0xb3, 0x0a, 0x84, 0x79, 0x0b, 0xfe, 0x37, 0xe5, 0x9e, 0x0c, 0xb1, 0xf9, 0x0b, 0xac, 0xdb, 0x98,
0x7a, 0x3f, 0xe1, 0x03, 0x36, 0x5c, 0x89, 0xcf, 0x1b, 0x90, 0x3f, 0xf3, 0x5c, 0xd6, 0x13, 0x0e,
0x57, 0x6c, 0x39, 0xe1, 0xf7, 0xef, 0x61, 0xaf, 0xdb, 0x63, 0xc2, 0xdd, 0x8a, 0xad, 0x66, 0xe6,
0x0b, 0xb8, 0xce, 0x1f, 0x6e, 0x35, 0x04, 0xfa, 0x27, 0x03, 0x15, 0x65, 0x4d, 0x11, 0xe8, 0xaa,
0x42, 0xa0, 0x08, 0x97, 0x9d, 0x10, 0xee, 0x11, 0x0f, 0xbc, 0xe0, 0x1a, 0xbf, 0xf8, 0x5a, 0xeb,
0x6e, 0x5c, 0x1a, 0x4e, 0x3f, 0x55, 0xea, 0x20, 0xc9, 0x67, 0x2b, 0xe8, 0x8a, 0x24, 0x20, 0xce,
0x9e, 0xe2, 0x0c, 0x7b, 0x66, 0xf2, 0xa0, 0xb4, 0x38, 0x0f, 0xe0, 0xf2, 0x79, 0x10, 0x8f, 0x74,
0x39, 0x35, 0xd2, 0x0c, 0xca, 0x2f, 0xbc, 0x7e, 0x7f, 0x25, 0x84, 0xe1, 0xee, 0x7b, 0xdd, 0x71,
0x8a, 0x54, 0x6c, 0x35, 0xe3, 0x6f, 0xe1, 0xf4, 0xc7, 0xf2, 0xca, 0x87, 0x66, 0x07, 0xd6, 0x76,
0xfa, 0x84, 0xe2, 0xf6, 0xfe, 0xaa, 0x98, 0x2a, 0x5f, 0x49, 0xa6, 0xa6, 0x9c, 0x98, 0x0f, 0xa0,
0x7c, 0xe0, 0xb9, 0xcb, 0xf2, 0xdf, 0xfc, 0x16, 0xae, 0x4b, 0x98, 0x62, 0xda, 0x53, 0x28, 0x05,
0x32, 0xb5, 0x30, 0x35, 0x34, 0x51, 0x45, 0xea, 0x89, 0x54, 0x51, 0x09, 0xd8, 0xf6, 0x8f, 0x89,
0x3d, 0xd9, 0x62, 0x52, 0xb8, 0x35, 0x11, 0xec, 0xcb, 0xd4, 0x32, 0x04, 0xb9, 0xc0, 0x61, 0x3d,
0x45, 0x60, 0x31, 0x8e, 0xeb, 0x7c, 0xf6, 0x32, 0x3a, 0xff, 0xaf, 0x06, 0x37, 0xbf, 0x0b, 0xdc,
0x4b, 0x56, 0xcf, 0x16, 0x94, 0x42, 0x4c, 0x49, 0x14, 0x76, 0xb0, 0x54, 0xde, 0x34, 0xfb, 0x13,
0x18, 0xfa, 0x1e, 0xca, 0x8e, 0xef, 0x13, 0xe6, 0x8c, 0x6f, 0xc5, 0x03, 0xf3, 0xd8, 0x9a, 0x6f,
0x56, 0xac, 0xb9, 0x7b, 0x58, 0xdb, 0x93, 0x8d, 0x7b, 0x3e, 0x0b, 0x87, 0x76, 0xdc, 0x54, 0xf5,
0x29, 0xac, 0xcf, 0x02, 0x38, 0x65, 0x4e, 0xf0, 0x50, 0x5e, 0xdd, 0xe6, 0x43, 0xfe, 0xc6, 0xa7,
0x4e, 0x3f, 0x1a, 0xe7, 0xb9, 0x9c, 0x3c, 0xc9, 0x7c, 0xa1, 0x29, 0xe5, 0x09, 0xd9, 0x4a, 0x94,
0xe7, 0x9e, 0x10, 0x1e, 0x6e, 0x2c, 0xb5, 0x56, 0x7e, 0x0d, 0xe5, 0x37, 0x8e, 0xb7, 0x9a, 0xe3,
0x7a, 0x70, 0x5d, 0xda, 0x52, 0xa7, 0xcd, 0xa8, 0x81, 0xb6, 0x58, 0x0d, 0x32, 0x57, 0xa8, 0x8a,
0x0f, 0xa5, 0x3e, 0x2f, 0x4d, 0x87, 0x2d, 0xa9, 0xbc, 0x93, 0x7c, 0xf8, 0x98, 0x27, 0x97, 0xc3,
0xe4, 0x65, 0xd2, 0x88, 0x22, 0x21, 0x66, 0x03, 0xd6, 0x76, 0x88, 0xef, 0xe3, 0xce, 0xb2, 0xe8,
0x98, 0x0e, 0xdc, 0xb8, 0x40, 0xaa, 0x83, 0xee, 0x40, 0x91, 0xb7, 0xc1, 0x87, 0x93, 0x70, 0x17,
0xf8, 0xfc, 0xc0, 0x73, 0xf9, 0x12, 0x67, 0x97, 0x58, 0x92, 0x9d, 0x42, 0x81, 0xcf, 0xf9, 0x92,
0x01, 0x85, 0x53, 0x1c, 0x52, 0x8f, 0xc8, 0xec, 0x2f, 0xd9, 0xe3, 0xa9, 0xb9, 0x05, 0x37, 0x5e,
0xf5, 0x22, 0xe6, 0x92, 0x33, 0x7f, 0xd9, 0x5b, 0xad, 0x43, 0xd6, 0x27, 0x67, 0xc2, 0x74, 0xd1,
0xe6, 0x43, 0x1e, 0xae, 0x03, 0x27, 0xa2, 0xcb, 0xca, 0x99, 0xf9, 0x21, 0x54, 0x6c, 0x4c, 0xa3,
0xc1, 0x32, 0x60, 0xeb, 0x37, 0x80, 0x1c, 0xcf, 0x09, 0xf4, 0x12, 0xf2, 0xa2, 0xb4, 0xa1, 0x7a,
0x52, 0xf2, 0xc4, 0x6b, 0x68, 0xf5, 0xde, 0x02, 0x84, 0x0a, 0xda, 0x1b, 0xd0, 0x65, 0x83, 0x87,
0x1e, 0x24, 0x81, 0xe7, 0x3a, 0xea, 0xea, 0xc3, 0x65, 0x30, 0x65, 0x58, 0x5e, 0x33, 0x64, 0xa9,
0xd7, 0xbc, 0x48, 0xb8, 0xd4, 0x6b, 0xc6, 0xb2, 0x68, 0x1f, 0x74, 0xd9, 0x11, 0xa2, 0x44, 0xf0,
0x54, 0xef, 0x59, 0x35, 0x17, 0x41, 0x94, 0xc1, 0x36, 0xe4, 0xb8, 0x6a, 0xa3, 0xcd, 0x24, 0x6c,
0x4c, 0xf6, 0xab, 0xf5, 0x74, 0x80, 0x32, 0xb5, 0x0d, 0x79, 0xf1, 0xd4, 0xc9, 0x9e, 0xc6, 0x59,
0x50, 0xbd, 0x3d, 0x47, 0xfe, 0x3d, 0xfe, 0xdf, 0x16, 0xda, 0x01, 0x5d, 0xb2, 0x20, 0xd9, 0xbd,
0x29, 0x86, 0xa4, 0x1a, 0xd9, 0x07, 0x88, 0x75, 0xfa, 0x1f, 0x25, 0xbe, 0x53, 0x52, 0x61, 0x49,
0x35, 0xf8, 0x25, 0xe4, 0x78, 0x6d, 0x4f, 0x8e, 0x51, 0xac, 0xea, 0xa7, 0x1a, 0xf8, 0x0a, 0x72,
0x5c, 0xaf, 0x50, 0x22, 0x67, 0xe6, 0x5b, 0xec, 0x54, 0x3b, 0x6d, 0x28, 0x5d, 0xb4, 0xa6, 0xe8,
0x83, 0x94, 0x08, 0x4d, 0x75, 0xae, 0xa9, 0xa6, 0xf6, 0xa0, 0xa0, 0x3a, 0x07, 0x94, 0x48, 0x93,
0xe9, 0xb6, 0x22, 0xd5, 0xcc, 0x73, 0xd0, 0x65, 0x99, 0x4a, 0x4e, 0x9b, 0xb9, 0x12, 0xb6, 0xc0,
0xb5, 0x1c, 0x17, 0xf0, 0xe4, 0x18, 0xc7, 0xca, 0x44, 0x32, 0x0f, 0xa7, 0xb4, 0x5f, 0x09, 0x03,
0x4d, 0x17, 0x06, 0xba, 0x54, 0x18, 0x26, 0xac, 0xb6, 0xa1, 0xa0, 0x04, 0x36, 0x25, 0x50, 0x53,
0x3a, 0x5d, 0xbd, 0xbf, 0x10, 0xa3, 0x6c, 0x3e, 0x87, 0xe2, 0x58, 0x51, 0x51, 0xe2, 0x86, 0x19,
0xbd, 0x4d, 0x8b, 0xda, 0xb3, 0xfd, 0xb7, 0xef, 0x6b, 0xd7, 0xfe, 0x7c, 0x5f, 0xbb, 0xf6, 0xeb,
0xa8, 0xa6, 0xbd, 0x1d, 0xd5, 0xb4, 0xdf, 0x47, 0x35, 0xed, 0xef, 0x51, 0x4d, 0xfb, 0xe1, 0xb3,
0xab, 0xfe, 0x74, 0xb2, 0xc5, 0xff, 0x1c, 0xe9, 0xe2, 0x80, 0x47, 0xff, 0x05, 0x00, 0x00, 0xff,
0xff, 0x2b, 0x56, 0x99, 0xb9, 0x7a, 0x11, 0x00, 0x00,
}
func (m *CreateTaskRequest) Marshal() (dAtA []byte, err error) {
@ -1423,14 +1419,18 @@ func (m *DeleteResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
i -= len(m.XXX_unrecognized)
copy(dAtA[i:], m.XXX_unrecognized)
}
n2, err2 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.ExitedAt, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.ExitedAt):])
if err2 != nil {
return 0, err2
if m.ExitedAt != nil {
{
size, err := m.ExitedAt.MarshalToSizedBuffer(dAtA[:i])
if err != nil {
return 0, err
}
i -= size
i = encodeVarintShim(dAtA, i, uint64(size))
}
i--
dAtA[i] = 0x1a
}
i -= n2
i = encodeVarintShim(dAtA, i, uint64(n2))
i--
dAtA[i] = 0x1a
if m.ExitStatus != 0 {
i = encodeVarintShim(dAtA, i, uint64(m.ExitStatus))
i--
@ -1678,14 +1678,18 @@ func (m *StateResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
i--
dAtA[i] = 0x5a
}
n4, err4 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.ExitedAt, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.ExitedAt):])
if err4 != nil {
return 0, err4
if m.ExitedAt != nil {
{
size, err := m.ExitedAt.MarshalToSizedBuffer(dAtA[:i])
if err != nil {
return 0, err
}
i -= size
i = encodeVarintShim(dAtA, i, uint64(size))
}
i--
dAtA[i] = 0x52
}
i -= n4
i = encodeVarintShim(dAtA, i, uint64(n4))
i--
dAtA[i] = 0x52
if m.ExitStatus != 0 {
i = encodeVarintShim(dAtA, i, uint64(m.ExitStatus))
i--
@ -2187,14 +2191,18 @@ func (m *WaitResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
i -= len(m.XXX_unrecognized)
copy(dAtA[i:], m.XXX_unrecognized)
}
n7, err7 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.ExitedAt, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.ExitedAt):])
if err7 != nil {
return 0, err7
if m.ExitedAt != nil {
{
size, err := m.ExitedAt.MarshalToSizedBuffer(dAtA[:i])
if err != nil {
return 0, err
}
i -= size
i = encodeVarintShim(dAtA, i, uint64(size))
}
i--
dAtA[i] = 0x12
}
i -= n7
i = encodeVarintShim(dAtA, i, uint64(n7))
i--
dAtA[i] = 0x12
if m.ExitStatus != 0 {
i = encodeVarintShim(dAtA, i, uint64(m.ExitStatus))
i--
@ -2577,8 +2585,10 @@ func (m *DeleteResponse) Size() (n int) {
if m.ExitStatus != 0 {
n += 1 + sovShim(uint64(m.ExitStatus))
}
l = github_com_gogo_protobuf_types.SizeOfStdTime(m.ExitedAt)
n += 1 + l + sovShim(uint64(l))
if m.ExitedAt != nil {
l = m.ExitedAt.Size()
n += 1 + l + sovShim(uint64(l))
}
if m.XXX_unrecognized != nil {
n += len(m.XXX_unrecognized)
}
@ -2720,8 +2730,10 @@ func (m *StateResponse) Size() (n int) {
if m.ExitStatus != 0 {
n += 1 + sovShim(uint64(m.ExitStatus))
}
l = github_com_gogo_protobuf_types.SizeOfStdTime(m.ExitedAt)
n += 1 + l + sovShim(uint64(l))
if m.ExitedAt != nil {
l = m.ExitedAt.Size()
n += 1 + l + sovShim(uint64(l))
}
l = len(m.ExecID)
if l > 0 {
n += 1 + l + sovShim(uint64(l))
@ -2931,8 +2943,10 @@ func (m *WaitResponse) Size() (n int) {
if m.ExitStatus != 0 {
n += 1 + sovShim(uint64(m.ExitStatus))
}
l = github_com_gogo_protobuf_types.SizeOfStdTime(m.ExitedAt)
n += 1 + l + sovShim(uint64(l))
if m.ExitedAt != nil {
l = m.ExitedAt.Size()
n += 1 + l + sovShim(uint64(l))
}
if m.XXX_unrecognized != nil {
n += len(m.XXX_unrecognized)
}
@ -3121,7 +3135,7 @@ func (this *DeleteResponse) String() string {
s := strings.Join([]string{`&DeleteResponse{`,
`Pid:` + fmt.Sprintf("%v", this.Pid) + `,`,
`ExitStatus:` + fmt.Sprintf("%v", this.ExitStatus) + `,`,
`ExitedAt:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.ExitedAt), "Timestamp", "types1.Timestamp", 1), `&`, ``, 1) + `,`,
`ExitedAt:` + strings.Replace(fmt.Sprintf("%v", this.ExitedAt), "Timestamp", "types1.Timestamp", 1) + `,`,
`XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`,
`}`,
}, "")
@ -3194,7 +3208,7 @@ func (this *StateResponse) String() string {
`Stderr:` + fmt.Sprintf("%v", this.Stderr) + `,`,
`Terminal:` + fmt.Sprintf("%v", this.Terminal) + `,`,
`ExitStatus:` + fmt.Sprintf("%v", this.ExitStatus) + `,`,
`ExitedAt:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.ExitedAt), "Timestamp", "types1.Timestamp", 1), `&`, ``, 1) + `,`,
`ExitedAt:` + strings.Replace(fmt.Sprintf("%v", this.ExitedAt), "Timestamp", "types1.Timestamp", 1) + `,`,
`ExecID:` + fmt.Sprintf("%v", this.ExecID) + `,`,
`XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`,
`}`,
@ -3332,7 +3346,7 @@ func (this *WaitResponse) String() string {
}
s := strings.Join([]string{`&WaitResponse{`,
`ExitStatus:` + fmt.Sprintf("%v", this.ExitStatus) + `,`,
`ExitedAt:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.ExitedAt), "Timestamp", "types1.Timestamp", 1), `&`, ``, 1) + `,`,
`ExitedAt:` + strings.Replace(fmt.Sprintf("%v", this.ExitedAt), "Timestamp", "types1.Timestamp", 1) + `,`,
`XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`,
`}`,
}, "")
@ -4362,7 +4376,10 @@ func (m *DeleteResponse) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.ExitedAt, dAtA[iNdEx:postIndex]); err != nil {
if m.ExitedAt == nil {
m.ExitedAt = &types1.Timestamp{}
}
if err := m.ExitedAt.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
@ -5269,7 +5286,10 @@ func (m *StateResponse) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.ExitedAt, dAtA[iNdEx:postIndex]); err != nil {
if m.ExitedAt == nil {
m.ExitedAt = &types1.Timestamp{}
}
if err := m.ExitedAt.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
@ -6558,7 +6578,10 @@ func (m *WaitResponse) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.ExitedAt, dAtA[iNdEx:postIndex]); err != nil {
if m.ExitedAt == nil {
m.ExitedAt = &types1.Timestamp{}
}
if err := m.ExitedAt.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex

6
runtime/v2/task/shim.proto
View File

@ -76,7 +76,7 @@ message DeleteRequest {
message DeleteResponse {
uint32 pid = 1;
uint32 exit_status = 2;
google.protobuf.Timestamp exited_at = 3 [(gogoproto.stdtime) = true, (gogoproto.nullable) = false];
google.protobuf.Timestamp exited_at = 3;
}
message ExecProcessRequest {
@ -114,7 +114,7 @@ message StateResponse {
string stderr = 7;
bool terminal = 8;
uint32 exit_status = 9;
google.protobuf.Timestamp exited_at = 10 [(gogoproto.stdtime) = true, (gogoproto.nullable) = false];
google.protobuf.Timestamp exited_at = 10;
string exec_id = 11;
}
@ -167,7 +167,7 @@ message WaitRequest {
message WaitResponse {
uint32 exit_status = 1;
google.protobuf.Timestamp exited_at = 2 [(gogoproto.stdtime) = true, (gogoproto.nullable) = false];
google.protobuf.Timestamp exited_at = 2;
}
message StatsRequest {

3
sandbox.go
View File

@ -23,6 +23,7 @@ import (
"github.com/containerd/containerd/containers"
"github.com/containerd/containerd/oci"
"github.com/containerd/containerd/protobuf"
api "github.com/containerd/containerd/sandbox"
"github.com/containerd/typeurl"
"github.com/gogo/protobuf/types"
@ -106,7 +107,7 @@ func (s *sandboxClient) Wait(ctx context.Context) (<-chan ExitStatus, error) {
c <- ExitStatus{
code: resp.ExitStatus,
exitedAt: resp.ExitedAt,
exitedAt: protobuf.FromTimestamp(resp.ExitedAt),
}
}()

8
sandbox/helpers.go
View File

@ -36,8 +36,8 @@ func ToProto(sandbox *Sandbox) types.Sandbox {
Options: protobuf.FromAny(sandbox.Runtime.Options),
},
Labels: sandbox.Labels,
CreatedAt: sandbox.CreatedAt,
UpdatedAt: sandbox.UpdatedAt,
CreatedAt: protobuf.ToTimestamp(sandbox.CreatedAt),
UpdatedAt: protobuf.ToTimestamp(sandbox.UpdatedAt),
Extensions: extensions,
Spec: protobuf.FromAny(sandbox.Spec),
}
@ -61,8 +61,8 @@ func FromProto(sandboxpb *types.Sandbox) Sandbox {
Labels: sandboxpb.Labels,
Runtime: runtime,
Spec: sandboxpb.Spec,
CreatedAt: sandboxpb.CreatedAt,
UpdatedAt: sandboxpb.UpdatedAt,
CreatedAt: protobuf.FromTimestamp(sandboxpb.CreatedAt),
UpdatedAt: protobuf.FromTimestamp(sandboxpb.UpdatedAt),
Extensions: extensions,
}
}

4
services/containers/helpers.go
View File

@ -51,8 +51,8 @@ func containerToProto(container *containers.Container) api.Container {
Spec: protobuf.FromAny(container.Spec),
Snapshotter: container.Snapshotter,
SnapshotKey: container.SnapshotKey,
CreatedAt: container.CreatedAt,
UpdatedAt: container.UpdatedAt,
CreatedAt: protobuf.ToTimestamp(container.CreatedAt),
UpdatedAt: protobuf.ToTimestamp(container.UpdatedAt),
Extensions: extensions,
Sandbox: container.SandboxID,
}

23
services/content/contentserver/contentserver.go
View File

@ -26,6 +26,7 @@ import (
"github.com/containerd/containerd/content"
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/log"
"github.com/containerd/containerd/protobuf"
ptypes "github.com/gogo/protobuf/types"
digest "github.com/opencontainers/go-digest"
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
@ -103,7 +104,7 @@ func (s *service) List(req *api.ListContentRequest, session api.Content_ListServ
buffer = append(buffer, api.Info{
Digest: info.Digest.String(),
Size_: info.Size,
CreatedAt: info.CreatedAt,
CreatedAt: protobuf.ToTimestamp(info.CreatedAt),
Labels: info.Labels,
})
@ -220,8 +221,8 @@ func (s *service) Status(ctx context.Context, req *api.StatusRequest) (*api.Stat
var resp api.StatusResponse
resp.Status = &api.Status{
StartedAt: status.StartedAt,
UpdatedAt: status.UpdatedAt,
StartedAt: protobuf.ToTimestamp(status.StartedAt),
UpdatedAt: protobuf.ToTimestamp(status.UpdatedAt),
Ref: status.Ref,
Offset: status.Offset,
Total: status.Total,
@ -240,8 +241,8 @@ func (s *service) ListStatuses(ctx context.Context, req *api.ListStatusesRequest
var resp api.ListStatusesResponse
for _, status := range statuses {
resp.Statuses = append(resp.Statuses, api.Status{
StartedAt: status.StartedAt,
UpdatedAt: status.UpdatedAt,
StartedAt: protobuf.ToTimestamp(status.StartedAt),
UpdatedAt: protobuf.ToTimestamp(status.UpdatedAt),
Ref: status.Ref,
Offset: status.Offset,
Total: status.Total,
@ -375,8 +376,8 @@ func (s *service) Write(session api.Content_WriteServer) (err error) {
switch req.Action {
case api.WriteAction_STAT:
msg.Digest = wr.Digest().String()
msg.StartedAt = ws.StartedAt
msg.UpdatedAt = ws.UpdatedAt
msg.StartedAt = protobuf.ToTimestamp(ws.StartedAt)
msg.UpdatedAt = protobuf.ToTimestamp(ws.UpdatedAt)
msg.Total = total
case api.WriteAction_WRITE, api.WriteAction_COMMIT:
if req.Offset > 0 {
@ -455,8 +456,8 @@ func infoToGRPC(info content.Info) api.Info {
return api.Info{
Digest: info.Digest.String(),
Size_: info.Size,
CreatedAt: info.CreatedAt,
UpdatedAt: info.UpdatedAt,
CreatedAt: protobuf.ToTimestamp(info.CreatedAt),
UpdatedAt: protobuf.ToTimestamp(info.UpdatedAt),
Labels: info.Labels,
}
}
@ -465,8 +466,8 @@ func infoFromGRPC(info api.Info) content.Info {
return content.Info{
Digest: digest.Digest(info.Digest),
Size: info.Size_,
CreatedAt: info.CreatedAt,
UpdatedAt: info.UpdatedAt,
CreatedAt: protobuf.FromTimestamp(info.CreatedAt),
UpdatedAt: protobuf.FromTimestamp(info.UpdatedAt),
Labels: info.Labels,
}
}

4
services/events/service.go
View File

@ -113,7 +113,7 @@ func (s *service) Subscribe(req *api.SubscribeRequest, srv api.Events_SubscribeS
func toProto(env *events.Envelope) *api.Envelope {
return &api.Envelope{
Timestamp: env.Timestamp,
Timestamp: protobuf.ToTimestamp(env.Timestamp),
Namespace: env.Namespace,
Topic: env.Topic,
Event: protobuf.FromAny(env.Event),
@ -122,7 +122,7 @@ func toProto(env *events.Envelope) *api.Envelope {
func fromProto(env *api.Envelope) *events.Envelope {
return &events.Envelope{
Timestamp: env.Timestamp,
Timestamp: protobuf.FromTimestamp(env.Timestamp),
Namespace: env.Namespace,
Topic: env.Topic,
Event: env.Event,

3
services/events/ttrpc.go
View File

@ -23,6 +23,7 @@ import (
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/events"
"github.com/containerd/containerd/events/exchange"
"github.com/containerd/containerd/protobuf"
ptypes "github.com/gogo/protobuf/types"
)
@ -40,7 +41,7 @@ func (s *ttrpcService) Forward(ctx context.Context, r *api.ForwardRequest) (*pty
func fromTProto(env *api.Envelope) *events.Envelope {
return &events.Envelope{
Timestamp: env.Timestamp,
Timestamp: protobuf.FromTimestamp(env.Timestamp),
Namespace: env.Namespace,
Topic: env.Topic,
Event: env.Event,

9
services/images/helpers.go
View File

@ -20,6 +20,7 @@ import (
imagesapi "github.com/containerd/containerd/api/services/images/v1"
"github.com/containerd/containerd/api/types"
"github.com/containerd/containerd/images"
"github.com/containerd/containerd/protobuf"
"github.com/opencontainers/go-digest"
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
)
@ -40,8 +41,8 @@ func imageToProto(image *images.Image) imagesapi.Image {
Name: image.Name,
Labels: image.Labels,
Target: descToProto(&image.Target),
CreatedAt: image.CreatedAt,
UpdatedAt: image.UpdatedAt,
CreatedAt: protobuf.ToTimestamp(image.CreatedAt),
UpdatedAt: protobuf.ToTimestamp(image.UpdatedAt),
}
}
@ -50,8 +51,8 @@ func imageFromProto(imagepb *imagesapi.Image) images.Image {
Name: imagepb.Name,
Labels: imagepb.Labels,
Target: descFromProto(&imagepb.Target),
CreatedAt: imagepb.CreatedAt,
UpdatedAt: imagepb.UpdatedAt,
CreatedAt: protobuf.FromTimestamp(imagepb.CreatedAt),
UpdatedAt: protobuf.FromTimestamp(imagepb.UpdatedAt),
}
}

3
services/leases/service.go
View File

@ -23,6 +23,7 @@ import (
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/leases"
"github.com/containerd/containerd/plugin"
"github.com/containerd/containerd/protobuf"
ptypes "github.com/gogo/protobuf/types"
"google.golang.org/grpc"
)
@ -156,6 +157,6 @@ func leaseToGRPC(l leases.Lease) *api.Lease {
return &api.Lease{
ID: l.ID,
Labels: l.Labels,
CreatedAt: l.CreatedAt,
CreatedAt: protobuf.ToTimestamp(l.CreatedAt),
}
}

9
services/snapshots/service.go
View File

@ -26,6 +26,7 @@ import (
"github.com/containerd/containerd/log"
"github.com/containerd/containerd/mount"
"github.com/containerd/containerd/plugin"
"github.com/containerd/containerd/protobuf"
"github.com/containerd/containerd/services"
"github.com/containerd/containerd/snapshots"
ptypes "github.com/gogo/protobuf/types"
@ -289,8 +290,8 @@ func fromInfo(info snapshots.Info) snapshotsapi.Info {
Name: info.Name,
Parent: info.Parent,
Kind: fromKind(info.Kind),
CreatedAt: info.Created,
UpdatedAt: info.Updated,
CreatedAt: protobuf.ToTimestamp(info.Created),
UpdatedAt: protobuf.ToTimestamp(info.Updated),
Labels: info.Labels,
}
}
@ -319,8 +320,8 @@ func toInfo(info snapshotsapi.Info) snapshots.Info {
Name: info.Name,
Parent: info.Parent,
Kind: toKind(info.Kind),
Created: info.CreatedAt,
Updated: info.UpdatedAt,
Created: protobuf.FromTimestamp(info.CreatedAt),
Updated: protobuf.FromTimestamp(info.UpdatedAt),
Labels: info.Labels,
}
}

10
services/tasks/local.go
View File

@ -298,7 +298,7 @@ func (l *local) Delete(ctx context.Context, r *api.DeleteTaskRequest, _ ...grpc.
return &api.DeleteResponse{
ExitStatus: exit.Status,
ExitedAt: exit.Timestamp,
ExitedAt: protobuf.ToTimestamp(exit.Timestamp),
Pid: exit.Pid,
}, nil
}
@ -319,7 +319,7 @@ func (l *local) DeleteProcess(ctx context.Context, r *api.DeleteProcessRequest,
return &api.DeleteResponse{
ID: r.ExecID,
ExitStatus: exit.Status,
ExitedAt: exit.Timestamp,
ExitedAt: protobuf.ToTimestamp(exit.Timestamp),
Pid: exit.Pid,
}, nil
}
@ -359,7 +359,7 @@ func getProcessState(ctx context.Context, p runtime.Process) (*task.Process, err
Stderr: state.Stderr,
Terminal: state.Terminal,
ExitStatus: state.ExitStatus,
ExitedAt: state.ExitedAt,
ExitedAt: protobuf.ToTimestamp(state.ExitedAt),
}, nil
}
@ -640,7 +640,7 @@ func (l *local) Wait(ctx context.Context, r *api.WaitRequest, _ ...grpc.CallOpti
}
return &api.WaitResponse{
ExitStatus: exit.Status,
ExitedAt: exit.Timestamp,
ExitedAt: protobuf.ToTimestamp(exit.Timestamp),
}, nil
}
@ -669,7 +669,7 @@ func getTasksMetrics(ctx context.Context, filter filters.Filter, tasks []runtime
continue
}
r.Metrics = append(r.Metrics, &types.Metric{
Timestamp: collected,
Timestamp: protobuf.ToTimestamp(collected),
ID: tk.ID(),
Data: stats,
})

9
snapshots/proxy/proxy.go
View File

@ -24,6 +24,7 @@ import (
"github.com/containerd/containerd/api/types"
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/mount"
"github.com/containerd/containerd/protobuf"
"github.com/containerd/containerd/snapshots"
protobuftypes "github.com/gogo/protobuf/types"
)
@ -206,8 +207,8 @@ func toInfo(info snapshotsapi.Info) snapshots.Info {
Name: info.Name,
Parent: info.Parent,
Kind: toKind(info.Kind),
Created: info.CreatedAt,
Updated: info.UpdatedAt,
Created: protobuf.FromTimestamp(info.CreatedAt),
Updated: protobuf.FromTimestamp(info.UpdatedAt),
Labels: info.Labels,
}
}
@ -246,8 +247,8 @@ func fromInfo(info snapshots.Info) snapshotsapi.Info {
Name: info.Name,
Parent: info.Parent,
Kind: fromKind(info.Kind),
CreatedAt: info.Created,
UpdatedAt: info.Updated,
CreatedAt: protobuf.ToTimestamp(info.Created),
UpdatedAt: protobuf.ToTimestamp(info.Updated),
Labels: info.Labels,
}
}

6
task.go
View File

@ -265,7 +265,7 @@ func (t *task) Status(ctx context.Context) (Status, error) {
return Status{
Status: ProcessStatus(strings.ToLower(r.Process.Status.String())),
ExitStatus: r.Process.ExitStatus,
ExitTime: r.Process.ExitedAt,
ExitTime: protobuf.FromTimestamp(r.Process.ExitedAt),
}, nil
}
@ -285,7 +285,7 @@ func (t *task) Wait(ctx context.Context) (<-chan ExitStatus, error) {
}
c <- ExitStatus{
code: r.ExitStatus,
exitedAt: r.ExitedAt,
exitedAt: protobuf.FromTimestamp(r.ExitedAt),
}
}()
return c, nil
@ -330,7 +330,7 @@ func (t *task) Delete(ctx context.Context, opts ...ProcessDeleteOpts) (*ExitStat
if t.io != nil {
t.io.Close()
}
return &ExitStatus{code: r.ExitStatus, exitedAt: r.ExitedAt}, nil
return &ExitStatus{code: r.ExitStatus, exitedAt: protobuf.FromTimestamp(r.ExitedAt)}, nil
}
func (t *task) Exec(ctx context.Context, id string, spec *specs.Process, ioCreate cio.Creator) (_ Process, err error) {