Do not use weak import
According to https://github.com/protocolbuffers/protobuf/issues/9184 > Weak fields are an old and deprecated internal-only feature that we never > open sourced. This blocks us to upgrade protoc. Fixes #6232. Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
This commit is contained in:
Kazuyoshi Kato
@@ -7,6 +7,7 @@ import (
|
||||
context "context"
|
||||
fmt "fmt"
|
||||
types "github.com/containerd/containerd/api/types"
|
||||
_ "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"
|
||||
@@ -479,49 +480,49 @@ func init() {
|
||||
}
|
||||
|
||||
var fileDescriptor_8666fa071128ae5f = []byte{
|
||||
// 659 bytes of a gzipped FileDescriptorProto
|
||||
// 657 bytes of a gzipped FileDescriptorProto
|
||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0xcd, 0x6e, 0xd3, 0x40,
|
||||
0x10, 0x8e, 0x93, 0xd4, 0x6d, 0x27, 0x07, 0xca, 0x52, 0x21, 0xcb, 0x40, 0x1a, 0x45, 0x20, 0xe5,
|
||||
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, 0x92, 0x94, 0xde,
|
||||
0x66, 0xed, 0xef, 0x9b, 0x9f, 0x6f, 0x66, 0x76, 0x61, 0xcf, 0xf3, 0xc5, 0x87, 0x6e, 0x9d, 0x36,
|
||||
0xa2, 0xd0, 0x69, 0x44, 0x1d, 0xc1, 0xfc, 0x0e, 0x26, 0xcd, 0x51, 0x93, 0xc5, 0xbe, 0xc3, 0x31,
|
||||
0xe9, 0xf9, 0x0d, 0xe4, 0x8e, 0x1f, 0x32, 0x0f, 0xb9, 0xd3, 0xdb, 0xd4, 0x16, 0x8d, 0x93, 0x48,
|
||||
0x44, 0xe4, 0xd6, 0x19, 0x9e, 0x0e, 0xb1, 0x54, 0x23, 0x7a, 0x9b, 0xf6, 0xba, 0x17, 0x79, 0x91,
|
||||
0x44, 0x3a, 0xa9, 0xa5, 0x48, 0xf6, 0x0d, 0x2f, 0x8a, 0xbc, 0x00, 0x1d, 0x79, 0xaa, 0x77, 0x5b,
|
||||
0x0e, 0x86, 0xb1, 0xe8, 0xeb, 0x9f, 0xa5, 0xf1, 0x9f, 0x2d, 0x1f, 0x83, 0xe6, 0x71, 0xc8, 0x78,
|
||||
0x5b, 0x23, 0x36, 0xc6, 0x11, 0xc2, 0x0f, 0x91, 0x0b, 0x16, 0xc6, 0x1a, 0xb0, 0x3d, 0x57, 0x69,
|
||||
0xa2, 0x1f, 0x23, 0x77, 0x9a, 0xc8, 0x1b, 0x89, 0x1f, 0x8b, 0x28, 0x51, 0xe4, 0xf2, 0xef, 0x2c,
|
||||
0x2c, 0x3d, 0x4f, 0x0b, 0x20, 0x04, 0xf2, 0x1d, 0x16, 0xa2, 0x65, 0x94, 0x8c, 0xca, 0xaa, 0x2b,
|
||||
0x6d, 0xf2, 0x0c, 0xcc, 0x80, 0xd5, 0x31, 0xe0, 0x56, 0xb6, 0x94, 0xab, 0x14, 0xaa, 0xf7, 0xe8,
|
||||
0x3f, 0x05, 0xa0, 0xd2, 0x13, 0x3d, 0x94, 0x94, 0xfd, 0x8e, 0x48, 0xfa, 0xae, 0xe6, 0x93, 0x2d,
|
||||
0x30, 0x05, 0x4b, 0x3c, 0x14, 0x56, 0xae, 0x64, 0x54, 0x0a, 0xd5, 0x9b, 0xa3, 0x9e, 0x64, 0x6e,
|
||||
0x74, 0xef, 0x6f, 0x6e, 0xb5, 0xfc, 0xc9, 0x8f, 0x8d, 0x8c, 0xab, 0x19, 0x64, 0x17, 0xa0, 0x91,
|
||||
0x20, 0x13, 0xd8, 0x3c, 0x66, 0xc2, 0x5a, 0x96, 0x7c, 0x9b, 0x2a, 0x59, 0xe8, 0x50, 0x16, 0xfa,
|
||||
0x7a, 0x28, 0x4b, 0x6d, 0x25, 0x65, 0x7f, 0xfe, 0xb9, 0x61, 0xb8, 0xab, 0x9a, 0xb7, 0x23, 0x9d,
|
||||
0x74, 0xe3, 0xe6, 0xd0, 0xc9, 0xca, 0x22, 0x4e, 0x34, 0x6f, 0x47, 0xd8, 0x0f, 0xa1, 0x30, 0x52,
|
||||
0x1c, 0x59, 0x83, 0x5c, 0x1b, 0xfb, 0x5a, 0xb1, 0xd4, 0x24, 0xeb, 0xb0, 0xd4, 0x63, 0x41, 0x17,
|
||||
0xad, 0xac, 0xfc, 0xa6, 0x0e, 0x5b, 0xd9, 0x07, 0x46, 0xf9, 0x0e, 0x5c, 0x39, 0x40, 0x21, 0x05,
|
||||
0x72, 0xf1, 0x63, 0x17, 0xb9, 0x98, 0xa6, 0x78, 0xf9, 0x25, 0xac, 0x9d, 0xc1, 0x78, 0x1c, 0x75,
|
||||
0x38, 0x92, 0x2d, 0x58, 0x92, 0x12, 0x4b, 0x60, 0xa1, 0x7a, 0x7b, 0x9e, 0x26, 0xb8, 0x8a, 0x52,
|
||||
0x7e, 0x0b, 0x64, 0x57, 0x6a, 0x70, 0x2e, 0xf2, 0x93, 0x0b, 0x78, 0xd4, 0x4d, 0xd1, 0x7e, 0xdf,
|
||||
0xc1, 0xb5, 0x73, 0x7e, 0x75, 0xaa, 0xff, 0xef, 0xf8, 0x8b, 0x01, 0xe4, 0x8d, 0x14, 0xfc, 0x72,
|
||||
0x33, 0x26, 0xdb, 0x50, 0x50, 0x8d, 0x94, 0xcb, 0x25, 0x1b, 0x34, 0x6d, 0x02, 0x9e, 0xa6, 0xfb,
|
||||
0xf7, 0x82, 0xf1, 0xb6, 0xab, 0xe7, 0x25, 0xb5, 0xd3, 0x72, 0xcf, 0x25, 0x75, 0x69, 0xe5, 0xde,
|
||||
0x85, 0xab, 0x87, 0x3e, 0x57, 0x0d, 0xe7, 0xc3, 0x62, 0x2d, 0x58, 0x6e, 0xf9, 0x81, 0xc0, 0x84,
|
||||
0x5b, 0x46, 0x29, 0x57, 0x59, 0x75, 0x87, 0xc7, 0xf2, 0x11, 0x90, 0x51, 0xb8, 0x4e, 0xa3, 0x06,
|
||||
0xa6, 0x0a, 0x22, 0xe1, 0x8b, 0xe5, 0xa1, 0x99, 0xe5, 0x47, 0x40, 0xf6, 0x30, 0xc0, 0x31, 0xd9,
|
||||
0xa7, 0x5d, 0x0a, 0x04, 0xf2, 0xbc, 0xdf, 0x69, 0x48, 0x05, 0x57, 0x5c, 0x69, 0x57, 0xbf, 0xe6,
|
||||
0xc1, 0x54, 0x49, 0x91, 0x16, 0xe4, 0x0e, 0x50, 0x10, 0x3a, 0x23, 0x87, 0xb1, 0x65, 0xb0, 0x9d,
|
||||
0xb9, 0xf1, 0xba, 0xe8, 0x36, 0xe4, 0x53, 0x29, 0xc8, 0xac, 0x3b, 0x69, 0x42, 0x5e, 0x7b, 0x73,
|
||||
0x01, 0x86, 0x0e, 0x16, 0x81, 0xa9, 0xc6, 0x9d, 0xcc, 0x22, 0x4f, 0x6e, 0x9b, 0x5d, 0x5d, 0x84,
|
||||
0x72, 0x16, 0x50, 0x0d, 0xdc, 0xcc, 0x80, 0x93, 0xcb, 0x32, 0x33, 0xe0, 0xb4, 0x51, 0x7e, 0x05,
|
||||
0xa6, 0xea, 0xff, 0xcc, 0x80, 0x93, 0x63, 0x62, 0x5f, 0x9f, 0x58, 0xa3, 0xfd, 0xf4, 0x8d, 0xab,
|
||||
0x1d, 0x9d, 0x9c, 0x16, 0x33, 0xdf, 0x4f, 0x8b, 0x99, 0x4f, 0x83, 0xa2, 0x71, 0x32, 0x28, 0x1a,
|
||||
0xdf, 0x06, 0x45, 0xe3, 0xd7, 0xa0, 0x68, 0xbc, 0x7f, 0x7c, 0xc1, 0xf7, 0x78, 0x5b, 0x59, 0x47,
|
||||
0x99, 0xba, 0x29, 0x63, 0xdd, 0xff, 0x13, 0x00, 0x00, 0xff, 0xff, 0x24, 0x4e, 0xca, 0x64, 0xda,
|
||||
0x07, 0x00, 0x00,
|
||||
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,
|
||||
}
|
||||
|
||||
// Reference imports to suppress errors if they are not otherwise used.
|
||||
|
||||
@@ -18,7 +18,7 @@ syntax = "proto3";
|
||||
|
||||
package containerd.services.images.v1;
|
||||
|
||||
import weak "gogoproto/gogo.proto";
|
||||
import "gogoproto/gogo.proto";
|
||||
import "google/protobuf/empty.proto";
|
||||
import "google/protobuf/field_mask.proto";
|
||||
import "google/protobuf/timestamp.proto";
|
||||
|
||||
Reference in New Issue
Block a user