From 69c0c84348c74749cd1d12ee4e4959991621a59d Mon Sep 17 00:00:00 2001 From: Sida Chen Date: Mon, 8 Oct 2018 14:12:00 -0400 Subject: [PATCH] api: Rename detector type to DType Rename detector type to DType because all reserved key words should be avoided used as type name or variable name. --- api/v3/clairpb/clair.pb.go | 210 +++++++++++++++--------------- api/v3/clairpb/clair.proto | 10 +- api/v3/clairpb/clair.swagger.json | 22 ++-- api/v3/clairpb/convert.go | 8 +- 4 files changed, 125 insertions(+), 125 deletions(-) diff --git a/api/v3/clairpb/clair.pb.go b/api/v3/clairpb/clair.pb.go index b6b2184e..1306dbee 100644 --- a/api/v3/clairpb/clair.pb.go +++ b/api/v3/clairpb/clair.pb.go @@ -50,29 +50,29 @@ var _ = math.Inf // proto package needs to be updated. const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package -type Detector_Type int32 +type Detector_DType int32 const ( - Detector_DETECTOR_TYPE_INVALID Detector_Type = 0 - Detector_DETECTOR_TYPE_NAMESPACE Detector_Type = 1 - Detector_DETECTOR_TYPE_FEATURE Detector_Type = 2 + Detector_DETECTOR_D_TYPE_INVALID Detector_DType = 0 + Detector_DETECTOR_D_TYPE_NAMESPACE Detector_DType = 1 + Detector_DETECTOR_D_TYPE_FEATURE Detector_DType = 2 ) -var Detector_Type_name = map[int32]string{ - 0: "DETECTOR_TYPE_INVALID", - 1: "DETECTOR_TYPE_NAMESPACE", - 2: "DETECTOR_TYPE_FEATURE", +var Detector_DType_name = map[int32]string{ + 0: "DETECTOR_D_TYPE_INVALID", + 1: "DETECTOR_D_TYPE_NAMESPACE", + 2: "DETECTOR_D_TYPE_FEATURE", } -var Detector_Type_value = map[string]int32{ - "DETECTOR_TYPE_INVALID": 0, - "DETECTOR_TYPE_NAMESPACE": 1, - "DETECTOR_TYPE_FEATURE": 2, +var Detector_DType_value = map[string]int32{ + "DETECTOR_D_TYPE_INVALID": 0, + "DETECTOR_D_TYPE_NAMESPACE": 1, + "DETECTOR_D_TYPE_FEATURE": 2, } -func (x Detector_Type) String() string { - return proto.EnumName(Detector_Type_name, int32(x)) +func (x Detector_DType) String() string { + return proto.EnumName(Detector_DType_name, int32(x)) } -func (Detector_Type) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{1, 0} } +func (Detector_DType) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{1, 0} } type Vulnerability struct { // The name of the vulnerability. @@ -162,7 +162,7 @@ type Detector struct { // The version of the detector. Version string `protobuf:"bytes,2,opt,name=version" json:"version,omitempty"` // The type of the detector. - Type Detector_Type `protobuf:"varint,3,opt,name=type,enum=coreos.clair.Detector_Type" json:"type,omitempty"` + Dtype Detector_DType `protobuf:"varint,3,opt,name=dtype,enum=coreos.clair.Detector_DType" json:"dtype,omitempty"` } func (m *Detector) Reset() { *m = Detector{} } @@ -184,11 +184,11 @@ func (m *Detector) GetVersion() string { return "" } -func (m *Detector) GetType() Detector_Type { +func (m *Detector) GetDtype() Detector_DType { if m != nil { - return m.Type + return m.Dtype } - return Detector_DETECTOR_TYPE_INVALID + return Detector_DETECTOR_D_TYPE_INVALID } type Namespace struct { @@ -809,7 +809,7 @@ func init() { proto.RegisterType((*MarkNotificationAsReadResponse)(nil), "coreos.clair.MarkNotificationAsReadResponse") proto.RegisterType((*GetStatusRequest)(nil), "coreos.clair.GetStatusRequest") proto.RegisterType((*GetStatusResponse)(nil), "coreos.clair.GetStatusResponse") - proto.RegisterEnum("coreos.clair.Detector_Type", Detector_Type_name, Detector_Type_value) + proto.RegisterEnum("coreos.clair.Detector_DType", Detector_DType_name, Detector_DType_value) } // Reference imports to suppress errors if they are not otherwise used. @@ -1091,89 +1091,89 @@ var _StatusService_serviceDesc = grpc.ServiceDesc{ func init() { proto.RegisterFile("api/v3/clairpb/clair.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 1334 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x57, 0x4d, 0x6f, 0x1b, 0xc5, - 0x1b, 0xff, 0xaf, 0x13, 0xc7, 0xf6, 0x63, 0x3b, 0x71, 0x27, 0x69, 0xe2, 0x6c, 0xfe, 0x6d, 0x93, - 0x85, 0x8a, 0x52, 0x90, 0x2d, 0xdc, 0x22, 0xb5, 0xe5, 0x80, 0xdc, 0xc4, 0x09, 0x91, 0xda, 0x10, - 0x6d, 0xd2, 0x48, 0x05, 0x21, 0x6b, 0xe2, 0x7d, 0x9c, 0xac, 0xb2, 0xde, 0x5d, 0x76, 0xc7, 0x49, - 0xad, 0xaa, 0x1c, 0xb8, 0x71, 0x43, 0x70, 0xe0, 0xc4, 0x07, 0xe0, 0x82, 0xf8, 0x0e, 0xf0, 0x09, - 0xe0, 0x0a, 0x37, 0x0e, 0x7c, 0x01, 0xee, 0x68, 0x66, 0x67, 0x36, 0xbb, 0xc9, 0x26, 0x71, 0x7b, - 0xf2, 0xcc, 0xf3, 0xfe, 0xf2, 0x9b, 0xe7, 0x59, 0x83, 0x4e, 0x7d, 0xbb, 0x79, 0x7c, 0xaf, 0xd9, - 0x73, 0xa8, 0x1d, 0xf8, 0xfb, 0xd1, 0x6f, 0xc3, 0x0f, 0x3c, 0xe6, 0x91, 0x4a, 0xcf, 0x0b, 0xd0, - 0x0b, 0x1b, 0x82, 0xa6, 0xdf, 0x3a, 0xf0, 0xbc, 0x03, 0x07, 0x9b, 0x82, 0xb7, 0x3f, 0xec, 0x37, - 0x99, 0x3d, 0xc0, 0x90, 0xd1, 0x81, 0x1f, 0x89, 0xeb, 0xff, 0x97, 0x02, 0xdc, 0x22, 0x75, 0x5d, - 0x8f, 0x51, 0x66, 0x7b, 0x6e, 0x18, 0x71, 0x8d, 0x1f, 0x72, 0x50, 0xdd, 0x1b, 0x3a, 0x2e, 0x06, - 0x74, 0xdf, 0x76, 0x6c, 0x36, 0x22, 0x04, 0x26, 0x5d, 0x3a, 0xc0, 0xba, 0xb6, 0xac, 0xdd, 0x29, - 0x99, 0xe2, 0x4c, 0x6e, 0xc3, 0x34, 0xff, 0x0d, 0x7d, 0xda, 0xc3, 0xae, 0xe0, 0xe6, 0x04, 0xb7, - 0x1a, 0x53, 0xb7, 0xb8, 0xd8, 0x32, 0x94, 0x2d, 0x0c, 0x7b, 0x81, 0xed, 0x73, 0x17, 0xf5, 0x09, - 0x21, 0x93, 0x24, 0x71, 0xe3, 0x8e, 0xed, 0x1e, 0xd5, 0x27, 0x23, 0xe3, 0xfc, 0x4c, 0x74, 0x28, - 0x86, 0x78, 0x8c, 0x81, 0xcd, 0x46, 0xf5, 0xbc, 0xa0, 0xc7, 0x77, 0xce, 0x1b, 0x20, 0xa3, 0x16, - 0x65, 0xb4, 0x3e, 0x15, 0xf1, 0xd4, 0x9d, 0x2c, 0x42, 0xb1, 0x6f, 0xbf, 0x40, 0xab, 0xbb, 0x3f, - 0xaa, 0x17, 0x04, 0xaf, 0x20, 0xee, 0x8f, 0x47, 0xe4, 0x31, 0x5c, 0xa3, 0xfd, 0x3e, 0xf6, 0x18, - 0x5a, 0xdd, 0x63, 0x0c, 0x42, 0x9e, 0x70, 0xbd, 0xb8, 0x3c, 0x71, 0xa7, 0xdc, 0xba, 0xde, 0x48, - 0x96, 0xaf, 0xb1, 0x8e, 0x94, 0x0d, 0x03, 0x34, 0x6b, 0x4a, 0x7e, 0x4f, 0x8a, 0x1b, 0xbf, 0x69, - 0x50, 0x5c, 0x43, 0x86, 0x3d, 0xe6, 0x05, 0x99, 0x45, 0xa9, 0x43, 0x41, 0xda, 0x96, 0xd5, 0x50, - 0x57, 0xd2, 0x84, 0x49, 0x36, 0xf2, 0x51, 0x14, 0x60, 0xba, 0xb5, 0x94, 0xf6, 0xa8, 0x6c, 0x36, - 0x76, 0x47, 0x3e, 0x9a, 0x42, 0xd0, 0x78, 0x0e, 0x93, 0xfc, 0x46, 0x16, 0xe1, 0xfa, 0x5a, 0x67, - 0xb7, 0xb3, 0xba, 0xfb, 0xa9, 0xd9, 0xdd, 0x7d, 0xbe, 0xdd, 0xe9, 0x6e, 0x6e, 0xed, 0xb5, 0x9f, - 0x6c, 0xae, 0xd5, 0xfe, 0x47, 0x96, 0x60, 0x21, 0xcd, 0xda, 0x6a, 0x3f, 0xed, 0xec, 0x6c, 0xb7, - 0x57, 0x3b, 0x35, 0xed, 0xbc, 0xde, 0x7a, 0xa7, 0xbd, 0xfb, 0xcc, 0xec, 0xd4, 0x72, 0xc6, 0x0e, - 0x94, 0xb6, 0x54, 0x93, 0x32, 0xd3, 0x68, 0x41, 0xd1, 0x92, 0x21, 0x89, 0x3c, 0xca, 0xad, 0xf9, - 0xec, 0x80, 0xcd, 0x58, 0xce, 0xf8, 0x36, 0x07, 0x05, 0x59, 0xb9, 0x4c, 0x9b, 0x1f, 0x42, 0x29, - 0x46, 0x86, 0x34, 0xba, 0x90, 0x36, 0x1a, 0xc7, 0x64, 0x9e, 0x4a, 0x26, 0x2b, 0x3a, 0x91, 0xae, - 0xe8, 0x6d, 0x98, 0x96, 0xc7, 0x6e, 0xdf, 0x0b, 0x06, 0x94, 0x49, 0x04, 0x55, 0x25, 0x75, 0x5d, - 0x10, 0x53, 0xb9, 0xe4, 0xc7, 0xcb, 0x85, 0x74, 0x60, 0xe6, 0x38, 0xf1, 0x00, 0x6c, 0x0c, 0xeb, - 0x53, 0x02, 0x29, 0x67, 0xfa, 0x96, 0x7a, 0x25, 0xe6, 0x59, 0x1d, 0x63, 0x09, 0xf2, 0x4f, 0xe8, - 0x08, 0x05, 0x54, 0x0e, 0x69, 0x78, 0xa8, 0xea, 0xc1, 0xcf, 0xc6, 0x37, 0x1a, 0x94, 0x57, 0xb9, - 0x95, 0x1d, 0x46, 0xd9, 0x30, 0x24, 0xf7, 0xa1, 0xa4, 0xfc, 0x87, 0x75, 0x4d, 0x78, 0xbb, 0x28, - 0xd0, 0x53, 0x41, 0xb2, 0x06, 0x35, 0x87, 0x86, 0xac, 0x3b, 0xf4, 0x2d, 0xca, 0xb0, 0xcb, 0x1f, - 0xba, 0x2c, 0xae, 0xde, 0x88, 0x1e, 0x79, 0x43, 0x4d, 0x81, 0xc6, 0xae, 0x9a, 0x02, 0xe6, 0x34, - 0xd7, 0x79, 0x26, 0x54, 0x38, 0xd1, 0x78, 0x08, 0x64, 0x03, 0x59, 0xdb, 0xed, 0x61, 0xc8, 0x82, - 0x91, 0x89, 0x5f, 0x0e, 0x31, 0x64, 0xe4, 0x2d, 0xa8, 0x52, 0x49, 0xea, 0x26, 0xda, 0x59, 0x51, - 0x44, 0xde, 0x2f, 0xe3, 0x97, 0x09, 0x98, 0x4d, 0xe9, 0x86, 0xbe, 0xe7, 0x86, 0x48, 0xd6, 0xa1, - 0xa8, 0xe4, 0x84, 0x5e, 0xb9, 0x75, 0x37, 0x9d, 0x4d, 0x86, 0x52, 0x23, 0x26, 0xc4, 0xba, 0xe4, - 0x03, 0x98, 0x0a, 0x45, 0x81, 0x64, 0x5a, 0x8b, 0x69, 0x2b, 0x89, 0x0a, 0x9a, 0x52, 0x50, 0xff, - 0x0a, 0xaa, 0xca, 0x50, 0x54, 0xfe, 0x77, 0x21, 0xef, 0xf0, 0x83, 0x0c, 0x64, 0x36, 0x6d, 0x42, - 0xc8, 0x98, 0x91, 0x04, 0x9f, 0x12, 0x51, 0x71, 0xd1, 0xea, 0xf6, 0x23, 0x34, 0x73, 0xcf, 0x97, - 0x4d, 0x09, 0x25, 0x2f, 0x09, 0xa1, 0xfe, 0xa3, 0x06, 0x45, 0x15, 0x40, 0xe6, 0x53, 0x48, 0xb5, - 0x3a, 0x37, 0x6e, 0xab, 0x37, 0x60, 0x4a, 0xc4, 0x18, 0xd6, 0x27, 0x84, 0x4a, 0x73, 0xfc, 0x7a, - 0x46, 0x29, 0x4a, 0x75, 0xe3, 0xaf, 0x1c, 0xcc, 0x6e, 0x7b, 0xe1, 0x1b, 0xf5, 0x9b, 0xcc, 0xc3, - 0x94, 0x7c, 0x6d, 0xd1, 0x80, 0x93, 0x37, 0xb2, 0x7a, 0x26, 0xba, 0xf7, 0xd2, 0xd1, 0x65, 0xf8, - 0x13, 0xb4, 0x54, 0x64, 0xfa, 0xaf, 0x1a, 0x94, 0x62, 0x6a, 0xd6, 0xab, 0xe1, 0x34, 0x9f, 0xb2, - 0x43, 0xe9, 0x5c, 0x9c, 0x89, 0x09, 0x85, 0x43, 0xa4, 0xd6, 0xa9, 0xef, 0x07, 0xaf, 0xe1, 0xbb, - 0xf1, 0x49, 0xa4, 0xda, 0x71, 0x39, 0x57, 0x19, 0xd2, 0x1f, 0x41, 0x25, 0xc9, 0x20, 0x35, 0x98, - 0x38, 0xc2, 0x91, 0x0c, 0x85, 0x1f, 0xc9, 0x1c, 0xe4, 0x8f, 0xa9, 0x33, 0x54, 0x6b, 0x2f, 0xba, - 0x3c, 0xca, 0x3d, 0xd0, 0x8c, 0x4d, 0x98, 0x4b, 0xbb, 0x94, 0x4f, 0xe2, 0x14, 0xca, 0xda, 0x98, - 0x50, 0x36, 0x7e, 0xd6, 0x60, 0x7e, 0x03, 0xd9, 0x96, 0xc7, 0xec, 0xbe, 0xdd, 0x13, 0x5b, 0x5a, - 0x75, 0xeb, 0x3e, 0xcc, 0x7b, 0x8e, 0xd5, 0x4d, 0xce, 0x9c, 0x51, 0xd7, 0xa7, 0x07, 0xaa, 0x6d, - 0x73, 0x9e, 0x63, 0xa5, 0xe6, 0xd3, 0x36, 0x3d, 0xe0, 0xd0, 0x9b, 0x77, 0xf1, 0x24, 0x4b, 0x2b, - 0x4a, 0x63, 0xce, 0xc5, 0x93, 0xf3, 0x5a, 0x73, 0x90, 0x77, 0xec, 0x81, 0xcd, 0xc4, 0x08, 0xce, - 0x9b, 0xd1, 0x25, 0x86, 0xf6, 0xe4, 0x29, 0xb4, 0x8d, 0x3f, 0x73, 0xb0, 0x70, 0x2e, 0x60, 0x99, - 0xff, 0x1e, 0x54, 0xdc, 0x04, 0x5d, 0x56, 0xa1, 0x75, 0x0e, 0xc6, 0x59, 0xca, 0x8d, 0x14, 0x31, - 0x65, 0x47, 0xff, 0x47, 0x83, 0x4a, 0x92, 0x7d, 0xd1, 0x66, 0xee, 0x05, 0x48, 0x19, 0x5a, 0x6a, - 0x33, 0xcb, 0x2b, 0xff, 0x9e, 0x88, 0xcc, 0xa1, 0x25, 0x57, 0x4c, 0x7c, 0xe7, 0x5a, 0x16, 0x3a, - 0xc8, 0xb5, 0xa2, 0x2c, 0xd5, 0x95, 0x3c, 0x84, 0x09, 0xcf, 0xb1, 0xe4, 0x46, 0x79, 0xe7, 0x0c, - 0xe0, 0xe8, 0x01, 0xc6, 0xb5, 0x77, 0x50, 0x02, 0xc1, 0xc6, 0xd0, 0xe4, 0x3a, 0x5c, 0xd5, 0xc5, - 0x13, 0xf1, 0xed, 0xf2, 0x3a, 0xaa, 0x2e, 0x9e, 0x18, 0xbf, 0xe7, 0x60, 0xf1, 0x42, 0x11, 0xb2, - 0x02, 0x95, 0xde, 0x30, 0x08, 0xd0, 0x65, 0x49, 0x20, 0x94, 0x25, 0x4d, 0x74, 0x72, 0x09, 0x4a, - 0x2e, 0xbe, 0x60, 0xc9, 0x96, 0x17, 0x39, 0xe1, 0x92, 0x36, 0xb7, 0xa1, 0x9a, 0x82, 0x8b, 0xa8, - 0xc4, 0x15, 0xab, 0x30, 0xad, 0x41, 0x3e, 0x07, 0xa0, 0x71, 0x98, 0xf5, 0xbc, 0x78, 0xa4, 0x1f, - 0x8d, 0x99, 0x78, 0x63, 0xd3, 0xb5, 0xf0, 0x05, 0x5a, 0xed, 0xc4, 0x14, 0x32, 0x13, 0xe6, 0xf4, - 0x8f, 0x61, 0x36, 0x43, 0x84, 0x27, 0x63, 0x73, 0xb2, 0xa8, 0x42, 0xde, 0x8c, 0x2e, 0x31, 0x34, - 0x72, 0x09, 0xcc, 0xde, 0x83, 0x1b, 0x4f, 0x69, 0x70, 0x94, 0x84, 0x50, 0x3b, 0x34, 0x91, 0x5a, - 0xea, 0xa9, 0x65, 0xe0, 0xc9, 0x58, 0x86, 0x9b, 0x17, 0x29, 0x45, 0x88, 0x35, 0x08, 0xd4, 0x36, - 0x90, 0xc9, 0x07, 0x1d, 0x59, 0x32, 0xd6, 0xe1, 0x5a, 0x82, 0xf6, 0xc6, 0x73, 0xa1, 0xf5, 0xaf, - 0x06, 0x33, 0x2a, 0xdb, 0x1d, 0x0c, 0x8e, 0xed, 0x1e, 0x92, 0x21, 0x94, 0x13, 0x3b, 0x80, 0x2c, - 0x5f, 0xb2, 0x1e, 0x44, 0x30, 0xfa, 0xca, 0x95, 0x0b, 0xc4, 0x58, 0xf9, 0xfa, 0x8f, 0xbf, 0xbf, - 0xcf, 0x2d, 0x91, 0xc5, 0xa6, 0x5a, 0x02, 0xcd, 0x97, 0xa9, 0x1d, 0xf1, 0x8a, 0x1c, 0x41, 0x25, - 0x39, 0xed, 0xc8, 0xca, 0x95, 0xc3, 0x57, 0x37, 0x2e, 0x13, 0x91, 0x9e, 0xe7, 0x84, 0xe7, 0x69, - 0xa3, 0x14, 0x7b, 0x7e, 0xa4, 0xdd, 0x6d, 0xfd, 0x94, 0x83, 0xd9, 0x64, 0xc9, 0x55, 0xee, 0xaf, - 0x60, 0xe6, 0xcc, 0xe0, 0x20, 0x6f, 0x5f, 0x31, 0x57, 0xa2, 0x50, 0x6e, 0x8f, 0x35, 0x7d, 0x8c, - 0x1b, 0x22, 0x9a, 0x05, 0x72, 0xbd, 0x99, 0x9c, 0x3c, 0x61, 0xf3, 0x65, 0x54, 0x83, 0xef, 0x34, - 0x98, 0xcf, 0x46, 0x03, 0x39, 0xb3, 0x07, 0x2f, 0x05, 0x9a, 0xfe, 0xfe, 0x78, 0xc2, 0xe9, 0xa0, - 0xee, 0x66, 0x07, 0xd5, 0x72, 0xa1, 0x1a, 0xa1, 0x46, 0x15, 0xe9, 0x0b, 0x28, 0xc5, 0xe0, 0x23, - 0x37, 0xcf, 0x25, 0x9e, 0x42, 0xaa, 0x7e, 0xeb, 0x42, 0xbe, 0xf4, 0x3e, 0x23, 0xbc, 0x97, 0x48, - 0xa1, 0x19, 0x61, 0xf2, 0xf1, 0x4d, 0x98, 0xed, 0x79, 0x83, 0xb4, 0x9a, 0xbf, 0xff, 0x59, 0x41, - 0xfe, 0x5f, 0xdd, 0x9f, 0x12, 0x1f, 0xa2, 0xf7, 0xfe, 0x0b, 0x00, 0x00, 0xff, 0xff, 0x9f, 0xd1, - 0xa1, 0x1f, 0xc8, 0x0e, 0x00, 0x00, + // 1336 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x57, 0x4b, 0x6f, 0x1b, 0x55, + 0x14, 0x66, 0x9c, 0x3a, 0xb6, 0x8f, 0xed, 0xc4, 0xbd, 0x49, 0x13, 0x67, 0xd2, 0x47, 0x32, 0x50, + 0x51, 0x0a, 0xb2, 0x85, 0x5b, 0xa4, 0xb6, 0x2c, 0x90, 0x9b, 0x38, 0x21, 0x52, 0x1b, 0xa2, 0x49, + 0x1a, 0x09, 0x10, 0x32, 0x37, 0x9e, 0xe3, 0x64, 0x94, 0xf1, 0xcc, 0x30, 0x73, 0x9d, 0xd4, 0xaa, + 0xca, 0x82, 0x1d, 0x3b, 0x04, 0x0b, 0x56, 0xfc, 0x00, 0x36, 0x88, 0xff, 0xc0, 0x9e, 0x05, 0x6c, + 0x61, 0xc7, 0x82, 0x3f, 0xc0, 0x1e, 0xdd, 0xc7, 0x4c, 0x66, 0x92, 0x49, 0xe2, 0x76, 0xe5, 0x7b, + 0xde, 0x8f, 0xfb, 0xdd, 0x73, 0xc6, 0xa0, 0x53, 0xdf, 0x6e, 0x1e, 0xdd, 0x6b, 0xf6, 0x1c, 0x6a, + 0x07, 0xfe, 0x9e, 0xfc, 0x6d, 0xf8, 0x81, 0xc7, 0x3c, 0x52, 0xe9, 0x79, 0x01, 0x7a, 0x61, 0x43, + 0xf0, 0xf4, 0x5b, 0xfb, 0x9e, 0xb7, 0xef, 0x60, 0x53, 0xc8, 0xf6, 0x86, 0xfd, 0x26, 0xb3, 0x07, + 0x18, 0x32, 0x3a, 0xf0, 0xa5, 0xba, 0x7e, 0x5d, 0x29, 0x70, 0x8f, 0xd4, 0x75, 0x3d, 0x46, 0x99, + 0xed, 0xb9, 0xa1, 0x94, 0x1a, 0x3f, 0xe6, 0xa0, 0xba, 0x3b, 0x74, 0x5c, 0x0c, 0xe8, 0x9e, 0xed, + 0xd8, 0x6c, 0x44, 0x08, 0x5c, 0x71, 0xe9, 0x00, 0xeb, 0xda, 0x92, 0x76, 0xa7, 0x64, 0x8a, 0x33, + 0xb9, 0x0d, 0x53, 0xfc, 0x37, 0xf4, 0x69, 0x0f, 0xbb, 0x42, 0x9a, 0x13, 0xd2, 0x6a, 0xcc, 0xdd, + 0xe4, 0x6a, 0x4b, 0x50, 0xb6, 0x30, 0xec, 0x05, 0xb6, 0xcf, 0x43, 0xd4, 0x27, 0x84, 0x4e, 0x92, + 0xc5, 0x9d, 0x3b, 0xb6, 0x7b, 0x58, 0xbf, 0x22, 0x9d, 0xf3, 0x33, 0xd1, 0xa1, 0x18, 0xe2, 0x11, + 0x06, 0x36, 0x1b, 0xd5, 0xf3, 0x82, 0x1f, 0xd3, 0x5c, 0x36, 0x40, 0x46, 0x2d, 0xca, 0x68, 0x7d, + 0x52, 0xca, 0x22, 0x9a, 0x2c, 0x40, 0xb1, 0x6f, 0x3f, 0x47, 0xab, 0xbb, 0x37, 0xaa, 0x17, 0x84, + 0xac, 0x20, 0xe8, 0xc7, 0x23, 0xf2, 0x18, 0xae, 0xd2, 0x7e, 0x1f, 0x7b, 0x0c, 0xad, 0xee, 0x11, + 0x06, 0x21, 0x2f, 0xb8, 0x5e, 0x5c, 0x9a, 0xb8, 0x53, 0x6e, 0x5d, 0x6b, 0x24, 0xdb, 0xd7, 0x58, + 0x43, 0xca, 0x86, 0x01, 0x9a, 0xb5, 0x48, 0x7f, 0x57, 0xa9, 0x1b, 0xbf, 0x6b, 0x50, 0x5c, 0x45, + 0x86, 0x3d, 0xe6, 0x05, 0x99, 0x4d, 0xa9, 0x43, 0x41, 0xf9, 0x56, 0xdd, 0x88, 0x48, 0xd2, 0x82, + 0xbc, 0xc5, 0x46, 0x3e, 0x8a, 0x0e, 0x4c, 0xb5, 0xae, 0xa7, 0x43, 0x46, 0x4e, 0x1b, 0xab, 0x3b, + 0x23, 0x1f, 0x4d, 0xa9, 0x6a, 0x7c, 0x09, 0x79, 0x41, 0x93, 0x45, 0x98, 0x5f, 0xed, 0xec, 0x74, + 0x56, 0x76, 0x3e, 0x31, 0xbb, 0xab, 0xdd, 0x9d, 0x4f, 0xb7, 0x3a, 0xdd, 0x8d, 0xcd, 0xdd, 0xf6, + 0x93, 0x8d, 0xd5, 0xda, 0x1b, 0xe4, 0x06, 0x2c, 0x9c, 0x16, 0x6e, 0xb6, 0x9f, 0x76, 0xb6, 0xb7, + 0xda, 0x2b, 0x9d, 0x9a, 0x96, 0x65, 0xbb, 0xd6, 0x69, 0xef, 0x3c, 0x33, 0x3b, 0xb5, 0x9c, 0xb1, + 0x0d, 0xa5, 0xcd, 0xe8, 0xba, 0x32, 0x0b, 0x6a, 0x41, 0xd1, 0x52, 0xb9, 0x89, 0x8a, 0xca, 0xad, + 0xb9, 0xec, 0xcc, 0xcd, 0x58, 0xcf, 0xf8, 0x2e, 0x07, 0x05, 0xd5, 0xc3, 0x4c, 0x9f, 0x1f, 0x40, + 0x29, 0xc6, 0x88, 0x72, 0x3a, 0x9f, 0x76, 0x1a, 0xe7, 0x64, 0x9e, 0x68, 0x26, 0x7b, 0x3b, 0x91, + 0xee, 0xed, 0x6d, 0x98, 0x52, 0xc7, 0x6e, 0xdf, 0x0b, 0x06, 0x94, 0x29, 0x2c, 0x55, 0x15, 0x77, + 0x4d, 0x30, 0x53, 0xb5, 0xe4, 0xc7, 0xab, 0x85, 0x74, 0x60, 0xfa, 0x28, 0xf1, 0x14, 0x6c, 0x0c, + 0xeb, 0x93, 0x02, 0x33, 0x8b, 0x69, 0xd3, 0xd4, 0x7b, 0x31, 0x4f, 0xdb, 0x18, 0x8b, 0x90, 0x7f, + 0x42, 0x47, 0x28, 0x40, 0x73, 0x40, 0xc3, 0x83, 0xa8, 0x1f, 0xfc, 0x6c, 0x7c, 0xab, 0x41, 0x79, + 0x85, 0x7b, 0xd9, 0x66, 0x94, 0x0d, 0x43, 0x72, 0x1f, 0x4a, 0x51, 0xfc, 0xb0, 0xae, 0x89, 0x68, + 0xe7, 0x25, 0x7a, 0xa2, 0x48, 0x56, 0xa1, 0xe6, 0xd0, 0x90, 0x75, 0x87, 0xbe, 0x45, 0x19, 0x76, + 0xf9, 0x93, 0x57, 0xcd, 0xd5, 0x1b, 0xf2, 0xb9, 0x37, 0xa2, 0x79, 0xd0, 0xd8, 0x89, 0xe6, 0x81, + 0x39, 0xc5, 0x6d, 0x9e, 0x09, 0x13, 0xce, 0x34, 0x1e, 0x02, 0x59, 0x47, 0xd6, 0x76, 0x7b, 0x18, + 0xb2, 0x60, 0x64, 0xe2, 0x57, 0x43, 0x0c, 0x19, 0x79, 0x13, 0xaa, 0x54, 0xb1, 0xba, 0x89, 0xeb, + 0xac, 0x44, 0x4c, 0x7e, 0x5f, 0xc6, 0xaf, 0x13, 0x30, 0x93, 0xb2, 0x0d, 0x7d, 0xcf, 0x0d, 0x91, + 0xac, 0x41, 0x31, 0xd2, 0x13, 0x76, 0xe5, 0xd6, 0xdd, 0x74, 0x35, 0x19, 0x46, 0x8d, 0x98, 0x11, + 0xdb, 0x92, 0xf7, 0x61, 0x32, 0x14, 0x0d, 0x52, 0x65, 0x2d, 0xa4, 0xbd, 0x24, 0x3a, 0x68, 0x2a, + 0x45, 0xfd, 0x6b, 0xa8, 0x46, 0x8e, 0x64, 0xfb, 0xdf, 0x81, 0xbc, 0xc3, 0x0f, 0x2a, 0x91, 0x99, + 0xb4, 0x0b, 0xa1, 0x63, 0x4a, 0x0d, 0x3e, 0x2f, 0x64, 0x73, 0xd1, 0xea, 0xf6, 0x25, 0x9a, 0x79, + 0xe4, 0x8b, 0xe6, 0x45, 0xa4, 0xaf, 0x18, 0xa1, 0xfe, 0x93, 0x06, 0xc5, 0x28, 0x81, 0xcc, 0xa7, + 0x90, 0xba, 0xea, 0xdc, 0xb8, 0x57, 0xbd, 0x0e, 0x93, 0x22, 0xc7, 0xb0, 0x3e, 0x21, 0x4c, 0x9a, + 0xe3, 0xf7, 0x53, 0x96, 0xa8, 0xcc, 0x8d, 0xbf, 0x73, 0x30, 0xb3, 0xe5, 0x85, 0xaf, 0x75, 0xdf, + 0x64, 0x0e, 0x26, 0xd5, 0x6b, 0x93, 0xa3, 0x4e, 0x51, 0x64, 0xe5, 0x54, 0x76, 0xef, 0xa6, 0xb3, + 0xcb, 0x88, 0x27, 0x78, 0xa9, 0xcc, 0xf4, 0xdf, 0x34, 0x28, 0xc5, 0xdc, 0xac, 0x57, 0xc3, 0x79, + 0x3e, 0x65, 0x07, 0x2a, 0xb8, 0x38, 0x13, 0x13, 0x0a, 0x07, 0x48, 0xad, 0x93, 0xd8, 0x0f, 0x5e, + 0x21, 0x76, 0xe3, 0x63, 0x69, 0xda, 0x71, 0xb9, 0x34, 0x72, 0xa4, 0x3f, 0x82, 0x4a, 0x52, 0x40, + 0x6a, 0x30, 0x71, 0x88, 0x23, 0x95, 0x0a, 0x3f, 0x92, 0x59, 0xc8, 0x1f, 0x51, 0x67, 0x18, 0x2d, + 0x40, 0x49, 0x3c, 0xca, 0x3d, 0xd0, 0x8c, 0x0d, 0x98, 0x4d, 0x87, 0x54, 0x4f, 0xe2, 0x04, 0xca, + 0xda, 0x98, 0x50, 0x36, 0x7e, 0xd1, 0x60, 0x6e, 0x1d, 0xd9, 0xa6, 0xc7, 0xec, 0xbe, 0xdd, 0x13, + 0xfb, 0x3a, 0xba, 0xad, 0xfb, 0x30, 0xe7, 0x39, 0x56, 0x37, 0x39, 0x73, 0x46, 0x5d, 0x9f, 0xee, + 0x47, 0xd7, 0x36, 0xeb, 0x39, 0x56, 0x6a, 0x3e, 0x6d, 0xd1, 0x7d, 0x0e, 0xbd, 0x39, 0x17, 0x8f, + 0xb3, 0xac, 0x64, 0x19, 0xb3, 0x2e, 0x1e, 0x9f, 0xb5, 0x9a, 0x85, 0xbc, 0x63, 0x0f, 0x6c, 0x26, + 0x46, 0x70, 0xde, 0x94, 0x44, 0x0c, 0xed, 0x2b, 0x27, 0xd0, 0x36, 0xfe, 0xca, 0xc1, 0xfc, 0x99, + 0x84, 0x55, 0xfd, 0xbb, 0x50, 0x71, 0x13, 0x7c, 0xd5, 0x85, 0xd6, 0x19, 0x18, 0x67, 0x19, 0x37, + 0x52, 0xcc, 0x94, 0x1f, 0xfd, 0x5f, 0x0d, 0x2a, 0x49, 0xf1, 0x79, 0x3b, 0xba, 0x17, 0x20, 0x65, + 0x68, 0x45, 0x3b, 0x5a, 0x91, 0xfc, 0xcb, 0x42, 0xba, 0x43, 0x4b, 0xad, 0x98, 0x98, 0xe6, 0x56, + 0x16, 0x3a, 0xc8, 0xad, 0x64, 0x95, 0x11, 0x49, 0x1e, 0xc2, 0x84, 0xe7, 0x58, 0x6a, 0xa3, 0xbc, + 0x7d, 0x0a, 0x70, 0x74, 0x1f, 0xe3, 0xde, 0x3b, 0xa8, 0x80, 0x60, 0x63, 0x68, 0x72, 0x1b, 0x6e, + 0xea, 0xe2, 0xb1, 0xf8, 0x8a, 0x79, 0x15, 0x53, 0x17, 0x8f, 0x8d, 0x3f, 0x72, 0xb0, 0x70, 0xae, + 0x0a, 0x59, 0x86, 0x4a, 0x6f, 0x18, 0x04, 0xe8, 0xb2, 0x24, 0x10, 0xca, 0x8a, 0x27, 0x6e, 0x72, + 0x11, 0x4a, 0x2e, 0x3e, 0x67, 0xc9, 0x2b, 0x2f, 0x72, 0xc6, 0x05, 0xd7, 0xdc, 0x86, 0x6a, 0x0a, + 0x2e, 0xa2, 0x13, 0x97, 0xac, 0xc2, 0xb4, 0x05, 0xf9, 0x1c, 0x80, 0xc6, 0x69, 0xd6, 0xf3, 0xe2, + 0x91, 0x7e, 0x38, 0x66, 0xe1, 0x8d, 0x0d, 0xd7, 0xc2, 0xe7, 0x68, 0xb5, 0x13, 0x53, 0xc8, 0x4c, + 0xb8, 0xd3, 0x3f, 0x82, 0x99, 0x0c, 0x15, 0x5e, 0x8c, 0xcd, 0xd9, 0xa2, 0x0b, 0x79, 0x53, 0x12, + 0x31, 0x34, 0x72, 0x09, 0xcc, 0xde, 0x83, 0x1b, 0x4f, 0x69, 0x70, 0x98, 0x84, 0x50, 0x3b, 0x34, + 0x91, 0x5a, 0xd1, 0x53, 0xcb, 0xc0, 0x93, 0xb1, 0x04, 0x37, 0xcf, 0x33, 0x92, 0x88, 0x35, 0x08, + 0xd4, 0xd6, 0x91, 0xa9, 0x07, 0x2d, 0x3d, 0x19, 0x6b, 0x70, 0x35, 0xc1, 0x7b, 0xed, 0xb9, 0xd0, + 0xfa, 0x4f, 0x83, 0xe9, 0xa8, 0xda, 0x6d, 0x0c, 0x8e, 0xec, 0x1e, 0x92, 0x21, 0x94, 0x13, 0x3b, + 0x80, 0x2c, 0x5d, 0xb0, 0x1e, 0x44, 0x32, 0xfa, 0xf2, 0xa5, 0x0b, 0xc4, 0x58, 0xfe, 0xe6, 0xcf, + 0x7f, 0x7e, 0xc8, 0x2d, 0x92, 0x85, 0x66, 0xb4, 0x04, 0x9a, 0x2f, 0x52, 0x3b, 0xe2, 0x25, 0x39, + 0x84, 0x4a, 0x72, 0xda, 0x91, 0xe5, 0x4b, 0x87, 0xaf, 0x6e, 0x5c, 0xa4, 0xa2, 0x22, 0xcf, 0x8a, + 0xc8, 0x53, 0x46, 0x29, 0x8e, 0xfc, 0x48, 0xbb, 0xdb, 0xfa, 0x39, 0x07, 0x33, 0xc9, 0x96, 0x47, + 0xb5, 0xbf, 0x84, 0xe9, 0x53, 0x83, 0x83, 0xbc, 0x75, 0xc9, 0x5c, 0x91, 0xa9, 0xdc, 0x1e, 0x6b, + 0xfa, 0x18, 0x37, 0x44, 0x36, 0xf3, 0xe4, 0x5a, 0x33, 0x39, 0x79, 0xc2, 0xe6, 0x0b, 0xd9, 0x83, + 0xef, 0x35, 0x98, 0xcb, 0x46, 0x03, 0x39, 0xb5, 0x07, 0x2f, 0x04, 0x9a, 0xfe, 0xde, 0x78, 0xca, + 0xe9, 0xa4, 0xee, 0x66, 0x27, 0xd5, 0x72, 0xa1, 0x2a, 0x51, 0x13, 0x35, 0xe9, 0x0b, 0x28, 0xc5, + 0xe0, 0x23, 0x37, 0xcf, 0x14, 0x9e, 0x42, 0xaa, 0x7e, 0xeb, 0x5c, 0xb9, 0x8a, 0x3e, 0x2d, 0xa2, + 0x97, 0x48, 0xa1, 0x29, 0x31, 0xf9, 0xf8, 0x26, 0xcc, 0xf4, 0xbc, 0x41, 0xda, 0xcc, 0xdf, 0xfb, + 0xac, 0xa0, 0xfe, 0xb9, 0xee, 0x4d, 0x8a, 0x0f, 0xd1, 0x7b, 0xff, 0x07, 0x00, 0x00, 0xff, 0xff, + 0xcb, 0x5c, 0xce, 0x34, 0xd2, 0x0e, 0x00, 0x00, } diff --git a/api/v3/clairpb/clair.proto b/api/v3/clairpb/clair.proto index f8545cff..015ab3ac 100644 --- a/api/v3/clairpb/clair.proto +++ b/api/v3/clairpb/clair.proto @@ -45,17 +45,17 @@ message Vulnerability { } message Detector { - enum Type { - DETECTOR_TYPE_INVALID = 0; - DETECTOR_TYPE_NAMESPACE = 1; - DETECTOR_TYPE_FEATURE = 2; + enum DType { + DETECTOR_D_TYPE_INVALID = 0; + DETECTOR_D_TYPE_NAMESPACE = 1; + DETECTOR_D_TYPE_FEATURE = 2; } // The name of the detector. string name = 1; // The version of the detector. string version = 2; // The type of the detector. - Type type = 3; + DType dtype = 3; } message Namespace { diff --git a/api/v3/clairpb/clair.swagger.json b/api/v3/clairpb/clair.swagger.json index a967092f..19396b43 100644 --- a/api/v3/clairpb/clair.swagger.json +++ b/api/v3/clairpb/clair.swagger.json @@ -156,6 +156,15 @@ } }, "definitions": { + "DetectorDType": { + "type": "string", + "enum": [ + "DETECTOR_D_TYPE_INVALID", + "DETECTOR_D_TYPE_NAMESPACE", + "DETECTOR_D_TYPE_FEATURE" + ], + "default": "DETECTOR_D_TYPE_INVALID" + }, "GetAncestryResponseAncestry": { "type": "object", "properties": { @@ -286,21 +295,12 @@ "type": "string", "description": "The version of the detector." }, - "type": { - "$ref": "#/definitions/clairDetectorType", + "dtype": { + "$ref": "#/definitions/DetectorDType", "description": "The type of the detector." } } }, - "clairDetectorType": { - "type": "string", - "enum": [ - "DETECTOR_TYPE_INVALID", - "DETECTOR_TYPE_NAMESPACE", - "DETECTOR_TYPE_FEATURE" - ], - "default": "DETECTOR_TYPE_INVALID" - }, "clairFeature": { "type": "object", "properties": { diff --git a/api/v3/clairpb/convert.go b/api/v3/clairpb/convert.go index da4e9e33..fe54b2f9 100644 --- a/api/v3/clairpb/convert.go +++ b/api/v3/clairpb/convert.go @@ -24,9 +24,9 @@ import ( // DatabaseDetectorTypeMapping maps the database detector type to the integer // enum proto. -var DatabaseDetectorTypeMapping = map[database.DetectorType]Detector_Type{ - database.NamespaceDetectorType: Detector_Type(1), - database.FeatureDetectorType: Detector_Type(2), +var DatabaseDetectorTypeMapping = map[database.DetectorType]Detector_DType{ + database.NamespaceDetectorType: Detector_DType(1), + database.FeatureDetectorType: Detector_DType(2), } // PagedVulnerableAncestriesFromDatabaseModel converts database @@ -152,7 +152,7 @@ func DetectorFromDatabaseModel(detector database.Detector) *Detector { return &Detector{ Name: detector.Name, Version: detector.Version, - Type: DatabaseDetectorTypeMapping[detector.DType], + Dtype: DatabaseDetectorTypeMapping[detector.DType], } }