api: use weak imports for plugin protobufs

Because of a side-effect import, we have the possibility of pulling in
several unnecessary packages that are used by the plugin and not at
runtime to implement protobuf structures. Setting these imports to
`weak` prevents this from happening, reducing the total import set,
reducing memory usage and binary size.

Signed-off-by: Stephen J Day <stephen.day@docker.com>

api/events/container.pb.go

@@ -43,9 +43,10 @@ package events
 import proto "github.com/gogo/protobuf/proto"
 import fmt "fmt"
 import math "math"
-import _ "github.com/gogo/protobuf/gogoproto"
-import google_protobuf1 "github.com/gogo/protobuf/types"
-import _ "github.com/containerd/containerd/protobuf/plugin"
+import google_protobuf "github.com/gogo/protobuf/types"
+
+// skipping weak import gogoproto "github.com/gogo/protobuf/gogoproto"
+// skipping weak import containerd_plugin "github.com/containerd/containerd/protobuf/plugin"
 
 import github_com_containerd_typeurl "github.com/containerd/typeurl"
 
@@ -77,8 +78,8 @@ func (*ContainerCreate) ProtoMessage()               {}
 func (*ContainerCreate) Descriptor() ([]byte, []int) { return fileDescriptorContainer, []int{0} }
 
 type ContainerCreate_Runtime struct {
-	Name    string                `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
-	Options *google_protobuf1.Any `protobuf:"bytes,2,opt,name=options" json:"options,omitempty"`
+	Name    string               `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	Options *google_protobuf.Any `protobuf:"bytes,2,opt,name=options" json:"options,omitempty"`
 }
 
 func (m *ContainerCreate_Runtime) Reset()      { *m = ContainerCreate_Runtime{} }
@@ -466,7 +467,7 @@ func (this *ContainerCreate_Runtime) String() string {
 	}
 	s := strings.Join([]string{`&ContainerCreate_Runtime{`,
 		`Name:` + fmt.Sprintf("%v", this.Name) + `,`,
-		`Options:` + strings.Replace(fmt.Sprintf("%v", this.Options), "Any", "google_protobuf1.Any", 1) + `,`,
+		`Options:` + strings.Replace(fmt.Sprintf("%v", this.Options), "Any", "google_protobuf.Any", 1) + `,`,
 		`}`,
 	}, "")
 	return s
@@ -738,7 +739,7 @@ func (m *ContainerCreate_Runtime) Unmarshal(dAtA []byte) error {
 				return io.ErrUnexpectedEOF
 			}
 			if m.Options == nil {
-				m.Options = &google_protobuf1.Any{}
+				m.Options = &google_protobuf.Any{}
 			}
 			if err := m.Options.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err
@@ -1209,31 +1210,31 @@ func init() {
 }
 
 var fileDescriptorContainer = []byte{
-	// 411 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x92, 0xcf, 0xaa, 0xd3, 0x40,
-	0x14, 0xc6, 0x3b, 0x49, 0x6d, 0x71, 0x22, 0xa8, 0x43, 0x91, 0x98, 0x45, 0xac, 0x5d, 0x55, 0x17,
-	0x13, 0x88, 0x1b, 0xb5, 0x1b, 0x6d, 0xab, 0x20, 0x2a, 0x48, 0xc0, 0x8d, 0x1b, 0x99, 0x34, 0xd3,
-	0x74, 0x30, 0x99, 0x09, 0xc9, 0xa4, 0x90, 0x9d, 0x8f, 0xe2, 0xe3, 0x74, 0xe9, 0xc2, 0x85, 0x2b,
-	0xb1, 0x01, 0xdf, 0xc0, 0x07, 0x90, 0xcc, 0x34, 0x6d, 0xf0, 0x72, 0xef, 0xa5, 0xab, 0x9c, 0x3f,
-	0xdf, 0x97, 0x73, 0x7e, 0x87, 0x81, 0xb3, 0x98, 0xc9, 0x4d, 0x19, 0xe2, 0x95, 0x48, 0xbd, 0x95,
-	0xe0, 0x92, 0x30, 0x4e, 0xf3, 0xa8, 0x1b, 0x92, 0x8c, 0x79, 0x74, 0x4b, 0xb9, 0x2c, 0x4e, 0x55,
-	0x9c, 0xe5, 0x42, 0x0a, 0x74, 0xf7, 0x24, 0xc3, 0x5a, 0xe2, 0x8c, 0x62, 0x11, 0x0b, 0xd5, 0xf5,
-	0x9a, 0x48, 0x0b, 0x9d, 0xfb, 0xb1, 0x10, 0x71, 0x42, 0x3d, 0x95, 0x85, 0xe5, 0xda, 0x23, 0xbc,
-	0x3a, 0xb4, 0x5e, 0x5c, 0xbb, 0xc0, 0xd1, 0x94, 0x25, 0x65, 0xcc, 0xb8, 0xb7, 0x66, 0x34, 0x89,
-	0x32, 0x22, 0x37, 0xfa, 0x0f, 0x93, 0x1f, 0x00, 0xde, 0x5e, 0xb4, 0xf2, 0x45, 0x4e, 0x89, 0xa4,
-	0xe8, 0x1e, 0x34, 0x58, 0x64, 0x83, 0x31, 0x98, 0xde, 0x9c, 0x0f, 0xea, 0x5f, 0x0f, 0x8c, 0x37,
-	0xcb, 0xc0, 0x60, 0x11, 0x1a, 0xc1, 0x1b, 0x2c, 0x25, 0x31, 0xb5, 0x8d, 0xa6, 0x15, 0xe8, 0x04,
-	0x2d, 0xe1, 0x30, 0x2f, 0xb9, 0x64, 0x29, 0xb5, 0xcd, 0x31, 0x98, 0x5a, 0xfe, 0x63, 0x7c, 0x81,
-	0x0c, 0xff, 0x37, 0x02, 0x07, 0xda, 0x11, 0xb4, 0x56, 0xe7, 0x3d, 0x1c, 0x1e, 0x6a, 0x08, 0xc1,
-	0x3e, 0x27, 0x29, 0xd5, 0x0b, 0x04, 0x2a, 0x46, 0x18, 0x0e, 0x45, 0x26, 0x99, 0xe0, 0x85, 0x1a,
-	0x6e, 0xf9, 0x23, 0xac, 0xaf, 0x82, 0x5b, 0x40, 0xfc, 0x92, 0x57, 0x41, 0x2b, 0x9a, 0xfc, 0xe9,
-	0x62, 0x7d, 0xcc, 0xa2, 0xf3, 0xb1, 0x5e, 0xc3, 0x41, 0x42, 0x42, 0x9a, 0x14, 0xb6, 0x39, 0x36,
-	0xa7, 0x96, 0x8f, 0xaf, 0xa2, 0xd2, 0x13, 0xf0, 0x3b, 0x65, 0x78, 0xc5, 0x65, 0x5e, 0x05, 0x07,
-	0x37, 0x7a, 0x08, 0x6f, 0x15, 0x9c, 0x64, 0xc5, 0x46, 0xc8, 0xcf, 0x5f, 0x68, 0x65, 0xf7, 0xd5,
-	0x10, 0xab, 0xad, 0xbd, 0xa5, 0x95, 0xf3, 0x0c, 0x5a, 0x1d, 0x27, 0xba, 0x03, 0xcd, 0x46, 0xa8,
-	0xf1, 0x9b, 0xb0, 0xd9, 0x70, 0x4b, 0x92, 0xf2, 0xb8, 0xa1, 0x4a, 0x9e, 0x1b, 0x4f, 0xc1, 0xe4,
-	0x51, 0x07, 0x73, 0x49, 0x13, 0x7a, 0x39, 0xe6, 0xfc, 0xc3, 0x6e, 0xef, 0xf6, 0x7e, 0xee, 0xdd,
-	0xde, 0xd7, 0xda, 0x05, 0xbb, 0xda, 0x05, 0xdf, 0x6b, 0x17, 0xfc, 0xae, 0x5d, 0xf0, 0xed, 0xaf,
-	0x0b, 0x3e, 0xf9, 0x67, 0x3c, 0xe5, 0x99, 0xfe, 0x84, 0x03, 0x75, 0xfb, 0x27, 0xff, 0x02, 0x00,
-	0x00, 0xff, 0xff, 0xc4, 0x03, 0x7d, 0xc8, 0x07, 0x03, 0x00, 0x00,
+	// 413 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x92, 0xc1, 0x0a, 0xd3, 0x30,
+	0x18, 0xc7, 0x97, 0x76, 0x6e, 0x98, 0x0a, 0x6a, 0x18, 0x52, 0x7b, 0xa8, 0x73, 0xa7, 0xe9, 0x21,
+	0x85, 0x7a, 0x51, 0x77, 0xd1, 0x6d, 0x0a, 0xa2, 0x82, 0x14, 0x84, 0xe1, 0x45, 0xd2, 0x35, 0xeb,
+	0x82, 0x6d, 0x52, 0xda, 0x74, 0xd0, 0x9b, 0x8f, 0xe2, 0xe3, 0xec, 0xe8, 0xc1, 0x83, 0x27, 0x71,
+	0x05, 0xdf, 0xc0, 0x07, 0x90, 0x26, 0xeb, 0x56, 0x14, 0x95, 0x9d, 0xfa, 0xcf, 0xd7, 0xff, 0x3f,
+	0xdf, 0xf7, 0xfb, 0x08, 0x9c, 0xc5, 0x4c, 0x6e, 0xcb, 0x10, 0xaf, 0x45, 0xea, 0xad, 0x05, 0x97,
+	0x84, 0x71, 0x9a, 0x47, 0x5d, 0x49, 0x32, 0xe6, 0xd1, 0x1d, 0xe5, 0xb2, 0x38, 0x57, 0x71, 0x96,
+	0x0b, 0x29, 0xd0, 0xcd, 0xb3, 0x0d, 0x6b, 0x8b, 0x73, 0x3b, 0x16, 0x22, 0x4e, 0xa8, 0xa7, 0x0c,
+	0x61, 0xb9, 0xf1, 0x08, 0xaf, 0xb4, 0xdb, 0x19, 0xc5, 0x22, 0x16, 0x4a, 0x7a, 0x8d, 0x3a, 0x56,
+	0x9f, 0xfc, 0x77, 0x80, 0xd3, 0x55, 0x59, 0x52, 0xc6, 0x8c, 0x7b, 0x1b, 0x46, 0x93, 0x28, 0x23,
+	0x72, 0xab, 0x6f, 0x98, 0x7c, 0x01, 0xf0, 0xfa, 0xa2, 0xb5, 0x2f, 0x72, 0x4a, 0x24, 0x45, 0xb7,
+	0xa0, 0xc1, 0x22, 0x1b, 0x8c, 0xc1, 0xf4, 0xea, 0x7c, 0x50, 0x7f, 0xbb, 0x63, 0xbc, 0x58, 0x06,
+	0x06, 0x8b, 0xd0, 0x08, 0x5e, 0x61, 0x29, 0x89, 0xa9, 0x6d, 0x34, 0xbf, 0x02, 0x7d, 0x40, 0x4b,
+	0x38, 0xcc, 0x4b, 0x2e, 0x59, 0x4a, 0x6d, 0x73, 0x0c, 0xa6, 0x96, 0x7f, 0x1f, 0xff, 0x41, 0x86,
+	0x7f, 0x6b, 0x81, 0x03, 0x9d, 0x08, 0xda, 0xa8, 0xf3, 0x1a, 0x0e, 0x8f, 0x35, 0x84, 0x60, 0x9f,
+	0x93, 0x94, 0xea, 0x01, 0x02, 0xa5, 0x11, 0x86, 0x43, 0x91, 0x49, 0x26, 0x78, 0xa1, 0x9a, 0x5b,
+	0xfe, 0x08, 0xeb, 0x5d, 0xe1, 0x16, 0x10, 0x3f, 0xe5, 0x55, 0xd0, 0x9a, 0x26, 0x3f, 0xba, 0x58,
+	0x6f, 0xb3, 0xe8, 0x72, 0xac, 0xe7, 0x70, 0x90, 0x90, 0x90, 0x26, 0x85, 0x6d, 0x8e, 0xcd, 0xa9,
+	0xe5, 0xe3, 0x7f, 0x51, 0xe9, 0x0e, 0xf8, 0x95, 0x0a, 0x3c, 0xe3, 0x32, 0xaf, 0x82, 0x63, 0x1a,
+	0xdd, 0x85, 0xd7, 0x0a, 0x4e, 0xb2, 0x62, 0x2b, 0xe4, 0xfb, 0x0f, 0xb4, 0xb2, 0xfb, 0xaa, 0x89,
+	0xd5, 0xd6, 0x5e, 0xd2, 0xca, 0x79, 0x04, 0xad, 0x4e, 0x12, 0xdd, 0x80, 0x66, 0x63, 0xd4, 0xf8,
+	0x8d, 0x6c, 0x26, 0xdc, 0x91, 0xa4, 0x3c, 0x4d, 0xa8, 0x0e, 0x8f, 0x8d, 0x87, 0x60, 0x72, 0xaf,
+	0x83, 0xb9, 0xa4, 0x09, 0xfd, 0x3b, 0xe6, 0xfc, 0xcd, 0xfe, 0xe0, 0xf6, 0xbe, 0x1e, 0xdc, 0xde,
+	0xc7, 0xda, 0x05, 0xfb, 0xda, 0x05, 0x9f, 0x6b, 0x17, 0x7c, 0xaf, 0x5d, 0xf0, 0xe9, 0xa7, 0x0b,
+	0xde, 0xf9, 0x17, 0x3c, 0xe5, 0x99, 0xfe, 0xac, 0xc0, 0xca, 0x08, 0x07, 0x6a, 0xff, 0x0f, 0x7e,
+	0x05, 0x00, 0x00, 0xff, 0xff, 0xf5, 0x09, 0xe0, 0xd6, 0x0b, 0x03, 0x00, 0x00,
 }

api/events/container.proto

@@ -2,9 +2,9 @@ syntax = "proto3";
 
 package containerd.events;
 
-import "gogoproto/gogo.proto";
 import "google/protobuf/any.proto";
-import "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto";
+import weak "gogoproto/gogo.proto";
+import weak "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto";
 
 option go_package = "github.com/containerd/containerd/api/events;events";
 option (containerd.plugin.fieldpath_all) = true;

api/events/content.pb.go

@@ -6,8 +6,9 @@ package events
 import proto "github.com/gogo/protobuf/proto"
 import fmt "fmt"
 import math "math"
-import _ "github.com/gogo/protobuf/gogoproto"
-import _ "github.com/containerd/containerd/protobuf/plugin"
+
+// skipping weak import gogoproto "github.com/gogo/protobuf/gogoproto"
+// skipping weak import containerd_plugin "github.com/containerd/containerd/protobuf/plugin"
 
 import github_com_opencontainers_go_digest "github.com/opencontainers/go-digest"
 
@@ -309,7 +310,7 @@ func init() {
 }
 
 var fileDescriptorContent = []byte{
-	// 224 bytes of a gzipped FileDescriptorProto
+	// 228 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xb2, 0x4c, 0xcf, 0x2c, 0xc9,
 	0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0xcf, 0x2b, 0x49, 0xcc, 0xcc, 0x4b, 0x2d,
 	0x4a, 0x41, 0x66, 0x26, 0x16, 0x64, 0xea, 0xa7, 0x96, 0xa5, 0xe6, 0x95, 0x14, 0x83, 0x45, 0x53,
@@ -322,6 +323,7 @@ var fileDescriptorContent = []byte{
 	0x24, 0xab, 0xf2, 0x0b, 0x52, 0xf3, 0xe0, 0x76, 0x14, 0xeb, 0xa7, 0xe7, 0xeb, 0x42, 0xb4, 0xe8,
 	0xb9, 0x80, 0xa9, 0x20, 0xa8, 0x09, 0x4e, 0x01, 0x27, 0x1e, 0xca, 0x31, 0xdc, 0x78, 0x28, 0xc7,
 	0xd0, 0xf0, 0x48, 0x8e, 0xf1, 0xc4, 0x23, 0x39, 0xc6, 0x0b, 0x8f, 0xe4, 0x18, 0x1f, 0x3c, 0x92,
-	0x63, 0x5c, 0xf0, 0x45, 0x8e, 0x31, 0xca, 0x88, 0x84, 0x00, 0xb2, 0x86, 0x50, 0x49, 0x6c, 0x60,
-	0x57, 0x1b, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0xee, 0x71, 0x10, 0x4c, 0x5d, 0x01, 0x00, 0x00,
+	0x63, 0x5c, 0xf0, 0x45, 0x8e, 0x31, 0xca, 0x88, 0x84, 0x00, 0xb2, 0x86, 0x50, 0x11, 0x0c, 0x11,
+	0x8c, 0x49, 0x6c, 0x60, 0x97, 0x1b, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0x4b, 0x78, 0x99, 0xee,
+	0x61, 0x01, 0x00, 0x00,
 }

api/events/content.proto

@@ -2,8 +2,8 @@ syntax = "proto3";
 
 package containerd.events;
 
-import "gogoproto/gogo.proto";
-import "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto";
+import weak "gogoproto/gogo.proto";
+import weak "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto";
 
 option go_package = "github.com/containerd/containerd/api/events;events";
 option (containerd.plugin.fieldpath_all) = true;

api/events/image.pb.go

@@ -6,7 +6,8 @@ package events
 import proto "github.com/gogo/protobuf/proto"
 import fmt "fmt"
 import math "math"
-import _ "github.com/containerd/containerd/protobuf/plugin"
+
+// skipping weak import containerd_plugin "github.com/containerd/containerd/protobuf/plugin"
 
 import strings "strings"
 import reflect "reflect"
@@ -925,7 +926,7 @@ func init() {
 }
 
 var fileDescriptorImage = []byte{
-	// 290 bytes of a gzipped FileDescriptorProto
+	// 292 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x32, 0x4f, 0xcf, 0x2c, 0xc9,
 	0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0xcf, 0x2b, 0x49, 0xcc, 0xcc, 0x4b, 0x2d,
 	0x4a, 0x41, 0x66, 0x26, 0x16, 0x64, 0xea, 0xa7, 0x96, 0xa5, 0xe6, 0x95, 0x14, 0xeb, 0x67, 0xe6,
@@ -942,7 +943,7 @@ var fileDescriptorImage = []byte{
 	0x30, 0x22, 0x9c, 0x1b, 0x5a, 0x90, 0x42, 0x55, 0xe7, 0x42, 0xcc, 0xa3, 0xb6, 0x73, 0x15, 0xa1,
 	0xae, 0x75, 0x49, 0xcd, 0x49, 0xc5, 0xee, 0x5a, 0xa7, 0x80, 0x13, 0x0f, 0xe5, 0x18, 0x6e, 0x3c,
 	0x94, 0x63, 0x68, 0x78, 0x24, 0xc7, 0x78, 0xe2, 0x91, 0x1c, 0xe3, 0x85, 0x47, 0x72, 0x8c, 0x0f,
-	0x1e, 0xc9, 0x31, 0x2e, 0xf8, 0x22, 0xc7, 0x18, 0x65, 0x44, 0x42, 0xc2, 0xb1, 0x86, 0x50, 0x49,
-	0x6c, 0xe0, 0x98, 0x35, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0xea, 0x1f, 0xed, 0xe5, 0x75, 0x02,
-	0x00, 0x00,
+	0x1e, 0xc9, 0x31, 0x2e, 0xf8, 0x22, 0xc7, 0x18, 0x65, 0x44, 0x42, 0xc2, 0xb1, 0x86, 0x50, 0x11,
+	0x0c, 0x49, 0x6c, 0xe0, 0xb8, 0x35, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0x41, 0x80, 0x92, 0x17,
+	0x77, 0x02, 0x00, 0x00,
 }

api/events/image.proto

@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package containerd.services.images.v1;
 
-import "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto";
+import weak "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto";
 
 option go_package = "github.com/containerd/containerd/api/events;events";
 option (containerd.plugin.fieldpath_all) = true;

api/events/namespace.pb.go

@@ -6,8 +6,9 @@ package events
 import proto "github.com/gogo/protobuf/proto"
 import fmt "fmt"
 import math "math"
-import _ "github.com/gogo/protobuf/gogoproto"
-import _ "github.com/containerd/containerd/protobuf/plugin"
+
+// skipping weak import gogoproto "github.com/gogo/protobuf/gogoproto"
+// skipping weak import containerd_plugin "github.com/containerd/containerd/protobuf/plugin"
 
 import strings "strings"
 import reflect "reflect"
@@ -926,7 +927,7 @@ func init() {
 }
 
 var fileDescriptorNamespace = []byte{
-	// 292 bytes of a gzipped FileDescriptorProto
+	// 296 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xb2, 0x4e, 0xcf, 0x2c, 0xc9,
 	0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0xcf, 0x2b, 0x49, 0xcc, 0xcc, 0x4b, 0x2d,
 	0x4a, 0x41, 0x66, 0x26, 0x16, 0x64, 0xea, 0xa7, 0x96, 0xa5, 0xe6, 0x95, 0x14, 0xeb, 0xe7, 0x25,
@@ -944,6 +945,6 @@ var fileDescriptorNamespace = []byte{
 	0x2a, 0x92, 0x4b, 0x5d, 0x52, 0x73, 0x52, 0xb1, 0xbb, 0xd4, 0x29, 0xe0, 0xc4, 0x43, 0x39, 0x86,
 	0x1b, 0x0f, 0xe5, 0x18, 0x1a, 0x1e, 0xc9, 0x31, 0x9e, 0x78, 0x24, 0xc7, 0x78, 0xe1, 0x91, 0x1c,
 	0xe3, 0x83, 0x47, 0x72, 0x8c, 0x0b, 0xbe, 0xc8, 0x31, 0x46, 0x19, 0x91, 0x90, 0x84, 0xac, 0x21,
-	0x54, 0x12, 0x1b, 0x38, 0x56, 0x8d, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0x0a, 0x22, 0xd4, 0x70,
-	0x7f, 0x02, 0x00, 0x00,
+	0x54, 0x04, 0x43, 0x04, 0x63, 0x12, 0x1b, 0x38, 0x66, 0x8d, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff,
+	0x00, 0x50, 0x87, 0x59, 0x83, 0x02, 0x00, 0x00,
 }

api/events/namespace.proto

@@ -2,8 +2,8 @@ syntax = "proto3";
 
 package containerd.events;
 
-import "gogoproto/gogo.proto";
-import "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto";
+import weak "gogoproto/gogo.proto";
+import weak "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto";
 
 option go_package = "github.com/containerd/containerd/api/events;events";
 option (containerd.plugin.fieldpath_all) = true;

api/events/snapshot.pb.go

@@ -6,7 +6,8 @@ package events
 import proto "github.com/gogo/protobuf/proto"
 import fmt "fmt"
 import math "math"
-import _ "github.com/containerd/containerd/protobuf/plugin"
+
+// skipping weak import containerd_plugin "github.com/containerd/containerd/protobuf/plugin"
 
 import strings "strings"
 import reflect "reflect"
@@ -684,7 +685,7 @@ func init() {
 }
 
 var fileDescriptorSnapshot = []byte{
-	// 233 bytes of a gzipped FileDescriptorProto
+	// 235 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xb2, 0x4a, 0xcf, 0x2c, 0xc9,
 	0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0xcf, 0x2b, 0x49, 0xcc, 0xcc, 0x4b, 0x2d,
 	0x4a, 0x41, 0x66, 0x26, 0x16, 0x64, 0xea, 0xa7, 0x96, 0xa5, 0xe6, 0x95, 0x14, 0xeb, 0x17, 0xe7,
@@ -698,6 +699,6 @@ var fileDescriptorSnapshot = []byte{
 	0x85, 0xea, 0x04, 0xb3, 0x95, 0x94, 0x10, 0xfa, 0x82, 0x52, 0x73, 0xf3, 0xcb, 0xb0, 0xd8, 0xe9,
 	0x14, 0x70, 0xe2, 0xa1, 0x1c, 0xc3, 0x8d, 0x87, 0x72, 0x0c, 0x0d, 0x8f, 0xe4, 0x18, 0x4f, 0x3c,
 	0x92, 0x63, 0xbc, 0xf0, 0x48, 0x8e, 0xf1, 0xc1, 0x23, 0x39, 0xc6, 0x05, 0x5f, 0xe4, 0x18, 0xa3,
-	0x8c, 0x48, 0x08, 0x47, 0x6b, 0x08, 0x95, 0xc4, 0x06, 0xf6, 0xb1, 0x31, 0x20, 0x00, 0x00, 0xff,
-	0xff, 0x62, 0x68, 0x19, 0xf5, 0x84, 0x01, 0x00, 0x00,
+	0x8c, 0x48, 0x08, 0x47, 0x6b, 0x08, 0x15, 0xc1, 0x90, 0xc4, 0x06, 0xf6, 0xb3, 0x31, 0x20, 0x00,
+	0x00, 0xff, 0xff, 0x69, 0x66, 0xa9, 0x2a, 0x86, 0x01, 0x00, 0x00,
 }

api/events/snapshot.proto

@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package containerd.events;
 
-import "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto";
+import weak "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto";
 
 option go_package = "github.com/containerd/containerd/api/events;events";
 option (containerd.plugin.fieldpath_all) = true;

api/events/task.pb.go

@@ -6,10 +6,12 @@ package events
 import proto "github.com/gogo/protobuf/proto"
 import fmt "fmt"
 import math "math"
-import _ "github.com/gogo/protobuf/gogoproto"
+
+// skipping weak import gogoproto "github.com/gogo/protobuf/gogoproto"
 import _ "github.com/gogo/protobuf/types"
 import containerd_types "github.com/containerd/containerd/api/types"
-import _ "github.com/containerd/containerd/protobuf/plugin"
+
+// skipping weak import containerd_plugin "github.com/containerd/containerd/protobuf/plugin"
 
 import time "time"
 
@@ -2564,45 +2566,45 @@ func init() {
 }
 
 var fileDescriptorTask = []byte{
-	// 632 bytes of a gzipped FileDescriptorProto
+	// 637 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x95, 0xcd, 0x6e, 0xd3, 0x40,
-	0x10, 0xc7, 0x6b, 0xa7, 0x75, 0x93, 0x09, 0x55, 0x8b, 0x55, 0x41, 0xc8, 0xc1, 0x8e, 0xcc, 0x25,
-	0x27, 0x5b, 0x04, 0x89, 0x0b, 0x42, 0x6a, 0xd2, 0x70, 0xc8, 0xa1, 0x4a, 0x71, 0x7b, 0xe2, 0x12,
-	0x6d, 0xb2, 0x9b, 0x64, 0x69, 0xe2, 0xb5, 0xec, 0x31, 0x2a, 0x12, 0x07, 0x1e, 0x81, 0x47, 0xe0,
-	0x29, 0x78, 0x86, 0x1e, 0x38, 0x70, 0xe4, 0x14, 0xa8, 0x1f, 0x80, 0x13, 0x0f, 0x80, 0xd6, 0xeb,
-	0xb8, 0x85, 0x8a, 0x2f, 0x4b, 0x9c, 0xb2, 0x33, 0x3b, 0xfb, 0x9f, 0x99, 0xdf, 0x4e, 0xd6, 0xf0,
-	0x68, 0xc6, 0x71, 0x9e, 0x8c, 0xdd, 0x89, 0x58, 0x7a, 0x13, 0x11, 0x20, 0xe1, 0x01, 0x8b, 0xe8,
-	0xf5, 0x25, 0x09, 0xb9, 0xc7, 0x5e, 0xb2, 0x00, 0x63, 0x0f, 0x49, 0x7c, 0xe6, 0x86, 0x91, 0x40,
-	0x61, 0xde, 0xbe, 0x8a, 0x70, 0xd5, 0x6e, 0x73, 0x7f, 0x26, 0x66, 0x22, 0xdb, 0xf5, 0xe4, 0x4a,
-	0x05, 0x36, 0xed, 0x99, 0x10, 0xb3, 0x05, 0xf3, 0x32, 0x6b, 0x9c, 0x4c, 0x3d, 0xe4, 0x4b, 0x16,
-	0x23, 0x59, 0x86, 0x79, 0xc0, 0xdf, 0x55, 0x80, 0xaf, 0x42, 0x16, 0x7b, 0x4b, 0x91, 0x04, 0x98,
-	0x9f, 0x3b, 0xf8, 0xe3, 0xb9, 0x22, 0x65, 0xb8, 0x48, 0x66, 0x3c, 0xf0, 0xa6, 0x9c, 0x2d, 0x68,
-	0x48, 0x70, 0xae, 0x14, 0x9c, 0xaf, 0x1a, 0xc0, 0x29, 0x89, 0xcf, 0x0e, 0x23, 0x46, 0x90, 0x99,
-	0x1d, 0xb8, 0x55, 0x1c, 0x1e, 0x71, 0xda, 0xd0, 0x5a, 0x5a, 0xbb, 0xd6, 0xdb, 0x4d, 0x57, 0x76,
-	0xfd, 0x70, 0xed, 0x1f, 0xf4, 0xfd, 0x7a, 0x11, 0x34, 0xa0, 0xe6, 0x1d, 0x30, 0xc6, 0x49, 0x40,
-	0x17, 0xac, 0xa1, 0xcb, 0x68, 0x3f, 0xb7, 0x4c, 0x0f, 0x8c, 0x48, 0x08, 0x9c, 0xc6, 0x8d, 0x4a,
-	0xab, 0xd2, 0xae, 0x77, 0xee, 0xba, 0xd7, 0x78, 0x65, 0xbd, 0xb8, 0x47, 0xb2, 0x17, 0x3f, 0x0f,
-	0x33, 0x1f, 0x80, 0xce, 0x45, 0x63, 0xb3, 0xa5, 0xb5, 0xeb, 0x9d, 0x7b, 0xee, 0x0d, 0xb8, 0xae,
-	0xac, 0x73, 0x30, 0xec, 0x19, 0xe9, 0xca, 0xd6, 0x07, 0x43, 0x5f, 0xe7, 0xc2, 0xb4, 0x00, 0x26,
-	0x73, 0x36, 0x39, 0x0b, 0x05, 0x0f, 0xb0, 0xb1, 0x95, 0xe5, 0xbf, 0xe6, 0x31, 0xf7, 0xa0, 0x12,
-	0x72, 0xda, 0x30, 0x5a, 0x5a, 0x7b, 0xc7, 0x97, 0x4b, 0xe7, 0x19, 0xd4, 0xa4, 0xce, 0x09, 0x92,
-	0x08, 0x4b, 0xb5, 0x9b, 0x4b, 0xea, 0x57, 0x92, 0xef, 0x73, 0x86, 0x7d, 0xb6, 0x60, 0x25, 0x19,
-	0xde, 0x10, 0x35, 0x6d, 0xa8, 0xb3, 0x73, 0x8e, 0xa3, 0x18, 0x09, 0x26, 0x12, 0xa1, 0xdc, 0x01,
-	0xe9, 0x3a, 0xc9, 0x3c, 0x66, 0x17, 0x6a, 0xd2, 0x62, 0x74, 0x44, 0x30, 0x87, 0xd6, 0x74, 0xd5,
-	0xa0, 0xb9, 0xeb, 0x5b, 0x77, 0x4f, 0xd7, 0x83, 0xd6, 0xab, 0x5e, 0xac, 0xec, 0x8d, 0xb7, 0x9f,
-	0x6d, 0xcd, 0xaf, 0xaa, 0x63, 0x5d, 0x74, 0x5e, 0x80, 0xa1, 0x98, 0x9a, 0xfb, 0xb0, 0x15, 0x23,
-	0xe5, 0x81, 0x2a, 0xd6, 0x57, 0x86, 0xbc, 0xd9, 0x18, 0xa9, 0x48, 0x70, 0x7d, 0xb3, 0xca, 0xca,
-	0xfd, 0x2c, 0x8a, 0xb2, 0xb2, 0x94, 0x9f, 0x45, 0x91, 0xd9, 0x84, 0x2a, 0xb2, 0x68, 0xc9, 0x03,
-	0xb2, 0xc8, 0x2a, 0xaa, 0xfa, 0x85, 0xed, 0x7c, 0xd0, 0xa0, 0x2a, 0x93, 0x3d, 0x3d, 0xe7, 0x58,
-	0x72, 0xcc, 0xf4, 0x9c, 0x50, 0x2d, 0x1f, 0x81, 0xbe, 0xaf, 0xf3, 0x02, 0x5d, 0xe5, 0x97, 0xe8,
-	0x36, 0x7f, 0x8f, 0x6e, 0xab, 0x14, 0xba, 0x27, 0xb0, 0x2d, 0xbb, 0x19, 0x0e, 0x8f, 0xca, 0x34,
-	0xe3, 0xcc, 0x61, 0x47, 0xc1, 0x60, 0x93, 0x2e, 0xa5, 0x8c, 0x96, 0x22, 0x72, 0x1f, 0xb6, 0xd9,
-	0x39, 0x9b, 0x8c, 0x0a, 0x2c, 0x90, 0xae, 0x6c, 0x43, 0x6a, 0x0e, 0xfa, 0xbe, 0x21, 0xb7, 0x06,
-	0xd4, 0x79, 0x0d, 0xbb, 0xeb, 0x4c, 0xd9, 0xcc, 0xff, 0xc7, 0x5c, 0x37, 0xaf, 0xc2, 0x39, 0x50,
-	0xff, 0x8c, 0x63, 0x92, 0xc4, 0xe5, 0x12, 0x3b, 0x5d, 0xa8, 0x4b, 0x05, 0x9f, 0xc5, 0xc9, 0xb2,
-	0xa4, 0xc4, 0x14, 0xf6, 0xb2, 0x27, 0xae, 0x78, 0x16, 0x4a, 0x32, 0xf8, 0xf1, 0xb1, 0xd1, 0x7f,
-	0x7e, 0x6c, 0x7a, 0xc7, 0x17, 0x97, 0xd6, 0xc6, 0xa7, 0x4b, 0x6b, 0xe3, 0x4d, 0x6a, 0x69, 0x17,
-	0xa9, 0xa5, 0x7d, 0x4c, 0x2d, 0xed, 0x4b, 0x6a, 0x69, 0xef, 0xbe, 0x59, 0xda, 0xf3, 0xce, 0x3f,
-	0x7c, 0x65, 0x1e, 0xab, 0x9f, 0xb1, 0x91, 0x4d, 0xe3, 0xc3, 0xef, 0x01, 0x00, 0x00, 0xff, 0xff,
-	0x13, 0x1c, 0x5d, 0xf2, 0xa2, 0x06, 0x00, 0x00,
+	0x10, 0xc7, 0x63, 0xa7, 0x75, 0x93, 0x09, 0x55, 0x8b, 0x55, 0x41, 0xc8, 0xc1, 0x8e, 0xcc, 0x25,
+	0x27, 0x5b, 0x04, 0x89, 0x0b, 0x42, 0x6a, 0xd2, 0x70, 0xc8, 0xa1, 0x4a, 0x71, 0x7b, 0xa8, 0xb8,
+	0x44, 0x4e, 0x76, 0x93, 0x2c, 0x8d, 0xbd, 0x96, 0x3d, 0x46, 0x45, 0xe2, 0xc0, 0x23, 0xf0, 0x08,
+	0x3c, 0x05, 0xcf, 0xd0, 0x03, 0x07, 0x8e, 0x9c, 0x02, 0xf5, 0x03, 0x70, 0xe2, 0x01, 0xd0, 0x7a,
+	0x1d, 0xb7, 0x50, 0xf1, 0x65, 0x89, 0x53, 0x76, 0x66, 0x67, 0xff, 0x33, 0xf3, 0xdb, 0xc9, 0x1a,
+	0x1e, 0xcd, 0x19, 0x2e, 0x92, 0x89, 0x3d, 0xe5, 0xbe, 0x33, 0xe5, 0x01, 0x7a, 0x2c, 0xa0, 0x11,
+	0xb9, 0xbe, 0xf4, 0x42, 0xe6, 0xd0, 0x97, 0x34, 0xc0, 0xd8, 0x41, 0x2f, 0x3e, 0xb3, 0xc3, 0x88,
+	0x23, 0xd7, 0x6f, 0x5f, 0x45, 0xd8, 0x72, 0xb7, 0xb5, 0x37, 0xe7, 0x73, 0x9e, 0xed, 0x3a, 0x62,
+	0x25, 0x03, 0x5b, 0xe6, 0x9c, 0xf3, 0xf9, 0x92, 0x3a, 0x99, 0x35, 0x49, 0x66, 0x0e, 0x32, 0x9f,
+	0xc6, 0xe8, 0xf9, 0x61, 0x1e, 0xf0, 0x77, 0x15, 0xe0, 0xab, 0x90, 0xc6, 0x8e, 0xcf, 0x93, 0x00,
+	0xf3, 0x73, 0xfb, 0x7f, 0x3c, 0x57, 0xa4, 0x0c, 0x97, 0xc9, 0x9c, 0x05, 0xce, 0x8c, 0xd1, 0x25,
+	0x09, 0x3d, 0x5c, 0x48, 0x05, 0xeb, 0xab, 0x02, 0x70, 0xe2, 0xc5, 0x67, 0x07, 0x11, 0xf5, 0x90,
+	0xea, 0x5d, 0xb8, 0x55, 0x1c, 0x1e, 0x33, 0xd2, 0x54, 0xda, 0x4a, 0xa7, 0xde, 0xdf, 0x49, 0x57,
+	0x66, 0xe3, 0x60, 0xed, 0x1f, 0x0e, 0xdc, 0x46, 0x11, 0x34, 0x24, 0xfa, 0x1d, 0xd0, 0x26, 0x49,
+	0x40, 0x96, 0xb4, 0xa9, 0x8a, 0x68, 0x37, 0xb7, 0x74, 0x07, 0xb4, 0x88, 0x73, 0x9c, 0xc5, 0xcd,
+	0x6a, 0xbb, 0xda, 0x69, 0x74, 0xef, 0xda, 0xd7, 0x78, 0x65, 0xbd, 0xd8, 0x87, 0xa2, 0x17, 0x37,
+	0x0f, 0xd3, 0x1f, 0x80, 0xca, 0x78, 0x73, 0xa3, 0xad, 0x74, 0x1a, 0xdd, 0x7b, 0xf6, 0x0d, 0xb8,
+	0xb6, 0xa8, 0x73, 0x38, 0xea, 0x6b, 0xe9, 0xca, 0x54, 0x87, 0x23, 0x57, 0x65, 0x5c, 0x37, 0x00,
+	0xa6, 0x0b, 0x3a, 0x3d, 0x0b, 0x39, 0x0b, 0xb0, 0xb9, 0x99, 0xe5, 0xbf, 0xe6, 0xd1, 0x77, 0xa1,
+	0x1a, 0x32, 0xd2, 0xd4, 0xda, 0x4a, 0x67, 0xdb, 0x15, 0x4b, 0xeb, 0x19, 0xd4, 0x85, 0xce, 0x31,
+	0x7a, 0x11, 0x96, 0x6a, 0x37, 0x97, 0x54, 0xaf, 0x24, 0xdf, 0xe7, 0x0c, 0x07, 0x74, 0x49, 0x4b,
+	0x32, 0xbc, 0x21, 0xaa, 0x9b, 0xd0, 0xa0, 0xe7, 0x0c, 0xc7, 0x31, 0x7a, 0x98, 0x08, 0x84, 0x62,
+	0x07, 0x84, 0xeb, 0x38, 0xf3, 0xe8, 0x3d, 0xa8, 0x0b, 0x8b, 0x92, 0xb1, 0x87, 0x39, 0xb4, 0x96,
+	0x2d, 0x07, 0xcd, 0x5e, 0xdf, 0xba, 0x7d, 0xb2, 0x1e, 0xb4, 0x7e, 0xed, 0x62, 0x65, 0x56, 0xde,
+	0x7e, 0x36, 0x15, 0xb7, 0x26, 0x8f, 0xf5, 0xd0, 0x7a, 0x01, 0x9a, 0x64, 0xaa, 0xef, 0xc1, 0x66,
+	0x8c, 0x84, 0x05, 0xb2, 0x58, 0x57, 0x1a, 0xe2, 0x66, 0x63, 0x24, 0x3c, 0xc1, 0xf5, 0xcd, 0x4a,
+	0x2b, 0xf7, 0xd3, 0x28, 0xca, 0xca, 0x92, 0x7e, 0x1a, 0x45, 0x7a, 0x0b, 0x6a, 0x48, 0x23, 0x9f,
+	0x05, 0xde, 0x32, 0xab, 0xa8, 0xe6, 0x16, 0xb6, 0xf5, 0x41, 0x81, 0x9a, 0x48, 0xf6, 0xf4, 0x9c,
+	0x61, 0xc9, 0x31, 0x53, 0x73, 0x42, 0xf5, 0x7c, 0x04, 0x06, 0xae, 0xca, 0x0a, 0x74, 0xd5, 0x5f,
+	0xa2, 0xdb, 0xf8, 0x3d, 0xba, 0xcd, 0x52, 0xe8, 0x9e, 0xc0, 0x96, 0xe8, 0x66, 0x34, 0x3a, 0x2c,
+	0xd3, 0x8c, 0xb5, 0x80, 0x6d, 0x09, 0x83, 0x4e, 0x7b, 0x84, 0x50, 0x52, 0x8a, 0xc8, 0x7d, 0xd8,
+	0xa2, 0xe7, 0x74, 0x3a, 0x2e, 0xb0, 0x40, 0xba, 0x32, 0x35, 0xa1, 0x39, 0x1c, 0xb8, 0x9a, 0xd8,
+	0x1a, 0x12, 0xeb, 0x35, 0xec, 0xac, 0x33, 0x65, 0x33, 0xff, 0x1f, 0x73, 0xdd, 0xbc, 0x0a, 0x6b,
+	0x5f, 0xfe, 0x33, 0x8e, 0xbc, 0x24, 0x2e, 0x97, 0xd8, 0xea, 0x41, 0x43, 0x28, 0xb8, 0x34, 0x4e,
+	0xfc, 0x92, 0x12, 0x33, 0xd8, 0xcd, 0x9e, 0xb8, 0xe2, 0x59, 0x28, 0xc9, 0xe0, 0xc7, 0xc7, 0x46,
+	0xfd, 0xf9, 0xb1, 0xe9, 0x1f, 0x5d, 0x5c, 0x1a, 0x95, 0x4f, 0x97, 0x46, 0xe5, 0x4d, 0x6a, 0x28,
+	0x17, 0xa9, 0xa1, 0x7c, 0x4c, 0x0d, 0xe5, 0x4b, 0x6a, 0x28, 0xef, 0xbe, 0x19, 0xca, 0xf3, 0xee,
+	0x3f, 0x7c, 0x65, 0x1e, 0xcb, 0x9f, 0xd3, 0xca, 0x69, 0x75, 0xa2, 0x65, 0x13, 0xf9, 0xf0, 0x7b,
+	0x00, 0x00, 0x00, 0xff, 0xff, 0x07, 0x69, 0x62, 0x9d, 0xa6, 0x06, 0x00, 0x00,
 }

api/events/task.proto

@@ -2,10 +2,10 @@ syntax = "proto3";
 
 package containerd.events;
 
-import "gogoproto/gogo.proto";
+import weak "gogoproto/gogo.proto";
 import "google/protobuf/timestamp.proto";
 import "github.com/containerd/containerd/api/types/mount.proto";
-import "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto";
+import weak "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto";
 
 option go_package = "github.com/containerd/containerd/api/events;events";
 option (containerd.plugin.fieldpath_all) = true;