Skip to content

Rename NodeScanV2 to NodeInventory #3755

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vikin91 merged 14 commits into from
Nov 30, 2022
Merged

Rename NodeScanV2 to NodeInventory #3755

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
a2c146a
Rename NodeScanV2 to NodeInventory
vikin91 Nov 3, 2022
fe48d07
Rename test suite to NodeInventoryTestSuite
vikin91 Nov 23, 2022
39f20f4
Rename leftovers in tests
vikin91 Nov 29, 2022
09a58f5
Readd lost proto annotation
vikin91 Nov 29, 2022
c34a394
Rephrase comment
vikin91 Nov 29, 2022
4122511
Rename sendScan to sendInventory
vikin91 Nov 29, 2022
32aa3e8
Regenerate proto-generated-srcs
vikin91 Nov 29, 2022
09e9878
Rename nodeScanHandlerImpl to nodeInventoryHandlerImpl
vikin91 Nov 29, 2022
cd6ee34
Rename var nodeScan
vikin91 Nov 29, 2022
b03d4f5
Rename var nodeScansC
vikin91 Nov 29, 2022
1209898
Rename var scan
vikin91 Nov 29, 2022
1a2451c
Rename files
vikin91 Nov 29, 2022
53648f2
Update error message
vikin91 Nov 29, 2022
f8b397f
s/NodeInventoryTestSuite/NodeInventoryHandlerTestSuite/
vikin91 Nov 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions central/sensor/service/pipeline/nodescansv2/pipeline.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
8 changes: 4 additions & 4 deletions compliance/collection/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down Expand Up @@ -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:
}
}
}()
Expand Down
8 changes: 4 additions & 4 deletions compliance/collection/nodescanv2/fake_nodescan.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down
6 changes: 3 additions & 3 deletions compliance/collection/nodescanv2/nodescan.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
2 changes: 1 addition & 1 deletion compliance/collection/nodescanv2/nodescan_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
266 changes: 133 additions & 133 deletions generated/internalapi/central/sensor_events.pb.go
View file
Open in desktop

Large diffs are not rendered by default.

136 changes: 68 additions & 68 deletions generated/internalapi/sensor/compliance_iservice.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading