From f2443cd4ecae73ab554b07bd9de51384a4bdd2b1 Mon Sep 17 00:00:00 2001 From: Michael Wolf Date: Wed, 21 Feb 2024 18:53:30 -0800 Subject: [PATCH] Change some struct member visibility --- .../sessionmd/add_session_metadata.go | 6 ++-- .../sessionmd/add_session_metadata_test.go | 10 +++---- .../auditbeat/processors/sessionmd/config.go | 6 ++-- .../processors/sessionmd/processdb/db.go | 30 +++++++++---------- 4 files changed, 26 insertions(+), 26 deletions(-) diff --git a/x-pack/auditbeat/processors/sessionmd/add_session_metadata.go b/x-pack/auditbeat/processors/sessionmd/add_session_metadata.go index 231527b88de..c7423a47aab 100644 --- a/x-pack/auditbeat/processors/sessionmd/add_session_metadata.go +++ b/x-pack/auditbeat/processors/sessionmd/add_session_metadata.go @@ -19,7 +19,7 @@ import ( "github.com/elastic/beats/v7/x-pack/auditbeat/processors/sessionmd/procfs" "github.com/elastic/beats/v7/x-pack/auditbeat/processors/sessionmd/provider" "github.com/elastic/beats/v7/x-pack/auditbeat/processors/sessionmd/provider/ebpf_provider" - "github.com/elastic/elastic-agent-libs/config" + cfg "github.com/elastic/elastic-agent-libs/config" "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) @@ -34,13 +34,13 @@ func init() { } type addSessionMetadata struct { - config Config + config config logger *logp.Logger db *processdb.DB provider provider.Provider } -func New(cfg *config.C) (beat.Processor, error) { +func New(cfg *cfg.C) (beat.Processor, error) { c := defaultConfig() if err := cfg.Unpack(&c); err != nil { return nil, fmt.Errorf("fail to unpack the %v configuration: %w", processorName, err) diff --git a/x-pack/auditbeat/processors/sessionmd/add_session_metadata_test.go b/x-pack/auditbeat/processors/sessionmd/add_session_metadata_test.go index c8b0e573156..2f00b2f419d 100644 --- a/x-pack/auditbeat/processors/sessionmd/add_session_metadata_test.go +++ b/x-pack/auditbeat/processors/sessionmd/add_session_metadata_test.go @@ -24,14 +24,14 @@ var ( enrichTests = []struct { testName string mockProcesses []types.ProcessExecEvent - config Config + config config input beat.Event expected beat.Event expect_error bool }{ { testName: "Enrich Process", - config: Config{ + config: config{ ReplaceFields: false, PIDField: "process.pid", }, @@ -93,7 +93,7 @@ var ( }, { testName: "No PID Field in Event", - config: Config{ + config: config{ ReplaceFields: false, PIDField: "process.pid", }, @@ -112,7 +112,7 @@ var ( }, { testName: "PID Not Number", - config: Config{ + config: config{ ReplaceFields: false, PIDField: "process.pid", }, @@ -132,7 +132,7 @@ var ( }, { testName: "PID not in DB", - config: Config{ + config: config{ ReplaceFields: false, PIDField: "process.pid", }, diff --git a/x-pack/auditbeat/processors/sessionmd/config.go b/x-pack/auditbeat/processors/sessionmd/config.go index a082c7d1fd1..31c07c9065f 100644 --- a/x-pack/auditbeat/processors/sessionmd/config.go +++ b/x-pack/auditbeat/processors/sessionmd/config.go @@ -7,14 +7,14 @@ package sessionmd // Config for add_session_metadata processor. -type Config struct { +type config struct { Backend string `config:"backend"` ReplaceFields bool `config:"replace_fields"` PIDField string `config:"pid_field"` } -func defaultConfig() Config { - return Config{ +func defaultConfig() config { + return config{ Backend: "auto", ReplaceFields: false, PIDField: "process.pid", diff --git a/x-pack/auditbeat/processors/sessionmd/processdb/db.go b/x-pack/auditbeat/processors/sessionmd/processdb/db.go index 4b0b90ea004..309fb018f9a 100644 --- a/x-pack/auditbeat/processors/sessionmd/processdb/db.go +++ b/x-pack/auditbeat/processors/sessionmd/processdb/db.go @@ -165,7 +165,7 @@ func ttyDevFromProto(p types.TTYDev) types.TTYDev { } type DB struct { - sync.RWMutex + mutex sync.RWMutex logger *logp.Logger processes map[uint32]Process entryLeaders map[uint32]EntryType @@ -207,8 +207,8 @@ func basename(pathStr string) string { } func (db *DB) InsertFork(fork types.ProcessForkEvent) { - db.Lock() - defer db.Unlock() + db.mutex.Lock() + defer db.mutex.Unlock() pid := fork.ChildPIDs.Tgid ppid := fork.ParentPIDs.Tgid @@ -240,8 +240,8 @@ func (db *DB) insertProcess(process Process) { } func (db *DB) InsertExec(exec types.ProcessExecEvent) { - db.Lock() - defer db.Unlock() + db.mutex.Lock() + defer db.mutex.Unlock() proc := Process{ PIDs: pidInfoFromProto(exec.PIDs), @@ -367,8 +367,8 @@ func (db *DB) evaluateEntryLeader(p Process) *uint32 { } func (db *DB) InsertSetsid(setsid types.ProcessSetsidEvent) { - db.Lock() - defer db.Unlock() + db.mutex.Lock() + defer db.mutex.Unlock() if entry, ok := db.processes[setsid.PIDs.Tgid]; ok { entry.PIDs = pidInfoFromProto(setsid.PIDs) @@ -381,8 +381,8 @@ func (db *DB) InsertSetsid(setsid types.ProcessSetsidEvent) { } func (db *DB) InsertExit(exit types.ProcessExitEvent) { - db.Lock() - defer db.Unlock() + db.mutex.Lock() + defer db.mutex.Unlock() pid := exit.PIDs.Tgid delete(db.processes, pid) @@ -528,8 +528,8 @@ func setSameAsProcess(process *types.Process) { } func (db *DB) GetProcess(pid uint32) (types.Process, error) { - db.RLock() - defer db.RUnlock() + db.mutex.RLock() + defer db.mutex.RUnlock() process, ok := db.processes[pid] if !ok { @@ -568,8 +568,8 @@ func (db *DB) GetProcess(pid uint32) (types.Process, error) { } func (db *DB) GetEntryType(pid uint32) (EntryType, error) { - db.RLock() - defer db.RUnlock() + db.mutex.RLock() + defer db.mutex.RUnlock() if entryType, ok := db.entryLeaders[pid]; ok { return entryType, nil @@ -578,8 +578,8 @@ func (db *DB) GetEntryType(pid uint32) (EntryType, error) { } func (db *DB) ScrapeProcfs() []uint32 { - db.Lock() - defer db.Unlock() + db.mutex.Lock() + defer db.mutex.Unlock() procs, err := db.procfs.GetAllProcesses() if err != nil {