diff --git a/generated/internalapi/sensor/compliance_iservice.pb.go b/generated/internalapi/sensor/compliance_iservice.pb.go index c59fa298a5502..e065b7c231d98 100644 --- a/generated/internalapi/sensor/compliance_iservice.pb.go +++ b/generated/internalapi/sensor/compliance_iservice.pb.go @@ -168,6 +168,7 @@ type MsgFromCompliance struct { // Types that are valid to be assigned to Msg: // *MsgFromCompliance_Return // *MsgFromCompliance_AuditEvents + // *MsgFromCompliance_NodeScanV2 Msg isMsgFromCompliance_Msg `protobuf_oneof:"msg"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` @@ -220,6 +221,9 @@ type MsgFromCompliance_Return struct { type MsgFromCompliance_AuditEvents struct { AuditEvents *AuditEvents `protobuf:"bytes,3,opt,name=audit_events,json=auditEvents,proto3,oneof" json:"audit_events,omitempty"` } +type MsgFromCompliance_NodeScanV2 struct { + NodeScanV2 *storage.NodeScanV2 `protobuf:"bytes,4,opt,name=node_scan_v2,json=nodeScanV2,proto3,oneof" json:"node_scan_v2,omitempty"` +} func (*MsgFromCompliance_Return) isMsgFromCompliance_Msg() {} func (m *MsgFromCompliance_Return) Clone() isMsgFromCompliance_Msg { @@ -243,6 +247,17 @@ func (m *MsgFromCompliance_AuditEvents) Clone() isMsgFromCompliance_Msg { cloned.AuditEvents = m.AuditEvents.Clone() return cloned } +func (*MsgFromCompliance_NodeScanV2) isMsgFromCompliance_Msg() {} +func (m *MsgFromCompliance_NodeScanV2) Clone() isMsgFromCompliance_Msg { + if m == nil { + return nil + } + cloned := new(MsgFromCompliance_NodeScanV2) + *cloned = *m + + cloned.NodeScanV2 = m.NodeScanV2.Clone() + return cloned +} func (m *MsgFromCompliance) GetMsg() isMsgFromCompliance_Msg { if m != nil { @@ -272,11 +287,19 @@ func (m *MsgFromCompliance) GetAuditEvents() *AuditEvents { return nil } +func (m *MsgFromCompliance) GetNodeScanV2() *storage.NodeScanV2 { + if x, ok := m.GetMsg().(*MsgFromCompliance_NodeScanV2); ok { + return x.NodeScanV2 + } + return nil +} + // XXX_OneofWrappers is for the internal use of the proto package. func (*MsgFromCompliance) XXX_OneofWrappers() []interface{} { return []interface{}{ (*MsgFromCompliance_Return)(nil), (*MsgFromCompliance_AuditEvents)(nil), + (*MsgFromCompliance_NodeScanV2)(nil), } } @@ -861,51 +884,53 @@ func init() { } var fileDescriptor_9b20c44efbf676a9 = []byte{ - // 690 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0xc1, 0x6e, 0xd3, 0x4a, - 0x14, 0x8d, 0x9b, 0xf7, 0xd2, 0xe4, 0x3a, 0xaf, 0x8f, 0x4c, 0x05, 0x24, 0xa6, 0x84, 0x12, 0x75, - 0x91, 0x05, 0x72, 0x4b, 0x90, 0x10, 0x1b, 0x8a, 0x68, 0xd4, 0xd2, 0x42, 0xdb, 0x85, 0xd3, 0x55, - 0x25, 0x64, 0x4d, 0xed, 0xc1, 0x1a, 0x61, 0xcf, 0xa4, 0x33, 0xe3, 0x4a, 0x48, 0x7c, 0x08, 0x4b, - 0x3e, 0x86, 0x05, 0x4b, 0x3e, 0x01, 0x95, 0x05, 0xbf, 0x81, 0x3c, 0x33, 0x89, 0x9d, 0xa2, 0x2c, - 0x60, 0xe7, 0xb9, 0x73, 0xce, 0xbd, 0xe7, 0x9e, 0x7b, 0x3d, 0xf0, 0x88, 0x32, 0x45, 0x04, 0xc3, - 0x29, 0x9e, 0xd2, 0x6d, 0x49, 0x98, 0xe4, 0x62, 0x3b, 0xe2, 0xd9, 0x34, 0xa5, 0x98, 0x45, 0x24, - 0xa4, 0x92, 0x88, 0x2b, 0x1a, 0x11, 0x7f, 0x2a, 0xb8, 0xe2, 0xa8, 0x61, 0x10, 0xde, 0x02, 0xab, - 0x84, 0x57, 0x99, 0x31, 0x56, 0xd8, 0xb0, 0xbc, 0xdb, 0x52, 0x71, 0x81, 0x13, 0xb2, 0x1d, 0xa5, - 0xb9, 0x54, 0x44, 0xd8, 0xf0, 0x83, 0x79, 0x98, 0x33, 0x85, 0x29, 0x23, 0x22, 0x14, 0x39, 0x53, - 0x34, 0xb3, 0xd5, 0xbc, 0xee, 0x0c, 0xf0, 0x3e, 0xbf, 0x20, 0x21, 0xb9, 0x22, 0x4c, 0x99, 0x9b, - 0x41, 0x00, 0x77, 0x5e, 0x11, 0x35, 0x89, 0x04, 0x9e, 0x92, 0x31, 0x67, 0xef, 0x68, 0x12, 0x90, - 0xcb, 0x9c, 0x48, 0x85, 0xee, 0x41, 0x8b, 0xf1, 0x98, 0x84, 0x0c, 0x67, 0xa4, 0xeb, 0x6c, 0x3a, - 0xc3, 0x56, 0xd0, 0x2c, 0x02, 0xa7, 0x38, 0x23, 0xc5, 0xa5, 0xd4, 0x9c, 0x90, 0xc6, 0xdd, 0x15, - 0x73, 0x69, 0x02, 0x47, 0xf1, 0xe0, 0x05, 0xb8, 0x2f, 0xf3, 0x98, 0xaa, 0xfd, 0xa2, 0x8e, 0x44, - 0x3b, 0xd0, 0xd0, 0x15, 0x65, 0xd7, 0xd9, 0xac, 0x0f, 0xdd, 0x51, 0xd7, 0xb7, 0x6a, 0xfc, 0x37, - 0xf9, 0x05, 0x11, 0x8c, 0x28, 0x22, 0x35, 0x34, 0xb0, 0xb8, 0xc1, 0x67, 0x07, 0x3a, 0x27, 0x32, - 0x39, 0x10, 0x3c, 0x1b, 0xcf, 0x7d, 0x40, 0x08, 0xfe, 0x29, 0xea, 0x5b, 0x2d, 0xfa, 0x1b, 0x3d, - 0x85, 0x86, 0x20, 0x2a, 0x17, 0x4c, 0x8b, 0x70, 0x47, 0x1b, 0x7e, 0x69, 0x9c, 0x5f, 0x72, 0x03, - 0x8d, 0x39, 0xac, 0x05, 0x16, 0x8d, 0x9e, 0x41, 0x1b, 0x17, 0x12, 0x43, 0xab, 0xac, 0xae, 0xd9, - 0xeb, 0xbe, 0x99, 0x8a, 0x5f, 0x91, 0x7f, 0x58, 0x0b, 0x5c, 0x5c, 0x1e, 0xf7, 0xfe, 0x85, 0x7a, - 0x26, 0x93, 0xc1, 0x97, 0x06, 0xfc, 0x7f, 0x22, 0x93, 0x33, 0x5e, 0x11, 0xb8, 0x0b, 0x8d, 0x48, - 0x5b, 0xa8, 0x25, 0xba, 0xa3, 0xad, 0x59, 0xba, 0x1b, 0x40, 0xbf, 0x6a, 0x77, 0x21, 0xca, 0xb0, - 0xd0, 0x2e, 0xac, 0x2a, 0x41, 0x93, 0x84, 0x08, 0xdb, 0xcd, 0x60, 0x59, 0x82, 0x33, 0x03, 0x0b, - 0xf2, 0xa2, 0xa7, 0x19, 0x09, 0x29, 0xd8, 0x30, 0x4d, 0xa5, 0x3c, 0x09, 0x23, 0x9e, 0xa6, 0x24, - 0x52, 0x94, 0xb3, 0x50, 0x98, 0x89, 0xda, 0x26, 0x1f, 0x2f, 0x4b, 0xaa, 0x9b, 0x3e, 0xe6, 0xc9, - 0x78, 0xce, 0xb4, 0xab, 0x70, 0x58, 0x0b, 0x7a, 0x78, 0xd9, 0xa5, 0xf7, 0x11, 0xda, 0xd5, 0x7e, - 0xd0, 0x01, 0x74, 0x7e, 0x5b, 0x43, 0x6d, 0xc8, 0xda, 0xa8, 0x37, 0x9f, 0xfc, 0x78, 0x86, 0x08, - 0x0c, 0x20, 0xb8, 0x15, 0xdd, 0x88, 0xa0, 0x2d, 0x58, 0xa3, 0x32, 0xcc, 0x70, 0xb1, 0xe7, 0xa1, - 0x1e, 0x7c, 0x61, 0x4a, 0x33, 0x68, 0x53, 0x79, 0xa2, 0x83, 0xa7, 0x3c, 0x26, 0xde, 0x31, 0x40, - 0x69, 0xc6, 0xe2, 0x5a, 0x3a, 0x8b, 0x6b, 0x89, 0x1e, 0x42, 0x5b, 0x2a, 0xcc, 0x62, 0x2c, 0xe2, - 0x90, 0xc6, 0xb2, 0xbb, 0xb2, 0x59, 0x1f, 0xb6, 0x02, 0x77, 0x16, 0x3b, 0x8a, 0xa5, 0xf7, 0x73, - 0x05, 0x7a, 0x4b, 0x6d, 0x40, 0x6f, 0xa1, 0x25, 0x15, 0x16, 0xaa, 0x30, 0xd4, 0x8e, 0x78, 0xf7, - 0x8f, 0xcd, 0xf4, 0x27, 0x45, 0x8a, 0xd2, 0xd9, 0xa6, 0xb4, 0x67, 0x74, 0x0e, 0x4d, 0xa9, 0xf8, - 0x54, 0x67, 0x37, 0xf3, 0x7f, 0xfe, 0x37, 0xd9, 0xf9, 0xb4, 0x4c, 0xbe, 0x2a, 0xcd, 0xd1, 0xfb, - 0x00, 0xed, 0x6a, 0x5d, 0x74, 0x1f, 0xc0, 0x3e, 0x21, 0xa5, 0x53, 0x2d, 0x1b, 0x39, 0x8a, 0xd1, - 0x6b, 0x58, 0xb7, 0xfb, 0x13, 0x9a, 0x8e, 0xa5, 0xc2, 0x8a, 0x58, 0x55, 0xde, 0x7c, 0x8a, 0x33, - 0x19, 0x07, 0x34, 0x25, 0x93, 0x02, 0x11, 0x74, 0x2c, 0x4d, 0x17, 0xd3, 0x21, 0xef, 0x3f, 0x70, - 0x2b, 0xa2, 0x8a, 0xff, 0x47, 0x90, 0x4b, 0xfb, 0x1b, 0x8d, 0xce, 0xa1, 0x53, 0xb6, 0x35, 0x31, - 0x2f, 0x24, 0xda, 0x07, 0x77, 0xcc, 0xb3, 0x2c, 0x67, 0x34, 0xc2, 0x8a, 0xa0, 0x5e, 0xc5, 0x85, - 0xc5, 0x27, 0xc1, 0xbb, 0xbb, 0xc4, 0xa0, 0xa1, 0xb3, 0xe3, 0xec, 0x75, 0xbf, 0x5e, 0xf7, 0x9d, - 0x6f, 0xd7, 0x7d, 0xe7, 0xfb, 0x75, 0xdf, 0xf9, 0xf4, 0xa3, 0x5f, 0x3b, 0xb7, 0x8f, 0xee, 0x45, - 0x43, 0xbf, 0x7d, 0x4f, 0x7e, 0x05, 0x00, 0x00, 0xff, 0xff, 0x4a, 0xbe, 0xe7, 0x0b, 0xb3, 0x05, - 0x00, 0x00, + // 725 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0x41, 0x6f, 0xd3, 0x4a, + 0x10, 0x8e, 0x9b, 0xbe, 0x34, 0x19, 0xe7, 0xf5, 0xbd, 0x6c, 0xf5, 0x1e, 0x8e, 0x29, 0xa1, 0x44, + 0x3d, 0xe4, 0x80, 0xdc, 0x12, 0x24, 0xe0, 0x42, 0x11, 0x8d, 0x5a, 0x52, 0x68, 0x7b, 0x70, 0x2a, + 0x0e, 0x95, 0x90, 0xb5, 0xb5, 0x17, 0x6b, 0x45, 0xbc, 0x9b, 0xee, 0xae, 0x2b, 0x21, 0xf1, 0x43, + 0xf8, 0x41, 0x1c, 0x38, 0x72, 0xe5, 0x86, 0xca, 0x81, 0xbf, 0x81, 0xbc, 0x5e, 0xc7, 0x4e, 0x51, + 0x0e, 0x70, 0xb3, 0x67, 0xbf, 0x6f, 0xf6, 0x9b, 0x6f, 0x66, 0x07, 0xee, 0x53, 0xa6, 0x88, 0x60, + 0x78, 0x8a, 0x67, 0x74, 0x47, 0x12, 0x26, 0xb9, 0xd8, 0x09, 0x79, 0x32, 0x9b, 0x52, 0xcc, 0x42, + 0x12, 0x50, 0x49, 0xc4, 0x15, 0x0d, 0x89, 0x37, 0x13, 0x5c, 0x71, 0xd4, 0xc8, 0x11, 0xee, 0x02, + 0xab, 0x84, 0x57, 0x99, 0x11, 0x56, 0x38, 0x67, 0xb9, 0xff, 0x49, 0xc5, 0x05, 0x8e, 0xc9, 0x4e, + 0x38, 0x4d, 0xa5, 0x22, 0xc2, 0x84, 0xef, 0xce, 0xc3, 0x9c, 0x29, 0x4c, 0x19, 0x11, 0x81, 0x48, + 0x99, 0xa2, 0x89, 0xb9, 0xcd, 0x75, 0x0a, 0xc0, 0xbb, 0xf4, 0x82, 0x04, 0xe4, 0x8a, 0x30, 0x65, + 0x4e, 0x50, 0x71, 0xc2, 0x78, 0x64, 0xd0, 0x7d, 0x1f, 0xfe, 0x7f, 0x41, 0xd4, 0x24, 0x14, 0x78, + 0x46, 0x46, 0x9c, 0xbd, 0xa5, 0xb1, 0x4f, 0x2e, 0x53, 0x22, 0x15, 0xba, 0x0d, 0xad, 0x0c, 0x17, + 0x30, 0x9c, 0x10, 0xc7, 0xda, 0xb2, 0x06, 0x2d, 0xbf, 0x99, 0x05, 0x4e, 0x71, 0x42, 0xb2, 0x43, + 0xa9, 0x39, 0x01, 0x8d, 0x9c, 0x95, 0xfc, 0x30, 0x0f, 0x1c, 0x45, 0xfd, 0x67, 0x60, 0x3f, 0x4f, + 0x23, 0xaa, 0x0e, 0xb2, 0xbb, 0x25, 0xda, 0x85, 0x86, 0x56, 0x21, 0x1d, 0x6b, 0xab, 0x3e, 0xb0, + 0x87, 0x8e, 0x67, 0x74, 0x78, 0xaf, 0xd2, 0x0b, 0x22, 0x18, 0x51, 0x44, 0x6a, 0xa8, 0x6f, 0x70, + 0xfd, 0xaf, 0x16, 0x74, 0x4e, 0x64, 0x7c, 0x28, 0x78, 0x32, 0x9a, 0x7b, 0x83, 0x10, 0xac, 0x66, + 0xf7, 0x1b, 0x2d, 0xfa, 0x1b, 0x3d, 0x82, 0x86, 0x20, 0x2a, 0x15, 0x4c, 0x8b, 0xb0, 0x87, 0x9b, + 0x5e, 0x69, 0xa6, 0x57, 0x72, 0x7d, 0x8d, 0x19, 0xd7, 0x7c, 0x83, 0x46, 0x4f, 0xa0, 0x8d, 0x33, + 0x89, 0x81, 0x51, 0x56, 0xd7, 0xec, 0x0d, 0x2f, 0xef, 0x94, 0x57, 0x91, 0x3f, 0xae, 0xf9, 0x36, + 0xae, 0x54, 0xf3, 0x18, 0xda, 0xda, 0x16, 0x19, 0x62, 0x16, 0x5c, 0x0d, 0x9d, 0xd5, 0x82, 0x69, + 0x6a, 0x3a, 0xe5, 0x11, 0x99, 0x84, 0x98, 0xbd, 0x1e, 0x8e, 0x6b, 0x3e, 0xb0, 0xf9, 0xdf, 0xfe, + 0x5f, 0x50, 0x4f, 0x64, 0xdc, 0xff, 0xd4, 0x80, 0x7f, 0x4e, 0x64, 0x7c, 0xc6, 0x2b, 0x95, 0xed, + 0x41, 0x23, 0xd4, 0xde, 0xeb, 0xda, 0xec, 0xe1, 0x76, 0xa1, 0xe3, 0x06, 0xd0, 0xab, 0xf6, 0x29, + 0xab, 0x26, 0x67, 0xa1, 0x3d, 0x58, 0x53, 0x82, 0xc6, 0x31, 0x11, 0xc6, 0x86, 0xfe, 0xb2, 0x04, + 0x67, 0x39, 0xcc, 0x4f, 0x33, 0x33, 0x0a, 0x12, 0x52, 0xb0, 0x99, 0xbb, 0x31, 0xe5, 0x71, 0x10, + 0xf2, 0xe9, 0x94, 0x84, 0x8a, 0x72, 0x16, 0x88, 0x7c, 0x14, 0x8c, 0x3b, 0x0f, 0x96, 0x25, 0xd5, + 0x6e, 0x1d, 0xf3, 0x78, 0x34, 0x67, 0x9a, 0x19, 0x1a, 0xd7, 0xfc, 0x2e, 0x5e, 0x76, 0xe8, 0x7e, + 0x80, 0x76, 0xb5, 0x1e, 0x74, 0x08, 0x9d, 0x5f, 0x66, 0x5a, 0x1b, 0xb2, 0x3e, 0xec, 0xce, 0xed, + 0x1d, 0x15, 0x08, 0x3f, 0x07, 0xf8, 0xff, 0x86, 0x37, 0x22, 0x68, 0x1b, 0xd6, 0xa9, 0x0c, 0x12, + 0x9c, 0x3d, 0x9a, 0x40, 0x4f, 0x4c, 0x66, 0x4a, 0xd3, 0x6f, 0x53, 0x79, 0xa2, 0x83, 0x59, 0x8b, + 0xdc, 0x63, 0x80, 0xd2, 0x8c, 0xc5, 0x79, 0xb6, 0x16, 0xe7, 0x19, 0xdd, 0x83, 0xb6, 0x54, 0x98, + 0x45, 0x58, 0x44, 0x01, 0x8d, 0xa4, 0xb3, 0xb2, 0x55, 0x1f, 0xb4, 0x7c, 0xbb, 0x88, 0x1d, 0x45, + 0xd2, 0xfd, 0xb1, 0x02, 0xdd, 0xa5, 0x36, 0xa0, 0x37, 0xd0, 0x92, 0x0a, 0x0b, 0x95, 0x19, 0x6a, + 0x5a, 0xbc, 0xf7, 0xdb, 0x66, 0x7a, 0x93, 0x2c, 0x45, 0xe9, 0x6c, 0x53, 0x9a, 0x7f, 0x74, 0x0e, + 0x4d, 0xa9, 0xf8, 0x4c, 0x67, 0xcf, 0xfb, 0xff, 0xf4, 0x4f, 0xb2, 0xf3, 0x59, 0x99, 0x7c, 0x4d, + 0xe6, 0xbf, 0xee, 0x7b, 0x68, 0x57, 0xef, 0x45, 0x77, 0x00, 0xcc, 0x3e, 0x2a, 0x9d, 0x6a, 0x99, + 0xc8, 0x51, 0x84, 0x5e, 0xc2, 0x86, 0x99, 0x9f, 0x20, 0xaf, 0x58, 0x2a, 0xac, 0x88, 0x51, 0xe5, + 0xce, 0xbb, 0x58, 0xc8, 0x38, 0xa4, 0x53, 0x32, 0xc9, 0x10, 0x7e, 0xc7, 0xd0, 0xf4, 0x65, 0x3a, + 0xe4, 0xfe, 0x0d, 0x76, 0x45, 0x54, 0xf6, 0x7e, 0x04, 0xb9, 0x34, 0xcf, 0x68, 0x78, 0x0e, 0x9d, + 0xb2, 0xac, 0x49, 0xbe, 0x6e, 0xd1, 0x01, 0xd8, 0x23, 0x9e, 0x24, 0x29, 0xa3, 0x21, 0x56, 0x04, + 0x75, 0x2b, 0x2e, 0x2c, 0xee, 0x12, 0xf7, 0xd6, 0x12, 0x83, 0x06, 0xd6, 0xae, 0xb5, 0xef, 0x7c, + 0xbe, 0xee, 0x59, 0x5f, 0xae, 0x7b, 0xd6, 0xb7, 0xeb, 0x9e, 0xf5, 0xf1, 0x7b, 0xaf, 0x76, 0x6e, + 0x36, 0xf8, 0x45, 0x43, 0x2f, 0xcd, 0x87, 0x3f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x26, 0xe1, 0x7f, + 0x02, 0x00, 0x06, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1187,6 +1212,27 @@ func (m *MsgFromCompliance_AuditEvents) MarshalToSizedBuffer(dAtA []byte) (int, } return len(dAtA) - i, nil } +func (m *MsgFromCompliance_NodeScanV2) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *MsgFromCompliance_NodeScanV2) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + if m.NodeScanV2 != nil { + { + size, err := m.NodeScanV2.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintComplianceIservice(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x22 + } + return len(dAtA) - i, nil +} func (m *MsgToCompliance) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -1614,6 +1660,18 @@ func (m *MsgFromCompliance_AuditEvents) Size() (n int) { } return n } +func (m *MsgFromCompliance_NodeScanV2) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.NodeScanV2 != nil { + l = m.NodeScanV2.Size() + n += 1 + l + sovComplianceIservice(uint64(l)) + } + return n +} func (m *MsgToCompliance) Size() (n int) { if m == nil { return 0 @@ -2113,6 +2171,41 @@ func (m *MsgFromCompliance) Unmarshal(dAtA []byte) error { } m.Msg = &MsgFromCompliance_AuditEvents{v} iNdEx = postIndex + case 4: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field NodeScanV2", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowComplianceIservice + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthComplianceIservice + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthComplianceIservice + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + v := &storage.NodeScanV2{} + if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + m.Msg = &MsgFromCompliance_NodeScanV2{v} + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipComplianceIservice(dAtA[iNdEx:]) diff --git a/generated/storage/node.pb.go b/generated/storage/node.pb.go index 2c9f641789da1..e0affe5ffad07 100644 --- a/generated/storage/node.pb.go +++ b/generated/storage/node.pb.go @@ -9,6 +9,7 @@ import ( _ "github.com/gogo/protobuf/gogoproto" types "github.com/gogo/protobuf/types" proto "github.com/golang/protobuf/proto" + v1 "github.com/stackrox/scanner/generated/scanner/api/v1" io "io" math "math" math_bits "math/bits" @@ -621,6 +622,104 @@ func (m *NodeScan) Clone() *NodeScan { return cloned } +type NodeScanV2 struct { + NodeId string `protobuf:"bytes,1,opt,name=node_id,json=nodeId,proto3" json:"node_id,omitempty" search:"Node ID,store" sql:"pk"` + NodeName string `protobuf:"bytes,2,opt,name=node_name,json=nodeName,proto3" json:"node_name,omitempty" search:"Node,store"` + ScanTime *types.Timestamp `protobuf:"bytes,3,opt,name=scan_time,json=scanTime,proto3" json:"scan_time,omitempty" search:"Node Scan Time,store"` + Components *v1.Components `protobuf:"bytes,4,opt,name=components,proto3" json:"components,omitempty"` + Notes []v1.Note `protobuf:"varint,5,rep,packed,name=notes,proto3,enum=scannerV1.Note" json:"notes,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *NodeScanV2) Reset() { *m = NodeScanV2{} } +func (m *NodeScanV2) String() string { return proto.CompactTextString(m) } +func (*NodeScanV2) ProtoMessage() {} +func (*NodeScanV2) Descriptor() ([]byte, []int) { + return fileDescriptor_107f6eed651900c7, []int{2} +} +func (m *NodeScanV2) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *NodeScanV2) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_NodeScanV2.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *NodeScanV2) XXX_Merge(src proto.Message) { + xxx_messageInfo_NodeScanV2.Merge(m, src) +} +func (m *NodeScanV2) XXX_Size() int { + return m.Size() +} +func (m *NodeScanV2) XXX_DiscardUnknown() { + xxx_messageInfo_NodeScanV2.DiscardUnknown(m) +} + +var xxx_messageInfo_NodeScanV2 proto.InternalMessageInfo + +func (m *NodeScanV2) GetNodeId() string { + if m != nil { + return m.NodeId + } + return "" +} + +func (m *NodeScanV2) GetNodeName() string { + if m != nil { + return m.NodeName + } + return "" +} + +func (m *NodeScanV2) GetScanTime() *types.Timestamp { + if m != nil { + return m.ScanTime + } + return nil +} + +func (m *NodeScanV2) GetComponents() *v1.Components { + if m != nil { + return m.Components + } + return nil +} + +func (m *NodeScanV2) GetNotes() []v1.Note { + if m != nil { + return m.Notes + } + return nil +} + +func (m *NodeScanV2) MessageClone() proto.Message { + return m.Clone() +} +func (m *NodeScanV2) Clone() *NodeScanV2 { + if m == nil { + return nil + } + cloned := new(NodeScanV2) + *cloned = *m + + cloned.ScanTime = m.ScanTime.Clone() + cloned.Components = m.Components.Clone() + if m.Notes != nil { + cloned.Notes = make([]v1.Note, len(m.Notes)) + copy(cloned.Notes, m.Notes) + } + return cloned +} + type EmbeddedNodeScanComponent struct { Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty" search:"Component,store"` Version string `protobuf:"bytes,2,opt,name=version,proto3" json:"version,omitempty" search:"Component Version,store"` @@ -640,7 +739,7 @@ func (m *EmbeddedNodeScanComponent) Reset() { *m = EmbeddedNodeScanCompo func (m *EmbeddedNodeScanComponent) String() string { return proto.CompactTextString(m) } func (*EmbeddedNodeScanComponent) ProtoMessage() {} func (*EmbeddedNodeScanComponent) Descriptor() ([]byte, []int) { - return fileDescriptor_107f6eed651900c7, []int{2} + return fileDescriptor_107f6eed651900c7, []int{3} } func (m *EmbeddedNodeScanComponent) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -789,96 +888,103 @@ func init() { proto.RegisterMapType((map[string]string)(nil), "storage.Node.AnnotationsEntry") proto.RegisterMapType((map[string]string)(nil), "storage.Node.LabelsEntry") proto.RegisterType((*NodeScan)(nil), "storage.NodeScan") + proto.RegisterType((*NodeScanV2)(nil), "storage.NodeScanV2") proto.RegisterType((*EmbeddedNodeScanComponent)(nil), "storage.EmbeddedNodeScanComponent") } func init() { proto.RegisterFile("storage/node.proto", fileDescriptor_107f6eed651900c7) } var fileDescriptor_107f6eed651900c7 = []byte{ - // 1322 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0xdd, 0x72, 0xda, 0x46, - 0x14, 0xb6, 0xc0, 0x3f, 0xb0, 0x38, 0x18, 0x6f, 0x12, 0x47, 0x26, 0xb1, 0xa5, 0xaa, 0x4d, 0x42, - 0x26, 0x0e, 0xee, 0x38, 0xb9, 0x48, 0x3c, 0x13, 0x77, 0x0c, 0xa6, 0x0d, 0x49, 0x4a, 0x3c, 0x02, - 0xfb, 0x22, 0x17, 0xd5, 0x08, 0xb4, 0xc6, 0x2a, 0x62, 0x57, 0xd5, 0x2e, 0x8c, 0x79, 0x93, 0x3e, - 0x46, 0x1f, 0xa3, 0x17, 0xbd, 0xe8, 0x13, 0x30, 0x9d, 0xf4, 0x09, 0xca, 0x13, 0x74, 0x76, 0xa5, - 0x95, 0x25, 0x70, 0x26, 0xd3, 0xde, 0x49, 0xe7, 0x7c, 0xdf, 0xb7, 0x67, 0x77, 0xcf, 0x39, 0x7b, - 0x00, 0xa4, 0x8c, 0x04, 0x76, 0x1f, 0xed, 0x63, 0xe2, 0xa0, 0xaa, 0x1f, 0x10, 0x46, 0xe0, 0x5a, - 0x64, 0x2b, 0x6b, 0x7d, 0x42, 0xfa, 0x1e, 0xda, 0x17, 0xe6, 0xee, 0xe8, 0x62, 0x9f, 0xb9, 0x43, - 0x44, 0x99, 0x3d, 0xf4, 0x43, 0x64, 0x59, 0x93, 0xec, 0x1e, 0xc1, 0xcc, 0x76, 0x31, 0x0a, 0xac, - 0x60, 0x84, 0x39, 0x2a, 0x02, 0xdc, 0x91, 0x00, 0xee, 0x65, 0x34, 0xb2, 0xde, 0x97, 0xd6, 0xf1, - 0xc8, 0xc3, 0x28, 0xb0, 0xbb, 0xae, 0xe7, 0xb2, 0x89, 0xa4, 0xf4, 0x49, 0x9f, 0x88, 0xcf, 0x7d, - 0xfe, 0x15, 0x5a, 0x8d, 0xdf, 0x36, 0xc0, 0x72, 0x8b, 0x38, 0x08, 0x3e, 0x07, 0x19, 0xd7, 0x51, - 0x15, 0x5d, 0xa9, 0xe4, 0x6b, 0x5f, 0xcf, 0xa6, 0x9a, 0x46, 0x91, 0x1d, 0xf4, 0x2e, 0x0f, 0x0d, - 0xee, 0xd5, 0x9b, 0x27, 0x7b, 0x5c, 0x1b, 0x19, 0x3a, 0xfd, 0xc5, 0x3b, 0x34, 0xfc, 0x81, 0x61, - 0x66, 0x5c, 0x07, 0x3e, 0x05, 0xcb, 0xd8, 0x1e, 0x22, 0x35, 0x23, 0x68, 0xf7, 0x66, 0x53, 0xed, - 0x76, 0x92, 0x16, 0x71, 0x4c, 0x01, 0x82, 0x8f, 0xc0, 0x6a, 0x18, 0xad, 0x9a, 0xd5, 0xb3, 0x95, - 0xc2, 0x41, 0xb1, 0x1a, 0x85, 0x5b, 0xed, 0x70, 0xb3, 0x19, 0x79, 0x61, 0x17, 0x80, 0x9e, 0x37, - 0xa2, 0x0c, 0x05, 0x96, 0xeb, 0xa8, 0xcb, 0x42, 0xba, 0x3e, 0x9b, 0x6a, 0xdf, 0x49, 0xe9, 0x7a, - 0xe8, 0x9d, 0x0f, 0xea, 0x62, 0x50, 0x89, 0x3c, 0x87, 0xae, 0xf3, 0x64, 0x0f, 0x93, 0x67, 0x17, - 0x83, 0x67, 0x3d, 0x82, 0x29, 0x0b, 0xb8, 0xb0, 0x61, 0xe6, 0x23, 0xd9, 0xa6, 0x03, 0x5f, 0x83, - 0x75, 0xb9, 0x86, 0xd8, 0xc0, 0x8a, 0x58, 0xa5, 0x3c, 0x9b, 0x6a, 0x5b, 0x73, 0xab, 0xc8, 0x3d, - 0x14, 0x22, 0x7c, 0x8b, 0x6f, 0xe5, 0x2d, 0x58, 0xf5, 0xec, 0x2e, 0xf2, 0xa8, 0xba, 0x2a, 0xb6, - 0xb2, 0x1d, 0x6f, 0x85, 0x6f, 0xbb, 0xfa, 0x5e, 0xf8, 0x1a, 0x98, 0x05, 0x93, 0xc5, 0x43, 0xd1, - 0x85, 0xd7, 0x30, 0x23, 0x05, 0xf8, 0x13, 0x28, 0xd8, 0x18, 0x13, 0x66, 0x33, 0x97, 0x60, 0xaa, - 0xae, 0x09, 0xc1, 0xdd, 0xb4, 0xe0, 0xf1, 0x35, 0x20, 0x54, 0x7d, 0x30, 0x9b, 0x6a, 0x6a, 0x4a, - 0xf5, 0x1a, 0x62, 0x98, 0x49, 0x41, 0xf8, 0x11, 0xe4, 0x7f, 0x26, 0x2e, 0x46, 0x8e, 0x65, 0x33, - 0xf5, 0x96, 0xae, 0x54, 0x0a, 0x07, 0xe5, 0x6a, 0x98, 0x80, 0x55, 0x99, 0x80, 0xd5, 0x8e, 0x4c, - 0xc0, 0xda, 0x57, 0xb3, 0xa9, 0xb6, 0x93, 0x52, 0x7e, 0x4b, 0x5c, 0xac, 0x73, 0x80, 0x3c, 0x8a, - 0x5c, 0xa8, 0x77, 0xcc, 0xe0, 0x01, 0xb8, 0xeb, 0x62, 0x86, 0x02, 0x6c, 0x7b, 0x96, 0xeb, 0x5b, - 0xb6, 0xe3, 0x04, 0x88, 0x52, 0x44, 0xd5, 0x9c, 0x9e, 0xad, 0xe4, 0xcd, 0xdb, 0xd2, 0xd9, 0xf4, - 0x8f, 0xa5, 0x8b, 0x73, 0xd0, 0xd5, 0x4d, 0x9c, 0x7c, 0xc8, 0x91, 0xce, 0x24, 0xe7, 0x08, 0x6c, - 0x2f, 0x54, 0x82, 0x35, 0x46, 0x01, 0x75, 0x09, 0x56, 0x81, 0xb8, 0xbb, 0x8c, 0xaa, 0x98, 0xf7, - 0x62, 0x90, 0x19, 0x62, 0xce, 0x43, 0x08, 0x7c, 0x0b, 0x36, 0x17, 0xf8, 0x6a, 0x51, 0x9c, 0xc5, - 0x4e, 0x7c, 0xd2, 0xf5, 0x39, 0x72, 0x13, 0x5f, 0x10, 0xb3, 0x34, 0x2f, 0x09, 0x1f, 0x82, 0xe2, - 0x00, 0x05, 0x18, 0x79, 0x71, 0x00, 0x05, 0x1e, 0x80, 0x79, 0x2b, 0xb4, 0xca, 0x25, 0x9f, 0x80, - 0x12, 0xf1, 0x51, 0x60, 0x33, 0x17, 0xf7, 0x2d, 0x3a, 0xa1, 0x0c, 0x0d, 0xd5, 0x4d, 0x01, 0xdc, - 0x88, 0xed, 0x6d, 0x61, 0x86, 0x47, 0x20, 0x47, 0xa8, 0xe5, 0x0e, 0xed, 0x3e, 0x52, 0xd7, 0x17, - 0x0b, 0xf0, 0x83, 0x84, 0xeb, 0x21, 0x5e, 0x5e, 0xc3, 0x1a, 0xa1, 0x4d, 0xce, 0x81, 0x8f, 0xc1, - 0xc6, 0x60, 0xd4, 0x45, 0x1e, 0x62, 0x71, 0x48, 0x1b, 0x62, 0xa5, 0x62, 0x64, 0x96, 0x31, 0xed, - 0x01, 0xc8, 0x2d, 0x96, 0x1f, 0x90, 0xab, 0x49, 0x8c, 0x2d, 0x09, 0x6c, 0x89, 0x7b, 0x4e, 0xb9, - 0x43, 0xa2, 0x2d, 0xb0, 0xee, 0xd9, 0x94, 0x59, 0x23, 0xdf, 0xb1, 0x19, 0x72, 0xd4, 0xed, 0x2f, - 0xe6, 0x8e, 0x3e, 0x9b, 0x6a, 0x0f, 0x64, 0xd8, 0xef, 0x6d, 0xca, 0xf4, 0xb3, 0x90, 0xbb, 0x77, - 0xe9, 0x3a, 0x0e, 0xe2, 0x99, 0xc9, 0x15, 0x23, 0x23, 0xec, 0x80, 0xc2, 0xe0, 0x25, 0x8d, 0xf5, - 0xcb, 0x5f, 0xd4, 0x8f, 0x6a, 0x09, 0x53, 0x12, 0x5c, 0xda, 0xf4, 0xf2, 0xd0, 0x70, 0xfb, 0x58, - 0x1c, 0x05, 0x18, 0xbc, 0xa4, 0x52, 0xf5, 0x35, 0x58, 0xa6, 0x3d, 0x1b, 0xab, 0x50, 0xc8, 0x6d, - 0xa6, 0x0a, 0xa9, 0xdd, 0xb3, 0x71, 0x6d, 0x6b, 0x36, 0xd5, 0xa0, 0x4f, 0x3c, 0xb7, 0x37, 0x89, - 0x32, 0x9c, 0x9b, 0x0d, 0x53, 0xd0, 0xe0, 0x3b, 0x00, 0x7a, 0x64, 0xe8, 0x13, 0x8c, 0x78, 0xa7, - 0xba, 0xad, 0x2b, 0x95, 0x95, 0xda, 0x93, 0xd9, 0x54, 0x7b, 0x18, 0xf7, 0x05, 0xe9, 0xd5, 0xeb, - 0x64, 0x84, 0x59, 0x78, 0x1b, 0x72, 0x83, 0x6f, 0x96, 0xcc, 0x04, 0x1d, 0xbe, 0x02, 0xcb, 0xbd, - 0x31, 0xa2, 0xea, 0x1d, 0x21, 0x93, 0xba, 0xd5, 0xfa, 0x79, 0xe3, 0x46, 0x01, 0xc5, 0x14, 0x14, - 0x78, 0x0a, 0xd6, 0x2f, 0xdc, 0x2b, 0xbb, 0xeb, 0x21, 0x4b, 0x48, 0xdc, 0x15, 0x12, 0x4f, 0x67, - 0x53, 0xed, 0xb1, 0x94, 0xf8, 0x3e, 0xf4, 0xeb, 0x9f, 0x93, 0xca, 0x98, 0x85, 0x48, 0xa2, 0xce, - 0x15, 0x6b, 0x20, 0xe7, 0x07, 0x2e, 0x09, 0x5c, 0x36, 0x51, 0xb7, 0x74, 0xa5, 0x92, 0xad, 0x3d, - 0x9a, 0x4d, 0x35, 0x23, 0x55, 0xeb, 0xa6, 0x4b, 0x07, 0xfa, 0x69, 0x84, 0x8a, 0x6f, 0x2d, 0xe6, - 0xc1, 0x1a, 0x00, 0x81, 0x4b, 0x07, 0x16, 0xed, 0x91, 0x00, 0xa9, 0xf7, 0x74, 0xa5, 0x92, 0xb9, - 0xe1, 0xb5, 0x10, 0x2a, 0xed, 0x5e, 0x22, 0x16, 0x33, 0xcf, 0x69, 0xc2, 0x04, 0x5f, 0x83, 0x1c, - 0x23, 0xbe, 0xd5, 0x1b, 0x53, 0xaa, 0xaa, 0x42, 0x21, 0x95, 0x37, 0x42, 0xa1, 0x43, 0x7c, 0xbd, - 0x7e, 0xde, 0x6e, 0x47, 0xb9, 0xfe, 0x26, 0x6b, 0xae, 0x31, 0xe2, 0xd7, 0xc7, 0x94, 0xc2, 0x0a, - 0x58, 0xc1, 0x84, 0x21, 0xaa, 0xde, 0xd7, 0xb3, 0x95, 0xe2, 0x01, 0x4c, 0x77, 0xca, 0x16, 0x61, - 0xc8, 0x0c, 0x01, 0xe5, 0x57, 0xa0, 0x90, 0xe8, 0xc4, 0xb0, 0x04, 0xb2, 0x03, 0x34, 0x09, 0x9f, - 0x38, 0x93, 0x7f, 0xc2, 0x3b, 0x60, 0x65, 0x6c, 0x7b, 0xa3, 0xe8, 0xfd, 0x32, 0xc3, 0x9f, 0xc3, - 0xcc, 0x4b, 0xa5, 0x7c, 0x04, 0x4a, 0xf3, 0x3d, 0xf7, 0xbf, 0xf0, 0x8d, 0x1d, 0xfe, 0xaa, 0x32, - 0x04, 0xef, 0x82, 0xcd, 0x1f, 0x9b, 0xed, 0x76, 0xb3, 0xf5, 0x83, 0xd5, 0xae, 0x1f, 0xb7, 0xac, - 0x93, 0xe3, 0xce, 0x71, 0x69, 0xa9, 0x56, 0x02, 0x45, 0x8a, 0x98, 0x75, 0x9d, 0x29, 0x35, 0x00, - 0x72, 0xc2, 0x32, 0x46, 0xb4, 0x76, 0x0b, 0x14, 0xf8, 0x77, 0x74, 0x77, 0xb5, 0x22, 0x58, 0xe7, - 0xbf, 0xf2, 0xcc, 0x8c, 0x3f, 0x32, 0x20, 0x27, 0x93, 0x99, 0x77, 0x77, 0x9e, 0xb6, 0x96, 0xe8, - 0x68, 0xca, 0xff, 0xe8, 0xee, 0x5c, 0x25, 0xdd, 0xdd, 0xb9, 0x1e, 0x37, 0xdc, 0xd8, 0xc2, 0xb2, - 0x37, 0xb7, 0xb0, 0x0f, 0xa9, 0xaa, 0xc9, 0x88, 0x37, 0xcc, 0x88, 0x6f, 0xa6, 0x31, 0xec, 0x22, - 0xc7, 0x41, 0x8e, 0x8c, 0x3a, 0x2e, 0xa1, 0x5a, 0x61, 0x36, 0xd5, 0xd6, 0xc4, 0xeb, 0xfd, 0xcc, - 0x48, 0x55, 0xce, 0x9e, 0xbc, 0xe5, 0x65, 0x71, 0xcb, 0x5b, 0x0b, 0x65, 0x9c, 0xbc, 0x69, 0xe3, - 0x30, 0x3a, 0xee, 0x3c, 0x58, 0x39, 0x6b, 0xb5, 0x1b, 0x9d, 0xd2, 0x12, 0xdc, 0x00, 0x85, 0xb3, - 0x56, 0xfb, 0xec, 0xf4, 0xf4, 0x83, 0xd9, 0x69, 0x9c, 0x94, 0x14, 0xb8, 0x05, 0xe0, 0xbb, 0x86, - 0xd9, 0x6a, 0xbc, 0xb7, 0x92, 0xf6, 0x8c, 0xf1, 0x4f, 0x06, 0x6c, 0x7f, 0x36, 0x40, 0xf8, 0x6d, - 0x34, 0xe1, 0x84, 0x83, 0x51, 0xea, 0xd9, 0x8d, 0x41, 0xe9, 0x31, 0xe7, 0x08, 0xac, 0xc9, 0xce, - 0x1a, 0x8e, 0x45, 0xdf, 0xcc, 0xa6, 0x9a, 0xbe, 0xd8, 0x3d, 0xa2, 0x36, 0x1b, 0x77, 0xf3, 0x88, - 0x04, 0x5f, 0x80, 0x15, 0x3e, 0xbe, 0xc9, 0x29, 0x69, 0x77, 0xe1, 0x14, 0xcf, 0x93, 0xc3, 0x9d, - 0x19, 0x82, 0xe1, 0x09, 0xd8, 0x48, 0x0e, 0x7d, 0x2e, 0x92, 0x93, 0x44, 0x39, 0x75, 0x72, 0x69, - 0xee, 0x3c, 0x05, 0x96, 0x13, 0x2d, 0x82, 0x0f, 0x5e, 0xd9, 0x44, 0xe9, 0xdf, 0x4f, 0x94, 0x2d, - 0x1f, 0x97, 0x32, 0x6f, 0x96, 0xae, 0x8b, 0x72, 0x27, 0xd5, 0x17, 0x56, 0xb9, 0x3b, 0x51, 0xf2, - 0xf3, 0x29, 0x5c, 0x7b, 0xf1, 0xfb, 0xa7, 0x5d, 0xe5, 0xcf, 0x4f, 0xbb, 0xca, 0x5f, 0x9f, 0x76, - 0x95, 0x5f, 0xff, 0xde, 0x5d, 0x02, 0xdb, 0x2e, 0xa9, 0x52, 0x66, 0xf7, 0x06, 0x01, 0xb9, 0x0a, - 0x13, 0x57, 0xc6, 0xfd, 0x51, 0x8e, 0xcd, 0xdd, 0x55, 0x61, 0x7f, 0xfe, 0x6f, 0x00, 0x00, 0x00, - 0xff, 0xff, 0x35, 0xdd, 0xe0, 0x5c, 0x5c, 0x0b, 0x00, 0x00, + // 1423 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0xdf, 0x52, 0xdb, 0x46, + 0x17, 0xc7, 0x36, 0x7f, 0xec, 0x63, 0x02, 0x66, 0x13, 0x88, 0x70, 0x02, 0xd2, 0xa7, 0xef, 0x4b, + 0xe2, 0x4c, 0x88, 0xf9, 0x42, 0xd2, 0x99, 0x84, 0x69, 0xe8, 0x60, 0x43, 0x1b, 0x27, 0xa9, 0xc3, + 0xc8, 0xc0, 0x45, 0x2e, 0xaa, 0x91, 0xad, 0xc5, 0xa8, 0x36, 0xbb, 0xaa, 0x76, 0xed, 0x81, 0x37, + 0xe9, 0x63, 0xf4, 0xba, 0x4f, 0xd0, 0x8b, 0x5e, 0xf4, 0x09, 0x3c, 0x9d, 0xf4, 0x09, 0xea, 0x27, + 0xe8, 0xec, 0x4a, 0x2b, 0x24, 0x43, 0x26, 0x4d, 0xa7, 0x77, 0xf2, 0x39, 0xbf, 0xdf, 0x6f, 0x77, + 0xcf, 0x39, 0x7b, 0xf6, 0x18, 0x10, 0xe3, 0x34, 0x70, 0xba, 0x78, 0x93, 0x50, 0x17, 0x57, 0xfd, + 0x80, 0x72, 0x8a, 0xe6, 0x22, 0x5b, 0x59, 0xef, 0x52, 0xda, 0xed, 0xe3, 0x4d, 0x69, 0x6e, 0x0f, + 0x4e, 0x36, 0xb9, 0x77, 0x86, 0x19, 0x77, 0xce, 0xfc, 0x10, 0x59, 0x5e, 0x65, 0x1d, 0x87, 0x10, + 0x1c, 0x6c, 0x3a, 0xbe, 0xb7, 0x39, 0x7c, 0xb2, 0x49, 0x28, 0x8f, 0x44, 0xca, 0xeb, 0x13, 0xae, + 0x0e, 0x3d, 0xf3, 0x29, 0xc1, 0x84, 0x47, 0x7e, 0x5d, 0x2d, 0xdc, 0xa1, 0x84, 0x3b, 0x1e, 0xc1, + 0x81, 0x1d, 0x0c, 0x88, 0x58, 0x20, 0x02, 0xdc, 0x52, 0x00, 0xe1, 0xe5, 0x2c, 0xb2, 0xde, 0x51, + 0xd6, 0xe1, 0xa0, 0x4f, 0x70, 0xe0, 0xb4, 0xbd, 0xbe, 0xc7, 0x2f, 0x14, 0xa5, 0x4b, 0xbb, 0x54, + 0x7e, 0x6e, 0x8a, 0xaf, 0xd0, 0x6a, 0xfe, 0xb4, 0x08, 0xd3, 0x4d, 0xea, 0x62, 0xf4, 0x14, 0xb2, + 0x9e, 0xab, 0x65, 0x8c, 0x4c, 0xa5, 0x50, 0xfb, 0xef, 0x78, 0xa4, 0xeb, 0x0c, 0x3b, 0x41, 0xe7, + 0x74, 0xdb, 0x14, 0x5e, 0xa3, 0xb1, 0xb7, 0x21, 0xb4, 0xb1, 0x69, 0xb0, 0x1f, 0xfa, 0xdb, 0xa6, + 0xdf, 0x33, 0xad, 0xac, 0xe7, 0xa2, 0x47, 0x30, 0x4d, 0x9c, 0x33, 0xac, 0x65, 0x25, 0xed, 0xf6, + 0x78, 0xa4, 0xdf, 0x4c, 0xd2, 0x22, 0x8e, 0x25, 0x41, 0xe8, 0x3e, 0xcc, 0x86, 0xbb, 0xd5, 0x72, + 0x46, 0xae, 0x52, 0xdc, 0x5a, 0xa8, 0x46, 0xdb, 0xad, 0x1e, 0x0a, 0xb3, 0x15, 0x79, 0x51, 0x1b, + 0xa0, 0xd3, 0x1f, 0x30, 0x8e, 0x03, 0xdb, 0x73, 0xb5, 0x69, 0x29, 0x5d, 0x1f, 0x8f, 0xf4, 0xaf, + 0x94, 0x74, 0x3d, 0xf4, 0x4e, 0x6e, 0xea, 0xa4, 0x57, 0x89, 0x3c, 0xdb, 0x9e, 0xfb, 0x70, 0x83, + 0xd0, 0xc7, 0x27, 0xbd, 0xc7, 0x1d, 0x4a, 0x18, 0x0f, 0x84, 0xb0, 0x69, 0x15, 0x22, 0xd9, 0x86, + 0x8b, 0x5e, 0xc2, 0xbc, 0x5a, 0x43, 0x1e, 0x60, 0x46, 0xae, 0x52, 0x1e, 0x8f, 0xf4, 0x95, 0x89, + 0x55, 0xd4, 0x19, 0x8a, 0x11, 0xbe, 0x29, 0x8e, 0xf2, 0x1a, 0x66, 0xfb, 0x4e, 0x1b, 0xf7, 0x99, + 0x36, 0x2b, 0x8f, 0xb2, 0x1a, 0x1f, 0x45, 0x1c, 0xbb, 0xfa, 0x56, 0xfa, 0xf6, 0x09, 0x0f, 0x2e, + 0xae, 0x06, 0xc5, 0x90, 0x5e, 0xd3, 0x8a, 0x14, 0xd0, 0x77, 0x50, 0x74, 0x08, 0xa1, 0xdc, 0xe1, + 0x1e, 0x25, 0x4c, 0x9b, 0x93, 0x82, 0xeb, 0x69, 0xc1, 0xdd, 0x4b, 0x40, 0xa8, 0x7a, 0x77, 0x3c, + 0xd2, 0xb5, 0x94, 0xea, 0x25, 0xc4, 0xb4, 0x92, 0x82, 0xe8, 0x3d, 0x14, 0xbe, 0xa7, 0x1e, 0xc1, + 0xae, 0xed, 0x70, 0xed, 0x86, 0x91, 0xa9, 0x14, 0xb7, 0xca, 0xd5, 0xb0, 0x76, 0xab, 0xaa, 0x76, + 0xab, 0x87, 0xaa, 0x76, 0x6b, 0xff, 0x19, 0x8f, 0xf4, 0xb5, 0x94, 0xf2, 0x6b, 0xea, 0x11, 0x43, + 0x00, 0x54, 0x28, 0xf2, 0xa1, 0xde, 0x2e, 0x47, 0x5b, 0xb0, 0xec, 0x11, 0x8e, 0x03, 0xe2, 0xf4, + 0x6d, 0xcf, 0xb7, 0x1d, 0xd7, 0x0d, 0x30, 0x63, 0x98, 0x69, 0x79, 0x23, 0x57, 0x29, 0x58, 0x37, + 0x95, 0xb3, 0xe1, 0xef, 0x2a, 0x97, 0xe0, 0xe0, 0xf3, 0xeb, 0x38, 0x85, 0x90, 0xa3, 0x9c, 0x49, + 0xce, 0x0e, 0xac, 0x5e, 0xb9, 0x09, 0xf6, 0x10, 0x07, 0xcc, 0xa3, 0x44, 0x03, 0x99, 0xbb, 0xac, + 0x96, 0xb1, 0x6e, 0xc7, 0x20, 0x2b, 0xc4, 0x1c, 0x87, 0x10, 0xf4, 0x1a, 0x96, 0xae, 0xf0, 0xb5, + 0x05, 0x19, 0x8b, 0xb5, 0x38, 0xd2, 0xf5, 0x09, 0x72, 0x83, 0x9c, 0x50, 0xab, 0x34, 0x29, 0x89, + 0xee, 0xc1, 0x42, 0x0f, 0x07, 0x04, 0xf7, 0xe3, 0x0d, 0x14, 0xc5, 0x06, 0xac, 0x1b, 0xa1, 0x55, + 0x2d, 0xf9, 0x10, 0x4a, 0xd4, 0xc7, 0x81, 0xc3, 0x3d, 0xd2, 0xb5, 0xd9, 0x05, 0xe3, 0xf8, 0x4c, + 0x5b, 0x92, 0xc0, 0xc5, 0xd8, 0xde, 0x92, 0x66, 0xb4, 0x03, 0x79, 0xca, 0x6c, 0xef, 0xcc, 0xe9, + 0x62, 0x6d, 0xfe, 0xea, 0x05, 0x7c, 0xa7, 0xe0, 0x46, 0x88, 0x57, 0x69, 0x98, 0xa3, 0xac, 0x21, + 0x38, 0xe8, 0x01, 0x2c, 0xf6, 0x06, 0x6d, 0xdc, 0xc7, 0x3c, 0xde, 0xd2, 0xa2, 0x5c, 0x69, 0x21, + 0x32, 0xab, 0x3d, 0x6d, 0x00, 0x12, 0x16, 0xdb, 0x0f, 0xe8, 0xf9, 0x45, 0x8c, 0x2d, 0x49, 0x6c, + 0x49, 0x78, 0x0e, 0x84, 0x43, 0xa1, 0x6d, 0x98, 0xef, 0x3b, 0x8c, 0xdb, 0x03, 0xdf, 0x75, 0x38, + 0x76, 0xb5, 0xd5, 0x4f, 0xd6, 0x8e, 0x31, 0x1e, 0xe9, 0x77, 0xd5, 0xb6, 0xdf, 0x3a, 0x8c, 0x1b, + 0x47, 0x21, 0x77, 0xe3, 0xd4, 0x73, 0x5d, 0x2c, 0x2a, 0x53, 0x28, 0x46, 0x46, 0x74, 0x08, 0xc5, + 0xde, 0x73, 0x16, 0xeb, 0x97, 0x3f, 0xa9, 0x1f, 0xdd, 0x25, 0xc2, 0x68, 0x70, 0xea, 0xb0, 0xd3, + 0x6d, 0xd3, 0xeb, 0x12, 0x19, 0x0a, 0xe8, 0x3d, 0x67, 0x4a, 0xf5, 0x25, 0x4c, 0x8b, 0xee, 0xaa, + 0x21, 0x29, 0xb7, 0x94, 0xba, 0x48, 0xad, 0x8e, 0x43, 0x6a, 0x2b, 0xe3, 0x91, 0x8e, 0x7c, 0xda, + 0xf7, 0x3a, 0x17, 0x51, 0x85, 0x0b, 0xb3, 0x69, 0x49, 0x1a, 0x7a, 0x03, 0x10, 0x77, 0x63, 0xa6, + 0xdd, 0x34, 0x32, 0x95, 0x99, 0xda, 0xc3, 0xf1, 0x48, 0xbf, 0x17, 0xf7, 0x05, 0xe5, 0x35, 0xea, + 0x74, 0x40, 0x78, 0x98, 0x0d, 0x75, 0xc0, 0x57, 0x53, 0x56, 0x82, 0x8e, 0x5e, 0xc0, 0x74, 0x67, + 0x88, 0x99, 0x76, 0x4b, 0xca, 0xa4, 0xb2, 0x5a, 0x3f, 0xde, 0xbf, 0x56, 0x20, 0x63, 0x49, 0x0a, + 0x3a, 0x80, 0xf9, 0x13, 0xef, 0xdc, 0x69, 0xf7, 0xb1, 0x2d, 0x25, 0x96, 0xa5, 0xc4, 0xa3, 0xf1, + 0x48, 0x7f, 0xa0, 0x24, 0xbe, 0x0e, 0xfd, 0xc6, 0xc7, 0xa4, 0xb2, 0x56, 0x31, 0x92, 0xa8, 0x0b, + 0xc5, 0x1a, 0xe4, 0xfd, 0xc0, 0xa3, 0x81, 0xc7, 0x2f, 0xb4, 0x15, 0x23, 0x53, 0xc9, 0xd5, 0xee, + 0x8f, 0x47, 0xba, 0x99, 0xba, 0xeb, 0x96, 0xc7, 0x7a, 0xc6, 0x41, 0x84, 0x8a, 0xb3, 0x16, 0xf3, + 0x50, 0x0d, 0x20, 0xf0, 0x58, 0xcf, 0x66, 0x1d, 0x1a, 0x60, 0xed, 0xb6, 0x91, 0xa9, 0x64, 0xaf, + 0x79, 0x2d, 0xa4, 0x4a, 0xab, 0x93, 0xd8, 0x8b, 0x55, 0x10, 0x34, 0x69, 0x42, 0x2f, 0x21, 0xcf, + 0xa9, 0x6f, 0x77, 0x86, 0x8c, 0x69, 0x9a, 0x54, 0x48, 0xd5, 0x8d, 0x54, 0x38, 0xa4, 0xbe, 0x51, + 0x3f, 0x6e, 0xb5, 0xa2, 0x5a, 0x7f, 0x95, 0xb3, 0xe6, 0x38, 0xf5, 0xeb, 0x43, 0xc6, 0x50, 0x05, + 0x66, 0xc4, 0x4b, 0xca, 0xb4, 0x3b, 0x46, 0xae, 0xb2, 0xb0, 0x85, 0xd2, 0x9d, 0xb2, 0x49, 0x39, + 0xb6, 0x42, 0x40, 0xf9, 0x05, 0x14, 0x13, 0x9d, 0x18, 0x95, 0x20, 0xd7, 0xc3, 0x17, 0xe1, 0x13, + 0x67, 0x89, 0x4f, 0x74, 0x0b, 0x66, 0x86, 0x4e, 0x7f, 0x10, 0xbd, 0x5f, 0x56, 0xf8, 0x63, 0x3b, + 0xfb, 0x3c, 0x53, 0xde, 0x81, 0xd2, 0x64, 0xcf, 0xfd, 0x1c, 0xbe, 0xb9, 0x26, 0x5e, 0x55, 0x8e, + 0xd1, 0x32, 0x2c, 0x7d, 0xdb, 0x68, 0xb5, 0x1a, 0xcd, 0x6f, 0xec, 0x56, 0x7d, 0xb7, 0x69, 0xef, + 0xed, 0x1e, 0xee, 0x96, 0xa6, 0x6a, 0x25, 0x58, 0x60, 0x98, 0xdb, 0x97, 0x95, 0x52, 0x03, 0xc8, + 0x4b, 0xcb, 0x10, 0xb3, 0xda, 0x0d, 0x28, 0x8a, 0xef, 0x28, 0x77, 0xb5, 0x05, 0x98, 0x17, 0x3f, + 0x55, 0xcc, 0xcc, 0x5f, 0xb3, 0x90, 0x57, 0xc5, 0x2c, 0xba, 0xbb, 0x28, 0x5b, 0x5b, 0x76, 0xb4, + 0xcc, 0x3f, 0xe8, 0xee, 0x42, 0x25, 0xdd, 0xdd, 0x85, 0x9e, 0x30, 0x5c, 0xdb, 0xc2, 0x72, 0xd7, + 0xb7, 0xb0, 0x77, 0xa9, 0x5b, 0x93, 0x95, 0x6f, 0x98, 0x19, 0x67, 0x66, 0xff, 0xac, 0x8d, 0x5d, + 0x17, 0xbb, 0x6a, 0xd7, 0xf1, 0x15, 0xaa, 0x15, 0xc7, 0x23, 0x7d, 0x4e, 0xbe, 0xde, 0x8f, 0xcd, + 0xd4, 0xcd, 0xd9, 0x50, 0x59, 0x9e, 0x96, 0x59, 0x5e, 0xb9, 0x72, 0x8d, 0x93, 0x99, 0x36, 0xb7, + 0xa3, 0x70, 0x17, 0x60, 0xe6, 0xa8, 0xd9, 0xda, 0x3f, 0x2c, 0x4d, 0xa1, 0x45, 0x28, 0x1e, 0x35, + 0x5b, 0x47, 0x07, 0x07, 0xef, 0xac, 0xc3, 0xfd, 0xbd, 0x52, 0x06, 0xad, 0x00, 0x7a, 0xb3, 0x6f, + 0x35, 0xf7, 0xdf, 0xda, 0x49, 0x7b, 0xd6, 0xfc, 0x39, 0x0b, 0xa0, 0x44, 0x8f, 0xb7, 0xd0, 0x97, + 0x30, 0x27, 0xa6, 0x3d, 0xfb, 0xf3, 0x86, 0xa1, 0x59, 0xc1, 0x69, 0xb8, 0xe8, 0x19, 0x14, 0x24, + 0xfb, 0xef, 0x4c, 0x45, 0x79, 0x81, 0x94, 0xe3, 0x44, 0x2a, 0x89, 0xb9, 0x7f, 0x37, 0x89, 0x5f, + 0xa4, 0x32, 0x33, 0x2d, 0xc5, 0x97, 0xab, 0xd1, 0xfc, 0x79, 0xfc, 0xa4, 0x1a, 0xe7, 0x82, 0xa5, + 0xe2, 0x7f, 0x4f, 0xc5, 0x7f, 0x46, 0xc6, 0x7f, 0x31, 0xc1, 0x48, 0x06, 0xfe, 0xcf, 0x2c, 0xac, + 0x7e, 0x34, 0xbb, 0xe8, 0xff, 0xd1, 0x78, 0x18, 0x06, 0x32, 0x35, 0xb3, 0xc4, 0xa0, 0xf4, 0x8c, + 0xb8, 0x03, 0x73, 0xea, 0x59, 0x0a, 0xa3, 0xf7, 0xbf, 0xf1, 0x48, 0x37, 0xae, 0xb6, 0xde, 0xe8, + 0x8d, 0x8a, 0x9f, 0xc2, 0x88, 0x84, 0x9e, 0xc1, 0x8c, 0x98, 0x7d, 0xd5, 0x88, 0xb9, 0x7e, 0xa5, + 0x04, 0x8f, 0x93, 0x93, 0xb1, 0x15, 0x82, 0xd1, 0x1e, 0x2c, 0x26, 0x27, 0x66, 0x0f, 0xab, 0x31, + 0xac, 0x9c, 0x2a, 0xbb, 0x34, 0x77, 0x92, 0x82, 0xca, 0x89, 0xfe, 0x2a, 0xe2, 0x9c, 0x4b, 0xf4, + 0xcd, 0x3b, 0x89, 0x9e, 0x27, 0x66, 0xcd, 0xec, 0xab, 0xa9, 0xcb, 0x8e, 0xb6, 0x96, 0x6a, 0xaa, + 0xb3, 0xc2, 0x9d, 0xe8, 0x97, 0x93, 0xf7, 0xbf, 0xf6, 0xec, 0x97, 0x0f, 0xeb, 0x99, 0xdf, 0x3e, + 0xac, 0x67, 0x7e, 0xff, 0xb0, 0x9e, 0xf9, 0xf1, 0x8f, 0xf5, 0x29, 0x58, 0xf5, 0x68, 0x95, 0x71, + 0xa7, 0xd3, 0x0b, 0xe8, 0x79, 0x58, 0x30, 0x6a, 0xdf, 0xef, 0xd5, 0xdf, 0x95, 0xf6, 0xac, 0xb4, + 0x3f, 0xfd, 0x2b, 0x00, 0x00, 0xff, 0xff, 0x7b, 0x07, 0x28, 0xc5, 0xd4, 0x0c, 0x00, 0x00, } func (m *Node) Marshal() (dAtA []byte, err error) { @@ -1324,6 +1430,89 @@ func (m *NodeScan) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } +func (m *NodeScanV2) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *NodeScanV2) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NodeScanV2) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } + if len(m.Notes) > 0 { + dAtA12 := make([]byte, len(m.Notes)*10) + var j11 int + for _, num := range m.Notes { + for num >= 1<<7 { + dAtA12[j11] = uint8(uint64(num)&0x7f | 0x80) + num >>= 7 + j11++ + } + dAtA12[j11] = uint8(num) + j11++ + } + i -= j11 + copy(dAtA[i:], dAtA12[:j11]) + i = encodeVarintNode(dAtA, i, uint64(j11)) + i-- + dAtA[i] = 0x2a + } + if m.Components != nil { + { + size, err := m.Components.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintNode(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x22 + } + if m.ScanTime != nil { + { + size, err := m.ScanTime.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintNode(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x1a + } + if len(m.NodeName) > 0 { + i -= len(m.NodeName) + copy(dAtA[i:], m.NodeName) + i = encodeVarintNode(dAtA, i, uint64(len(m.NodeName))) + i-- + dAtA[i] = 0x12 + } + if len(m.NodeId) > 0 { + i -= len(m.NodeId) + copy(dAtA[i:], m.NodeId) + i = encodeVarintNode(dAtA, i, uint64(len(m.NodeId))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + func (m *EmbeddedNodeScanComponent) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -1637,6 +1826,41 @@ func (m *NodeScan) Size() (n int) { return n } +func (m *NodeScanV2) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.NodeId) + if l > 0 { + n += 1 + l + sovNode(uint64(l)) + } + l = len(m.NodeName) + if l > 0 { + n += 1 + l + sovNode(uint64(l)) + } + if m.ScanTime != nil { + l = m.ScanTime.Size() + n += 1 + l + sovNode(uint64(l)) + } + if m.Components != nil { + l = m.Components.Size() + n += 1 + l + sovNode(uint64(l)) + } + if len(m.Notes) > 0 { + l = 0 + for _, e := range m.Notes { + l += sovNode(uint64(e)) + } + n += 1 + sovNode(uint64(l)) + l + } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } + return n +} + func (m *EmbeddedNodeScanComponent) Size() (n int) { if m == nil { return 0 @@ -2989,6 +3213,262 @@ func (m *NodeScan) Unmarshal(dAtA []byte) error { } return nil } +func (m *NodeScanV2) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowNode + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: NodeScanV2: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: NodeScanV2: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field NodeId", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowNode + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthNode + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthNode + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.NodeId = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field NodeName", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowNode + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthNode + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthNode + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.NodeName = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ScanTime", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowNode + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthNode + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthNode + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.ScanTime == nil { + m.ScanTime = &types.Timestamp{} + } + if err := m.ScanTime.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 4: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Components", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowNode + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthNode + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthNode + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.Components == nil { + m.Components = &v1.Components{} + } + if err := m.Components.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 5: + if wireType == 0 { + var v v1.Note + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowNode + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= v1.Note(b&0x7F) << shift + if b < 0x80 { + break + } + } + m.Notes = append(m.Notes, v) + } else if wireType == 2 { + var packedLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowNode + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + packedLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if packedLen < 0 { + return ErrInvalidLengthNode + } + postIndex := iNdEx + packedLen + if postIndex < 0 { + return ErrInvalidLengthNode + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + var elementCount int + if elementCount != 0 && len(m.Notes) == 0 { + m.Notes = make([]v1.Note, 0, elementCount) + } + for iNdEx < postIndex { + var v v1.Note + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowNode + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= v1.Note(b&0x7F) << shift + if b < 0x80 { + break + } + } + m.Notes = append(m.Notes, v) + } + } else { + return fmt.Errorf("proto: wrong wireType = %d for field Notes", wireType) + } + default: + iNdEx = preIndex + skippy, err := skipNode(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthNode + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func (m *EmbeddedNodeScanComponent) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 diff --git a/proto/internalapi/sensor/compliance_iservice.proto b/proto/internalapi/sensor/compliance_iservice.proto index def206fa72270..2c1a89451ccc0 100644 --- a/proto/internalapi/sensor/compliance_iservice.proto +++ b/proto/internalapi/sensor/compliance_iservice.proto @@ -6,6 +6,7 @@ import "internalapi/compliance/compliance_data.proto"; import "storage/cluster.proto"; import "storage/container_runtime.proto"; import "storage/kube_event.proto"; +import "storage/node.proto"; package sensor; @@ -25,6 +26,7 @@ message MsgFromCompliance { oneof msg { compliance.ComplianceReturn return = 2; AuditEvents audit_events = 3; + storage.NodeScanV2 node_scan_v2 = 4; } } diff --git a/proto/storage/node.proto b/proto/storage/node.proto index de8b3e3cae363..d53b918657dd9 100644 --- a/proto/storage/node.proto +++ b/proto/storage/node.proto @@ -4,10 +4,13 @@ option go_package = "storage"; option java_package = "io.stackrox.proto.storage"; import "google/protobuf/timestamp.proto"; +import "scanner/api/v1/note.proto"; +import "scanner/api/v1/component.proto"; import "storage/container_runtime.proto"; import "storage/taints.proto"; import "storage/vulnerability.proto"; + import "gogoproto/gogo.proto"; package storage; @@ -82,6 +85,14 @@ message NodeScan { repeated Note notes = 4; } +message NodeScanV2 { + string node_id = 1 [(gogoproto.moretags) = 'search:"Node ID,store" sql:"pk"']; + string node_name = 2 [(gogoproto.moretags) = 'search:"Node,store"']; + google.protobuf.Timestamp scan_time = 3 [(gogoproto.moretags) = 'search:"Node Scan Time,store"']; + scannerV1.Components components = 4; + repeated scannerV1.Note notes = 5; +} + message EmbeddedNodeScanComponent { string name = 1 [(gogoproto.moretags) = 'search:"Component,store"']; string version = 2 [(gogoproto.moretags) = 'search:"Component Version,store"'];