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

Remove gogoproto.stdtime

Browse Source 
This commit removes gogoproto.stdtime, since it is not supported by
Google's official toolchain
(see https://github.com/containerd/containerd/issues/6564).

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
This commit is contained in:
Kazuyoshi Kato
2022-04-18 22:12:15 +00:00
parent 26a3ab446b
commit 80b825ca2c
71 changed files with 1803 additions and 1594 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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 {