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

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;
}