Bumping k8s dependencies to 1.13

vendor/github.com/gogo/protobuf/vanity/file.go

@@ -179,3 +179,11 @@ func TurnOffGogoImport(file *descriptor.FileDescriptorProto) {
 func TurnOnCompareAll(file *descriptor.FileDescriptorProto) {
 	SetBoolFileOption(gogoproto.E_CompareAll, true)(file)
 }
+
+func TurnOnMessageNameAll(file *descriptor.FileDescriptorProto) {
+	SetBoolFileOption(gogoproto.E_MessagenameAll, true)(file)
+}
+
+func TurnOnGoRegistration(file *descriptor.FileDescriptorProto) {
+	SetBoolFileOption(gogoproto.E_GoprotoRegistration, true)(file)
+}

vendor/github.com/gogo/protobuf/vanity/msg.go

@@ -140,3 +140,7 @@ func TurnOffGoUnrecognized(msg *descriptor.DescriptorProto) {
 func TurnOnCompare(msg *descriptor.DescriptorProto) {
 	SetBoolMessageOption(gogoproto.E_Compare, true)(msg)
 }
+
+func TurnOnMessageName(msg *descriptor.DescriptorProto) {
+	SetBoolMessageOption(gogoproto.E_Messagename, true)(msg)
+}

vendor/github.com/gogo/protobuf/vanity/test/fast/gogovanity.pb.go

@@ -1,15 +1,6 @@
 // Code generated by protoc-gen-gogo. DO NOT EDIT.
 // source: gogovanity.proto
 
-/*
-	Package vanity is a generated protocol buffer package.
-
-	It is generated from these files:
-		gogovanity.proto
-
-	It has these top-level messages:
-		B
-*/
 package vanity
 
 import proto "github.com/gogo/protobuf/proto"
@@ -31,16 +22,46 @@ var _ = math.Inf
 const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package
 
 type B struct {
-	String_          *string `protobuf:"bytes,1,opt,name=String" json:"String,omitempty"`
-	Int64            *int64  `protobuf:"varint,2,opt,name=Int64" json:"Int64,omitempty"`
-	Int32            *int32  `protobuf:"varint,3,opt,name=Int32,def=1234" json:"Int32,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
+	String_              *string  `protobuf:"bytes,1,opt,name=String" json:"String,omitempty"`
+	Int64                *int64   `protobuf:"varint,2,opt,name=Int64" json:"Int64,omitempty"`
+	Int32                *int32   `protobuf:"varint,3,opt,name=Int32,def=1234" json:"Int32,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *B) Reset()                    { *m = B{} }
-func (m *B) String() string            { return proto.CompactTextString(m) }
-func (*B) ProtoMessage()               {}
-func (*B) Descriptor() ([]byte, []int) { return fileDescriptorGogovanity, []int{0} }
+func (m *B) Reset()         { *m = B{} }
+func (m *B) String() string { return proto.CompactTextString(m) }
+func (*B) ProtoMessage()    {}
+func (*B) Descriptor() ([]byte, []int) {
+	return fileDescriptor_gogovanity_77d0a6938d93e1f7, []int{0}
+}
+func (m *B) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *B) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_B.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
+	}
+}
+func (dst *B) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_B.Merge(dst, src)
+}
+func (m *B) XXX_Size() int {
+	return m.Size()
+}
+func (m *B) XXX_DiscardUnknown() {
+	xxx_messageInfo_B.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_B proto.InternalMessageInfo
 
 const Default_B_Int32 int32 = 1234
 
@@ -372,9 +393,9 @@ var (
 	ErrIntOverflowGogovanity   = fmt.Errorf("proto: integer overflow")
 )
 
-func init() { proto.RegisterFile("gogovanity.proto", fileDescriptorGogovanity) }
+func init() { proto.RegisterFile("gogovanity.proto", fileDescriptor_gogovanity_77d0a6938d93e1f7) }
 
-var fileDescriptorGogovanity = []byte{
+var fileDescriptor_gogovanity_77d0a6938d93e1f7 = []byte{
 	// 157 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x48, 0xcf, 0x4f, 0xcf,
 	0x2f, 0x4b, 0xcc, 0xcb, 0x2c, 0xa9, 0xd4, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x83, 0xf0,

vendor/github.com/gogo/protobuf/vanity/test/fast/proto3.pb.go

@@ -1,15 +1,6 @@
 // Code generated by protoc-gen-gogo. DO NOT EDIT.
 // source: proto3.proto
 
-/*
-Package vanity is a generated protocol buffer package.
-
-It is generated from these files:
-	proto3.proto
-
-It has these top-level messages:
-	Aproto3
-*/
 package vanity
 
 import proto "github.com/gogo/protobuf/proto"
@@ -30,13 +21,44 @@ var _ = math.Inf
 const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package
 
 type Aproto3 struct {
-	B string `protobuf:"bytes,1,opt,name=B,proto3" json:"B,omitempty"`
+	B                    string   `protobuf:"bytes,1,opt,name=B,proto3" json:"B,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *Aproto3) Reset()                    { *m = Aproto3{} }
-func (m *Aproto3) String() string            { return proto.CompactTextString(m) }
-func (*Aproto3) ProtoMessage()               {}
-func (*Aproto3) Descriptor() ([]byte, []int) { return fileDescriptorProto3, []int{0} }
+func (m *Aproto3) Reset()         { *m = Aproto3{} }
+func (m *Aproto3) String() string { return proto.CompactTextString(m) }
+func (*Aproto3) ProtoMessage()    {}
+func (*Aproto3) Descriptor() ([]byte, []int) {
+	return fileDescriptor_proto3_7d4345ceecd7203e, []int{0}
+}
+func (m *Aproto3) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *Aproto3) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_Aproto3.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
+	}
+}
+func (dst *Aproto3) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Aproto3.Merge(dst, src)
+}
+func (m *Aproto3) XXX_Size() int {
+	return m.Size()
+}
+func (m *Aproto3) XXX_DiscardUnknown() {
+	xxx_messageInfo_Aproto3.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Aproto3 proto.InternalMessageInfo
 
 func (m *Aproto3) GetB() string {
 	if m != nil {
@@ -69,6 +91,9 @@ func (m *Aproto3) MarshalTo(dAtA []byte) (int, error) {
 		i = encodeVarintProto3(dAtA, i, uint64(len(m.B)))
 		i += copy(dAtA[i:], m.B)
 	}
+	if m.XXX_unrecognized != nil {
+		i += copy(dAtA[i:], m.XXX_unrecognized)
+	}
 	return i, nil
 }
 
@@ -88,6 +113,9 @@ func (m *Aproto3) Size() (n int) {
 	if l > 0 {
 		n += 1 + l + sovProto3(uint64(l))
 	}
+	if m.XXX_unrecognized != nil {
+		n += len(m.XXX_unrecognized)
+	}
 	return n
 }
 
@@ -174,6 +202,7 @@ func (m *Aproto3) Unmarshal(dAtA []byte) error {
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
+			m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...)
 			iNdEx += skippy
 		}
 	}
@@ -288,9 +317,9 @@ var (
 	ErrIntOverflowProto3   = fmt.Errorf("proto: integer overflow")
 )
 
-func init() { proto.RegisterFile("proto3.proto", fileDescriptorProto3) }
+func init() { proto.RegisterFile("proto3.proto", fileDescriptor_proto3_7d4345ceecd7203e) }
 
-var fileDescriptorProto3 = []byte{
+var fileDescriptor_proto3_7d4345ceecd7203e = []byte{
 	// 82 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0x29, 0x28, 0xca, 0x2f,
 	0xc9, 0x37, 0xd6, 0x03, 0x53, 0x42, 0x6c, 0x65, 0x89, 0x79, 0x99, 0x25, 0x95, 0x4a, 0xe2, 0x5c,

vendor/github.com/gogo/protobuf/vanity/test/fast/vanity.pb.go

@@ -1,21 +1,14 @@
 // Code generated by protoc-gen-gogo. DO NOT EDIT.
 // source: vanity.proto
 
-/*
-	Package vanity is a generated protocol buffer package.
-
-	It is generated from these files:
-		vanity.proto
-
-	It has these top-level messages:
-		A
-*/
 package vanity
 
 import proto "github.com/gogo/protobuf/proto"
 import fmt "fmt"
 import math "math"
 
+import github_com_gogo_protobuf_proto "github.com/gogo/protobuf/proto"
+
 import io "io"
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -30,15 +23,45 @@ var _ = math.Inf
 const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package
 
 type A struct {
-	Strings          *string `protobuf:"bytes,1,opt,name=Strings" json:"Strings,omitempty"`
-	Int              *int64  `protobuf:"varint,2,req,name=Int" json:"Int,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
+	Strings              *string  `protobuf:"bytes,1,opt,name=Strings" json:"Strings,omitempty"`
+	Int                  *int64   `protobuf:"varint,2,req,name=Int" json:"Int,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *A) Reset()                    { *m = A{} }
-func (m *A) String() string            { return proto.CompactTextString(m) }
-func (*A) ProtoMessage()               {}
-func (*A) Descriptor() ([]byte, []int) { return fileDescriptorVanity, []int{0} }
+func (m *A) Reset()         { *m = A{} }
+func (m *A) String() string { return proto.CompactTextString(m) }
+func (*A) ProtoMessage()    {}
+func (*A) Descriptor() ([]byte, []int) {
+	return fileDescriptor_vanity_62f5a5ee00b3fc23, []int{0}
+}
+func (m *A) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *A) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_A.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
+	}
+}
+func (dst *A) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_A.Merge(dst, src)
+}
+func (m *A) XXX_Size() int {
+	return m.Size()
+}
+func (m *A) XXX_DiscardUnknown() {
+	xxx_messageInfo_A.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_A proto.InternalMessageInfo
 
 func (m *A) GetStrings() string {
 	if m != nil && m.Strings != nil {
@@ -79,7 +102,7 @@ func (m *A) MarshalTo(dAtA []byte) (int, error) {
 		i += copy(dAtA[i:], *m.Strings)
 	}
 	if m.Int == nil {
-		return 0, proto.NewRequiredNotSetError("Int")
+		return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("Int")
 	} else {
 		dAtA[i] = 0x10
 		i++
@@ -227,7 +250,7 @@ func (m *A) Unmarshal(dAtA []byte) error {
 		}
 	}
 	if hasFields[0]&uint64(0x00000001) == 0 {
-		return proto.NewRequiredNotSetError("Int")
+		return github_com_gogo_protobuf_proto.NewRequiredNotSetError("Int")
 	}
 
 	if iNdEx > l {
@@ -340,9 +363,9 @@ var (
 	ErrIntOverflowVanity   = fmt.Errorf("proto: integer overflow")
 )
 
-func init() { proto.RegisterFile("vanity.proto", fileDescriptorVanity) }
+func init() { proto.RegisterFile("vanity.proto", fileDescriptor_vanity_62f5a5ee00b3fc23) }
 
-var fileDescriptorVanity = []byte{
+var fileDescriptor_vanity_62f5a5ee00b3fc23 = []byte{
 	// 97 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0x29, 0x4b, 0xcc, 0xcb,
 	0x2c, 0xa9, 0xd4, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x83, 0xf0, 0x94, 0xf4, 0xb9, 0x18,

vendor/github.com/gogo/protobuf/vanity/test/faster/gogovanity.pb.go

@@ -1,15 +1,6 @@
 // Code generated by protoc-gen-gogo. DO NOT EDIT.
 // source: gogovanity.proto
 
-/*
-	Package vanity is a generated protocol buffer package.
-
-	It is generated from these files:
-		gogovanity.proto
-
-	It has these top-level messages:
-		B
-*/
 package vanity
 
 import proto "github.com/gogo/protobuf/proto"
@@ -31,15 +22,45 @@ var _ = math.Inf
 const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package
 
 type B struct {
-	String_ *string `protobuf:"bytes,1,opt,name=String" json:"String,omitempty"`
-	Int64   int64   `protobuf:"varint,2,opt,name=Int64" json:"Int64"`
-	Int32   *int32  `protobuf:"varint,3,opt,name=Int32,def=1234" json:"Int32,omitempty"`
+	String_              *string  `protobuf:"bytes,1,opt,name=String" json:"String,omitempty"`
+	Int64                int64    `protobuf:"varint,2,opt,name=Int64" json:"Int64"`
+	Int32                *int32   `protobuf:"varint,3,opt,name=Int32,def=1234" json:"Int32,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *B) Reset()                    { *m = B{} }
-func (m *B) String() string            { return proto.CompactTextString(m) }
-func (*B) ProtoMessage()               {}
-func (*B) Descriptor() ([]byte, []int) { return fileDescriptorGogovanity, []int{0} }
+func (m *B) Reset()         { *m = B{} }
+func (m *B) String() string { return proto.CompactTextString(m) }
+func (*B) ProtoMessage()    {}
+func (*B) Descriptor() ([]byte, []int) {
+	return fileDescriptor_gogovanity_3d56375bbc5ff070, []int{0}
+}
+func (m *B) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *B) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_B.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
+	}
+}
+func (dst *B) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_B.Merge(dst, src)
+}
+func (m *B) XXX_Size() int {
+	return m.Size()
+}
+func (m *B) XXX_DiscardUnknown() {
+	xxx_messageInfo_B.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_B proto.InternalMessageInfo
 
 const Default_B_Int32 int32 = 1234
 
@@ -359,9 +380,9 @@ var (
 	ErrIntOverflowGogovanity   = fmt.Errorf("proto: integer overflow")
 )
 
-func init() { proto.RegisterFile("gogovanity.proto", fileDescriptorGogovanity) }
+func init() { proto.RegisterFile("gogovanity.proto", fileDescriptor_gogovanity_3d56375bbc5ff070) }
 
-var fileDescriptorGogovanity = []byte{
+var fileDescriptor_gogovanity_3d56375bbc5ff070 = []byte{
 	// 163 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x48, 0xcf, 0x4f, 0xcf,
 	0x2f, 0x4b, 0xcc, 0xcb, 0x2c, 0xa9, 0xd4, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x83, 0xf0,

vendor/github.com/gogo/protobuf/vanity/test/faster/proto3.pb.go

@@ -1,15 +1,6 @@
 // Code generated by protoc-gen-gogo. DO NOT EDIT.
 // source: proto3.proto
 
-/*
-Package vanity is a generated protocol buffer package.
-
-It is generated from these files:
-	proto3.proto
-
-It has these top-level messages:
-	Aproto3
-*/
 package vanity
 
 import proto "github.com/gogo/protobuf/proto"
@@ -30,13 +21,43 @@ var _ = math.Inf
 const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package
 
 type Aproto3 struct {
-	B string `protobuf:"bytes,1,opt,name=B,proto3" json:"B,omitempty"`
+	B                    string   `protobuf:"bytes,1,opt,name=B,proto3" json:"B,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *Aproto3) Reset()                    { *m = Aproto3{} }
-func (m *Aproto3) String() string            { return proto.CompactTextString(m) }
-func (*Aproto3) ProtoMessage()               {}
-func (*Aproto3) Descriptor() ([]byte, []int) { return fileDescriptorProto3, []int{0} }
+func (m *Aproto3) Reset()         { *m = Aproto3{} }
+func (m *Aproto3) String() string { return proto.CompactTextString(m) }
+func (*Aproto3) ProtoMessage()    {}
+func (*Aproto3) Descriptor() ([]byte, []int) {
+	return fileDescriptor_proto3_efd1bbd2b7dd033b, []int{0}
+}
+func (m *Aproto3) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *Aproto3) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_Aproto3.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
+	}
+}
+func (dst *Aproto3) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Aproto3.Merge(dst, src)
+}
+func (m *Aproto3) XXX_Size() int {
+	return m.Size()
+}
+func (m *Aproto3) XXX_DiscardUnknown() {
+	xxx_messageInfo_Aproto3.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Aproto3 proto.InternalMessageInfo
 
 func (m *Aproto3) GetB() string {
 	if m != nil {
@@ -288,9 +309,9 @@ var (
 	ErrIntOverflowProto3   = fmt.Errorf("proto: integer overflow")
 )
 
-func init() { proto.RegisterFile("proto3.proto", fileDescriptorProto3) }
+func init() { proto.RegisterFile("proto3.proto", fileDescriptor_proto3_efd1bbd2b7dd033b) }
 
-var fileDescriptorProto3 = []byte{
+var fileDescriptor_proto3_efd1bbd2b7dd033b = []byte{
 	// 87 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0x29, 0x28, 0xca, 0x2f,
 	0xc9, 0x37, 0xd6, 0x03, 0x53, 0x42, 0x6c, 0x65, 0x89, 0x79, 0x99, 0x25, 0x95, 0x4a, 0xe2, 0x5c,

vendor/github.com/gogo/protobuf/vanity/test/faster/vanity.pb.go

@@ -1,15 +1,6 @@
 // Code generated by protoc-gen-gogo. DO NOT EDIT.
 // source: vanity.proto
 
-/*
-	Package vanity is a generated protocol buffer package.
-
-	It is generated from these files:
-		vanity.proto
-
-	It has these top-level messages:
-		A
-*/
 package vanity
 
 import proto "github.com/gogo/protobuf/proto"
@@ -17,6 +8,7 @@ import fmt "fmt"
 import math "math"
 
 import io "io"
+import github_com_gogo_protobuf_proto "github.com/gogo/protobuf/proto"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -30,14 +22,44 @@ var _ = math.Inf
 const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package
 
 type A struct {
-	Strings string `protobuf:"bytes,1,opt,name=Strings" json:"Strings"`
-	Int     int64  `protobuf:"varint,2,req,name=Int" json:"Int"`
+	Strings              string   `protobuf:"bytes,1,opt,name=Strings" json:"Strings"`
+	Int                  int64    `protobuf:"varint,2,req,name=Int" json:"Int"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *A) Reset()                    { *m = A{} }
-func (m *A) String() string            { return proto.CompactTextString(m) }
-func (*A) ProtoMessage()               {}
-func (*A) Descriptor() ([]byte, []int) { return fileDescriptorVanity, []int{0} }
+func (m *A) Reset()         { *m = A{} }
+func (m *A) String() string { return proto.CompactTextString(m) }
+func (*A) ProtoMessage()    {}
+func (*A) Descriptor() ([]byte, []int) {
+	return fileDescriptor_vanity_ee422b61c12e2be7, []int{0}
+}
+func (m *A) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *A) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_A.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
+	}
+}
+func (dst *A) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_A.Merge(dst, src)
+}
+func (m *A) XXX_Size() int {
+	return m.Size()
+}
+func (m *A) XXX_DiscardUnknown() {
+	xxx_messageInfo_A.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_A proto.InternalMessageInfo
 
 func (m *A) GetStrings() string {
 	if m != nil {
@@ -207,7 +229,7 @@ func (m *A) Unmarshal(dAtA []byte) error {
 		}
 	}
 	if hasFields[0]&uint64(0x00000001) == 0 {
-		return proto.NewRequiredNotSetError("Int")
+		return github_com_gogo_protobuf_proto.NewRequiredNotSetError("Int")
 	}
 
 	if iNdEx > l {
@@ -320,9 +342,9 @@ var (
 	ErrIntOverflowVanity   = fmt.Errorf("proto: integer overflow")
 )
 
-func init() { proto.RegisterFile("vanity.proto", fileDescriptorVanity) }
+func init() { proto.RegisterFile("vanity.proto", fileDescriptor_vanity_ee422b61c12e2be7) }
 
-var fileDescriptorVanity = []byte{
+var fileDescriptor_vanity_ee422b61c12e2be7 = []byte{
 	// 109 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0x29, 0x4b, 0xcc, 0xcb,
 	0x2c, 0xa9, 0xd4, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x83, 0xf0, 0x94, 0xac, 0xb9, 0x18,

vendor/github.com/gogo/protobuf/vanity/test/slick/gogovanity.pb.go

@@ -1,15 +1,6 @@
 // Code generated by protoc-gen-gogo. DO NOT EDIT.
 // source: gogovanity.proto
 
-/*
-	Package vanity is a generated protocol buffer package.
-
-	It is generated from these files:
-		gogovanity.proto
-
-	It has these top-level messages:
-		B
-*/
 package vanity
 
 import proto "github.com/gogo/protobuf/proto"
@@ -34,14 +25,44 @@ var _ = math.Inf
 const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package
 
 type B struct {
-	String_ *string `protobuf:"bytes,1,opt,name=String" json:"String,omitempty"`
-	Int64   int64   `protobuf:"varint,2,opt,name=Int64" json:"Int64"`
-	Int32   *int32  `protobuf:"varint,3,opt,name=Int32,def=1234" json:"Int32,omitempty"`
+	String_              *string  `protobuf:"bytes,1,opt,name=String" json:"String,omitempty"`
+	Int64                int64    `protobuf:"varint,2,opt,name=Int64" json:"Int64"`
+	Int32                *int32   `protobuf:"varint,3,opt,name=Int32,def=1234" json:"Int32,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *B) Reset()                    { *m = B{} }
-func (*B) ProtoMessage()               {}
-func (*B) Descriptor() ([]byte, []int) { return fileDescriptorGogovanity, []int{0} }
+func (m *B) Reset()      { *m = B{} }
+func (*B) ProtoMessage() {}
+func (*B) Descriptor() ([]byte, []int) {
+	return fileDescriptor_gogovanity_fc574e04ada47644, []int{0}
+}
+func (m *B) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *B) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_B.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
+	}
+}
+func (dst *B) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_B.Merge(dst, src)
+}
+func (m *B) XXX_Size() int {
+	return m.Size()
+}
+func (m *B) XXX_DiscardUnknown() {
+	xxx_messageInfo_B.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_B proto.InternalMessageInfo
 
 const Default_B_Int32 int32 = 1234
 
@@ -447,9 +468,9 @@ var (
 	ErrIntOverflowGogovanity   = fmt.Errorf("proto: integer overflow")
 )
 
-func init() { proto.RegisterFile("gogovanity.proto", fileDescriptorGogovanity) }
+func init() { proto.RegisterFile("gogovanity.proto", fileDescriptor_gogovanity_fc574e04ada47644) }
 
-var fileDescriptorGogovanity = []byte{
+var fileDescriptor_gogovanity_fc574e04ada47644 = []byte{
 	// 192 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x48, 0xcf, 0x4f, 0xcf,
 	0x2f, 0x4b, 0xcc, 0xcb, 0x2c, 0xa9, 0xd4, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x83, 0xf0,

vendor/github.com/gogo/protobuf/vanity/test/slick/proto3.pb.go

@@ -1,15 +1,6 @@
 // Code generated by protoc-gen-gogo. DO NOT EDIT.
 // source: proto3.proto
 
-/*
-Package vanity is a generated protocol buffer package.
-
-It is generated from these files:
-	proto3.proto
-
-It has these top-level messages:
-	Aproto3
-*/
 package vanity
 
 import proto "github.com/gogo/protobuf/proto"
@@ -33,12 +24,42 @@ var _ = math.Inf
 const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package
 
 type Aproto3 struct {
-	B string `protobuf:"bytes,1,opt,name=B,proto3" json:"B,omitempty"`
+	B                    string   `protobuf:"bytes,1,opt,name=B,proto3" json:"B,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *Aproto3) Reset()                    { *m = Aproto3{} }
-func (*Aproto3) ProtoMessage()               {}
-func (*Aproto3) Descriptor() ([]byte, []int) { return fileDescriptorProto3, []int{0} }
+func (m *Aproto3) Reset()      { *m = Aproto3{} }
+func (*Aproto3) ProtoMessage() {}
+func (*Aproto3) Descriptor() ([]byte, []int) {
+	return fileDescriptor_proto3_5ebceb1b2969522e, []int{0}
+}
+func (m *Aproto3) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *Aproto3) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_Aproto3.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
+	}
+}
+func (dst *Aproto3) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Aproto3.Merge(dst, src)
+}
+func (m *Aproto3) XXX_Size() int {
+	return m.Size()
+}
+func (m *Aproto3) XXX_DiscardUnknown() {
+	xxx_messageInfo_Aproto3.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Aproto3 proto.InternalMessageInfo
 
 func (m *Aproto3) GetB() string {
 	if m != nil {
@@ -350,9 +371,9 @@ var (
 	ErrIntOverflowProto3   = fmt.Errorf("proto: integer overflow")
 )
 
-func init() { proto.RegisterFile("proto3.proto", fileDescriptorProto3) }
+func init() { proto.RegisterFile("proto3.proto", fileDescriptor_proto3_5ebceb1b2969522e) }
 
-var fileDescriptorProto3 = []byte{
+var fileDescriptor_proto3_5ebceb1b2969522e = []byte{
 	// 116 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0x29, 0x28, 0xca, 0x2f,
 	0xc9, 0x37, 0xd6, 0x03, 0x53, 0x42, 0x6c, 0x65, 0x89, 0x79, 0x99, 0x25, 0x95, 0x4a, 0xe2, 0x5c,

vendor/github.com/gogo/protobuf/vanity/test/slick/vanity.pb.go

@@ -1,15 +1,6 @@
 // Code generated by protoc-gen-gogo. DO NOT EDIT.
 // source: vanity.proto
 
-/*
-	Package vanity is a generated protocol buffer package.
-
-	It is generated from these files:
-		vanity.proto
-
-	It has these top-level messages:
-		A
-*/
 package vanity
 
 import proto "github.com/gogo/protobuf/proto"
@@ -20,6 +11,7 @@ import strings "strings"
 import reflect "reflect"
 
 import io "io"
+import github_com_gogo_protobuf_proto "github.com/gogo/protobuf/proto"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -33,13 +25,43 @@ var _ = math.Inf
 const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package
 
 type A struct {
-	Strings string `protobuf:"bytes,1,opt,name=Strings" json:"Strings"`
-	Int     int64  `protobuf:"varint,2,req,name=Int" json:"Int"`
+	Strings              string   `protobuf:"bytes,1,opt,name=Strings" json:"Strings"`
+	Int                  int64    `protobuf:"varint,2,req,name=Int" json:"Int"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *A) Reset()                    { *m = A{} }
-func (*A) ProtoMessage()               {}
-func (*A) Descriptor() ([]byte, []int) { return fileDescriptorVanity, []int{0} }
+func (m *A) Reset()      { *m = A{} }
+func (*A) ProtoMessage() {}
+func (*A) Descriptor() ([]byte, []int) {
+	return fileDescriptor_vanity_a964ed6473033f4a, []int{0}
+}
+func (m *A) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *A) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_A.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
+	}
+}
+func (dst *A) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_A.Merge(dst, src)
+}
+func (m *A) XXX_Size() int {
+	return m.Size()
+}
+func (m *A) XXX_DiscardUnknown() {
+	xxx_messageInfo_A.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_A proto.InternalMessageInfo
 
 func (m *A) GetStrings() string {
 	if m != nil {
@@ -274,7 +296,7 @@ func (m *A) Unmarshal(dAtA []byte) error {
 		}
 	}
 	if hasFields[0]&uint64(0x00000001) == 0 {
-		return proto.NewRequiredNotSetError("Int")
+		return github_com_gogo_protobuf_proto.NewRequiredNotSetError("Int")
 	}
 
 	if iNdEx > l {
@@ -387,9 +409,9 @@ var (
 	ErrIntOverflowVanity   = fmt.Errorf("proto: integer overflow")
 )
 
-func init() { proto.RegisterFile("vanity.proto", fileDescriptorVanity) }
+func init() { proto.RegisterFile("vanity.proto", fileDescriptor_vanity_a964ed6473033f4a) }
 
-var fileDescriptorVanity = []byte{
+var fileDescriptor_vanity_a964ed6473033f4a = []byte{
 	// 138 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0x29, 0x4b, 0xcc, 0xcb,
 	0x2c, 0xa9, 0xd4, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x83, 0xf0, 0x94, 0xac, 0xb9, 0x18,