Remove all gogoproto extensions

This commit removes the following gogoproto extensions;

- gogoproto.nullable
- gogoproto.customename
- gogoproto.unmarshaller_all
- gogoproto.stringer_all
- gogoproto.sizer_all
- gogoproto.marshaler_all
- gogoproto.goproto_unregonized_all
- gogoproto.goproto_stringer_all
- gogoproto.goproto_getters_all

None of them are supported by Google's toolchain (see #6564).

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
This commit is contained in:
Kazuyoshi Kato
2022-04-20 03:30:52 +00:00
parent 9b33526ef6
commit 237ef0de9b
48 changed files with 1301 additions and 1246 deletions

View File

@@ -44,7 +44,7 @@ type Image struct {
// The combined size of a key/value pair cannot exceed 4096 bytes.
Labels map[string]string `protobuf:"bytes,2,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
// Target describes the content entry point of the image.
Target types.Descriptor `protobuf:"bytes,3,opt,name=target,proto3" json:"target"`
Target *types.Descriptor `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
// CreatedAt is the time the image was first created.
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.
@@ -165,7 +165,7 @@ func (m *GetImageResponse) XXX_DiscardUnknown() {
var xxx_messageInfo_GetImageResponse proto.InternalMessageInfo
type CreateImageRequest struct {
Image Image `protobuf:"bytes,1,opt,name=image,proto3" json:"image"`
Image *Image `protobuf:"bytes,1,opt,name=image,proto3" json:"image,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
@@ -204,7 +204,7 @@ func (m *CreateImageRequest) XXX_DiscardUnknown() {
var xxx_messageInfo_CreateImageRequest proto.InternalMessageInfo
type CreateImageResponse struct {
Image Image `protobuf:"bytes,1,opt,name=image,proto3" json:"image"`
Image *Image `protobuf:"bytes,1,opt,name=image,proto3" json:"image,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
@@ -246,7 +246,7 @@ type UpdateImageRequest struct {
// Image provides a full or partial image for update.
//
// The name field must be set or an error will be returned.
Image Image `protobuf:"bytes,1,opt,name=image,proto3" json:"image"`
Image *Image `protobuf:"bytes,1,opt,name=image,proto3" json:"image,omitempty"`
// UpdateMask specifies which fields to perform the update on. If empty,
// the operation applies to all fields.
UpdateMask *types1.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
@@ -288,7 +288,7 @@ func (m *UpdateImageRequest) XXX_DiscardUnknown() {
var xxx_messageInfo_UpdateImageRequest proto.InternalMessageInfo
type UpdateImageResponse struct {
Image Image `protobuf:"bytes,1,opt,name=image,proto3" json:"image"`
Image *Image `protobuf:"bytes,1,opt,name=image,proto3" json:"image,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
@@ -376,7 +376,7 @@ func (m *ListImagesRequest) XXX_DiscardUnknown() {
var xxx_messageInfo_ListImagesRequest proto.InternalMessageInfo
type ListImagesResponse struct {
Images []Image `protobuf:"bytes,1,rep,name=images,proto3" json:"images"`
Images []*Image `protobuf:"bytes,1,rep,name=images,proto3" json:"images,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
@@ -477,48 +477,47 @@ func init() {
}
var fileDescriptor_8666fa071128ae5f = []byte{
// 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,
// 634 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, 0x88, 0x22, 0x90, 0x72,
0x61, 0x4d, 0x03, 0x07, 0xfa, 0x23, 0xa4, 0x42, 0x4b, 0x41, 0x2a, 0x08, 0x0c, 0x48, 0x88, 0x4b,
0xb5, 0x49, 0x26, 0xc6, 0x8a, 0xff, 0xf0, 0x6e, 0x22, 0xe5, 0xc6, 0x0b, 0x70, 0xe3, 0xa1, 0x7a,
0xe0, 0xc0, 0x91, 0x23, 0xcd, 0x93, 0x20, 0xef, 0xae, 0x69, 0x9a, 0x44, 0x38, 0x85, 0xde, 0x66,
0xbd, 0xdf, 0x37, 0x3f, 0xdf, 0xcc, 0x78, 0x61, 0xdf, 0xf3, 0xc5, 0xa7, 0x41, 0x9b, 0x76, 0xe2,
0xd0, 0xe9, 0xc4, 0x91, 0x60, 0x7e, 0x84, 0x69, 0x77, 0xd2, 0x64, 0x89, 0xef, 0x70, 0x4c, 0x87,
0x7e, 0x07, 0xb9, 0xe3, 0x87, 0xcc, 0x43, 0xee, 0x0c, 0x37, 0xb5, 0x45, 0x93, 0x34, 0x16, 0x31,
0xb9, 0x75, 0x86, 0xa7, 0x39, 0x96, 0x6a, 0xc4, 0x70, 0xd3, 0xde, 0xf0, 0x62, 0x2f, 0x96, 0x48,
0x27, 0xb3, 0x14, 0xc9, 0xbe, 0xe1, 0xc5, 0xb1, 0x17, 0xa0, 0x23, 0x4f, 0xed, 0x41, 0xcf, 0xc1,
0x30, 0x11, 0x23, 0x7d, 0x59, 0x9f, 0xbe, 0xec, 0xf9, 0x18, 0x74, 0x8f, 0x43, 0xc6, 0xfb, 0x1a,
0x71, 0x7b, 0x1a, 0x21, 0xfc, 0x10, 0xb9, 0x60, 0x61, 0xa2, 0x01, 0x3b, 0x0b, 0x95, 0x26, 0x46,
0x09, 0x72, 0xa7, 0x8b, 0xbc, 0x93, 0xfa, 0x89, 0x88, 0x53, 0x45, 0x6e, 0x7c, 0x2f, 0xc1, 0xf2,
0x8b, 0xac, 0x00, 0x42, 0xa0, 0x12, 0xb1, 0x10, 0x2d, 0xa3, 0x6e, 0x34, 0xd7, 0x5c, 0x69, 0x93,
0xe7, 0x60, 0x06, 0xac, 0x8d, 0x01, 0xb7, 0x4a, 0xf5, 0x72, 0xb3, 0xda, 0xba, 0x4f, 0xff, 0x2a,
0x00, 0x95, 0x9e, 0xe8, 0x91, 0xa4, 0x1c, 0x44, 0x22, 0x1d, 0xb9, 0x9a, 0x4f, 0x1e, 0x82, 0x29,
0x58, 0xea, 0xa1, 0xb0, 0xca, 0x75, 0xa3, 0x59, 0x6d, 0xdd, 0x9c, 0xf4, 0x24, 0x73, 0xa3, 0xfb,
0x7f, 0x72, 0x73, 0x35, 0x96, 0x6c, 0x01, 0x74, 0x52, 0x64, 0x02, 0xbb, 0xc7, 0x4c, 0x58, 0x2b,
0x92, 0x69, 0x53, 0x25, 0x08, 0xcd, 0x05, 0xa1, 0xef, 0x72, 0x41, 0xdc, 0x35, 0x8d, 0xde, 0x93,
0xd4, 0x41, 0xd2, 0xcd, 0xa9, 0xab, 0xc5, 0x54, 0x8d, 0xde, 0x13, 0xf6, 0x16, 0x54, 0x27, 0x4a,
0x20, 0xeb, 0x50, 0xee, 0xe3, 0x48, 0xeb, 0x92, 0x99, 0x64, 0x03, 0x96, 0x87, 0x2c, 0x18, 0xa0,
0x55, 0x92, 0xdf, 0xd4, 0x61, 0xbb, 0xf4, 0xc8, 0x68, 0xdc, 0x85, 0x2b, 0x87, 0x28, 0xa4, 0x0c,
0x2e, 0x7e, 0x1e, 0x20, 0x17, 0xf3, 0x74, 0x6d, 0xbc, 0x82, 0xf5, 0x33, 0x18, 0x4f, 0xe2, 0x88,
0x23, 0xd9, 0x86, 0x65, 0x29, 0xa4, 0x04, 0x56, 0x5b, 0x77, 0x16, 0x91, 0xda, 0x55, 0x94, 0xc6,
0x6b, 0x20, 0x4f, 0x65, 0xe5, 0xe7, 0x22, 0xff, 0x8f, 0xc7, 0x37, 0x70, 0xed, 0x9c, 0xc7, 0x4b,
0x48, 0xf2, 0xab, 0x01, 0xe4, 0xbd, 0x14, 0xf9, 0xb2, 0xb2, 0x24, 0x3b, 0x50, 0x55, 0x6d, 0x93,
0x0b, 0x23, 0xdb, 0x31, 0xaf, 0xcb, 0xcf, 0xb2, 0x9d, 0x7a, 0xc9, 0x78, 0xdf, 0xd5, 0x33, 0x91,
0xd9, 0x59, 0x89, 0xe7, 0xd2, 0xb9, 0x84, 0x12, 0xef, 0xc1, 0xd5, 0x23, 0x9f, 0xab, 0xc6, 0xf2,
0xbc, 0x40, 0x0b, 0x56, 0x7a, 0x7e, 0x20, 0x30, 0xe5, 0x96, 0x51, 0x2f, 0x37, 0xd7, 0xdc, 0xfc,
0xd8, 0x70, 0x81, 0x4c, 0xc2, 0x75, 0x02, 0xbb, 0x60, 0x2a, 0xf7, 0x12, 0xbe, 0x68, 0x06, 0x9a,
0xd3, 0xd8, 0x05, 0xb2, 0x8f, 0x01, 0x4e, 0x89, 0x3c, 0x6f, 0xb9, 0x09, 0x54, 0xf8, 0x28, 0xea,
0x48, 0xd5, 0x56, 0x5d, 0x69, 0xb7, 0xbe, 0x55, 0xc0, 0x54, 0xe9, 0x90, 0x1e, 0x94, 0x0f, 0x51,
0x10, 0x5a, 0x10, 0x7d, 0x6a, 0xdc, 0x6d, 0x67, 0x61, 0xbc, 0x2e, 0xb7, 0x0f, 0x95, 0x4c, 0x04,
0x52, 0xf4, 0x6f, 0x99, 0x11, 0xd6, 0xde, 0xbc, 0x00, 0x43, 0x07, 0x8b, 0xc1, 0x54, 0x63, 0x4d,
0x8a, 0xc8, 0xb3, 0xfb, 0x64, 0xb7, 0x2e, 0x42, 0x39, 0x0b, 0xa8, 0x86, 0xac, 0x30, 0xe0, 0xec,
0x6a, 0x14, 0x06, 0x9c, 0x37, 0xbe, 0x6f, 0xc1, 0x54, 0xfd, 0x2f, 0x0c, 0x38, 0x3b, 0x26, 0xf6,
0xf5, 0x99, 0xd5, 0x39, 0xc8, 0xde, 0xaa, 0x27, 0x1f, 0x4e, 0x4e, 0x6b, 0x4b, 0x3f, 0x4f, 0x6b,
0x4b, 0x5f, 0xc6, 0x35, 0xe3, 0x64, 0x5c, 0x33, 0x7e, 0x8c, 0x6b, 0xc6, 0xaf, 0x71, 0xcd, 0xf8,
0xf8, 0xf8, 0x1f, 0xdf, 0xd5, 0x1d, 0x65, 0xb5, 0x4d, 0x19, 0xe9, 0xc1, 0xef, 0x00, 0x00, 0x00,
0xff, 0xff, 0xf8, 0xbf, 0x52, 0x9e, 0xa0, 0x07, 0x00, 0x00,
}
// Reference imports to suppress errors if they are not otherwise used.
@@ -809,16 +808,18 @@ func (m *Image) MarshalToSizedBuffer(dAtA []byte) (int, error) {
i--
dAtA[i] = 0x3a
}
{
size, err := m.Target.MarshalToSizedBuffer(dAtA[:i])
if err != nil {
return 0, err
if m.Target != nil {
{
size, err := m.Target.MarshalToSizedBuffer(dAtA[:i])
if err != nil {
return 0, err
}
i -= size
i = encodeVarintImages(dAtA, i, uint64(size))
}
i -= size
i = encodeVarintImages(dAtA, i, uint64(size))
i--
dAtA[i] = 0x1a
}
i--
dAtA[i] = 0x1a
if len(m.Labels) > 0 {
for k := range m.Labels {
v := m.Labels[k]
@@ -945,16 +946,18 @@ func (m *CreateImageRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) {
i -= len(m.XXX_unrecognized)
copy(dAtA[i:], m.XXX_unrecognized)
}
{
size, err := m.Image.MarshalToSizedBuffer(dAtA[:i])
if err != nil {
return 0, err
if m.Image != nil {
{
size, err := m.Image.MarshalToSizedBuffer(dAtA[:i])
if err != nil {
return 0, err
}
i -= size
i = encodeVarintImages(dAtA, i, uint64(size))
}
i -= size
i = encodeVarintImages(dAtA, i, uint64(size))
i--
dAtA[i] = 0xa
}
i--
dAtA[i] = 0xa
return len(dAtA) - i, nil
}
@@ -982,16 +985,18 @@ func (m *CreateImageResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
i -= len(m.XXX_unrecognized)
copy(dAtA[i:], m.XXX_unrecognized)
}
{
size, err := m.Image.MarshalToSizedBuffer(dAtA[:i])
if err != nil {
return 0, err
if m.Image != nil {
{
size, err := m.Image.MarshalToSizedBuffer(dAtA[:i])
if err != nil {
return 0, err
}
i -= size
i = encodeVarintImages(dAtA, i, uint64(size))
}
i -= size
i = encodeVarintImages(dAtA, i, uint64(size))
i--
dAtA[i] = 0xa
}
i--
dAtA[i] = 0xa
return len(dAtA) - i, nil
}
@@ -1031,16 +1036,18 @@ func (m *UpdateImageRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) {
i--
dAtA[i] = 0x12
}
{
size, err := m.Image.MarshalToSizedBuffer(dAtA[:i])
if err != nil {
return 0, err
if m.Image != nil {
{
size, err := m.Image.MarshalToSizedBuffer(dAtA[:i])
if err != nil {
return 0, err
}
i -= size
i = encodeVarintImages(dAtA, i, uint64(size))
}
i -= size
i = encodeVarintImages(dAtA, i, uint64(size))
i--
dAtA[i] = 0xa
}
i--
dAtA[i] = 0xa
return len(dAtA) - i, nil
}
@@ -1068,16 +1075,18 @@ func (m *UpdateImageResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
i -= len(m.XXX_unrecognized)
copy(dAtA[i:], m.XXX_unrecognized)
}
{
size, err := m.Image.MarshalToSizedBuffer(dAtA[:i])
if err != nil {
return 0, err
if m.Image != nil {
{
size, err := m.Image.MarshalToSizedBuffer(dAtA[:i])
if err != nil {
return 0, err
}
i -= size
i = encodeVarintImages(dAtA, i, uint64(size))
}
i -= size
i = encodeVarintImages(dAtA, i, uint64(size))
i--
dAtA[i] = 0xa
}
i--
dAtA[i] = 0xa
return len(dAtA) - i, nil
}
@@ -1231,8 +1240,10 @@ func (m *Image) Size() (n int) {
n += mapEntrySize + 1 + sovImages(uint64(mapEntrySize))
}
}
l = m.Target.Size()
n += 1 + l + sovImages(uint64(l))
if m.Target != nil {
l = m.Target.Size()
n += 1 + l + sovImages(uint64(l))
}
if m.CreatedAt != nil {
l = m.CreatedAt.Size()
n += 1 + l + sovImages(uint64(l))
@@ -1285,8 +1296,10 @@ func (m *CreateImageRequest) Size() (n int) {
}
var l int
_ = l
l = m.Image.Size()
n += 1 + l + sovImages(uint64(l))
if m.Image != nil {
l = m.Image.Size()
n += 1 + l + sovImages(uint64(l))
}
if m.XXX_unrecognized != nil {
n += len(m.XXX_unrecognized)
}
@@ -1299,8 +1312,10 @@ func (m *CreateImageResponse) Size() (n int) {
}
var l int
_ = l
l = m.Image.Size()
n += 1 + l + sovImages(uint64(l))
if m.Image != nil {
l = m.Image.Size()
n += 1 + l + sovImages(uint64(l))
}
if m.XXX_unrecognized != nil {
n += len(m.XXX_unrecognized)
}
@@ -1313,8 +1328,10 @@ func (m *UpdateImageRequest) Size() (n int) {
}
var l int
_ = l
l = m.Image.Size()
n += 1 + l + sovImages(uint64(l))
if m.Image != nil {
l = m.Image.Size()
n += 1 + l + sovImages(uint64(l))
}
if m.UpdateMask != nil {
l = m.UpdateMask.Size()
n += 1 + l + sovImages(uint64(l))
@@ -1331,8 +1348,10 @@ func (m *UpdateImageResponse) Size() (n int) {
}
var l int
_ = l
l = m.Image.Size()
n += 1 + l + sovImages(uint64(l))
if m.Image != nil {
l = m.Image.Size()
n += 1 + l + sovImages(uint64(l))
}
if m.XXX_unrecognized != nil {
n += len(m.XXX_unrecognized)
}
@@ -1417,7 +1436,7 @@ func (this *Image) String() string {
s := strings.Join([]string{`&Image{`,
`Name:` + fmt.Sprintf("%v", this.Name) + `,`,
`Labels:` + mapStringForLabels + `,`,
`Target:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Target), "Descriptor", "types.Descriptor", 1), `&`, ``, 1) + `,`,
`Target:` + strings.Replace(fmt.Sprintf("%v", this.Target), "Descriptor", "types.Descriptor", 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) + `,`,
@@ -1452,7 +1471,7 @@ func (this *CreateImageRequest) String() string {
return "nil"
}
s := strings.Join([]string{`&CreateImageRequest{`,
`Image:` + strings.Replace(strings.Replace(this.Image.String(), "Image", "Image", 1), `&`, ``, 1) + `,`,
`Image:` + strings.Replace(this.Image.String(), "Image", "Image", 1) + `,`,
`XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`,
`}`,
}, "")
@@ -1463,7 +1482,7 @@ func (this *CreateImageResponse) String() string {
return "nil"
}
s := strings.Join([]string{`&CreateImageResponse{`,
`Image:` + strings.Replace(strings.Replace(this.Image.String(), "Image", "Image", 1), `&`, ``, 1) + `,`,
`Image:` + strings.Replace(this.Image.String(), "Image", "Image", 1) + `,`,
`XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`,
`}`,
}, "")
@@ -1474,7 +1493,7 @@ func (this *UpdateImageRequest) String() string {
return "nil"
}
s := strings.Join([]string{`&UpdateImageRequest{`,
`Image:` + strings.Replace(strings.Replace(this.Image.String(), "Image", "Image", 1), `&`, ``, 1) + `,`,
`Image:` + strings.Replace(this.Image.String(), "Image", "Image", 1) + `,`,
`UpdateMask:` + strings.Replace(fmt.Sprintf("%v", this.UpdateMask), "FieldMask", "types1.FieldMask", 1) + `,`,
`XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`,
`}`,
@@ -1486,7 +1505,7 @@ func (this *UpdateImageResponse) String() string {
return "nil"
}
s := strings.Join([]string{`&UpdateImageResponse{`,
`Image:` + strings.Replace(strings.Replace(this.Image.String(), "Image", "Image", 1), `&`, ``, 1) + `,`,
`Image:` + strings.Replace(this.Image.String(), "Image", "Image", 1) + `,`,
`XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`,
`}`,
}, "")
@@ -1507,9 +1526,9 @@ func (this *ListImagesResponse) String() string {
if this == nil {
return "nil"
}
repeatedStringForImages := "[]Image{"
repeatedStringForImages := "[]*Image{"
for _, f := range this.Images {
repeatedStringForImages += strings.Replace(strings.Replace(f.String(), "Image", "Image", 1), `&`, ``, 1) + ","
repeatedStringForImages += strings.Replace(f.String(), "Image", "Image", 1) + ","
}
repeatedStringForImages += "}"
s := strings.Join([]string{`&ListImagesResponse{`,
@@ -1756,6 +1775,9 @@ func (m *Image) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
if m.Target == nil {
m.Target = &types.Descriptor{}
}
if err := m.Target.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err
}
@@ -2082,6 +2104,9 @@ func (m *CreateImageRequest) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
if m.Image == nil {
m.Image = &Image{}
}
if err := m.Image.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err
}
@@ -2166,6 +2191,9 @@ func (m *CreateImageResponse) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
if m.Image == nil {
m.Image = &Image{}
}
if err := m.Image.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err
}
@@ -2250,6 +2278,9 @@ func (m *UpdateImageRequest) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
if m.Image == nil {
m.Image = &Image{}
}
if err := m.Image.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err
}
@@ -2370,6 +2401,9 @@ func (m *UpdateImageResponse) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
if m.Image == nil {
m.Image = &Image{}
}
if err := m.Image.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err
}
@@ -2537,7 +2571,7 @@ func (m *ListImagesResponse) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
m.Images = append(m.Images, Image{})
m.Images = append(m.Images, &Image{})
if err := m.Images[len(m.Images)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err
}

View File

@@ -71,7 +71,7 @@ message Image {
map<string, string> labels = 2;
// Target describes the content entry point of the image.
containerd.types.Descriptor target = 3 [(gogoproto.nullable) = false];
containerd.types.Descriptor target = 3;
// CreatedAt is the time the image was first created.
google.protobuf.Timestamp created_at = 7;
@@ -89,18 +89,18 @@ message GetImageResponse {
}
message CreateImageRequest {
Image image = 1 [(gogoproto.nullable) = false];
Image image = 1;
}
message CreateImageResponse {
Image image = 1 [(gogoproto.nullable) = false];
Image image = 1;
}
message UpdateImageRequest {
// Image provides a full or partial image for update.
//
// The name field must be set or an error will be returned.
Image image = 1 [(gogoproto.nullable) = false];
Image image = 1;
// UpdateMask specifies which fields to perform the update on. If empty,
// the operation applies to all fields.
@@ -108,7 +108,7 @@ message UpdateImageRequest {
}
message UpdateImageResponse {
Image image = 1 [(gogoproto.nullable) = false];
Image image = 1;
}
message ListImagesRequest {
@@ -126,7 +126,7 @@ message ListImagesRequest {
}
message ListImagesResponse {
repeated Image images = 1 [(gogoproto.nullable) = false];
repeated Image images = 1;
}
message DeleteImageRequest {