diff --git a/central/sensor/service/pipeline/nodescansv2/pipeline.go b/central/sensor/service/pipeline/nodescansv2/pipeline.go index 6f912b106a385..740e7484dc2c7 100644 --- a/central/sensor/service/pipeline/nodescansv2/pipeline.go +++ b/central/sensor/service/pipeline/nodescansv2/pipeline.go @@ -35,21 +35,21 @@ func (p *pipelineImpl) Reconcile(ctx context.Context, clusterID string, storeMap } func (p *pipelineImpl) Match(msg *central.MsgFromSensor) bool { - return msg.GetEvent().GetNodeScanV2() != nil + return msg.GetEvent().GetNodeInventory() != nil } // Run runs the pipeline template on the input and returns the output. func (p *pipelineImpl) Run(ctx context.Context, clusterID string, msg *central.MsgFromSensor, _ common.MessageInjector) error { - defer countMetrics.IncrementResourceProcessedCounter(pipeline.ActionToOperation(msg.GetEvent().GetAction()), metrics.NodeScanV2) + defer countMetrics.IncrementResourceProcessedCounter(pipeline.ActionToOperation(msg.GetEvent().GetAction()), metrics.NodeInventory) event := msg.GetEvent() - nodeScan := event.GetNodeScanV2() - if nodeScan == nil { - return errors.Errorf("unexpected resource type %T for node scan v2", event.GetResource()) + nodeInventory := event.GetNodeInventory() + if nodeInventory == nil { + return errors.Errorf("unexpected resource type %T for node inventory", event.GetResource()) } - // TODO(ROX-12240, ROX-13053): Do something meaningful with the nodeScan - log.Infof("Central received NodeScanV2: %+v", nodeScan) + // TODO(ROX-12240, ROX-13053): Do something meaningful with the nodeInventory + log.Infof("Central received NodeInventory: %+v", nodeInventory) return nil } diff --git a/compliance/collection/main.go b/compliance/collection/main.go index 986a5d9854aa2..26dfebe692176 100644 --- a/compliance/collection/main.go +++ b/compliance/collection/main.go @@ -187,7 +187,7 @@ func scanNode(nodeName string, scanner nodescanv2.NodeScanner) (*sensor.MsgFromC } return &sensor.MsgFromCompliance{ Node: nodeName, - Msg: &sensor.MsgFromCompliance_NodeScanV2{NodeScanV2: result}, + Msg: &sensor.MsgFromCompliance_NodeInventory{NodeInventory: result}, }, nil } @@ -278,14 +278,14 @@ func main() { // TODO(ROX-12971): Replace with real scanner scanner := nodescanv2.FakeNodeScanner{} - nodeScansC := manageNodeScanLoop(ctx, env.NodeRescanInterval.DurationSetting(), &scanner) - // multiplex producers (nodeScansC) into the output channel (sensorC) + nodeInventoriesC := manageNodeScanLoop(ctx, env.NodeRescanInterval.DurationSetting(), &scanner) + // multiplex producers (nodeInventoriesC) into the output channel (sensorC) go func() { for { select { case <-ctx.Done(): return - case sensorC <- <-nodeScansC: + case sensorC <- <-nodeInventoriesC: } } }() diff --git a/compliance/collection/nodescanv2/fake_nodescan.go b/compliance/collection/nodescanv2/fake_nodescan.go index ee806da3a4452..59ac7f863080b 100644 --- a/compliance/collection/nodescanv2/fake_nodescan.go +++ b/compliance/collection/nodescanv2/fake_nodescan.go @@ -11,14 +11,14 @@ var ( log = logging.LoggerForModule() ) -// FakeNodeScanner can be used to send fake messages that would be emitted by NodeScanV2 +// FakeNodeScanner can be used to send fake messages that would be emitted by NodeInventory type FakeNodeScanner struct { } -// Scan returns a fake message in the same format a real NodeScanV2 would produce -func (f *FakeNodeScanner) Scan(nodeName string) (*storage.NodeScanV2, error) { +// Scan returns a fake message in the same format a real NodeInventory would produce +func (f *FakeNodeScanner) Scan(nodeName string) (*storage.NodeInventory, error) { log.Infof("Generating fake scan result message...") - msg := &storage.NodeScanV2{ + msg := &storage.NodeInventory{ NodeId: "", NodeName: nodeName, ScanTime: timestamp.TimestampNow(), diff --git a/compliance/collection/nodescanv2/nodescan.go b/compliance/collection/nodescanv2/nodescan.go index b99148896f4a1..3885873680b96 100644 --- a/compliance/collection/nodescanv2/nodescan.go +++ b/compliance/collection/nodescanv2/nodescan.go @@ -7,14 +7,14 @@ import ( // NodeScanner defines an interface for V2 NodeScanning type NodeScanner interface { - Scan(nodeName string) (*storage.NodeScanV2, error) + Scan(nodeName string) (*storage.NodeInventory, error) } // NodeScan is the V2 NodeScanning implementation type NodeScan struct { } -// Scan scans the current node and returns the results as storage.NodeScanV2 object -func (n *NodeScan) Scan(nodeName string) (*storage.NodeScanV2, error) { +// Scan scans the current node and returns the results as storage.NodeInventory object +func (n *NodeScan) Scan(nodeName string) (*storage.NodeInventory, error) { return nil, errors.New("Not implemented") } diff --git a/compliance/collection/nodescanv2/nodescan_test.go b/compliance/collection/nodescanv2/nodescan_test.go index e9e0762e6f1a7..d47cd7bf9214a 100644 --- a/compliance/collection/nodescanv2/nodescan_test.go +++ b/compliance/collection/nodescanv2/nodescan_test.go @@ -19,5 +19,5 @@ func (n *NodeScanSuite) TestMessageFormat() { fns, err := (&FakeNodeScanner{}).Scan("someNode") n.Nil(err) n.NotNil(fns) - n.IsType(&storage.NodeScanV2{}, fns) + n.IsType(&storage.NodeInventory{}, fns) } diff --git a/generated/internalapi/central/sensor_events.pb.go b/generated/internalapi/central/sensor_events.pb.go index c8d015f531c0f..eec7b95739321 100644 --- a/generated/internalapi/central/sensor_events.pb.go +++ b/generated/internalapi/central/sensor_events.pb.go @@ -323,7 +323,7 @@ type SensorEvent struct { // *SensorEvent_Namespace // *SensorEvent_Secret // *SensorEvent_Node - // *SensorEvent_NodeScanV2 + // *SensorEvent_NodeInventory // *SensorEvent_ServiceAccount // *SensorEvent_Role // *SensorEvent_Binding @@ -403,8 +403,8 @@ type SensorEvent_Secret struct { type SensorEvent_Node struct { Node *storage.Node `protobuf:"bytes,9,opt,name=node,proto3,oneof" json:"node,omitempty"` } -type SensorEvent_NodeScanV2 struct { - NodeScanV2 *storage.NodeScanV2 `protobuf:"bytes,25,opt,name=node_scan_v2,json=nodeScanV2,proto3,oneof" json:"node_scan_v2,omitempty"` +type SensorEvent_NodeInventory struct { + NodeInventory *storage.NodeInventory `protobuf:"bytes,25,opt,name=node_inventory,json=nodeInventory,proto3,oneof" json:"node_inventory,omitempty"` } type SensorEvent_ServiceAccount struct { ServiceAccount *storage.ServiceAccount `protobuf:"bytes,14,opt,name=service_account,json=serviceAccount,proto3,oneof" json:"service_account,omitempty"` @@ -518,15 +518,15 @@ func (m *SensorEvent_Node) Clone() isSensorEvent_Resource { cloned.Node = m.Node.Clone() return cloned } -func (*SensorEvent_NodeScanV2) isSensorEvent_Resource() {} -func (m *SensorEvent_NodeScanV2) Clone() isSensorEvent_Resource { +func (*SensorEvent_NodeInventory) isSensorEvent_Resource() {} +func (m *SensorEvent_NodeInventory) Clone() isSensorEvent_Resource { if m == nil { return nil } - cloned := new(SensorEvent_NodeScanV2) + cloned := new(SensorEvent_NodeInventory) *cloned = *m - cloned.NodeScanV2 = m.NodeScanV2.Clone() + cloned.NodeInventory = m.NodeInventory.Clone() return cloned } func (*SensorEvent_ServiceAccount) isSensorEvent_Resource() {} @@ -765,9 +765,9 @@ func (m *SensorEvent) GetNode() *storage.Node { return nil } -func (m *SensorEvent) GetNodeScanV2() *storage.NodeScanV2 { - if x, ok := m.GetResource().(*SensorEvent_NodeScanV2); ok { - return x.NodeScanV2 +func (m *SensorEvent) GetNodeInventory() *storage.NodeInventory { + if x, ok := m.GetResource().(*SensorEvent_NodeInventory); ok { + return x.NodeInventory } return nil } @@ -886,7 +886,7 @@ func (*SensorEvent) XXX_OneofWrappers() []interface{} { (*SensorEvent_Namespace)(nil), (*SensorEvent_Secret)(nil), (*SensorEvent_Node)(nil), - (*SensorEvent_NodeScanV2)(nil), + (*SensorEvent_NodeInventory)(nil), (*SensorEvent_ServiceAccount)(nil), (*SensorEvent_Role)(nil), (*SensorEvent_Binding)(nil), @@ -2409,118 +2409,118 @@ func init() { } var fileDescriptor_6ea3082f8d4cc74c = []byte{ - // 1763 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x58, 0xbb, 0x53, 0x23, 0xc9, - 0x19, 0x1f, 0x49, 0x48, 0x82, 0x4f, 0x0f, 0xa0, 0x41, 0x30, 0xe8, 0x38, 0x96, 0xd3, 0x9e, 0x77, - 0xb1, 0xcb, 0x07, 0x55, 0xec, 0xf9, 0x59, 0xf6, 0xda, 0xc0, 0xca, 0x25, 0xd5, 0x1e, 0x8f, 0x6a, - 0xc1, 0x56, 0xdd, 0x39, 0x98, 0x9a, 0x9d, 0x69, 0xd8, 0x31, 0xa3, 0xe9, 0xb9, 0xee, 0xd1, 0xba, - 0x14, 0x38, 0x70, 0xe4, 0xc4, 0x81, 0x43, 0x67, 0xce, 0x9d, 0xb8, 0xfc, 0x5f, 0x38, 0xf4, 0x9f, - 0xe0, 0x5a, 0x27, 0x4e, 0x1d, 0x39, 0x75, 0xf5, 0x63, 0x66, 0x5a, 0x83, 0xe0, 0xa8, 0x8b, 0x98, - 0xfe, 0x7d, 0xbf, 0xef, 0xd9, 0xdd, 0xdf, 0xd7, 0x02, 0x9e, 0x07, 0x51, 0x42, 0x58, 0xe4, 0x86, - 0x6e, 0x1c, 0x1c, 0x78, 0x24, 0x4a, 0x98, 0x1b, 0x1e, 0x70, 0x12, 0x71, 0xca, 0x1c, 0xf2, 0x9e, - 0x44, 0x09, 0xdf, 0x8f, 0x19, 0x4d, 0x28, 0xaa, 0x6b, 0x61, 0xf7, 0xfb, 0x33, 0x1a, 0x74, 0x1c, - 0x87, 0x81, 0x1b, 0x79, 0xc4, 0xf8, 0x74, 0x7c, 0x37, 0x71, 0x95, 0x5a, 0x77, 0x8d, 0x27, 0x94, - 0xb9, 0x37, 0xe4, 0xc0, 0x0d, 0x09, 0x4b, 0x34, 0xd8, 0x49, 0x41, 0x2f, 0x9c, 0xf0, 0x84, 0x30, - 0x0d, 0xdb, 0x29, 0xec, 0x93, 0x38, 0xa4, 0xd3, 0x31, 0x89, 0x52, 0x85, 0xdd, 0x54, 0x12, 0xb9, - 0x63, 0xc2, 0x63, 0xd7, 0x23, 0xce, 0x98, 0x24, 0xae, 0xe1, 0x67, 0x3b, 0x63, 0x90, 0xe4, 0xb7, - 0x94, 0xdd, 0x3a, 0x31, 0x0d, 0x03, 0x6f, 0xaa, 0xa5, 0x28, 0x93, 0x52, 0x9f, 0x68, 0x6c, 0x3d, - 0xc5, 0x38, 0xf1, 0x18, 0x49, 0x3d, 0x7d, 0x9c, 0xa3, 0xec, 0x7d, 0xe0, 0x11, 0xc7, 0xf5, 0x3c, - 0x3a, 0xc9, 0x02, 0xc9, 0x0c, 0xb1, 0xb7, 0xae, 0x57, 0x34, 0x34, 0xe3, 0xf2, 0x49, 0x86, 0x32, - 0xea, 0x11, 0xce, 0x9d, 0x20, 0xf2, 0x03, 0xcf, 0x4d, 0x28, 0x2b, 0x12, 0x82, 0xb1, 0x7b, 0x43, - 0x1c, 0x51, 0xd5, 0x1b, 0xe6, 0x26, 0x01, 0x8d, 0x34, 0xe1, 0x93, 0xac, 0x4a, 0x79, 0x65, 0x69, - 0x4c, 0x58, 0x6e, 0xa3, 0xf7, 0x12, 0x36, 0x31, 0xd1, 0x0e, 0x5e, 0x65, 0x45, 0xc3, 0x01, 0xbf, - 0x45, 0x4f, 0xa1, 0x95, 0x97, 0xd1, 0x09, 0x7c, 0xbb, 0xb4, 0x5b, 0xda, 0x5b, 0xc2, 0xcd, 0x1c, - 0x1c, 0xfa, 0xbd, 0xff, 0x96, 0xa0, 0x79, 0x24, 0x36, 0x06, 0x13, 0x3e, 0x09, 0x13, 0xfe, 0x28, - 0x2d, 0xf4, 0x0c, 0x6a, 0x72, 0x37, 0xb9, 0x5d, 0xde, 0xad, 0xec, 0x35, 0x0e, 0xdb, 0xfb, 0x3a, - 0xd2, 0x7d, 0x65, 0x4b, 0x4b, 0xd1, 0x67, 0x50, 0xe5, 0x89, 0x7b, 0x43, 0xec, 0xca, 0x6e, 0x69, - 0xaf, 0x7d, 0xb8, 0x99, 0xd1, 0xbe, 0x08, 0xae, 0x89, 0x37, 0xf5, 0x42, 0x32, 0x12, 0x62, 0xac, - 0x58, 0xe8, 0x73, 0xa8, 0x71, 0x3a, 0x61, 0x1e, 0xb1, 0x17, 0x24, 0x7f, 0x7b, 0x5f, 0x1f, 0xb9, - 0x7d, 0x33, 0xc4, 0xfd, 0x91, 0xe4, 0x60, 0xcd, 0xed, 0x1d, 0x40, 0x4d, 0x21, 0x68, 0x1d, 0x56, - 0x5e, 0xf5, 0x2f, 0xbe, 0x38, 0xff, 0xf2, 0xb4, 0x7f, 0x76, 0xe9, 0xf4, 0xdf, 0xf4, 0xcf, 0x2e, - 0x57, 0x2c, 0xb4, 0x0c, 0x8d, 0xa3, 0xab, 0x57, 0xc3, 0x14, 0x28, 0xf5, 0xbe, 0x82, 0xda, 0x65, - 0x30, 0x0e, 0xa2, 0x1b, 0xb4, 0x03, 0xe0, 0x07, 0x3c, 0x76, 0x13, 0xef, 0x1d, 0x61, 0x3a, 0x53, - 0x03, 0x41, 0x5d, 0x58, 0x64, 0x44, 0x87, 0x54, 0x96, 0xd2, 0x6c, 0x8d, 0xd6, 0xa1, 0x1a, 0xb9, - 0x11, 0xe5, 0x32, 0xb7, 0x0a, 0x56, 0x8b, 0xde, 0xdf, 0x5b, 0xd0, 0x18, 0xc9, 0xcb, 0xd3, 0x17, - 0x77, 0x07, 0xb5, 0xa1, 0x9c, 0xd5, 0xb0, 0x1c, 0xf8, 0xe8, 0x00, 0x6a, 0xae, 0x27, 0xb6, 0x58, - 0xda, 0x13, 0x25, 0x49, 0x53, 0xc4, 0xda, 0xf0, 0x91, 0x14, 0x63, 0x4d, 0x43, 0xcf, 0xa1, 0x96, - 0xc8, 0x60, 0xa5, 0x9f, 0xc6, 0xe1, 0x72, 0xa6, 0xa0, 0x72, 0xc0, 0x5a, 0x8c, 0x7e, 0x01, 0xed, - 0xd9, 0x93, 0x2f, 0x8b, 0xd8, 0x38, 0xdc, 0xc8, 0x8a, 0x7e, 0xa6, 0xc4, 0x17, 0x52, 0x3a, 0xb0, - 0x70, 0x2b, 0x32, 0x01, 0xf4, 0x03, 0x80, 0x7c, 0x93, 0xed, 0xaa, 0x54, 0x5e, 0xcb, 0x94, 0xf3, - 0xc3, 0x35, 0xb0, 0xb0, 0x41, 0x44, 0xbb, 0x50, 0x89, 0xa9, 0x6f, 0xaf, 0x49, 0x7e, 0x33, 0xe3, - 0x5f, 0x50, 0x7f, 0x60, 0x61, 0x21, 0x42, 0x3f, 0x85, 0xa5, 0xec, 0xd6, 0xda, 0x35, 0xc9, 0xeb, - 0xe6, 0x41, 0xa5, 0x92, 0x53, 0x7d, 0x9d, 0x07, 0x16, 0xce, 0xe9, 0xe8, 0xbb, 0x50, 0x53, 0xb7, - 0xd3, 0xae, 0xeb, 0xf4, 0x53, 0xc5, 0x91, 0x84, 0x07, 0x16, 0xd6, 0x04, 0xf4, 0x14, 0x16, 0xc4, - 0xe5, 0xb6, 0x97, 0x24, 0xb1, 0x95, 0x7b, 0xa0, 0x3e, 0x19, 0x58, 0x58, 0x0a, 0xd1, 0x8f, 0xa0, - 0x29, 0xfe, 0x3a, 0xdc, 0x73, 0x23, 0xe7, 0xfd, 0xa1, 0xbd, 0x55, 0x48, 0x53, 0x90, 0x47, 0x9e, - 0x1b, 0xbd, 0x39, 0x14, 0x69, 0x46, 0xd9, 0x0a, 0x1d, 0xc3, 0x72, 0xa1, 0x21, 0xd8, 0x6d, 0xa9, - 0xbb, 0x69, 0x44, 0x24, 0xe5, 0x47, 0x4a, 0x3c, 0xb0, 0x70, 0x9b, 0xcf, 0x20, 0xe8, 0x19, 0x2c, - 0x30, 0x1a, 0x12, 0x7b, 0x59, 0x2a, 0xae, 0x64, 0x8a, 0xaf, 0x7f, 0xcc, 0x31, 0x0d, 0x65, 0x90, - 0x42, 0x8e, 0x5e, 0x40, 0xfd, 0xad, 0x68, 0x16, 0xd1, 0x8d, 0xbd, 0x52, 0xf0, 0xa1, 0xa9, 0xc7, - 0x4a, 0x3c, 0xb0, 0x70, 0xca, 0x44, 0x03, 0x58, 0xbd, 0xd3, 0x68, 0xec, 0x45, 0xa9, 0xbe, 0x95, - 0xef, 0x8a, 0x62, 0x0c, 0x53, 0xc2, 0xc0, 0xc2, 0x2b, 0x71, 0x01, 0xd3, 0x96, 0xde, 0x07, 0x3e, - 0x61, 0x59, 0x93, 0xb5, 0xe1, 0xae, 0x25, 0xc9, 0x30, 0xb6, 0x6d, 0x25, 0x2e, 0x60, 0xe8, 0x25, - 0xd4, 0xf8, 0x34, 0xf2, 0x88, 0x6f, 0x37, 0xa4, 0xfa, 0xa7, 0xd9, 0xe1, 0x35, 0xee, 0x48, 0x76, - 0xf2, 0xf9, 0x48, 0x72, 0xe5, 0x96, 0xca, 0x2f, 0x74, 0x09, 0x1d, 0xca, 0xbc, 0x77, 0x84, 0x27, - 0xb2, 0xe7, 0xe5, 0xd1, 0x34, 0xa5, 0xb9, 0x8f, 0xb3, 0x68, 0xce, 0x0d, 0x96, 0x11, 0xd1, 0x3a, - 0x9d, 0x83, 0x8b, 0xfc, 0xee, 0x74, 0x5c, 0xbb, 0x55, 0xc8, 0x6f, 0x28, 0x18, 0xc3, 0x9c, 0x20, - 0xf2, 0x0b, 0x0a, 0x18, 0xba, 0x82, 0x75, 0x96, 0x76, 0x5f, 0xc7, 0xb8, 0x3c, 0xab, 0xd2, 0xd8, - 0xae, 0x71, 0xb7, 0xe7, 0xb6, 0xe8, 0x81, 0x85, 0xd7, 0xd8, 0x5d, 0x11, 0xfa, 0x19, 0xb4, 0x64, - 0x03, 0x75, 0x98, 0xea, 0x78, 0x36, 0x92, 0xf6, 0x3a, 0x73, 0xdb, 0xe1, 0xc0, 0xc2, 0x4d, 0xd7, - 0xec, 0xe0, 0xd7, 0xd0, 0x9d, 0x33, 0x2f, 0xb4, 0x2d, 0x7b, 0x5d, 0x9a, 0x7a, 0x96, 0xe5, 0x79, - 0x92, 0x51, 0xcf, 0x35, 0xf3, 0xe4, 0x1d, 0xf1, 0x6e, 0x95, 0xb1, 0x81, 0x85, 0x6d, 0xef, 0x0e, - 0x41, 0xc9, 0x90, 0x0f, 0x1f, 0xcd, 0xf3, 0x13, 0x33, 0x7a, 0x1d, 0x84, 0xc4, 0xee, 0x48, 0x47, - 0xbd, 0x07, 0x1c, 0x5d, 0x28, 0xe6, 0xc0, 0xc2, 0x5b, 0xde, 0x7d, 0x42, 0xf4, 0x6b, 0xb0, 0xe7, - 0x66, 0x33, 0x09, 0x89, 0xbd, 0x21, 0x5d, 0x3c, 0x79, 0xc0, 0x05, 0x9e, 0x48, 0xfb, 0x1b, 0xde, - 0x5c, 0x09, 0xfa, 0x43, 0x09, 0xf6, 0xe6, 0x59, 0x97, 0xdd, 0x81, 0x93, 0x24, 0x09, 0xa2, 0x1b, - 0x27, 0xbd, 0x8a, 0x9b, 0xd2, 0xdb, 0x67, 0x0f, 0x78, 0x13, 0xad, 0x62, 0xa4, 0xb4, 0xf2, 0x0b, - 0xfa, 0xa9, 0xf7, 0x08, 0xde, 0x7d, 0x69, 0x8a, 0x40, 0x6c, 0xfb, 0x1b, 0xd3, 0x14, 0x06, 0xe7, - 0xa7, 0x29, 0x24, 0xdd, 0x55, 0x58, 0x2e, 0xdc, 0xb1, 0x63, 0xc8, 0x27, 0x5b, 0xef, 0x7f, 0x25, - 0x58, 0xd5, 0xf7, 0x31, 0xba, 0xa6, 0xcc, 0x23, 0xfa, 0x10, 0x36, 0x48, 0xbe, 0x94, 0x23, 0xac, - 0x6d, 0xf4, 0x6d, 0x83, 0xaa, 0x27, 0x96, 0x49, 0x47, 0xbf, 0x9c, 0x19, 0x26, 0x65, 0x99, 0xc1, - 0x4e, 0x76, 0x7e, 0xf3, 0xb3, 0x6e, 0x98, 0x29, 0xcc, 0x95, 0x37, 0x80, 0x3c, 0x1a, 0x25, 0x6e, - 0x10, 0x11, 0xe6, 0x04, 0x11, 0x4f, 0x44, 0x5a, 0x7a, 0x08, 0x7e, 0x27, 0xb3, 0x74, 0x92, 0x52, - 0x86, 0x9a, 0x31, 0x6b, 0x70, 0xd5, 0x2b, 0xca, 0x67, 0x32, 0xff, 0x4f, 0x09, 0x3a, 0x73, 0x63, - 0x79, 0xdc, 0x33, 0xe8, 0x39, 0x2c, 0x1b, 0x24, 0x31, 0xb4, 0xf4, 0x2b, 0xa1, 0x9d, 0xc3, 0x62, - 0xbe, 0x15, 0x88, 0xc9, 0x34, 0x56, 0x89, 0xcc, 0x10, 0x2f, 0xa7, 0x31, 0x41, 0xdb, 0xe6, 0xa8, - 0x5c, 0x90, 0x14, 0x63, 0x18, 0x6e, 0xc1, 0xa2, 0xea, 0x0b, 0x81, 0x2f, 0xe7, 0xf3, 0x12, 0xae, - 0xcb, 0xf5, 0xd0, 0x47, 0x4f, 0xa0, 0xa1, 0xa6, 0xbe, 0x0a, 0xa3, 0xa6, 0x9e, 0x32, 0x0a, 0x12, - 0x21, 0xf4, 0xfe, 0x58, 0x82, 0xed, 0x87, 0x8a, 0x85, 0x3a, 0x50, 0x8b, 0xa9, 0x2f, 0x4c, 0xab, - 0x1c, 0xaa, 0x31, 0xf5, 0x87, 0x3e, 0xba, 0x82, 0x0d, 0x23, 0x74, 0xf3, 0x44, 0x54, 0x1e, 0xb3, - 0xa9, 0xb8, 0xe3, 0xcf, 0x83, 0x7b, 0x7f, 0x2d, 0x41, 0x6b, 0xe4, 0x31, 0x37, 0x26, 0x27, 0x74, - 0x3c, 0x76, 0x23, 0x1f, 0x7d, 0x04, 0x4b, 0x5c, 0x02, 0x79, 0xb5, 0x17, 0x15, 0x30, 0xf4, 0xd1, - 0x4f, 0xa0, 0xc9, 0x13, 0x97, 0x25, 0x8e, 0x42, 0xf4, 0x81, 0x5a, 0xcf, 0xc7, 0x89, 0x10, 0x2a, - 0x7b, 0x03, 0x0b, 0x37, 0x78, 0xbe, 0x44, 0x3f, 0x84, 0xc6, 0x6d, 0x10, 0x86, 0xa9, 0x66, 0x45, - 0x0f, 0xfc, 0x54, 0xf3, 0x75, 0x10, 0x86, 0x99, 0x22, 0xdc, 0x66, 0xab, 0xe3, 0x25, 0xa8, 0x7b, - 0x2a, 0xb4, 0xde, 0x10, 0x1a, 0x86, 0x03, 0xb1, 0x49, 0xef, 0x28, 0x4f, 0xe4, 0xbe, 0xd8, 0xa5, - 0xdd, 0x8a, 0xd8, 0xa4, 0x0c, 0x10, 0x52, 0x51, 0x5c, 0xdf, 0x65, 0xbe, 0x7a, 0x1e, 0x2f, 0xe1, - 0x1c, 0xe8, 0x35, 0x01, 0x72, 0x8f, 0xbd, 0xdf, 0x97, 0xa1, 0xa9, 0x3e, 0xaf, 0x62, 0xdf, 0x4d, - 0xc8, 0xc3, 0x45, 0x78, 0x0d, 0xab, 0x46, 0x8f, 0x60, 0x24, 0x99, 0xb0, 0x48, 0x57, 0x62, 0x7b, - 0x3f, 0x97, 0x18, 0xfd, 0x01, 0x4b, 0x8e, 0x18, 0x5d, 0x5e, 0x01, 0x13, 0xcf, 0x45, 0xed, 0x49, - 0x16, 0x8b, 0xf8, 0xba, 0x32, 0x1b, 0x79, 0x4d, 0xa5, 0x78, 0xa4, 0xa4, 0xe2, 0xb9, 0xc8, 0x4d, - 0x40, 0x0c, 0x29, 0x6d, 0x40, 0x14, 0x8d, 0xf8, 0xfa, 0xb9, 0xd9, 0x29, 0xe8, 0xbf, 0x96, 0x42, - 0x31, 0xa4, 0xb8, 0xb1, 0x3e, 0x5e, 0x84, 0xda, 0x44, 0xa6, 0xdc, 0xfb, 0x3c, 0x3d, 0x08, 0xa9, - 0xe1, 0xa7, 0xd0, 0x22, 0x8c, 0xc9, 0x69, 0xcf, 0xb9, 0xf8, 0xf1, 0xa0, 0xaf, 0x9e, 0x04, 0x4f, - 0x15, 0xd6, 0x7b, 0x91, 0x16, 0x4e, 0xd9, 0x7b, 0x9c, 0xd2, 0xdf, 0xca, 0xb0, 0x61, 0x3e, 0x82, - 0x03, 0xc2, 0xd3, 0xd3, 0xd7, 0x11, 0xef, 0xcc, 0xaf, 0xd3, 0xaa, 0x57, 0x70, 0x95, 0x93, 0xaf, - 0x87, 0x3e, 0x3a, 0x82, 0x7a, 0xec, 0x4e, 0x43, 0xea, 0xfa, 0xba, 0xd0, 0xcf, 0xb3, 0xf4, 0xe6, - 0x1b, 0xda, 0xbf, 0x50, 0x74, 0x9c, 0xea, 0x75, 0x7f, 0x03, 0xd5, 0xa3, 0x38, 0x0e, 0xa7, 0xf2, - 0xf6, 0x8a, 0x8f, 0x7c, 0x6b, 0xeb, 0x72, 0x3d, 0xf4, 0xd1, 0xaf, 0xa0, 0x39, 0xa6, 0x7e, 0x70, - 0x2d, 0x1e, 0x60, 0xe9, 0x6f, 0x03, 0x73, 0x76, 0xce, 0xbc, 0xdc, 0x4f, 0x0d, 0x26, 0x9e, 0xd1, - 0xeb, 0x9e, 0x43, 0x5d, 0xfb, 0x47, 0x3f, 0x87, 0xaa, 0xb4, 0x2e, 0x5d, 0x99, 0x1d, 0xf3, 0x9e, - 0xb8, 0x65, 0x8c, 0x03, 0x0b, 0x2b, 0xad, 0xe3, 0x2a, 0x54, 0xbc, 0xb1, 0xdf, 0xfb, 0x4b, 0x05, - 0x36, 0x0b, 0x0a, 0x98, 0xf0, 0x98, 0x46, 0x9c, 0xdc, 0x57, 0xb2, 0xe3, 0x62, 0xc9, 0xf6, 0xee, - 0x73, 0x9d, 0x5a, 0xba, 0x5b, 0x33, 0xfe, 0x88, 0x9a, 0x9d, 0xc3, 0xea, 0x24, 0xf2, 0xa9, 0xf3, - 0x2d, 0x0b, 0xb7, 0x22, 0x94, 0x4d, 0xa4, 0xfb, 0x09, 0x54, 0xfb, 0xe2, 0xb4, 0x20, 0x1b, 0xea, - 0xb3, 0xa7, 0x28, 0x5d, 0x76, 0xff, 0x54, 0xca, 0x0b, 0xfc, 0x12, 0xaa, 0xf2, 0x70, 0xe9, 0x02, - 0x3f, 0xfb, 0xc6, 0x2c, 0xa5, 0x71, 0x51, 0x61, 0xa9, 0x26, 0xf4, 0xd5, 0x06, 0x95, 0x1f, 0xa9, - 0x3f, 0x77, 0x87, 0xbe, 0xf7, 0x3b, 0x68, 0xcf, 0xfe, 0x72, 0x44, 0x5b, 0xd0, 0xb9, 0x3a, 0x1b, - 0xf5, 0x2f, 0x9d, 0xa3, 0x93, 0xcb, 0xe1, 0xf9, 0x99, 0x83, 0xfb, 0xa3, 0xf3, 0x2b, 0x7c, 0xd2, - 0x5f, 0xb1, 0xd0, 0x1a, 0x2c, 0x9f, 0xe0, 0xfe, 0xd1, 0x65, 0x3f, 0x07, 0x4b, 0x02, 0xc4, 0xfd, - 0xd3, 0xf3, 0x37, 0x06, 0x58, 0x16, 0xe0, 0xd5, 0xc5, 0xab, 0x19, 0x66, 0x05, 0xad, 0x42, 0x6b, - 0xf4, 0xe5, 0xd9, 0x49, 0x0e, 0x2d, 0x1c, 0x6f, 0xfd, 0xe3, 0xc3, 0x4e, 0xe9, 0x9f, 0x1f, 0x76, - 0x4a, 0xff, 0xfa, 0xb0, 0x53, 0xfa, 0xf3, 0xbf, 0x77, 0xac, 0xaf, 0xd2, 0x7f, 0x13, 0xbd, 0xad, - 0xc9, 0xff, 0x50, 0xbc, 0xf8, 0x7f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x2b, 0x0c, 0x13, 0xeb, 0x61, - 0x12, 0x00, 0x00, + // 1761 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x58, 0xbd, 0x73, 0x23, 0x49, + 0x15, 0x1f, 0x59, 0x96, 0x64, 0x3f, 0x7d, 0xd8, 0x6e, 0x5b, 0xf6, 0x58, 0xe7, 0xf3, 0xf9, 0xb4, + 0xc7, 0xae, 0xa1, 0x38, 0xbb, 0x6a, 0xf7, 0xa0, 0x80, 0x82, 0x05, 0xdb, 0x2b, 0x4a, 0xaa, 0x3d, + 0x7f, 0x54, 0xcb, 0xde, 0xaa, 0x3b, 0x82, 0xa9, 0xd9, 0xe9, 0xb6, 0x77, 0xf0, 0x68, 0x7a, 0xae, + 0x7b, 0xb4, 0x94, 0x02, 0x02, 0x22, 0x12, 0x02, 0x42, 0x32, 0x72, 0x12, 0x62, 0xfe, 0x03, 0x42, + 0xfe, 0x04, 0x6a, 0x49, 0x48, 0x89, 0x48, 0xa9, 0xfe, 0x98, 0x99, 0x96, 0x2c, 0xfb, 0x5c, 0x64, + 0xd3, 0xbf, 0xf7, 0x7b, 0x9f, 0xdd, 0xfd, 0x5e, 0x4b, 0xf0, 0x2c, 0x8c, 0x53, 0xca, 0x63, 0x3f, + 0xf2, 0x93, 0xf0, 0x30, 0xa0, 0x71, 0xca, 0xfd, 0xe8, 0x50, 0xd0, 0x58, 0x30, 0xee, 0xd1, 0xf7, + 0x34, 0x4e, 0xc5, 0x41, 0xc2, 0x59, 0xca, 0x50, 0xcd, 0x08, 0x3b, 0xdf, 0x9f, 0xd2, 0x60, 0xa3, + 0x24, 0x0a, 0xfd, 0x38, 0xa0, 0xd6, 0xa7, 0x47, 0xfc, 0xd4, 0xd7, 0x6a, 0x9d, 0x75, 0x91, 0x32, + 0xee, 0xdf, 0xd0, 0x43, 0x3f, 0xa2, 0x3c, 0x35, 0x60, 0x3b, 0x03, 0x83, 0x68, 0x2c, 0x52, 0xca, + 0x0d, 0xec, 0x66, 0x30, 0xa1, 0x49, 0xc4, 0x26, 0x23, 0x1a, 0x67, 0x0a, 0x7b, 0x99, 0x24, 0xf6, + 0x47, 0x54, 0x24, 0x7e, 0x40, 0xbd, 0x11, 0x4d, 0x7d, 0xcb, 0xcf, 0x4e, 0xce, 0xa0, 0xe9, 0x6f, + 0x18, 0xbf, 0xf5, 0x12, 0x16, 0x85, 0xc1, 0xc4, 0x48, 0x51, 0x2e, 0x65, 0x84, 0x1a, 0x6c, 0x23, + 0xc3, 0x04, 0x0d, 0x38, 0xcd, 0x3c, 0x7d, 0x5c, 0xa0, 0xfc, 0x7d, 0x18, 0x50, 0xcf, 0x0f, 0x02, + 0x36, 0xce, 0x03, 0xc9, 0x0d, 0xf1, 0xb7, 0x7e, 0x30, 0x6b, 0x68, 0xca, 0xe5, 0x27, 0x39, 0xca, + 0x59, 0x40, 0x85, 0xf0, 0xc2, 0x98, 0x84, 0x81, 0x9f, 0x32, 0x3e, 0x4b, 0x08, 0x47, 0xfe, 0x0d, + 0xf5, 0x64, 0x55, 0x6f, 0xb8, 0x9f, 0x86, 0x2c, 0x36, 0x84, 0x4f, 0xf3, 0x2a, 0x15, 0x95, 0x65, + 0x09, 0xe5, 0x85, 0x8d, 0xee, 0x4b, 0xd8, 0xc2, 0xd4, 0x38, 0x78, 0x95, 0x17, 0x0d, 0x87, 0xe2, + 0x16, 0x3d, 0x81, 0x66, 0x51, 0x46, 0x2f, 0x24, 0x6e, 0x69, 0xaf, 0xb4, 0xbf, 0x8c, 0x1b, 0x05, + 0x38, 0x20, 0xdd, 0xff, 0x94, 0xa0, 0x71, 0x24, 0x37, 0x06, 0x53, 0x31, 0x8e, 0x52, 0xf1, 0x28, + 0x2d, 0xf4, 0x14, 0xaa, 0x6a, 0x37, 0x85, 0xbb, 0xb0, 0x57, 0xde, 0xaf, 0x3f, 0x6f, 0x1d, 0x98, + 0x48, 0x0f, 0xb4, 0x2d, 0x23, 0x45, 0x9f, 0x43, 0x45, 0xa4, 0xfe, 0x0d, 0x75, 0xcb, 0x7b, 0xa5, + 0xfd, 0xd6, 0xf3, 0xad, 0x9c, 0xf6, 0x65, 0x78, 0x4d, 0x83, 0x49, 0x10, 0xd1, 0xa1, 0x14, 0x63, + 0xcd, 0x42, 0x5f, 0x40, 0x55, 0xb0, 0x31, 0x0f, 0xa8, 0xbb, 0xa8, 0xf8, 0x3b, 0x07, 0xe6, 0xc8, + 0x1d, 0xd8, 0x21, 0x1e, 0x0c, 0x15, 0x07, 0x1b, 0x6e, 0xf7, 0x10, 0xaa, 0x1a, 0x41, 0x1b, 0xb0, + 0xfa, 0xaa, 0x77, 0xf1, 0xe5, 0xf9, 0x57, 0xa7, 0xbd, 0xb3, 0x4b, 0xaf, 0xf7, 0xa6, 0x77, 0x76, + 0xb9, 0xea, 0xa0, 0x15, 0xa8, 0x1f, 0x5d, 0xbd, 0x1a, 0x64, 0x40, 0xa9, 0xfb, 0x35, 0x54, 0x2f, + 0xc3, 0x51, 0x18, 0xdf, 0xa0, 0x5d, 0x00, 0x12, 0x8a, 0xc4, 0x4f, 0x83, 0x77, 0x94, 0x9b, 0x4c, + 0x2d, 0x04, 0x75, 0x60, 0x89, 0x53, 0x13, 0xd2, 0x82, 0x92, 0xe6, 0x6b, 0xb4, 0x01, 0x95, 0xd8, + 0x8f, 0x99, 0x50, 0xb9, 0x95, 0xb1, 0x5e, 0x74, 0xff, 0xd6, 0x84, 0xfa, 0x50, 0x5d, 0x9e, 0x9e, + 0xbc, 0x3b, 0xa8, 0x05, 0x0b, 0x79, 0x0d, 0x17, 0x42, 0x82, 0x0e, 0xa1, 0xea, 0x07, 0x72, 0x8b, + 0x95, 0x3d, 0x59, 0x92, 0x2c, 0x45, 0x6c, 0x0c, 0x1f, 0x29, 0x31, 0x36, 0x34, 0xf4, 0x0c, 0xaa, + 0xa9, 0x0a, 0x56, 0xf9, 0xa9, 0x3f, 0x5f, 0xc9, 0x15, 0x74, 0x0e, 0xd8, 0x88, 0xd1, 0xcf, 0xa1, + 0x35, 0x7d, 0xf2, 0x55, 0x11, 0xeb, 0xcf, 0x37, 0xf3, 0xa2, 0x9f, 0x69, 0xf1, 0x85, 0x92, 0xf6, + 0x1d, 0xdc, 0x8c, 0x6d, 0x00, 0xfd, 0x00, 0xa0, 0xd8, 0x64, 0xb7, 0xa2, 0x94, 0xd7, 0x73, 0xe5, + 0xe2, 0x70, 0xf5, 0x1d, 0x6c, 0x11, 0xd1, 0x1e, 0x94, 0x13, 0x46, 0xdc, 0x75, 0xc5, 0x6f, 0xe4, + 0xfc, 0x0b, 0x46, 0xfa, 0x0e, 0x96, 0x22, 0xf4, 0x13, 0x58, 0xce, 0x6f, 0xad, 0x5b, 0x55, 0xbc, + 0x4e, 0x11, 0x54, 0x26, 0x39, 0x35, 0xd7, 0xb9, 0xef, 0xe0, 0x82, 0x8e, 0xbe, 0x0b, 0x55, 0x7d, + 0x3b, 0xdd, 0x9a, 0x49, 0x3f, 0x53, 0x1c, 0x2a, 0xb8, 0xef, 0x60, 0x43, 0x40, 0x4f, 0x60, 0x51, + 0x5e, 0x6e, 0x77, 0x59, 0x11, 0x9b, 0x85, 0x07, 0x46, 0x68, 0xdf, 0xc1, 0x4a, 0xa8, 0xaa, 0xc4, + 0x88, 0xbc, 0x6c, 0x72, 0x7b, 0x18, 0x9f, 0xb8, 0xdb, 0xb3, 0x55, 0x62, 0x84, 0x0e, 0x32, 0xa9, + 0xaa, 0x92, 0x0d, 0xa0, 0x63, 0x58, 0x99, 0x69, 0x0c, 0x6e, 0x4b, 0x59, 0xd8, 0xb2, 0x22, 0x53, + 0xf2, 0x23, 0x2d, 0xee, 0x3b, 0xb8, 0x25, 0xa6, 0x10, 0xf4, 0x14, 0x16, 0x39, 0x8b, 0xa8, 0xbb, + 0xa2, 0x14, 0x57, 0x73, 0xc5, 0xd7, 0x3f, 0x12, 0x98, 0x45, 0x2a, 0x58, 0x29, 0x47, 0x2f, 0xa0, + 0xf6, 0x56, 0x36, 0x8d, 0xf8, 0xc6, 0x5d, 0x9d, 0xf1, 0x61, 0xa8, 0xc7, 0x5a, 0xdc, 0x77, 0x70, + 0xc6, 0x44, 0x7d, 0x58, 0xbb, 0xd3, 0x70, 0xdc, 0x25, 0xa5, 0xbe, 0x5d, 0xec, 0x8e, 0x66, 0x0c, + 0x32, 0x42, 0xdf, 0xc1, 0xab, 0xc9, 0x0c, 0x66, 0x2c, 0xbd, 0x0f, 0x09, 0xe5, 0x79, 0xb3, 0x75, + 0xe1, 0xae, 0x25, 0xc5, 0xb0, 0xb6, 0x6f, 0x35, 0x99, 0xc1, 0xd0, 0x4b, 0xa8, 0x8a, 0x49, 0x1c, + 0x50, 0xe2, 0xd6, 0x95, 0xfa, 0x67, 0xf9, 0x21, 0xb6, 0xee, 0x4a, 0x7e, 0x03, 0xc4, 0x50, 0x71, + 0xd5, 0xd6, 0xaa, 0x2f, 0x74, 0x09, 0x6d, 0xc6, 0x83, 0x77, 0x54, 0xa4, 0xaa, 0xf7, 0x15, 0xd1, + 0x34, 0x94, 0xb9, 0x8f, 0xf3, 0x68, 0xce, 0x2d, 0x96, 0x15, 0xd1, 0x06, 0x9b, 0x83, 0xcb, 0xfc, + 0xee, 0x74, 0x5e, 0xb7, 0x39, 0x93, 0xdf, 0x40, 0x32, 0x06, 0x05, 0x41, 0xe6, 0x17, 0xce, 0x60, + 0xe8, 0x0a, 0x36, 0x78, 0xd6, 0x85, 0x3d, 0xeb, 0x12, 0xad, 0x29, 0x63, 0x7b, 0xd6, 0x1d, 0x9f, + 0xdb, 0xaa, 0xfb, 0x0e, 0x5e, 0xe7, 0x77, 0x45, 0xe8, 0xa7, 0xd0, 0x54, 0x8d, 0xd4, 0xe3, 0xba, + 0xf3, 0xb9, 0x48, 0xd9, 0x6b, 0xcf, 0x6d, 0x8b, 0x7d, 0x07, 0x37, 0x7c, 0xbb, 0x93, 0x5f, 0x43, + 0x67, 0xce, 0xdc, 0x30, 0xb6, 0xdc, 0x0d, 0x65, 0xea, 0x69, 0x9e, 0xe7, 0x49, 0x4e, 0x3d, 0x37, + 0xcc, 0x93, 0x77, 0x34, 0xb8, 0xd5, 0xc6, 0xfa, 0x0e, 0x76, 0x83, 0x3b, 0x04, 0x2d, 0x43, 0x04, + 0x3e, 0x9a, 0xe7, 0x27, 0xe1, 0xec, 0x3a, 0x8c, 0xa8, 0xdb, 0x56, 0x8e, 0xba, 0x0f, 0x38, 0xba, + 0xd0, 0xcc, 0xbe, 0x83, 0xb7, 0x83, 0xfb, 0x84, 0xe8, 0x57, 0xe0, 0xce, 0xcd, 0x66, 0x1c, 0x51, + 0x77, 0x53, 0xb9, 0xf8, 0xe4, 0x01, 0x17, 0x78, 0xac, 0xec, 0x6f, 0x06, 0x73, 0x25, 0xe8, 0xf7, + 0x25, 0xd8, 0x9f, 0x67, 0x5d, 0x04, 0x7e, 0xec, 0x09, 0x9a, 0xa6, 0x61, 0x7c, 0xe3, 0x65, 0x57, + 0x71, 0x4b, 0x79, 0xfb, 0xfc, 0x01, 0x6f, 0xc3, 0xc0, 0x8f, 0x87, 0x5a, 0xab, 0xb8, 0xa0, 0x9f, + 0x05, 0x8f, 0xe0, 0xdd, 0x97, 0xa6, 0x0c, 0xc4, 0x75, 0xbf, 0x35, 0x4d, 0x69, 0x70, 0x7e, 0x9a, + 0x52, 0xd2, 0x59, 0x83, 0x95, 0x99, 0x3b, 0x76, 0x0c, 0xc5, 0x84, 0xeb, 0xfe, 0xb7, 0x04, 0x6b, + 0xe6, 0x3e, 0xc6, 0xd7, 0x8c, 0x07, 0xd4, 0x1c, 0xc2, 0x3a, 0x2d, 0x96, 0x6a, 0x94, 0xb5, 0xac, + 0xfe, 0x6d, 0x51, 0xcd, 0xe4, 0xb2, 0xe9, 0xe8, 0x17, 0x53, 0x43, 0x65, 0x41, 0x65, 0xb0, 0x9b, + 0x9f, 0xdf, 0xe2, 0xac, 0x5b, 0x66, 0x66, 0xe6, 0xcb, 0x1b, 0x40, 0x01, 0x8b, 0x53, 0x3f, 0x8c, + 0x29, 0xf7, 0xc2, 0x58, 0xa4, 0x32, 0x2d, 0x33, 0x0c, 0xbf, 0x93, 0x5b, 0x3a, 0xc9, 0x28, 0x03, + 0xc3, 0x98, 0x36, 0xb8, 0x16, 0xcc, 0xca, 0xa7, 0x32, 0xff, 0x77, 0x09, 0xda, 0x73, 0x63, 0x79, + 0xdc, 0x73, 0xe8, 0x19, 0xac, 0x58, 0x24, 0x39, 0xbc, 0xcc, 0x6b, 0xa1, 0x55, 0xc0, 0x72, 0xce, + 0xcd, 0x10, 0xd3, 0x49, 0xa2, 0x13, 0x99, 0x22, 0x5e, 0x4e, 0x12, 0x8a, 0x76, 0xec, 0x91, 0xb9, + 0xa8, 0x28, 0xd6, 0x50, 0xdc, 0x86, 0x25, 0xdd, 0x17, 0x42, 0xa2, 0xe6, 0xf4, 0x32, 0xae, 0xa9, + 0xf5, 0x80, 0xa0, 0x4f, 0xa0, 0xae, 0xa7, 0xbf, 0x0e, 0xa3, 0xaa, 0x9f, 0x34, 0x1a, 0x92, 0x21, + 0x74, 0xff, 0x50, 0x82, 0x9d, 0x87, 0x8a, 0x85, 0xda, 0x50, 0x4d, 0x18, 0x91, 0xa6, 0x75, 0x0e, + 0x95, 0x84, 0x91, 0x01, 0x41, 0x57, 0xb0, 0x69, 0x85, 0x6e, 0x9f, 0x88, 0xf2, 0x63, 0x36, 0x15, + 0xb7, 0xc9, 0x3c, 0xb8, 0xfb, 0x97, 0x12, 0x34, 0x87, 0x01, 0xf7, 0x13, 0x7a, 0xc2, 0x46, 0x23, + 0x3f, 0x26, 0xe8, 0x23, 0x58, 0x16, 0x0a, 0x28, 0xaa, 0xbd, 0xa4, 0x81, 0x01, 0x41, 0x3f, 0x86, + 0x86, 0x48, 0x7d, 0x9e, 0x7a, 0x1a, 0x31, 0x07, 0x6a, 0xa3, 0x18, 0x27, 0x52, 0xa8, 0xed, 0xf5, + 0x1d, 0x5c, 0x17, 0xc5, 0x12, 0xfd, 0x10, 0xea, 0xb7, 0x61, 0x14, 0x65, 0x9a, 0x65, 0xf3, 0xbe, + 0xc9, 0x34, 0x5f, 0x87, 0x51, 0x94, 0x2b, 0xc2, 0x6d, 0xbe, 0x3a, 0x5e, 0x86, 0x5a, 0xa0, 0x43, + 0xeb, 0x0e, 0xa0, 0x6e, 0x39, 0x90, 0x9b, 0xf4, 0x8e, 0x89, 0x54, 0xed, 0x8b, 0x5b, 0xda, 0x2b, + 0xcb, 0x4d, 0xca, 0x01, 0x29, 0x95, 0xc5, 0x25, 0x3e, 0x27, 0xfa, 0x99, 0xbc, 0x8c, 0x0b, 0xa0, + 0xdb, 0x00, 0x28, 0x3c, 0x76, 0x7f, 0xb7, 0x00, 0x0d, 0xfd, 0x79, 0x95, 0x10, 0x3f, 0xa5, 0x0f, + 0x17, 0xe1, 0x35, 0xac, 0x59, 0x3d, 0x82, 0xd3, 0x74, 0xcc, 0x63, 0x53, 0x89, 0x9d, 0x83, 0x42, + 0x62, 0xf5, 0x07, 0xac, 0x38, 0x72, 0x74, 0x05, 0x33, 0x98, 0x7c, 0x10, 0x19, 0x4f, 0xaa, 0x58, + 0x94, 0x98, 0xca, 0x6c, 0x16, 0x35, 0x55, 0xe2, 0xa1, 0x96, 0xca, 0x07, 0x91, 0xb0, 0x01, 0x39, + 0xa4, 0x8c, 0x01, 0x59, 0x34, 0x4a, 0xcc, 0xb3, 0xb3, 0x3d, 0xa3, 0xff, 0x5a, 0x09, 0xe5, 0x90, + 0x12, 0xd6, 0xfa, 0x78, 0x09, 0xaa, 0x63, 0x95, 0x72, 0xf7, 0x8b, 0xec, 0x20, 0x64, 0x86, 0x9f, + 0x40, 0x93, 0x72, 0xae, 0xa6, 0xbd, 0x10, 0xf2, 0x47, 0x84, 0xb9, 0x7a, 0x0a, 0x3c, 0xd5, 0x58, + 0xf7, 0x45, 0x56, 0x38, 0x6d, 0xef, 0x71, 0x4a, 0x7f, 0x5d, 0x80, 0x4d, 0xfb, 0x31, 0x1c, 0x52, + 0x91, 0x9d, 0xbe, 0xb6, 0x7c, 0x6f, 0x7e, 0x93, 0x55, 0xbd, 0x8c, 0x2b, 0x82, 0x7e, 0x33, 0x20, + 0xe8, 0x08, 0x6a, 0x89, 0x3f, 0x89, 0x98, 0x4f, 0x4c, 0xa1, 0x9f, 0xe5, 0xe9, 0xcd, 0x37, 0x74, + 0x70, 0xa1, 0xe9, 0x38, 0xd3, 0xeb, 0xfc, 0x1a, 0x2a, 0x47, 0x49, 0x12, 0x4d, 0xd4, 0xed, 0x95, + 0x1f, 0xc5, 0xd6, 0xd6, 0xd4, 0x7a, 0x40, 0xd0, 0x2f, 0xa1, 0x31, 0x62, 0x24, 0xbc, 0x96, 0x0f, + 0xb0, 0xec, 0x37, 0x82, 0x3d, 0x3b, 0xa7, 0x5e, 0xf0, 0xa7, 0x16, 0x13, 0x4f, 0xe9, 0x75, 0xce, + 0xa1, 0x66, 0xfc, 0xa3, 0x9f, 0x41, 0x45, 0x59, 0x57, 0xae, 0xec, 0x8e, 0x79, 0x4f, 0xdc, 0x2a, + 0xc6, 0xbe, 0x83, 0xb5, 0xd6, 0x71, 0x05, 0xca, 0xc1, 0x88, 0x74, 0xff, 0x5c, 0x86, 0xad, 0x19, + 0x05, 0x4c, 0x45, 0xc2, 0x62, 0x41, 0xef, 0x2b, 0xd9, 0xf1, 0x6c, 0xc9, 0xf6, 0xef, 0x73, 0x9d, + 0x59, 0xba, 0x5b, 0x33, 0xf1, 0x88, 0x9a, 0x9d, 0xc3, 0xda, 0x38, 0x26, 0xcc, 0xfb, 0x3f, 0x0b, + 0xb7, 0x2a, 0x95, 0x6d, 0xa4, 0xf3, 0x29, 0x54, 0x7a, 0xf2, 0xb4, 0x20, 0x17, 0x6a, 0xd3, 0xa7, + 0x28, 0x5b, 0x76, 0xfe, 0x58, 0x2a, 0x0a, 0xfc, 0x12, 0x2a, 0xea, 0x70, 0x99, 0x02, 0x3f, 0xfd, + 0xd6, 0x2c, 0x95, 0x71, 0x59, 0x61, 0xa5, 0x26, 0xf5, 0xf5, 0x06, 0x2d, 0x3c, 0x52, 0x7f, 0xee, + 0x0e, 0x7d, 0xef, 0xb7, 0xd0, 0x9a, 0xfe, 0x05, 0x89, 0xb6, 0xa1, 0x7d, 0x75, 0x36, 0xec, 0x5d, + 0x7a, 0x47, 0x27, 0x97, 0x83, 0xf3, 0x33, 0x0f, 0xf7, 0x86, 0xe7, 0x57, 0xf8, 0xa4, 0xb7, 0xea, + 0xa0, 0x75, 0x58, 0x39, 0xc1, 0xbd, 0xa3, 0xcb, 0x5e, 0x01, 0x96, 0x24, 0x88, 0x7b, 0xa7, 0xe7, + 0x6f, 0x2c, 0x70, 0x41, 0x82, 0x57, 0x17, 0xaf, 0xa6, 0x98, 0x65, 0xb4, 0x06, 0xcd, 0xe1, 0x57, + 0x67, 0x27, 0x05, 0xb4, 0x78, 0xbc, 0xfd, 0xf7, 0x0f, 0xbb, 0xa5, 0x7f, 0x7c, 0xd8, 0x2d, 0xfd, + 0xf3, 0xc3, 0x6e, 0xe9, 0x4f, 0xff, 0xda, 0x75, 0xbe, 0xce, 0xfe, 0x2e, 0x7a, 0x5b, 0x55, 0xff, + 0x54, 0xbc, 0xf8, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x03, 0xc4, 0xbe, 0xbe, 0x69, 0x12, 0x00, + 0x00, } func (m *ReprocessDeploymentRisk) Marshal() (dAtA []byte, err error) { @@ -3180,16 +3180,16 @@ func (m *SensorEvent_ComplianceOperatorScan) MarshalToSizedBuffer(dAtA []byte) ( } return len(dAtA) - i, nil } -func (m *SensorEvent_NodeScanV2) MarshalTo(dAtA []byte) (int, error) { +func (m *SensorEvent_NodeInventory) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *SensorEvent_NodeScanV2) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *SensorEvent_NodeInventory) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) - if m.NodeScanV2 != nil { + if m.NodeInventory != nil { { - size, err := m.NodeScanV2.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.NodeInventory.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -4464,14 +4464,14 @@ func (m *SensorEvent_ComplianceOperatorScan) Size() (n int) { } return n } -func (m *SensorEvent_NodeScanV2) Size() (n int) { +func (m *SensorEvent_NodeInventory) Size() (n int) { if m == nil { return 0 } var l int _ = l - if m.NodeScanV2 != nil { - l = m.NodeScanV2.Size() + if m.NodeInventory != nil { + l = m.NodeInventory.Size() n += 2 + l + sovSensorEvents(uint64(l)) } return n @@ -6144,7 +6144,7 @@ func (m *SensorEvent) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 25: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field NodeScanV2", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field NodeInventory", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -6171,11 +6171,11 @@ func (m *SensorEvent) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - v := &storage.NodeScanV2{} + v := &storage.NodeInventory{} if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } - m.Resource = &SensorEvent_NodeScanV2{v} + m.Resource = &SensorEvent_NodeInventory{v} iNdEx = postIndex default: iNdEx = preIndex diff --git a/generated/internalapi/sensor/compliance_iservice.pb.go b/generated/internalapi/sensor/compliance_iservice.pb.go index e065b7c231d98..42003655b7c50 100644 --- a/generated/internalapi/sensor/compliance_iservice.pb.go +++ b/generated/internalapi/sensor/compliance_iservice.pb.go @@ -168,7 +168,7 @@ type MsgFromCompliance struct { // Types that are valid to be assigned to Msg: // *MsgFromCompliance_Return // *MsgFromCompliance_AuditEvents - // *MsgFromCompliance_NodeScanV2 + // *MsgFromCompliance_NodeInventory Msg isMsgFromCompliance_Msg `protobuf_oneof:"msg"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` @@ -221,8 +221,8 @@ 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"` +type MsgFromCompliance_NodeInventory struct { + NodeInventory *storage.NodeInventory `protobuf:"bytes,4,opt,name=node_inventory,json=nodeInventory,proto3,oneof" json:"node_inventory,omitempty"` } func (*MsgFromCompliance_Return) isMsgFromCompliance_Msg() {} @@ -247,15 +247,15 @@ 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 { +func (*MsgFromCompliance_NodeInventory) isMsgFromCompliance_Msg() {} +func (m *MsgFromCompliance_NodeInventory) Clone() isMsgFromCompliance_Msg { if m == nil { return nil } - cloned := new(MsgFromCompliance_NodeScanV2) + cloned := new(MsgFromCompliance_NodeInventory) *cloned = *m - cloned.NodeScanV2 = m.NodeScanV2.Clone() + cloned.NodeInventory = m.NodeInventory.Clone() return cloned } @@ -287,9 +287,9 @@ func (m *MsgFromCompliance) GetAuditEvents() *AuditEvents { return nil } -func (m *MsgFromCompliance) GetNodeScanV2() *storage.NodeScanV2 { - if x, ok := m.GetMsg().(*MsgFromCompliance_NodeScanV2); ok { - return x.NodeScanV2 +func (m *MsgFromCompliance) GetNodeInventory() *storage.NodeInventory { + if x, ok := m.GetMsg().(*MsgFromCompliance_NodeInventory); ok { + return x.NodeInventory } return nil } @@ -299,7 +299,7 @@ func (*MsgFromCompliance) XXX_OneofWrappers() []interface{} { return []interface{}{ (*MsgFromCompliance_Return)(nil), (*MsgFromCompliance_AuditEvents)(nil), - (*MsgFromCompliance_NodeScanV2)(nil), + (*MsgFromCompliance_NodeInventory)(nil), } } @@ -884,53 +884,53 @@ func init() { } var fileDescriptor_9b20c44efbf676a9 = []byte{ - // 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, + // 723 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0xc1, 0x6e, 0xeb, 0x44, + 0x14, 0x8d, 0x9b, 0x92, 0x26, 0xd7, 0x69, 0x21, 0x53, 0x51, 0x1c, 0x53, 0x42, 0x89, 0xba, 0xc8, + 0x02, 0xb9, 0x25, 0x48, 0x88, 0x0d, 0xad, 0x68, 0xd4, 0x92, 0x40, 0xdb, 0x85, 0xd3, 0x55, 0x25, + 0x64, 0x4d, 0xed, 0xc1, 0x1a, 0x11, 0xcf, 0xa4, 0x33, 0xe3, 0x4a, 0x95, 0xf8, 0x10, 0x3e, 0x88, + 0x05, 0x4b, 0x3e, 0x01, 0xca, 0xe2, 0xfd, 0xc6, 0xd3, 0x8c, 0xc7, 0xb1, 0xd3, 0xa7, 0x2c, 0xde, + 0xdb, 0xd9, 0xf7, 0x9e, 0x73, 0xe7, 0xdc, 0x73, 0xef, 0x0c, 0x7c, 0x4d, 0x99, 0x22, 0x82, 0xe1, + 0x05, 0x5e, 0xd2, 0x13, 0x49, 0x98, 0xe4, 0xe2, 0x24, 0xe6, 0xd9, 0x72, 0x41, 0x31, 0x8b, 0x49, + 0x44, 0x25, 0x11, 0x4f, 0x34, 0x26, 0xc1, 0x52, 0x70, 0xc5, 0x51, 0xab, 0x40, 0xf8, 0x6b, 0xac, + 0x0a, 0x5e, 0x67, 0x26, 0x58, 0xe1, 0x82, 0xe5, 0x7f, 0x2a, 0x15, 0x17, 0x38, 0x25, 0x27, 0xf1, + 0x22, 0x97, 0x8a, 0x08, 0x1b, 0xfe, 0x72, 0x15, 0xe6, 0x4c, 0x61, 0xca, 0x88, 0x88, 0x44, 0xce, + 0x14, 0xcd, 0xec, 0x69, 0xbe, 0x57, 0x02, 0x7e, 0xcf, 0x1f, 0x48, 0x44, 0x9e, 0x08, 0x53, 0x36, + 0x83, 0xca, 0x0c, 0xe3, 0x89, 0x45, 0x0f, 0x43, 0x38, 0xf8, 0x89, 0xa8, 0x79, 0x2c, 0xf0, 0x92, + 0x4c, 0x38, 0xfb, 0x8d, 0xa6, 0x21, 0x79, 0xcc, 0x89, 0x54, 0xe8, 0x73, 0xe8, 0x68, 0x5c, 0xc4, + 0x70, 0x46, 0x3c, 0xe7, 0xc8, 0x19, 0x75, 0xc2, 0xb6, 0x0e, 0xdc, 0xe2, 0x8c, 0xe8, 0xa4, 0x34, + 0x9c, 0x88, 0x26, 0xde, 0x56, 0x91, 0x2c, 0x02, 0xb3, 0x64, 0x78, 0x0e, 0xee, 0x8f, 0x79, 0x42, + 0xd5, 0xa5, 0x3e, 0x5b, 0xa2, 0x53, 0x68, 0x19, 0x15, 0xd2, 0x73, 0x8e, 0x9a, 0x23, 0x77, 0xec, + 0x05, 0x56, 0x47, 0xf0, 0x4b, 0xfe, 0x40, 0x04, 0x23, 0x8a, 0x48, 0x03, 0x0d, 0x2d, 0x6e, 0xf8, + 0x9f, 0x03, 0xbd, 0x1b, 0x99, 0x5e, 0x09, 0x9e, 0x4d, 0x56, 0xde, 0x20, 0x04, 0xdb, 0xfa, 0x7c, + 0xab, 0xc5, 0x7c, 0xa3, 0xef, 0xa0, 0x25, 0x88, 0xca, 0x05, 0x33, 0x22, 0xdc, 0xf1, 0x61, 0x50, + 0x99, 0x19, 0x54, 0xdc, 0xd0, 0x60, 0xa6, 0x8d, 0xd0, 0xa2, 0xd1, 0xf7, 0xd0, 0xc5, 0x5a, 0x62, + 0x64, 0x95, 0x35, 0x0d, 0x7b, 0x3f, 0x28, 0x26, 0x15, 0xd4, 0xe4, 0x4f, 0x1b, 0xa1, 0x8b, 0x6b, + 0xdd, 0x9c, 0xc3, 0x9e, 0xb1, 0x85, 0x32, 0xfd, 0xcf, 0xc5, 0xb3, 0xb7, 0x6d, 0xb8, 0x07, 0xab, + 0xae, 0x6e, 0x79, 0x42, 0x66, 0x65, 0x76, 0xda, 0x08, 0x77, 0x59, 0x3d, 0x70, 0xf1, 0x11, 0x34, + 0x33, 0x99, 0x0e, 0xff, 0x6a, 0xc1, 0xc7, 0x37, 0x32, 0xbd, 0xe3, 0xb5, 0x0e, 0xcf, 0xa0, 0x15, + 0x9b, 0x19, 0x98, 0x1e, 0xdd, 0xf1, 0x71, 0xa9, 0xe7, 0x15, 0x30, 0xa8, 0xcf, 0x4b, 0x77, 0x55, + 0xb0, 0xd0, 0x19, 0xec, 0x28, 0x41, 0xd3, 0x94, 0x08, 0x6b, 0xc7, 0x70, 0x53, 0x81, 0xbb, 0x02, + 0x16, 0xe6, 0xda, 0x94, 0x92, 0x84, 0x14, 0x1c, 0x16, 0xae, 0x2c, 0x78, 0x1a, 0xc5, 0x7c, 0xb1, + 0x20, 0xb1, 0xa2, 0x9c, 0x45, 0xa2, 0x58, 0x09, 0xeb, 0xd2, 0x37, 0x9b, 0x8a, 0x1a, 0xd7, 0xae, + 0x79, 0x3a, 0x59, 0x31, 0xed, 0x2e, 0x4d, 0x1b, 0x61, 0x1f, 0x6f, 0x4a, 0xfa, 0x7f, 0x40, 0xb7, + 0xde, 0x0f, 0xba, 0x82, 0xde, 0x3b, 0xbb, 0x6d, 0x0c, 0xd9, 0x1b, 0xf7, 0x57, 0x26, 0x4f, 0x4a, + 0x44, 0x58, 0x00, 0xc2, 0x4f, 0xe2, 0x57, 0x11, 0x74, 0x0c, 0x7b, 0x54, 0x46, 0x19, 0xd6, 0x97, + 0x27, 0x32, 0x9b, 0xa3, 0x4d, 0x69, 0x87, 0x5d, 0x2a, 0x6f, 0x4c, 0x50, 0x0f, 0xca, 0xbf, 0x06, + 0xa8, 0xcc, 0x58, 0xdf, 0x6b, 0x67, 0x7d, 0xaf, 0xd1, 0x57, 0xd0, 0x95, 0x0a, 0xb3, 0x04, 0x8b, + 0x24, 0xa2, 0x89, 0xf4, 0xb6, 0x8e, 0x9a, 0xa3, 0x4e, 0xe8, 0x96, 0xb1, 0x59, 0x22, 0xfd, 0x37, + 0x5b, 0xd0, 0xdf, 0x68, 0x03, 0xfa, 0x15, 0x3a, 0x52, 0x61, 0xa1, 0xb4, 0xa1, 0x76, 0xc4, 0x67, + 0xef, 0x6d, 0x66, 0x30, 0xd7, 0x25, 0x2a, 0x67, 0xdb, 0xd2, 0xfe, 0xa3, 0x7b, 0x68, 0x4b, 0xc5, + 0x97, 0xa6, 0x7a, 0x31, 0xff, 0x1f, 0x3e, 0xa4, 0x3a, 0x5f, 0x56, 0xc5, 0x77, 0x64, 0xf1, 0xeb, + 0x3f, 0x43, 0xb7, 0x7e, 0x2e, 0xfa, 0x02, 0xc0, 0xbe, 0x4b, 0x95, 0x53, 0x1d, 0x1b, 0x99, 0x25, + 0xe8, 0x67, 0xd8, 0xb7, 0xfb, 0x13, 0x15, 0x1d, 0x4b, 0x85, 0x15, 0xb1, 0xaa, 0xfc, 0xd5, 0x14, + 0x4b, 0x19, 0x57, 0x74, 0x41, 0xe6, 0x1a, 0x11, 0xf6, 0x2c, 0xcd, 0x1c, 0x66, 0x42, 0xfe, 0x2e, + 0xb8, 0x35, 0x51, 0xfa, 0xfe, 0x08, 0xf2, 0x68, 0xaf, 0xd1, 0xf8, 0x1e, 0x7a, 0x55, 0x5b, 0xf3, + 0xe2, 0xd9, 0x45, 0x97, 0xe0, 0x4e, 0x78, 0x96, 0xe5, 0x8c, 0xc6, 0x58, 0x11, 0xd4, 0xaf, 0xb9, + 0xb0, 0xfe, 0xa6, 0xf8, 0x9f, 0x6d, 0x30, 0x68, 0xe4, 0x9c, 0x3a, 0x17, 0xde, 0xdf, 0x2f, 0x03, + 0xe7, 0x9f, 0x97, 0x81, 0xf3, 0xef, 0xcb, 0xc0, 0xf9, 0xf3, 0xff, 0x41, 0xe3, 0xde, 0xbe, 0xe4, + 0x0f, 0x2d, 0xf3, 0x78, 0x7e, 0xfb, 0x36, 0x00, 0x00, 0xff, 0xff, 0xb8, 0x68, 0xc0, 0xe9, 0x08, + 0x06, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1212,16 +1212,16 @@ func (m *MsgFromCompliance_AuditEvents) MarshalToSizedBuffer(dAtA []byte) (int, } return len(dAtA) - i, nil } -func (m *MsgFromCompliance_NodeScanV2) MarshalTo(dAtA []byte) (int, error) { +func (m *MsgFromCompliance_NodeInventory) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *MsgFromCompliance_NodeScanV2) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *MsgFromCompliance_NodeInventory) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) - if m.NodeScanV2 != nil { + if m.NodeInventory != nil { { - size, err := m.NodeScanV2.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.NodeInventory.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -1660,14 +1660,14 @@ func (m *MsgFromCompliance_AuditEvents) Size() (n int) { } return n } -func (m *MsgFromCompliance_NodeScanV2) Size() (n int) { +func (m *MsgFromCompliance_NodeInventory) Size() (n int) { if m == nil { return 0 } var l int _ = l - if m.NodeScanV2 != nil { - l = m.NodeScanV2.Size() + if m.NodeInventory != nil { + l = m.NodeInventory.Size() n += 1 + l + sovComplianceIservice(uint64(l)) } return n @@ -2173,7 +2173,7 @@ func (m *MsgFromCompliance) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 4: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field NodeScanV2", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field NodeInventory", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -2200,11 +2200,11 @@ func (m *MsgFromCompliance) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - v := &storage.NodeScanV2{} + v := &storage.NodeInventory{} if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } - m.Msg = &MsgFromCompliance_NodeScanV2{v} + m.Msg = &MsgFromCompliance_NodeInventory{v} iNdEx = postIndex default: iNdEx = preIndex diff --git a/generated/storage/node.pb.go b/generated/storage/node.pb.go index 61e70d9908980..8cbf2e6e91263 100644 --- a/generated/storage/node.pb.go +++ b/generated/storage/node.pb.go @@ -622,7 +622,7 @@ func (m *NodeScan) Clone() *NodeScan { return cloned } -type NodeScanV2 struct { +type NodeInventory struct { NodeId string `protobuf:"bytes,1,opt,name=node_id,json=nodeId,proto3" json:"node_id,omitempty" search:"Node ID,store" sql:"pk,type(uuid)"` 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"` @@ -633,18 +633,18 @@ type NodeScanV2 struct { 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) { +func (m *NodeInventory) Reset() { *m = NodeInventory{} } +func (m *NodeInventory) String() string { return proto.CompactTextString(m) } +func (*NodeInventory) ProtoMessage() {} +func (*NodeInventory) Descriptor() ([]byte, []int) { return fileDescriptor_107f6eed651900c7, []int{2} } -func (m *NodeScanV2) XXX_Unmarshal(b []byte) error { +func (m *NodeInventory) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *NodeScanV2) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *NodeInventory) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_NodeScanV2.Marshal(b, m, deterministic) + return xxx_messageInfo_NodeInventory.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -654,61 +654,61 @@ func (m *NodeScanV2) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return b[:n], nil } } -func (m *NodeScanV2) XXX_Merge(src proto.Message) { - xxx_messageInfo_NodeScanV2.Merge(m, src) +func (m *NodeInventory) XXX_Merge(src proto.Message) { + xxx_messageInfo_NodeInventory.Merge(m, src) } -func (m *NodeScanV2) XXX_Size() int { +func (m *NodeInventory) XXX_Size() int { return m.Size() } -func (m *NodeScanV2) XXX_DiscardUnknown() { - xxx_messageInfo_NodeScanV2.DiscardUnknown(m) +func (m *NodeInventory) XXX_DiscardUnknown() { + xxx_messageInfo_NodeInventory.DiscardUnknown(m) } -var xxx_messageInfo_NodeScanV2 proto.InternalMessageInfo +var xxx_messageInfo_NodeInventory proto.InternalMessageInfo -func (m *NodeScanV2) GetNodeId() string { +func (m *NodeInventory) GetNodeId() string { if m != nil { return m.NodeId } return "" } -func (m *NodeScanV2) GetNodeName() string { +func (m *NodeInventory) GetNodeName() string { if m != nil { return m.NodeName } return "" } -func (m *NodeScanV2) GetScanTime() *types.Timestamp { +func (m *NodeInventory) GetScanTime() *types.Timestamp { if m != nil { return m.ScanTime } return nil } -func (m *NodeScanV2) GetComponents() *v1.Components { +func (m *NodeInventory) GetComponents() *v1.Components { if m != nil { return m.Components } return nil } -func (m *NodeScanV2) GetNotes() []v1.Note { +func (m *NodeInventory) GetNotes() []v1.Note { if m != nil { return m.Notes } return nil } -func (m *NodeScanV2) MessageClone() proto.Message { +func (m *NodeInventory) MessageClone() proto.Message { return m.Clone() } -func (m *NodeScanV2) Clone() *NodeScanV2 { +func (m *NodeInventory) Clone() *NodeInventory { if m == nil { return nil } - cloned := new(NodeScanV2) + cloned := new(NodeInventory) *cloned = *m cloned.ScanTime = m.ScanTime.Clone() @@ -888,104 +888,105 @@ 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((*NodeInventory)(nil), "storage.NodeInventory") proto.RegisterType((*EmbeddedNodeScanComponent)(nil), "storage.EmbeddedNodeScanComponent") } func init() { proto.RegisterFile("storage/node.proto", fileDescriptor_107f6eed651900c7) } var fileDescriptor_107f6eed651900c7 = []byte{ - // 1436 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0xdf, 0x52, 0xdb, 0xc6, - 0x17, 0xc6, 0x36, 0x7f, 0xec, 0x35, 0x01, 0xb3, 0x09, 0x44, 0x38, 0x01, 0xe9, 0xa7, 0x5f, 0x93, - 0x98, 0x86, 0x98, 0x86, 0xa6, 0x33, 0x09, 0x33, 0x61, 0x06, 0x1b, 0x9a, 0x98, 0xa4, 0x0e, 0x23, - 0x03, 0x17, 0xb9, 0xa8, 0x46, 0x58, 0x8b, 0xd9, 0xda, 0xde, 0x55, 0xb5, 0x6b, 0x0f, 0x7e, 0x93, - 0xbe, 0x50, 0x3b, 0xbd, 0xe8, 0x45, 0x9f, 0xc0, 0xd3, 0x49, 0x9f, 0xa0, 0x7a, 0x82, 0xce, 0xae, - 0xb4, 0x42, 0x32, 0x64, 0xd2, 0x66, 0x7a, 0x27, 0x9f, 0xf3, 0x7d, 0xdf, 0x9e, 0xdd, 0x73, 0xf6, - 0xec, 0x31, 0x80, 0x8c, 0x53, 0xdf, 0xe9, 0xa0, 0x2d, 0x42, 0x5d, 0x54, 0xf5, 0x7c, 0xca, 0x29, - 0x9c, 0x8b, 0x6c, 0x65, 0xbd, 0x43, 0x69, 0xa7, 0x87, 0xb6, 0xa4, 0xf9, 0x6c, 0x70, 0xbe, 0xc5, - 0x71, 0x1f, 0x31, 0xee, 0xf4, 0xbd, 0x10, 0x59, 0x5e, 0x65, 0x6d, 0x87, 0x10, 0xe4, 0x6f, 0x39, - 0x1e, 0xde, 0x1a, 0x3e, 0xdd, 0x22, 0x94, 0x47, 0x22, 0xe5, 0xf5, 0x09, 0x57, 0x9b, 0xf6, 0x3d, - 0x4a, 0x10, 0xe1, 0x91, 0x5f, 0x57, 0x0b, 0xb7, 0x29, 0xe1, 0x0e, 0x26, 0xc8, 0xb7, 0xfd, 0x01, - 0x11, 0x0b, 0x44, 0x80, 0x3b, 0x0a, 0x20, 0xbc, 0x9c, 0x45, 0xd6, 0x7b, 0xca, 0x3a, 0x1c, 0xf4, - 0x08, 0xf2, 0x9d, 0x33, 0xdc, 0xc3, 0x7c, 0xa4, 0x28, 0x1d, 0xda, 0xa1, 0xf2, 0x73, 0x4b, 0x7c, - 0x85, 0x56, 0xf3, 0x97, 0x45, 0x30, 0xdd, 0xa4, 0x2e, 0x82, 0xbb, 0x20, 0x8b, 0x5d, 0x2d, 0x63, - 0x64, 0x2a, 0x85, 0x5a, 0x35, 0x18, 0xeb, 0x5f, 0x32, 0xe4, 0xf8, 0xed, 0x8b, 0x1d, 0x53, 0x78, - 0x8d, 0xc6, 0xfe, 0xa6, 0xd0, 0x46, 0xa6, 0xc1, 0x7e, 0xec, 0xed, 0x98, 0x5e, 0x77, 0x93, 0x8f, - 0x3c, 0x54, 0x19, 0x0c, 0xb0, 0xbb, 0x61, 0x5a, 0x59, 0xec, 0xc2, 0xc7, 0x60, 0x9a, 0x38, 0x7d, - 0xa4, 0x65, 0xa5, 0xc2, 0xdd, 0x60, 0xac, 0xdf, 0x4e, 0x2a, 0x44, 0x74, 0x4b, 0x82, 0xe0, 0x43, - 0x30, 0x1b, 0x06, 0xae, 0xe5, 0x8c, 0x5c, 0xa5, 0xb8, 0xbd, 0x50, 0x8d, 0x22, 0xaf, 0x1e, 0x0b, - 0xb3, 0x15, 0x79, 0x61, 0x1f, 0x80, 0x76, 0x6f, 0xc0, 0x38, 0xf2, 0x6d, 0xec, 0x6a, 0xd3, 0x52, - 0xba, 0x19, 0x8c, 0xf5, 0x43, 0x25, 0x5d, 0x0f, 0xbd, 0x93, 0xf1, 0x9d, 0x77, 0x2b, 0x91, 0x67, - 0x07, 0xbb, 0x1b, 0x9b, 0x84, 0x3e, 0x39, 0xef, 0x3e, 0x69, 0x53, 0xc2, 0xb8, 0x2f, 0x84, 0x53, - 0xc1, 0x17, 0xa2, 0x15, 0x1a, 0x2e, 0x7c, 0x09, 0xe6, 0xd5, 0x72, 0x72, 0x2f, 0x33, 0x72, 0xc1, - 0x72, 0x30, 0xd6, 0x57, 0x26, 0x16, 0x54, 0xdb, 0x29, 0x46, 0xf8, 0xa6, 0xd8, 0xd5, 0x21, 0x98, - 0xed, 0x39, 0x67, 0xa8, 0xc7, 0xb4, 0x59, 0xb9, 0xab, 0xd5, 0x78, 0x57, 0xe2, 0x04, 0xaa, 0x6f, - 0xa5, 0xef, 0x80, 0x70, 0x7f, 0x74, 0xfd, 0x7c, 0x0c, 0xe9, 0x35, 0xad, 0x48, 0x01, 0x7e, 0x0f, - 0x8a, 0x0e, 0x21, 0x94, 0x3b, 0x1c, 0x53, 0xc2, 0xb4, 0x39, 0x29, 0xb8, 0x9e, 0x16, 0xdc, 0xbb, - 0x02, 0x84, 0xaa, 0xf7, 0x83, 0xb1, 0xae, 0xa5, 0x54, 0xaf, 0x20, 0xa6, 0x95, 0x14, 0x84, 0xef, - 0x41, 0xe1, 0x07, 0x8a, 0x09, 0x72, 0x6d, 0x87, 0x6b, 0xb7, 0x8c, 0x4c, 0xa5, 0xb8, 0x5d, 0xae, - 0x86, 0x15, 0x5d, 0x55, 0x15, 0x5d, 0x3d, 0x56, 0x15, 0x5d, 0xfb, 0x5f, 0x30, 0xd6, 0xd7, 0x52, - 0xca, 0x87, 0x14, 0x13, 0x43, 0x00, 0xd4, 0x51, 0xe4, 0x43, 0xbd, 0x3d, 0x0e, 0xb7, 0xc1, 0x32, - 0x26, 0x1c, 0xf9, 0xc4, 0xe9, 0xd9, 0xd8, 0xb3, 0x1d, 0xd7, 0xf5, 0x11, 0x63, 0x88, 0x69, 0x79, - 0x23, 0x57, 0x29, 0x58, 0xb7, 0x95, 0xb3, 0xe1, 0xed, 0x29, 0x97, 0xe0, 0xa0, 0xcb, 0x9b, 0x38, - 0x85, 0x90, 0xa3, 0x9c, 0x49, 0xce, 0x2e, 0x58, 0xbd, 0x76, 0x3f, 0xec, 0x21, 0xf2, 0x19, 0xa6, - 0x44, 0x03, 0x32, 0x77, 0x59, 0x2d, 0x63, 0xdd, 0x8d, 0x41, 0x56, 0x88, 0x39, 0x0d, 0x21, 0xf0, - 0x10, 0x2c, 0x5d, 0xe3, 0x6b, 0x0b, 0xf2, 0x2c, 0xd6, 0xe2, 0x93, 0xae, 0x4f, 0x90, 0x1b, 0xe4, - 0x9c, 0x5a, 0xa5, 0x49, 0x49, 0xf8, 0x00, 0x2c, 0x74, 0x91, 0x4f, 0x50, 0x2f, 0x0e, 0xa0, 0x28, - 0x02, 0xb0, 0x6e, 0x85, 0x56, 0xb5, 0xe4, 0x06, 0x28, 0x51, 0x0f, 0xf9, 0x0e, 0xc7, 0xa4, 0x63, - 0xb3, 0x11, 0xe3, 0xa8, 0xaf, 0x2d, 0x49, 0xe0, 0x62, 0x6c, 0x6f, 0x49, 0x33, 0xdc, 0x05, 0x79, - 0xca, 0x6c, 0xdc, 0x77, 0x3a, 0x48, 0x9b, 0x97, 0x9b, 0xf9, 0x7f, 0x30, 0xd6, 0x75, 0x95, 0x84, - 0x77, 0x0a, 0x6e, 0x84, 0x78, 0x95, 0x86, 0x39, 0xca, 0x1a, 0x82, 0x03, 0x1f, 0x81, 0xc5, 0xee, - 0xe0, 0x0c, 0xf5, 0x10, 0x8f, 0x43, 0x5a, 0x94, 0x2b, 0x2d, 0x44, 0x66, 0x15, 0xd3, 0x26, 0x80, - 0xc2, 0x62, 0x7b, 0x3e, 0xbd, 0x1c, 0xc5, 0xd8, 0x92, 0xc4, 0x96, 0x84, 0xe7, 0x48, 0x38, 0x14, - 0xda, 0x06, 0xf3, 0x3d, 0x87, 0x71, 0x7b, 0xe0, 0xb9, 0x0e, 0x47, 0xae, 0xb6, 0xfa, 0xc9, 0xda, - 0x31, 0x82, 0xb1, 0x7e, 0x5f, 0x85, 0xfd, 0xd6, 0x61, 0xdc, 0x38, 0x09, 0xb9, 0x9b, 0x17, 0xd8, - 0x75, 0x91, 0xa8, 0x4c, 0xa1, 0x18, 0x19, 0xe1, 0x31, 0x28, 0x76, 0x9f, 0xb3, 0x58, 0xbf, 0xfc, - 0x49, 0xfd, 0xe8, 0x2e, 0x11, 0x46, 0xfd, 0x0b, 0x87, 0x5d, 0xec, 0x98, 0xb8, 0x43, 0xe4, 0x51, - 0x80, 0xee, 0x73, 0xa6, 0x54, 0x5f, 0x82, 0x69, 0xd1, 0x73, 0x35, 0x28, 0xe5, 0x96, 0x52, 0x17, - 0xa9, 0xd5, 0x76, 0x48, 0x6d, 0x25, 0x18, 0xeb, 0xd0, 0xa3, 0x3d, 0xdc, 0x1e, 0x45, 0x15, 0x2e, - 0xcc, 0xa6, 0x25, 0x69, 0xf0, 0x0d, 0x00, 0x71, 0x8f, 0x66, 0xda, 0x6d, 0x23, 0x53, 0x99, 0xa9, - 0x6d, 0x04, 0x63, 0xfd, 0x41, 0xdc, 0x17, 0x94, 0xd7, 0xa8, 0xd3, 0x01, 0xe1, 0x61, 0x36, 0xd4, - 0x06, 0x5f, 0x4f, 0x59, 0x09, 0x3a, 0x7c, 0x01, 0xa6, 0xdb, 0x43, 0xc4, 0xb4, 0x3b, 0x52, 0x26, - 0x95, 0xd5, 0xfa, 0xe9, 0xc1, 0x8d, 0x02, 0x19, 0x4b, 0x52, 0xe0, 0x11, 0x98, 0x3f, 0xc7, 0x97, - 0xce, 0x59, 0x0f, 0xd9, 0x52, 0x62, 0x59, 0x4a, 0x3c, 0x0e, 0xc6, 0xfa, 0x23, 0x25, 0xf1, 0x6d, - 0xe8, 0x37, 0x3e, 0x26, 0x95, 0xb5, 0x8a, 0x91, 0x44, 0x5d, 0x28, 0xd6, 0x40, 0xde, 0xf3, 0x31, - 0xf5, 0x31, 0x1f, 0x69, 0x2b, 0x46, 0xa6, 0x92, 0xab, 0x3d, 0x0c, 0xc6, 0xba, 0x99, 0xba, 0xeb, - 0x16, 0x66, 0x5d, 0xe3, 0x28, 0x42, 0xc5, 0x59, 0x8b, 0x79, 0xb0, 0x06, 0x80, 0x8f, 0x59, 0xd7, - 0x66, 0x6d, 0xea, 0x23, 0xed, 0xae, 0x91, 0xa9, 0x64, 0xd3, 0xdb, 0xba, 0x52, 0x69, 0xb5, 0x13, - 0xb1, 0x58, 0x05, 0x41, 0x93, 0x26, 0xf8, 0x12, 0xe4, 0x39, 0xf5, 0xec, 0xf6, 0x90, 0x31, 0x4d, - 0x93, 0x0a, 0xa9, 0xba, 0x91, 0x0a, 0xc7, 0xd4, 0x33, 0xea, 0xa7, 0xad, 0x56, 0x54, 0xeb, 0xaf, - 0x73, 0xd6, 0x1c, 0xa7, 0x5e, 0x7d, 0xc8, 0x18, 0xac, 0x80, 0x19, 0xf1, 0xbe, 0x32, 0xed, 0x9e, - 0x91, 0xab, 0x2c, 0x6c, 0xc3, 0x74, 0xa7, 0x6c, 0x52, 0x8e, 0xac, 0x10, 0x50, 0x7e, 0x01, 0x8a, - 0x89, 0x4e, 0x0c, 0x4b, 0x20, 0xd7, 0x45, 0xa3, 0xf0, 0xe1, 0xb3, 0xc4, 0x27, 0xbc, 0x03, 0x66, - 0x86, 0x4e, 0x6f, 0x10, 0x3d, 0x65, 0x56, 0xf8, 0x63, 0x27, 0xfb, 0x3c, 0x53, 0xde, 0x05, 0xa5, - 0xc9, 0x9e, 0xfb, 0x6f, 0xf8, 0xe6, 0x9a, 0x78, 0x6b, 0x39, 0x82, 0xcb, 0x60, 0xe9, 0xbb, 0x46, - 0xab, 0xd5, 0x68, 0xbe, 0xb2, 0x5b, 0xf5, 0xbd, 0xa6, 0xbd, 0xbf, 0x77, 0xbc, 0x57, 0x9a, 0xaa, - 0x95, 0xc0, 0x02, 0x43, 0xdc, 0xbe, 0xaa, 0x94, 0x1a, 0x00, 0x79, 0x69, 0x19, 0x22, 0x56, 0xbb, - 0x05, 0x8a, 0xe2, 0x3b, 0xca, 0x5d, 0x6d, 0x01, 0xcc, 0x8b, 0x9f, 0xea, 0xcc, 0xcc, 0xdf, 0xb2, - 0x20, 0xaf, 0x8a, 0x59, 0x74, 0x77, 0x51, 0xb6, 0xb6, 0xec, 0x68, 0x99, 0xcf, 0xe8, 0xee, 0x42, - 0x25, 0xdd, 0xdd, 0x85, 0x9e, 0x30, 0xdc, 0xd8, 0xc2, 0x72, 0x37, 0xb7, 0xb0, 0x77, 0xa9, 0x5b, - 0x93, 0x95, 0x6f, 0x98, 0x19, 0x67, 0xe6, 0xa0, 0x7f, 0x86, 0x5c, 0x17, 0xb9, 0x2a, 0xea, 0xf8, - 0x0a, 0xd5, 0x8a, 0xc1, 0x58, 0x9f, 0x93, 0x0f, 0xf9, 0x13, 0x33, 0x75, 0x73, 0x36, 0x55, 0x96, - 0xa7, 0x65, 0x96, 0x57, 0xae, 0x5d, 0xe3, 0x64, 0xa6, 0xcd, 0x9d, 0xe8, 0xb8, 0x0b, 0x60, 0xe6, - 0xa4, 0xd9, 0x3a, 0x38, 0x2e, 0x4d, 0xc1, 0x45, 0x50, 0x3c, 0x69, 0xb6, 0x4e, 0x8e, 0x8e, 0xde, - 0x59, 0xc7, 0x07, 0xfb, 0xa5, 0x0c, 0x5c, 0x01, 0xf0, 0xcd, 0x81, 0xd5, 0x3c, 0x78, 0x6b, 0x27, - 0xed, 0x59, 0xf3, 0xe7, 0x2c, 0x00, 0x4a, 0xf4, 0x74, 0x1b, 0xbe, 0x02, 0x73, 0x62, 0x06, 0xb4, - 0x3f, 0x7b, 0x44, 0x9a, 0x15, 0xf4, 0x86, 0x0b, 0x9f, 0x81, 0x82, 0x14, 0xfa, 0x27, 0xb3, 0x52, - 0x5e, 0x20, 0xe5, 0x64, 0x91, 0xca, 0x67, 0xee, 0xbf, 0xcd, 0xe7, 0x37, 0xa9, 0x24, 0x4d, 0x4b, - 0xf1, 0xe5, 0x6a, 0x34, 0xa0, 0x9e, 0x3e, 0xad, 0xc6, 0x69, 0x61, 0xa9, 0x54, 0x3c, 0x50, 0xa9, - 0x98, 0x91, 0xa9, 0x58, 0x4c, 0x30, 0x92, 0x39, 0xf8, 0x2b, 0x0b, 0x56, 0x3f, 0x9a, 0x68, 0xf8, - 0x55, 0x34, 0x34, 0x86, 0x67, 0x9a, 0x1a, 0x5f, 0x62, 0x50, 0x7a, 0x72, 0xdc, 0x05, 0x73, 0xea, - 0x85, 0x0a, 0x4f, 0xef, 0x8b, 0x60, 0xac, 0x1b, 0xd7, 0xbb, 0x70, 0xf4, 0x5c, 0xc5, 0xaf, 0x62, - 0x44, 0x82, 0xcf, 0xc0, 0x8c, 0x18, 0x8e, 0xd5, 0xe0, 0xb9, 0x7e, 0xad, 0x1a, 0x4f, 0x93, 0xa3, - 0xb3, 0x15, 0x82, 0xe1, 0x3e, 0x58, 0x4c, 0x8e, 0xd4, 0x18, 0xa9, 0x89, 0xac, 0x9c, 0xaa, 0xc0, - 0x34, 0x77, 0x92, 0x02, 0xcb, 0x89, 0x56, 0x2b, 0xce, 0x39, 0x97, 0x68, 0xa1, 0xf7, 0x12, 0xed, - 0x4f, 0x8c, 0x9d, 0xd9, 0xd7, 0x53, 0x57, 0xcd, 0x6d, 0x2d, 0xd5, 0x5f, 0x67, 0x85, 0x3b, 0xd1, - 0x3a, 0x27, 0x5b, 0x41, 0xed, 0xd9, 0xaf, 0x1f, 0xd6, 0x33, 0xbf, 0x7f, 0x58, 0xcf, 0xfc, 0xf1, - 0x61, 0x3d, 0xf3, 0xd3, 0x9f, 0xeb, 0x53, 0x60, 0x15, 0xd3, 0x2a, 0xe3, 0x4e, 0xbb, 0xeb, 0xd3, - 0xcb, 0xb0, 0x60, 0x54, 0xdc, 0xef, 0xd5, 0xff, 0x99, 0xb3, 0x59, 0x69, 0xff, 0xfa, 0xef, 0x00, - 0x00, 0x00, 0xff, 0xff, 0x01, 0x86, 0xee, 0x25, 0xf5, 0x0c, 0x00, 0x00, + // 1441 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0xdd, 0x72, 0xdb, 0xb6, + 0x12, 0xb6, 0x24, 0xff, 0x48, 0x90, 0x7f, 0x64, 0x24, 0x76, 0x68, 0x25, 0x36, 0x79, 0x78, 0x4e, + 0x12, 0xf9, 0xc4, 0x91, 0x4f, 0x7c, 0xd2, 0x99, 0xc4, 0x33, 0xf1, 0x8c, 0x25, 0xbb, 0x89, 0x9c, + 0x54, 0xf1, 0x50, 0xb6, 0x2f, 0x72, 0x51, 0x0e, 0x2d, 0xc2, 0x32, 0x2a, 0x09, 0x60, 0x09, 0x48, + 0x63, 0xbd, 0x49, 0x9f, 0xa8, 0x93, 0x8b, 0x5e, 0xf4, 0x09, 0x34, 0x9d, 0xf4, 0x09, 0xca, 0x27, + 0xe8, 0x00, 0x24, 0x68, 0x52, 0x76, 0x26, 0x6d, 0xa6, 0x77, 0xd4, 0xee, 0xf7, 0x7d, 0x58, 0x60, + 0x17, 0x8b, 0x15, 0x80, 0x8c, 0x53, 0xdf, 0xe9, 0xa0, 0x6d, 0x42, 0x5d, 0x54, 0xf5, 0x7c, 0xca, + 0x29, 0x9c, 0x8b, 0x6c, 0x65, 0xbd, 0x43, 0x69, 0xa7, 0x87, 0xb6, 0xa5, 0xf9, 0x7c, 0x70, 0xb1, + 0xcd, 0x71, 0x1f, 0x31, 0xee, 0xf4, 0xbd, 0x10, 0x59, 0x5e, 0x63, 0x6d, 0x87, 0x10, 0xe4, 0x6f, + 0x3b, 0x1e, 0xde, 0x1e, 0x3e, 0xdb, 0x26, 0x94, 0x47, 0x22, 0xe5, 0x8d, 0x09, 0x57, 0x9b, 0xf6, + 0x3d, 0x4a, 0x10, 0xe1, 0x91, 0x5f, 0x57, 0x0b, 0xb7, 0x29, 0xe1, 0x0e, 0x26, 0xc8, 0xb7, 0xfd, + 0x01, 0x11, 0x0b, 0x44, 0x80, 0xbb, 0x0a, 0x20, 0xbc, 0x9c, 0x45, 0xd6, 0xfb, 0xca, 0x3a, 0x1c, + 0xf4, 0x08, 0xf2, 0x9d, 0x73, 0xdc, 0xc3, 0x7c, 0xa4, 0x28, 0x1d, 0xda, 0xa1, 0xf2, 0x73, 0x5b, + 0x7c, 0x85, 0x56, 0xf3, 0xe7, 0x25, 0x30, 0xdd, 0xa4, 0x2e, 0x82, 0x7b, 0x20, 0x8b, 0x5d, 0x2d, + 0x63, 0x64, 0x2a, 0x85, 0x5a, 0x35, 0x18, 0xeb, 0xff, 0x65, 0xc8, 0xf1, 0xdb, 0x97, 0xbb, 0xa6, + 0xf0, 0x1a, 0x8d, 0x83, 0x2d, 0xa1, 0x8d, 0x4c, 0x83, 0xfd, 0xd8, 0xdb, 0x35, 0xbd, 0xee, 0x16, + 0x1f, 0x79, 0xa8, 0x32, 0x18, 0x60, 0x77, 0xd3, 0xb4, 0xb2, 0xd8, 0x85, 0x4f, 0xc0, 0x34, 0x71, + 0xfa, 0x48, 0xcb, 0x4a, 0x85, 0x7b, 0xc1, 0x58, 0xbf, 0x93, 0x54, 0x88, 0xe8, 0x96, 0x04, 0xc1, + 0x47, 0x60, 0x36, 0x0c, 0x5c, 0xcb, 0x19, 0xb9, 0x4a, 0x71, 0x67, 0xb1, 0x1a, 0x45, 0x5e, 0x3d, + 0x11, 0x66, 0x2b, 0xf2, 0xc2, 0x3e, 0x00, 0xed, 0xde, 0x80, 0x71, 0xe4, 0xdb, 0xd8, 0xd5, 0xa6, + 0xa5, 0x74, 0x33, 0x18, 0xeb, 0x47, 0x4a, 0xba, 0x1e, 0x7a, 0x27, 0xe3, 0xbb, 0xe8, 0x56, 0x22, + 0xcf, 0x2e, 0x76, 0x37, 0xb7, 0x08, 0x7d, 0x7a, 0xd1, 0x7d, 0xda, 0xa6, 0x84, 0x71, 0x5f, 0x08, + 0xa7, 0x82, 0x2f, 0x44, 0x2b, 0x34, 0x5c, 0xf8, 0x0a, 0xcc, 0xab, 0xe5, 0xe4, 0x5e, 0x66, 0xe4, + 0x82, 0xe5, 0x60, 0xac, 0xaf, 0x4e, 0x2c, 0xa8, 0xb6, 0x53, 0x8c, 0xf0, 0x4d, 0xb1, 0xab, 0x23, + 0x30, 0xdb, 0x73, 0xce, 0x51, 0x8f, 0x69, 0xb3, 0x72, 0x57, 0x6b, 0xf1, 0xae, 0xc4, 0x09, 0x54, + 0xdf, 0x49, 0xdf, 0x21, 0xe1, 0xfe, 0xe8, 0xe6, 0xf9, 0x18, 0xd2, 0x6b, 0x5a, 0x91, 0x02, 0xfc, + 0x1e, 0x14, 0x1d, 0x42, 0x28, 0x77, 0x38, 0xa6, 0x84, 0x69, 0x73, 0x52, 0x70, 0x23, 0x2d, 0xb8, + 0x7f, 0x0d, 0x08, 0x55, 0x1f, 0x04, 0x63, 0x5d, 0x4b, 0xa9, 0x5e, 0x43, 0x4c, 0x2b, 0x29, 0x08, + 0x3f, 0x80, 0xc2, 0x0f, 0x14, 0x13, 0xe4, 0xda, 0x0e, 0xd7, 0x16, 0x8c, 0x4c, 0xa5, 0xb8, 0x53, + 0xae, 0x86, 0x15, 0x5d, 0x55, 0x15, 0x5d, 0x3d, 0x51, 0x15, 0x5d, 0xfb, 0x57, 0x30, 0xd6, 0xd7, + 0x53, 0xca, 0x47, 0x14, 0x13, 0x43, 0x00, 0xd4, 0x51, 0xe4, 0x43, 0xbd, 0x7d, 0x0e, 0x77, 0xc0, + 0x0a, 0x26, 0x1c, 0xf9, 0xc4, 0xe9, 0xd9, 0xd8, 0xb3, 0x1d, 0xd7, 0xf5, 0x11, 0x63, 0x88, 0x69, + 0x79, 0x23, 0x57, 0x29, 0x58, 0x77, 0x94, 0xb3, 0xe1, 0xed, 0x2b, 0x97, 0xe0, 0xa0, 0xab, 0xdb, + 0x38, 0x85, 0x90, 0xa3, 0x9c, 0x49, 0xce, 0x1e, 0x58, 0xbb, 0x71, 0x3f, 0xec, 0x21, 0xf2, 0x19, + 0xa6, 0x44, 0x03, 0x32, 0x77, 0x59, 0x2d, 0x63, 0xdd, 0x8b, 0x41, 0x56, 0x88, 0x39, 0x0b, 0x21, + 0xf0, 0x08, 0x2c, 0xdf, 0xe0, 0x6b, 0x8b, 0xf2, 0x2c, 0xd6, 0xe3, 0x93, 0xae, 0x4f, 0x90, 0x1b, + 0xe4, 0x82, 0x5a, 0xa5, 0x49, 0x49, 0xf8, 0x10, 0x2c, 0x76, 0x91, 0x4f, 0x50, 0x2f, 0x0e, 0xa0, + 0x28, 0x02, 0xb0, 0x16, 0x42, 0xab, 0x5a, 0x72, 0x13, 0x94, 0xa8, 0x87, 0x7c, 0x87, 0x63, 0xd2, + 0xb1, 0xd9, 0x88, 0x71, 0xd4, 0xd7, 0x96, 0x25, 0x70, 0x29, 0xb6, 0xb7, 0xa4, 0x19, 0xee, 0x81, + 0x3c, 0x65, 0x36, 0xee, 0x3b, 0x1d, 0xa4, 0xcd, 0xcb, 0xcd, 0xfc, 0x3b, 0x18, 0xeb, 0xba, 0x4a, + 0xc2, 0x7b, 0x05, 0x37, 0x42, 0xbc, 0x4a, 0xc3, 0x1c, 0x65, 0x0d, 0xc1, 0x81, 0x8f, 0xc1, 0x52, + 0x77, 0x70, 0x8e, 0x7a, 0x88, 0xc7, 0x21, 0x2d, 0xc9, 0x95, 0x16, 0x23, 0xb3, 0x8a, 0x69, 0x0b, + 0x40, 0x61, 0xb1, 0x3d, 0x9f, 0x5e, 0x8d, 0x62, 0x6c, 0x49, 0x62, 0x4b, 0xc2, 0x73, 0x2c, 0x1c, + 0x0a, 0x6d, 0x83, 0xf9, 0x9e, 0xc3, 0xb8, 0x3d, 0xf0, 0x5c, 0x87, 0x23, 0x57, 0x5b, 0xfb, 0x62, + 0xed, 0x18, 0xc1, 0x58, 0x7f, 0xa0, 0xc2, 0x7e, 0xe7, 0x30, 0x6e, 0x9c, 0x86, 0xdc, 0xad, 0x4b, + 0xec, 0xba, 0x48, 0x54, 0xa6, 0x50, 0x8c, 0x8c, 0xf0, 0x04, 0x14, 0xbb, 0x2f, 0x58, 0xac, 0x5f, + 0xfe, 0xa2, 0x7e, 0x74, 0x97, 0x08, 0xa3, 0xfe, 0xa5, 0xc3, 0x2e, 0x77, 0x4d, 0xdc, 0x21, 0xf2, + 0x28, 0x40, 0xf7, 0x05, 0x53, 0xaa, 0xaf, 0xc0, 0xb4, 0xe8, 0xb9, 0x1a, 0x94, 0x72, 0xcb, 0xa9, + 0x8b, 0xd4, 0x6a, 0x3b, 0xa4, 0xb6, 0x1a, 0x8c, 0x75, 0xe8, 0xd1, 0x1e, 0x6e, 0x8f, 0xa2, 0x0a, + 0x17, 0x66, 0xd3, 0x92, 0x34, 0xf8, 0x16, 0x80, 0xb8, 0x47, 0x33, 0xed, 0x8e, 0x91, 0xa9, 0xcc, + 0xd4, 0x36, 0x83, 0xb1, 0xfe, 0x30, 0xee, 0x0b, 0xca, 0x6b, 0xd4, 0xe9, 0x80, 0xf0, 0x30, 0x1b, + 0x6a, 0x83, 0x6f, 0xa6, 0xac, 0x04, 0x1d, 0xbe, 0x04, 0xd3, 0xed, 0x21, 0x62, 0xda, 0x5d, 0x29, + 0x93, 0xca, 0x6a, 0xfd, 0xec, 0xf0, 0x56, 0x81, 0x8c, 0x25, 0x29, 0xf0, 0x18, 0xcc, 0x5f, 0xe0, + 0x2b, 0xe7, 0xbc, 0x87, 0x6c, 0x29, 0xb1, 0x22, 0x25, 0x9e, 0x04, 0x63, 0xfd, 0xb1, 0x92, 0xf8, + 0x36, 0xf4, 0x1b, 0x9f, 0x93, 0xca, 0x5a, 0xc5, 0x48, 0xa2, 0x2e, 0x14, 0x6b, 0x20, 0xef, 0xf9, + 0x98, 0xfa, 0x98, 0x8f, 0xb4, 0x55, 0x23, 0x53, 0xc9, 0xd5, 0x1e, 0x05, 0x63, 0xdd, 0x4c, 0xdd, + 0x75, 0x0b, 0xb3, 0xae, 0x71, 0x1c, 0xa1, 0xe2, 0xac, 0xc5, 0x3c, 0x58, 0x03, 0xc0, 0xc7, 0xac, + 0x6b, 0xb3, 0x36, 0xf5, 0x91, 0x76, 0xcf, 0xc8, 0x54, 0xb2, 0xe9, 0x6d, 0x5d, 0xab, 0xb4, 0xda, + 0x89, 0x58, 0xac, 0x82, 0xa0, 0x49, 0x13, 0x7c, 0x05, 0xf2, 0x9c, 0x7a, 0x76, 0x7b, 0xc8, 0x98, + 0xa6, 0x49, 0x85, 0x54, 0xdd, 0x48, 0x85, 0x13, 0xea, 0x19, 0xf5, 0xb3, 0x56, 0x2b, 0xaa, 0xf5, + 0x37, 0x39, 0x6b, 0x8e, 0x53, 0xaf, 0x3e, 0x64, 0x0c, 0x56, 0xc0, 0x8c, 0x78, 0x5f, 0x99, 0x76, + 0xdf, 0xc8, 0x55, 0x16, 0x77, 0x60, 0xba, 0x53, 0x36, 0x29, 0x47, 0x56, 0x08, 0x28, 0xbf, 0x04, + 0xc5, 0x44, 0x27, 0x86, 0x25, 0x90, 0xeb, 0xa2, 0x51, 0xf8, 0xf0, 0x59, 0xe2, 0x13, 0xde, 0x05, + 0x33, 0x43, 0xa7, 0x37, 0x88, 0x9e, 0x32, 0x2b, 0xfc, 0xb1, 0x9b, 0x7d, 0x91, 0x29, 0xef, 0x81, + 0xd2, 0x64, 0xcf, 0xfd, 0x3b, 0x7c, 0x73, 0x5d, 0xbc, 0xb5, 0x1c, 0xc1, 0x15, 0xb0, 0xfc, 0x5d, + 0xa3, 0xd5, 0x6a, 0x34, 0x5f, 0xdb, 0xad, 0xfa, 0x7e, 0xd3, 0x3e, 0xd8, 0x3f, 0xd9, 0x2f, 0x4d, + 0xd5, 0x4a, 0x60, 0x91, 0x21, 0x6e, 0x5f, 0x57, 0x4a, 0x0d, 0x80, 0xbc, 0xb4, 0x0c, 0x11, 0xab, + 0x2d, 0x80, 0xa2, 0xf8, 0x8e, 0x72, 0x57, 0x5b, 0x04, 0xf3, 0xe2, 0xa7, 0x3a, 0x33, 0xf3, 0x97, + 0x2c, 0xc8, 0xab, 0x62, 0x16, 0xdd, 0x5d, 0x94, 0xad, 0x2d, 0x3b, 0x5a, 0xe6, 0x2b, 0xba, 0xbb, + 0x50, 0x49, 0x77, 0x77, 0xa1, 0x27, 0x0c, 0xb7, 0xb6, 0xb0, 0xdc, 0xed, 0x2d, 0xec, 0x7d, 0xea, + 0xd6, 0x64, 0xe5, 0x1b, 0x66, 0xc6, 0x99, 0x39, 0xec, 0x9f, 0x23, 0xd7, 0x45, 0xae, 0x8a, 0x3a, + 0xbe, 0x42, 0xb5, 0x62, 0x30, 0xd6, 0xe7, 0xe4, 0x43, 0xfe, 0xd4, 0x4c, 0xdd, 0x9c, 0x2d, 0x95, + 0xe5, 0x69, 0x99, 0xe5, 0xd5, 0x1b, 0xd7, 0x38, 0x99, 0x69, 0x73, 0x37, 0x3a, 0xee, 0x02, 0x98, + 0x39, 0x6d, 0xb6, 0x0e, 0x4f, 0x4a, 0x53, 0x70, 0x09, 0x14, 0x4f, 0x9b, 0xad, 0xd3, 0xe3, 0xe3, + 0xf7, 0xd6, 0xc9, 0xe1, 0x41, 0x29, 0x03, 0x57, 0x01, 0x7c, 0x7b, 0x68, 0x35, 0x0f, 0xdf, 0xd9, + 0x49, 0x7b, 0xd6, 0xfc, 0x98, 0x05, 0x0b, 0x42, 0xb4, 0x41, 0x86, 0x88, 0x70, 0xea, 0x8f, 0xe0, + 0x6b, 0x30, 0x27, 0xc6, 0x40, 0xfb, 0xab, 0xa7, 0xa4, 0x59, 0x41, 0x6f, 0xb8, 0xf0, 0x39, 0x28, + 0x48, 0xa1, 0xbf, 0x32, 0x2e, 0xe5, 0x05, 0x52, 0x0e, 0x17, 0xa9, 0x94, 0xe6, 0xfe, 0xd9, 0x94, + 0x7e, 0x93, 0xca, 0xd3, 0xb4, 0x14, 0x5f, 0xa9, 0x46, 0x33, 0xea, 0xd9, 0xb3, 0x6a, 0x9c, 0x19, + 0x96, 0xca, 0xc6, 0x43, 0x95, 0x8d, 0x19, 0x99, 0x8d, 0xa5, 0x04, 0x23, 0x99, 0x86, 0x3f, 0xb2, + 0x60, 0xed, 0xb3, 0xb9, 0x86, 0xff, 0x8b, 0xe6, 0xc6, 0xf0, 0x4c, 0x53, 0x13, 0x4c, 0x0c, 0x4a, + 0x0f, 0x8f, 0x7b, 0x60, 0x4e, 0x3d, 0x52, 0xe1, 0xe9, 0xfd, 0x27, 0x18, 0xeb, 0xc6, 0xcd, 0x46, + 0x1c, 0xbd, 0x58, 0xf1, 0xc3, 0x18, 0x91, 0xe0, 0x73, 0x30, 0x23, 0xe6, 0x63, 0x35, 0x7b, 0x6e, + 0xdc, 0x28, 0xc8, 0xb3, 0xe4, 0xf4, 0x6c, 0x85, 0x60, 0x78, 0x00, 0x96, 0x92, 0x53, 0x35, 0x46, + 0x6a, 0x28, 0x2b, 0xa7, 0x8a, 0x30, 0xcd, 0x9d, 0xa4, 0xc0, 0x72, 0xa2, 0xdb, 0x8a, 0x73, 0xce, + 0x25, 0xba, 0xe8, 0xfd, 0x44, 0x07, 0x14, 0x93, 0x67, 0xf6, 0xcd, 0xd4, 0x75, 0x7f, 0x5b, 0x4f, + 0xb5, 0xd8, 0x59, 0xe1, 0x4e, 0x74, 0xcf, 0xc9, 0x6e, 0x50, 0x7b, 0xfe, 0xf1, 0xd3, 0x46, 0xe6, + 0xd7, 0x4f, 0x1b, 0x99, 0xdf, 0x3e, 0x6d, 0x64, 0x7e, 0xfa, 0x7d, 0x63, 0x0a, 0xac, 0x61, 0x5a, + 0x65, 0xdc, 0x69, 0x77, 0x7d, 0x7a, 0x15, 0x16, 0x8c, 0x8a, 0xfb, 0x83, 0xfa, 0x4b, 0x73, 0x3e, + 0x2b, 0xed, 0xff, 0xff, 0x33, 0x00, 0x00, 0xff, 0xff, 0x2a, 0x32, 0x04, 0x1b, 0xf8, 0x0c, 0x00, + 0x00, } func (m *Node) Marshal() (dAtA []byte, err error) { @@ -1431,7 +1432,7 @@ func (m *NodeScan) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *NodeScanV2) Marshal() (dAtA []byte, err error) { +func (m *NodeInventory) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -1441,12 +1442,12 @@ func (m *NodeScanV2) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *NodeScanV2) MarshalTo(dAtA []byte) (int, error) { +func (m *NodeInventory) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *NodeScanV2) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *NodeInventory) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -1827,7 +1828,7 @@ func (m *NodeScan) Size() (n int) { return n } -func (m *NodeScanV2) Size() (n int) { +func (m *NodeInventory) Size() (n int) { if m == nil { return 0 } @@ -3214,7 +3215,7 @@ func (m *NodeScan) Unmarshal(dAtA []byte) error { } return nil } -func (m *NodeScanV2) Unmarshal(dAtA []byte) error { +func (m *NodeInventory) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -3237,10 +3238,10 @@ func (m *NodeScanV2) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: NodeScanV2: wiretype end group for non-group") + return fmt.Errorf("proto: NodeInventory: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: NodeScanV2: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: NodeInventory: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: diff --git a/pkg/env/node_scan.go b/pkg/env/node_scan.go index d679413c874bd..c66b08e9a5995 100644 --- a/pkg/env/node_scan.go +++ b/pkg/env/node_scan.go @@ -3,6 +3,6 @@ package env import "time" var ( - // NodeRescanInterval will set the duration for when to scan nodes for vulnerabilities (NodeScanV2) + // NodeRescanInterval will set the duration for when to fetch node inventory to be scanned for vulnerabilities NodeRescanInterval = registerDurationSetting("ROX_NODE_RESCAN_INTERVAL", 4*time.Hour) ) diff --git a/pkg/metrics/resource_string.go b/pkg/metrics/resource_string.go index 20f129da41826..99b7abe86ac76 100644 --- a/pkg/metrics/resource_string.go +++ b/pkg/metrics/resource_string.go @@ -16,7 +16,7 @@ func _() { _ = x[Namespace-5] _ = x[NetworkPolicy-6] _ = x[Node-7] - _ = x[NodeScanV2-8] + _ = x[NodeInventory-8] _ = x[ProviderMetadata-9] _ = x[ComplianceReturn-10] _ = x[ImageIntegration-11] @@ -33,9 +33,9 @@ func _() { _ = x[ComplianceOperatorScan-22] } -const _Resource_name = "AlertDeploymentProcessIndicatorImageSecretNamespaceNetworkPolicyNodeNodeScanV2ProviderMetadataComplianceReturnImageIntegrationServiceAccountPermissionSetRoleRoleBindingDeploymentReprocessPodComplianceOperatorCheckResultComplianceOperatorProfileComplianceOperatorScanSettingBindingComplianceOperatorRuleComplianceOperatorScan" +const _Resource_name = "AlertDeploymentProcessIndicatorImageSecretNamespaceNetworkPolicyNodeNodeInventoryProviderMetadataComplianceReturnImageIntegrationServiceAccountPermissionSetRoleRoleBindingDeploymentReprocessPodComplianceOperatorCheckResultComplianceOperatorProfileComplianceOperatorScanSettingBindingComplianceOperatorRuleComplianceOperatorScan" -var _Resource_index = [...]uint16{0, 5, 15, 31, 36, 42, 51, 64, 68, 78, 94, 110, 126, 140, 153, 157, 168, 187, 190, 219, 244, 280, 302, 324} +var _Resource_index = [...]uint16{0, 5, 15, 31, 36, 42, 51, 64, 68, 81, 97, 113, 129, 143, 156, 160, 171, 190, 193, 222, 247, 283, 305, 327} func (i Resource) String() string { if i < 0 || i >= Resource(len(_Resource_index)-1) { diff --git a/pkg/metrics/resources.go b/pkg/metrics/resources.go index 03e4ca34fa2e7..dafe8bbcfc01f 100644 --- a/pkg/metrics/resources.go +++ b/pkg/metrics/resources.go @@ -15,7 +15,7 @@ const ( Namespace NetworkPolicy Node - NodeScanV2 + NodeInventory ProviderMetadata ComplianceReturn ImageIntegration diff --git a/proto/internalapi/central/sensor_events.proto b/proto/internalapi/central/sensor_events.proto index f651b515a23cd..24944e05ee195 100644 --- a/proto/internalapi/central/sensor_events.proto +++ b/proto/internalapi/central/sensor_events.proto @@ -62,16 +62,16 @@ message SensorEvent { message ResourcesSynced {} oneof resource { - storage.NetworkPolicy network_policy = 4; - storage.Deployment deployment = 5; - storage.Pod pod = 19; - storage.NamespaceMetadata namespace = 6; - storage.Secret secret = 7; - storage.Node node = 9; - storage.NodeScanV2 node_scan_v2 = 25; - storage.ServiceAccount service_account = 14; - storage.K8sRole role = 15; - storage.K8sRoleBinding binding = 16; + storage.NetworkPolicy network_policy = 4; + storage.Deployment deployment = 5; + storage.Pod pod = 19; + storage.NamespaceMetadata namespace = 6; + storage.Secret secret = 7; + storage.Node node = 9; + storage.NodeInventory node_inventory = 25; + storage.ServiceAccount service_account = 14; + storage.K8sRole role = 15; + storage.K8sRoleBinding binding = 16; storage.ProcessIndicator process_indicator = 8; storage.ProviderMetadata provider_metadata = 10; diff --git a/proto/internalapi/sensor/compliance_iservice.proto b/proto/internalapi/sensor/compliance_iservice.proto index 1030b6c8dfb2c..5cfbada473849 100644 --- a/proto/internalapi/sensor/compliance_iservice.proto +++ b/proto/internalapi/sensor/compliance_iservice.proto @@ -24,9 +24,9 @@ message MsgFromCompliance { string node = 1; oneof msg { - compliance.ComplianceReturn return = 2; - AuditEvents audit_events = 3; - storage.NodeScanV2 node_scan_v2 = 4; + compliance.ComplianceReturn return = 2; + AuditEvents audit_events = 3; + storage.NodeInventory node_inventory = 4; } } diff --git a/proto/storage/node.proto b/proto/storage/node.proto index e97b18ec2b4ba..48f3598f791db 100644 --- a/proto/storage/node.proto +++ b/proto/storage/node.proto @@ -85,7 +85,7 @@ message NodeScan { repeated Note notes = 4; } -message NodeScanV2 { +message NodeInventory { string node_id = 1 [(gogoproto.moretags) = 'search:"Node ID,store" sql:"pk,type(uuid)"']; string node_name = 2 [(gogoproto.moretags) = 'search:"Node,store"']; google.protobuf.Timestamp scan_time = 3 [(gogoproto.moretags) = 'search:"Node Scan Time,store"']; diff --git a/sensor/common/compliance/node_inventory_handler.go b/sensor/common/compliance/node_inventory_handler.go new file mode 100644 index 0000000000000..3709ce111a45e --- /dev/null +++ b/sensor/common/compliance/node_inventory_handler.go @@ -0,0 +1,25 @@ +package compliance + +import ( + "github.com/stackrox/rox/generated/storage" + "github.com/stackrox/rox/pkg/concurrency" + "github.com/stackrox/rox/pkg/sync" + "github.com/stackrox/rox/sensor/common" +) + +// NodeInventoryHandler is responsible for handling arriving NodeInventory messages, processing them, and sending them to central +type NodeInventoryHandler interface { + common.SensorComponent + Stopped() concurrency.ReadOnlyErrorSignal +} + +// NewNodeInventoryHandler returns a new instance of a NodeInventoryHandler +func NewNodeInventoryHandler(ch <-chan *storage.NodeInventory) NodeInventoryHandler { + return &nodeInventoryHandlerImpl{ + inventories: ch, + toCentral: nil, + stopC: concurrency.NewErrorSignal(), + lock: &sync.Mutex{}, + stoppedC: concurrency.NewErrorSignal(), + } +} diff --git a/sensor/common/compliance/nodescan_handler_impl.go b/sensor/common/compliance/node_inventory_handler_impl.go similarity index 66% rename from sensor/common/compliance/nodescan_handler_impl.go rename to sensor/common/compliance/node_inventory_handler_impl.go index 31707edb56a0d..bf189633fb114 100644 --- a/sensor/common/compliance/nodescan_handler_impl.go +++ b/sensor/common/compliance/node_inventory_handler_impl.go @@ -10,13 +10,13 @@ import ( ) var ( - errInputChanClosed = errors.New("channel receiving node scans v2 is closed") + errInputChanClosed = errors.New("channel receiving node inventories is closed") errStartMoreThanOnce = errors.New("unable to start the component more than once") ) -type nodeScanHandlerImpl struct { - nodeScans <-chan *storage.NodeScanV2 - toCentral <-chan *central.MsgFromSensor +type nodeInventoryHandlerImpl struct { + inventories <-chan *storage.NodeInventory + toCentral <-chan *central.MsgFromSensor // lock prevents the race condition between Start() [writer] and ResponsesC() [reader] lock *sync.Mutex @@ -26,16 +26,16 @@ type nodeScanHandlerImpl struct { stoppedC concurrency.ErrorSignal } -func (c *nodeScanHandlerImpl) Stopped() concurrency.ReadOnlyErrorSignal { +func (c *nodeInventoryHandlerImpl) Stopped() concurrency.ReadOnlyErrorSignal { return &c.stoppedC } -func (c *nodeScanHandlerImpl) Capabilities() []centralsensor.SensorCapability { +func (c *nodeInventoryHandlerImpl) Capabilities() []centralsensor.SensorCapability { return []centralsensor.SensorCapability{centralsensor.NodeScanningCap} } // ResponsesC returns a channel with messages to Central. It must be called after Start() for the channel to be not nil -func (c *nodeScanHandlerImpl) ResponsesC() <-chan *central.MsgFromSensor { +func (c *nodeInventoryHandlerImpl) ResponsesC() <-chan *central.MsgFromSensor { c.lock.Lock() defer c.lock.Unlock() if c.toCentral == nil { @@ -44,7 +44,7 @@ func (c *nodeScanHandlerImpl) ResponsesC() <-chan *central.MsgFromSensor { return c.toCentral } -func (c *nodeScanHandlerImpl) Start() error { +func (c *nodeInventoryHandlerImpl) Start() error { c.lock.Lock() defer c.lock.Unlock() if c.toCentral != nil { @@ -54,11 +54,11 @@ func (c *nodeScanHandlerImpl) Start() error { return nil } -func (c *nodeScanHandlerImpl) Stop(err error) { +func (c *nodeInventoryHandlerImpl) Stop(err error) { c.stopC.SignalWithError(err) } -func (c *nodeScanHandlerImpl) ProcessMessage(_ *central.MsgToSensor) error { +func (c *nodeInventoryHandlerImpl) ProcessMessage(_ *central.MsgToSensor) error { // This component doesn't actually process or handle any messages sent from Central to Sensor (yet). // It uses the sensor component so that the lifecycle (start, stop) can be handled when Sensor starts up. return nil @@ -66,7 +66,7 @@ func (c *nodeScanHandlerImpl) ProcessMessage(_ *central.MsgToSensor) error { // run handles the messages from Compliance and forwards them to Central // This is the only goroutine that writes into the toCentral channel, thus it is responsible for creating and closing that chan -func (c *nodeScanHandlerImpl) run() <-chan *central.MsgFromSensor { +func (c *nodeInventoryHandlerImpl) run() <-chan *central.MsgFromSensor { toC := make(chan *central.MsgFromSensor) go func() { defer func() { @@ -77,21 +77,21 @@ func (c *nodeScanHandlerImpl) run() <-chan *central.MsgFromSensor { select { case <-c.stopC.Done(): return - case scan, ok := <-c.nodeScans: + case inventory, ok := <-c.inventories: if !ok { c.stopC.SignalWithError(errInputChanClosed) return } - // TODO(ROX-12943): Do something with the scan, e.g., attach NodeID - c.sendScan(toC, scan) + // TODO(ROX-12943): Do something with the inventory, e.g., attach NodeID + c.sendInventory(toC, inventory) } } }() return toC } -func (c *nodeScanHandlerImpl) sendScan(toC chan *central.MsgFromSensor, scan *storage.NodeScanV2) { - if scan == nil { +func (c *nodeInventoryHandlerImpl) sendInventory(toC chan *central.MsgFromSensor, inventory *storage.NodeInventory) { + if inventory == nil { return } select { @@ -99,8 +99,8 @@ func (c *nodeScanHandlerImpl) sendScan(toC chan *central.MsgFromSensor, scan *st case toC <- ¢ral.MsgFromSensor{ Msg: ¢ral.MsgFromSensor_Event{ Event: ¢ral.SensorEvent{ - Resource: ¢ral.SensorEvent_NodeScanV2{ - NodeScanV2: scan, + Resource: ¢ral.SensorEvent_NodeInventory{ + NodeInventory: inventory, }, }, }, diff --git a/sensor/common/compliance/nodescan_handler_test.go b/sensor/common/compliance/node_inventory_handler_test.go similarity index 75% rename from sensor/common/compliance/nodescan_handler_test.go rename to sensor/common/compliance/node_inventory_handler_test.go index f401420db6f32..c43010f61728f 100644 --- a/sensor/common/compliance/nodescan_handler_test.go +++ b/sensor/common/compliance/node_inventory_handler_test.go @@ -37,12 +37,12 @@ func (st *stoppable) signalAndWait(err error) error { return st.stoppedC.Wait() } -func TestNodeScanHandler(t *testing.T) { - suite.Run(t, &NodeScanHandlerTestSuite{}) +func TestNodeInventoryHandler(t *testing.T) { + suite.Run(t, &NodeInventoryHandlerTestSuite{}) } -func fakeNodeScanV2(nodeName string) *storage.NodeScanV2 { - msg := &storage.NodeScanV2{ +func fakeNodeInventory(nodeName string) *storage.NodeInventory { + msg := &storage.NodeInventory{ NodeId: "", NodeName: nodeName, ScanTime: timestamp.TimestampNow(), @@ -67,12 +67,14 @@ func fakeNodeScanV2(nodeName string) *storage.NodeScanV2 { return msg } -var _ suite.TearDownTestSuite = (*NodeScanHandlerTestSuite)(nil) +var _ suite.TearDownTestSuite = (*NodeInventoryHandlerTestSuite)(nil) -type NodeScanHandlerTestSuite struct { +type NodeInventoryHandlerTestSuite struct { suite.Suite } +func (s *NodeInventoryHandlerTestSuite) SetupTest() {} + func assertNoGoroutineLeaks(t *testing.T) { goleak.VerifyNone(t, // Ignore a known leak: https://github.com/DataDog/dd-trace-go/issues/1469 @@ -80,29 +82,29 @@ func assertNoGoroutineLeaks(t *testing.T) { ) } -func (s *NodeScanHandlerTestSuite) TearDownTest() { +func (s *NodeInventoryHandlerTestSuite) TearDownTest() { assertNoGoroutineLeaks(s.T()) } -func (s *NodeScanHandlerTestSuite) TestResponsesCShouldPanicWhenNotStarted() { - nodeScans := make(chan *storage.NodeScanV2) - defer close(nodeScans) - h := NewNodeScanHandler(nodeScans) +func (s *NodeInventoryHandlerTestSuite) TestResponsesCShouldPanicWhenNotStarted() { + inventories := make(chan *storage.NodeInventory) + defer close(inventories) + h := NewNodeInventoryHandler(inventories) s.Panics(func() { h.ResponsesC() }) } // TestStopHandler goal is to stop handler while there are still some messages to process -// in the channel passed into NewNodeScanHandler. +// in the channel passed into NewNodeInventoryHandler. // We expect that premature stop of the handler results in a clean stop without any race conditions or goroutine leaks. -// Exec with: go test -race -count=1 -v -run ^TestNodeScanHandler$ ./sensor/common/compliance -func (s *NodeScanHandlerTestSuite) TestStopHandler() { - nodeScans := make(chan *storage.NodeScanV2) - defer close(nodeScans) +// Exec with: go test -race -count=1 -v -run ^TestNodeInventoryHandler$ ./sensor/common/compliance +func (s *NodeInventoryHandlerTestSuite) TestStopHandler() { + inventories := make(chan *storage.NodeInventory) + defer close(inventories) producer := newStoppable() errTest := errors.New("example-stop-error") - h := NewNodeScanHandler(nodeScans) + h := NewNodeInventoryHandler(inventories) s.NoError(h.Start()) consumer := consumeAndCount(h.ResponsesC(), 1) // This is a producer that stops the handler after producing the first message and then sends many (29) more messages. @@ -112,7 +114,7 @@ func (s *NodeScanHandlerTestSuite) TestStopHandler() { select { case <-producer.stopC.Done(): return - case nodeScans <- fakeNodeScanV2("Node"): + case inventories <- fakeNodeInventory("Node"): if i == 0 { s.NoError(consumer.stoppedC.Wait()) // This blocks until consumer receives its 1 message h.Stop(errTest) @@ -124,10 +126,10 @@ func (s *NodeScanHandlerTestSuite) TestStopHandler() { s.NoError(producer.signalAndWait(nil)) } -func (s *NodeScanHandlerTestSuite) TestHandlerRegularRoutine() { +func (s *NodeInventoryHandlerTestSuite) TestHandlerRegularRoutine() { ch, producer := s.generateTestInputNoClose(10) defer close(ch) - h := NewNodeScanHandler(ch) + h := NewNodeInventoryHandler(ch) s.NoError(h.Start()) consumer := consumeAndCount(h.ResponsesC(), 10) s.NoError(producer.stoppedC.Wait()) @@ -137,10 +139,10 @@ func (s *NodeScanHandlerTestSuite) TestHandlerRegularRoutine() { s.NoError(h.Stopped().Wait()) } -func (s *NodeScanHandlerTestSuite) TestHandlerStoppedError() { +func (s *NodeInventoryHandlerTestSuite) TestHandlerStoppedError() { ch, producer := s.generateTestInputNoClose(10) defer close(ch) - h := NewNodeScanHandler(ch) + h := NewNodeInventoryHandler(ch) s.NoError(h.Start()) consumer := consumeAndCount(h.ResponsesC(), 10) s.NoError(producer.stoppedC.Wait()) @@ -151,10 +153,10 @@ func (s *NodeScanHandlerTestSuite) TestHandlerStoppedError() { s.ErrorIs(h.Stopped().Wait(), errTest) } -// generateTestInputNoClose generates numToProduce messages of type NodeScanV2. +// generateTestInputNoClose generates numToProduce messages of type NodeInventory. // It returns a channel that must be closed by the caller. -func (s *NodeScanHandlerTestSuite) generateTestInputNoClose(numToProduce int) (chan *storage.NodeScanV2, stoppable) { - input := make(chan *storage.NodeScanV2) +func (s *NodeInventoryHandlerTestSuite) generateTestInputNoClose(numToProduce int) (chan *storage.NodeInventory, stoppable) { + input := make(chan *storage.NodeInventory) st := newStoppable() go func() { defer st.signalStopped() @@ -162,7 +164,7 @@ func (s *NodeScanHandlerTestSuite) generateTestInputNoClose(numToProduce int) (c select { case <-st.stopC.Done(): return - case input <- fakeNodeScanV2(fmt.Sprintf("Node-%d", i)): + case input <- fakeNodeInventory(fmt.Sprintf("Node-%d", i)): } } }() @@ -192,10 +194,10 @@ func consumeAndCount[T any](ch <-chan *T, numToConsume int) stoppable { return st } -func (s *NodeScanHandlerTestSuite) TestMultipleStartHandler() { +func (s *NodeInventoryHandlerTestSuite) TestMultipleStartHandler() { ch, producer := s.generateTestInputNoClose(10) defer close(ch) - h := NewNodeScanHandler(ch) + h := NewNodeInventoryHandler(ch) s.NoError(h.Start()) s.ErrorIs(h.Start(), errStartMoreThanOnce) @@ -214,10 +216,10 @@ func (s *NodeScanHandlerTestSuite) TestMultipleStartHandler() { s.ErrorIs(h.Start(), errStartMoreThanOnce) } -func (s *NodeScanHandlerTestSuite) TestDoubleStopHandler() { +func (s *NodeInventoryHandlerTestSuite) TestDoubleStopHandler() { ch, producer := s.generateTestInputNoClose(10) defer close(ch) - h := NewNodeScanHandler(ch) + h := NewNodeInventoryHandler(ch) s.NoError(h.Start()) consumer := consumeAndCount(h.ResponsesC(), 10) s.NoError(producer.stoppedC.Wait()) @@ -229,9 +231,9 @@ func (s *NodeScanHandlerTestSuite) TestDoubleStopHandler() { s.NoError(h.Stopped().Wait()) } -func (s *NodeScanHandlerTestSuite) TestInputChannelClosed() { +func (s *NodeInventoryHandlerTestSuite) TestInputChannelClosed() { ch, producer := s.generateTestInputNoClose(10) - h := NewNodeScanHandler(ch) + h := NewNodeInventoryHandler(ch) s.NoError(h.Start()) consumer := consumeAndCount(h.ResponsesC(), 10) s.NoError(producer.stoppedC.Wait()) diff --git a/sensor/common/compliance/nodescan_handler.go b/sensor/common/compliance/nodescan_handler.go deleted file mode 100644 index 4514fbcbfe9a5..0000000000000 --- a/sensor/common/compliance/nodescan_handler.go +++ /dev/null @@ -1,25 +0,0 @@ -package compliance - -import ( - "github.com/stackrox/rox/generated/storage" - "github.com/stackrox/rox/pkg/concurrency" - "github.com/stackrox/rox/pkg/sync" - "github.com/stackrox/rox/sensor/common" -) - -// NodeScanHandler is responsible for handling the arriving NodeScanV2 messages, processing then, and sending them to central -type NodeScanHandler interface { - common.SensorComponent - Stopped() concurrency.ReadOnlyErrorSignal -} - -// NewNodeScanHandler returns a new instance of a NodeScanHandler -func NewNodeScanHandler(ch <-chan *storage.NodeScanV2) NodeScanHandler { - return &nodeScanHandlerImpl{ - nodeScans: ch, - toCentral: nil, - stopC: concurrency.NewErrorSignal(), - lock: &sync.Mutex{}, - stoppedC: concurrency.NewErrorSignal(), - } -} diff --git a/sensor/common/compliance/service.go b/sensor/common/compliance/service.go index 62aa3a60d93af..b5c906213a083 100644 --- a/sensor/common/compliance/service.go +++ b/sensor/common/compliance/service.go @@ -22,7 +22,7 @@ type Service interface { Output() chan *compliance.ComplianceReturn AuditEvents() chan *sensor.AuditEvents - NodeScans() <-chan *storage.NodeScanV2 + NodeInventories() <-chan *storage.NodeInventory } // NewService returns the ComplianceServiceServer API for Sensor to use, outputs any received ComplianceReturns @@ -30,7 +30,7 @@ type Service interface { func NewService(orchestrator orchestrator.Orchestrator, auditEventsInput chan *sensor.AuditEvents, auditLogCollectionManager AuditLogCollectionManager) Service { return &serviceImpl{ output: make(chan *compliance.ComplianceReturn), - nodeScans: make(chan *storage.NodeScanV2), + nodeInventories: make(chan *storage.NodeInventory), connectionManager: newConnectionManager(), orchestrator: orchestrator, auditEvents: auditEventsInput, diff --git a/sensor/common/compliance/service_impl.go b/sensor/common/compliance/service_impl.go index 7f1d10fafe1ca..94307cf896b2a 100644 --- a/sensor/common/compliance/service_impl.go +++ b/sensor/common/compliance/service_impl.go @@ -21,9 +21,9 @@ import ( type serviceImpl struct { sensor.UnimplementedComplianceServiceServer - output chan *compliance.ComplianceReturn - auditEvents chan *sensor.AuditEvents - nodeScans chan *storage.NodeScanV2 + output chan *compliance.ComplianceReturn + auditEvents chan *sensor.AuditEvents + nodeInventories chan *storage.NodeInventory auditLogCollectionManager AuditLogCollectionManager @@ -144,9 +144,9 @@ func (s *serviceImpl) Communicate(server sensor.ComplianceService_CommunicateSer case *sensor.MsgFromCompliance_AuditEvents: s.auditEvents <- t.AuditEvents s.auditLogCollectionManager.AuditMessagesChan() <- msg - case *sensor.MsgFromCompliance_NodeScanV2: + case *sensor.MsgFromCompliance_NodeInventory: if features.RHCOSNodeScanning.Enabled() { - s.nodeScans <- t.NodeScanV2 + s.nodeInventories <- t.NodeInventory } } } @@ -175,6 +175,6 @@ func (s *serviceImpl) AuditEvents() chan *sensor.AuditEvents { return s.auditEvents } -func (s *serviceImpl) NodeScans() <-chan *storage.NodeScanV2 { - return s.nodeScans +func (s *serviceImpl) NodeInventories() <-chan *storage.NodeInventory { + return s.nodeInventories } diff --git a/sensor/kubernetes/sensor/sensor.go b/sensor/kubernetes/sensor/sensor.go index 6eab850cb9b72..f8c4caa516b5c 100644 --- a/sensor/kubernetes/sensor/sensor.go +++ b/sensor/kubernetes/sensor/sensor.go @@ -135,7 +135,7 @@ func CreateSensor(cfg *CreateOptions) (*sensor.Sensor, error) { reprocessor.NewHandler(admCtrlSettingsMgr, policyDetector, imageCache), } if features.RHCOSNodeScanning.Enabled() { - components = append(components, compliance.NewNodeScanHandler(complianceService.NodeScans())) + components = append(components, compliance.NewNodeInventoryHandler(complianceService.NodeInventories())) } if !cfg.localSensor {