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

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