Apply suggestions from code review

Co-authored-by: Dan Kortschak <[email protected]>
elastic · Jan 17, 2024 · c688f5a · c688f5a
1 parent 0f610cb
commit c688f5a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/x-pack/auditbeat/processors/add_session_metadata/add_session_metadata.go b/x-pack/auditbeat/processors/add_session_metadata/add_session_metadata.go
@@ -130,7 +130,7 @@ func (p *addSessionMetadata) enrich(ev *beat.Event) (*beat.Event, error) {
 	return result, nil
 }
 
-//pidToUInt32 converts PID value to uint32
+// pidToUInt32 converts PID value to uint32
 func pidToUInt32(value interface{}) (pid uint32, err error) {
 	switch v := value.(type) {
 	case string:

diff --git a/x-pack/auditbeat/processors/add_session_metadata/pkg/processdb/db.go b/x-pack/auditbeat/processors/add_session_metadata/pkg/processdb/db.go
@@ -78,7 +78,9 @@ func stringStartsWithEntryInList(str string, list []string) bool {
 }
 
 func isContainerRuntime(executable string) bool {
-	return stringStartsWithEntryInList(executable, containerRuntimes[:])
+	return slices.ContainsFunc(containerRuntimes[:], func(s string) bool {
+		return strings.HasPrefix(executable, s)
+	})
 }
 
 func isFilteredExecutable(executable string) bool {

diff --git a/x-pack/auditbeat/processors/add_session_metadata/pkg/procfs/mock.go b/x-pack/auditbeat/processors/add_session_metadata/pkg/procfs/mock.go
@@ -31,7 +31,7 @@ func (r *MockReader) GetProcess(pid uint32) (ProcessInfo, error) {
 }
 
 func (r *MockReader) GetAllProcesses() ([]ProcessInfo, error) {
-	ret := make([]ProcessInfo, 0)
+	ret := make([]ProcessInfo, 0, len(r.entries))
 
 	for _, entry := range r.entries {
 		ret = append(ret, entry)

diff --git a/x-pack/auditbeat/processors/add_session_metadata/pkg/procfs/procfs.go b/x-pack/auditbeat/processors/add_session_metadata/pkg/procfs/procfs.go
@@ -124,7 +124,7 @@ func (r ProcfsReader) getProcessInfo(proc p.Proc) (ProcessInfo, error) {
 	// start time is needed to register the process in the database
 	stat, err := proc.Stat()
 	if err != nil {
-		return ProcessInfo{}, fmt.Errorf("failed to read /proc/%d/stat: %v", pid, err)
+		return ProcessInfo{}, fmt.Errorf("failed to read /proc/%d/stat: %w", pid, err)
 	}
 
 	argv, err := proc.CmdLine()