From b2bd537d03f8f4b35dae565610c83aca2fb35349 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D7=A0=CF=85=CE=B1=CE=B7=20=D7=A0=CF=85=CE=B1=CE=B7=D1=95?= =?UTF-8?q?=CF=83=CE=B7?= Date: Thu, 1 Oct 2026 11:18:02 -0700 Subject: [PATCH] refactor(memory): name the domain memory, not mem The URL segment, the SDK service and the generated types all say memory. The provider directory and its package said mem, so the domain carried two names and the search that checks a domain reaches every layer missed one of them. The rename is not mechanical, because gopsutil's package is also called mem and two of our files import both. Our package is renamed and gopsutil's references are left alone; the two files that import both already alias gopsutil as sysMem, so nothing is ambiguous. Identifiers, package declarations, test package names and mock imports go with it. memFs, MemBytes, MemPercent and memInfo stay: the first is the in-memory filesystem used in tests, the next two belong to the process domain, and the last holds a gopsutil value. Three stale doc comments turned up on the way. host, disk and load each said their Debian implementation "implements the Mem interface", copied from this package and never corrected. They name their own interface now. Refs #566 Co-Authored-By: Claude Opus 5 (1M context) Claude-Session: https://claude.ai/code/session_01FuKUsHFG1EqZXamffh9M2c --- cmd/agent_setup.go | 16 ++++++------ internal/agent/agent.go | 6 ++--- internal/agent/agent_public_test.go | 12 ++++----- internal/agent/condition.go | 4 +-- internal/agent/condition_public_test.go | 20 +++++++------- internal/agent/consumer_public_test.go | 4 +-- internal/agent/drain_public_test.go | 4 +-- internal/agent/enrollment_public_test.go | 2 +- internal/agent/export_test.go | 12 ++++----- internal/agent/facts_public_test.go | 4 +-- internal/agent/handler_public_test.go | 4 +-- internal/agent/heartbeat.go | 6 ++--- internal/agent/heartbeat_public_test.go | 10 +++---- internal/agent/lifecycle_public_test.go | 4 +-- internal/agent/node_status_public_test.go | 14 +++++----- internal/agent/processor.go | 18 ++++++------- internal/agent/processor_public_test.go | 26 +++++++++---------- .../agent/processor_schedule_public_test.go | 14 +++++----- internal/agent/test_agent_public_test.go | 10 +++---- internal/agent/types.go | 4 +-- .../api/agent/agent_get_public_test.go | 6 ++--- .../api/agent/agent_list_public_test.go | 4 +-- .../controller/api/node/node_memory_get.go | 10 +++---- .../api/node/node_memory_get_public_test.go | 14 +++++----- .../api/node/node_status_get_public_test.go | 6 ++--- internal/job/types.go | 8 +++--- internal/job/types_public_test.go | 4 +-- internal/provider/node/disk/debian.go | 2 +- internal/provider/node/host/debian.go | 2 +- internal/provider/node/load/debian.go | 2 +- .../provider/node/{mem => memory}/darwin.go | 4 +-- .../node/{mem => memory}/darwin_get_vm.go | 2 +- .../darwin_get_vm_public_test.go | 16 ++++++------ .../provider/node/{mem => memory}/debian.go | 4 +-- .../node/{mem => memory}/debian_get_vm.go | 2 +- .../debian_get_vm_public_test.go | 16 ++++++------ .../provider/node/{mem => memory}/linux.go | 6 ++--- .../node/{mem => memory}/linux_get_vm.go | 2 +- .../linux_get_vm_public_test.go | 10 +++---- .../node/{mem => memory}/mocks/generate.go | 0 .../node/{mem => memory}/mocks/mocks.go | 4 +-- .../node/{mem => memory}/mocks/types.gen.go | 6 ++--- .../provider/node/{mem => memory}/types.go | 4 +-- 43 files changed, 164 insertions(+), 164 deletions(-) rename internal/provider/node/{mem => memory}/darwin.go (95%) rename internal/provider/node/{mem => memory}/darwin_get_vm.go (99%) rename internal/provider/node/{mem => memory}/darwin_get_vm_public_test.go (88%) rename internal/provider/node/{mem => memory}/debian.go (95%) rename internal/provider/node/{mem => memory}/debian_get_vm.go (99%) rename internal/provider/node/{mem => memory}/debian_get_vm_public_test.go (88%) rename internal/provider/node/{mem => memory}/linux.go (91%) rename internal/provider/node/{mem => memory}/linux_get_vm.go (98%) rename internal/provider/node/{mem => memory}/linux_get_vm_public_test.go (90%) rename internal/provider/node/{mem => memory}/mocks/generate.go (100%) rename internal/provider/node/{mem => memory}/mocks/mocks.go (93%) rename internal/provider/node/{mem => memory}/mocks/types.gen.go (89%) rename internal/provider/node/{mem => memory}/types.go (94%) diff --git a/cmd/agent_setup.go b/cmd/agent_setup.go index a32e9faca..e27d6c5f8 100644 --- a/cmd/agent_setup.go +++ b/cmd/agent_setup.go @@ -47,7 +47,7 @@ import ( nodeHost "github.com/osapi-io/osapi/internal/provider/node/host" "github.com/osapi-io/osapi/internal/provider/node/load" logProv "github.com/osapi-io/osapi/internal/provider/node/log" - "github.com/osapi-io/osapi/internal/provider/node/mem" + "github.com/osapi-io/osapi/internal/provider/node/memory" ntpProv "github.com/osapi-io/osapi/internal/provider/node/ntp" powerProv "github.com/osapi-io/osapi/internal/provider/node/power" processProv "github.com/osapi-io/osapi/internal/provider/node/process" @@ -114,14 +114,14 @@ func setupAgent( diskProvider = disk.NewLinuxProvider() } - var memProvider mem.Provider + var memoryProvider memory.Provider switch plat { case "debian": - memProvider = mem.NewDebianProvider() + memoryProvider = memory.NewDebianProvider() case "darwin": - memProvider = mem.NewDarwinProvider() + memoryProvider = memory.NewDarwinProvider() default: - memProvider = mem.NewLinuxProvider() + memoryProvider = memory.NewLinuxProvider() } var loadProvider load.Provider @@ -235,7 +235,7 @@ func setupAgent( agent.NewNodeProcessor( hostProvider, diskProvider, - memProvider, + memoryProvider, loadProvider, sysctlProvider, ntpProvider, @@ -251,7 +251,7 @@ func setupAgent( ), hostProvider, diskProvider, - memProvider, + memoryProvider, loadProvider, sysctlProvider, ntpProvider, @@ -313,7 +313,7 @@ func setupAgent( streamName, hostProvider, diskProvider, - memProvider, + memoryProvider, loadProvider, netinfoProvider, process.New(), diff --git a/internal/agent/agent.go b/internal/agent/agent.go index 18aa96f2c..5af7c4993 100644 --- a/internal/agent/agent.go +++ b/internal/agent/agent.go @@ -39,7 +39,7 @@ import ( "github.com/osapi-io/osapi/internal/provider/node/disk" nodeHost "github.com/osapi-io/osapi/internal/provider/node/host" "github.com/osapi-io/osapi/internal/provider/node/load" - "github.com/osapi-io/osapi/internal/provider/node/mem" + "github.com/osapi-io/osapi/internal/provider/node/memory" "github.com/osapi-io/osapi/internal/telemetry/process" ) @@ -52,7 +52,7 @@ func New( streamName string, hostProvider nodeHost.Provider, diskProvider disk.Provider, - memProvider mem.Provider, + memoryProvider memory.Provider, loadProvider load.Provider, netinfoProvider netinfo.Provider, processProvider process.Provider, @@ -70,7 +70,7 @@ func New( streamName: streamName, hostProvider: hostProvider, diskProvider: diskProvider, - memProvider: memProvider, + memoryProvider: memoryProvider, loadProvider: loadProvider, netinfoProvider: netinfoProvider, processProvider: processProvider, diff --git a/internal/agent/agent_public_test.go b/internal/agent/agent_public_test.go index 4b7bc0d5f..c41ce980b 100644 --- a/internal/agent/agent_public_test.go +++ b/internal/agent/agent_public_test.go @@ -50,7 +50,7 @@ import ( diskMocks "github.com/osapi-io/osapi/internal/provider/node/disk/mocks" hostMocks "github.com/osapi-io/osapi/internal/provider/node/host/mocks" loadMocks "github.com/osapi-io/osapi/internal/provider/node/load/mocks" - memMocks "github.com/osapi-io/osapi/internal/provider/node/mem/mocks" + memoryMocks "github.com/osapi-io/osapi/internal/provider/node/memory/mocks" "github.com/osapi-io/osapi/internal/telemetry/metrics" processMocks "github.com/osapi-io/osapi/internal/telemetry/process/mocks" ) @@ -132,7 +132,7 @@ func (s *AgentPublicTestSuite) buildAgent() *agent.Agent { streamName: "test-stream", hostProvider: hostMocks.NewDefaultMockProvider(s.mockCtrl), diskProvider: diskMocks.NewDefaultMockProvider(s.mockCtrl), - memProvider: memMocks.NewDefaultMockProvider(s.mockCtrl), + memoryProvider: memoryMocks.NewDefaultMockProvider(s.mockCtrl), loadProvider: loadMocks.NewDefaultMockProvider(s.mockCtrl), dnsProvider: dnsMocks.NewDefaultMockProvider(s.mockCtrl), pingProvider: pingMocks.NewDefaultMockProvider(s.mockCtrl), @@ -239,7 +239,7 @@ func (s *AgentPublicTestSuite) TestStart() { streamName: "test-stream", hostProvider: hostMocks.NewDefaultMockProvider(s.mockCtrl), diskProvider: diskMocks.NewDefaultMockProvider(s.mockCtrl), - memProvider: memMocks.NewDefaultMockProvider(s.mockCtrl), + memoryProvider: memoryMocks.NewDefaultMockProvider(s.mockCtrl), loadProvider: loadMocks.NewDefaultMockProvider(s.mockCtrl), dnsProvider: dnsMocks.NewDefaultMockProvider(s.mockCtrl), pingProvider: pingMocks.NewDefaultMockProvider(s.mockCtrl), @@ -285,7 +285,7 @@ func (s *AgentPublicTestSuite) TestStart() { streamName: "test-stream", hostProvider: hostMocks.NewDefaultMockProvider(s.mockCtrl), diskProvider: diskMocks.NewDefaultMockProvider(s.mockCtrl), - memProvider: memMocks.NewDefaultMockProvider(s.mockCtrl), + memoryProvider: memoryMocks.NewDefaultMockProvider(s.mockCtrl), loadProvider: loadMocks.NewDefaultMockProvider(s.mockCtrl), dnsProvider: dnsMocks.NewDefaultMockProvider(s.mockCtrl), pingProvider: pingMocks.NewDefaultMockProvider(s.mockCtrl), @@ -327,7 +327,7 @@ func (s *AgentPublicTestSuite) TestStart() { streamName: "test-stream", hostProvider: hostMocks.NewDefaultMockProvider(s.mockCtrl), diskProvider: diskMocks.NewDefaultMockProvider(s.mockCtrl), - memProvider: memMocks.NewDefaultMockProvider(s.mockCtrl), + memoryProvider: memoryMocks.NewDefaultMockProvider(s.mockCtrl), loadProvider: loadMocks.NewDefaultMockProvider(s.mockCtrl), dnsProvider: dnsMocks.NewDefaultMockProvider(s.mockCtrl), pingProvider: pingMocks.NewDefaultMockProvider(s.mockCtrl), @@ -389,7 +389,7 @@ func (s *AgentPublicTestSuite) TestStart() { streamName: "test-stream", hostProvider: hostMocks.NewDefaultMockProvider(s.mockCtrl), diskProvider: diskMocks.NewDefaultMockProvider(s.mockCtrl), - memProvider: memMocks.NewDefaultMockProvider(s.mockCtrl), + memoryProvider: memoryMocks.NewDefaultMockProvider(s.mockCtrl), loadProvider: loadMocks.NewDefaultMockProvider(s.mockCtrl), dnsProvider: dnsMocks.NewDefaultMockProvider(s.mockCtrl), pingProvider: pingMocks.NewDefaultMockProvider(s.mockCtrl), diff --git a/internal/agent/condition.go b/internal/agent/condition.go index 4fe6361a6..8a34b0da9 100644 --- a/internal/agent/condition.go +++ b/internal/agent/condition.go @@ -27,7 +27,7 @@ import ( "github.com/osapi-io/osapi/internal/job" "github.com/osapi-io/osapi/internal/provider/node/disk" "github.com/osapi-io/osapi/internal/provider/node/load" - "github.com/osapi-io/osapi/internal/provider/node/mem" + "github.com/osapi-io/osapi/internal/provider/node/memory" ) // findPrevCondition returns the previous condition of the given type, @@ -60,7 +60,7 @@ func transitionTime( } func evaluateMemoryPressure( - stats *mem.Result, + stats *memory.Result, threshold int, prev []job.Condition, ) job.Condition { diff --git a/internal/agent/condition_public_test.go b/internal/agent/condition_public_test.go index f930b13bc..c2288b56a 100644 --- a/internal/agent/condition_public_test.go +++ b/internal/agent/condition_public_test.go @@ -30,7 +30,7 @@ import ( "github.com/osapi-io/osapi/internal/job" "github.com/osapi-io/osapi/internal/provider/node/disk" "github.com/osapi-io/osapi/internal/provider/node/load" - "github.com/osapi-io/osapi/internal/provider/node/mem" + "github.com/osapi-io/osapi/internal/provider/node/memory" ) type ConditionPublicTestSuite struct { @@ -191,14 +191,14 @@ func (s *ConditionPublicTestSuite) TestTransitionTime() { func (s *ConditionPublicTestSuite) TestEvaluateMemoryPressure() { tests := []struct { name string - stats *mem.Result + stats *memory.Result threshold int prev []job.Condition validateFunc func(job.Condition) }{ { name: "when usage above threshold returns true with reason", - stats: &mem.Result{ + stats: &memory.Result{ Total: 8 * 1024 * 1024 * 1024, // 8 GB Available: 1 * 1024 * 1024 * 1024, // 1 GB available = 87.5% used }, @@ -214,7 +214,7 @@ func (s *ConditionPublicTestSuite) TestEvaluateMemoryPressure() { }, { name: "when usage below threshold returns false", - stats: &mem.Result{ + stats: &memory.Result{ Total: 8 * 1024 * 1024 * 1024, // 8 GB Available: 6 * 1024 * 1024 * 1024, // 6 GB available = 25% used }, @@ -239,7 +239,7 @@ func (s *ConditionPublicTestSuite) TestEvaluateMemoryPressure() { }, { name: "when total is zero returns false", - stats: &mem.Result{ + stats: &memory.Result{ Total: 0, Available: 0, }, @@ -253,7 +253,7 @@ func (s *ConditionPublicTestSuite) TestEvaluateMemoryPressure() { }, { name: "when usage exactly at threshold returns false", - stats: &mem.Result{ + stats: &memory.Result{ Total: 100, Available: 20, // 80% used, threshold is 80 (> not >=) }, @@ -511,7 +511,7 @@ func (s *ConditionPublicTestSuite) TestLastTransitionTimeTracking() { name: "when status flips from false to true transition time updates", evalFunc: func(prev []job.Condition) job.Condition { return agent.ExportEvaluateMemoryPressure( - &mem.Result{ + &memory.Result{ Total: 100, Available: 10, // 90% used }, @@ -536,7 +536,7 @@ func (s *ConditionPublicTestSuite) TestLastTransitionTimeTracking() { name: "when status stays true transition time is preserved", evalFunc: func(prev []job.Condition) job.Condition { return agent.ExportEvaluateMemoryPressure( - &mem.Result{ + &memory.Result{ Total: 100, Available: 10, // 90% used }, @@ -560,7 +560,7 @@ func (s *ConditionPublicTestSuite) TestLastTransitionTimeTracking() { name: "when status flips from true to false transition time updates", evalFunc: func(prev []job.Condition) job.Condition { return agent.ExportEvaluateMemoryPressure( - &mem.Result{ + &memory.Result{ Total: 100, Available: 80, // 20% used }, @@ -585,7 +585,7 @@ func (s *ConditionPublicTestSuite) TestLastTransitionTimeTracking() { name: "when status stays false transition time is preserved", evalFunc: func(prev []job.Condition) job.Condition { return agent.ExportEvaluateMemoryPressure( - &mem.Result{ + &memory.Result{ Total: 100, Available: 80, // 20% used }, diff --git a/internal/agent/consumer_public_test.go b/internal/agent/consumer_public_test.go index 13a966d93..fd11dccce 100644 --- a/internal/agent/consumer_public_test.go +++ b/internal/agent/consumer_public_test.go @@ -41,7 +41,7 @@ import ( diskMocks "github.com/osapi-io/osapi/internal/provider/node/disk/mocks" hostMocks "github.com/osapi-io/osapi/internal/provider/node/host/mocks" loadMocks "github.com/osapi-io/osapi/internal/provider/node/load/mocks" - memMocks "github.com/osapi-io/osapi/internal/provider/node/mem/mocks" + memoryMocks "github.com/osapi-io/osapi/internal/provider/node/memory/mocks" processMocks "github.com/osapi-io/osapi/internal/telemetry/process/mocks" ) @@ -83,7 +83,7 @@ func (s *ConsumerPublicTestSuite) SetupTest() { streamName: "test-stream", hostProvider: hostMocks.NewDefaultMockProvider(s.mockCtrl), diskProvider: diskMocks.NewDefaultMockProvider(s.mockCtrl), - memProvider: memMocks.NewDefaultMockProvider(s.mockCtrl), + memoryProvider: memoryMocks.NewDefaultMockProvider(s.mockCtrl), loadProvider: loadMocks.NewDefaultMockProvider(s.mockCtrl), dnsProvider: dnsMocks.NewDefaultMockProvider(s.mockCtrl), pingProvider: pingMocks.NewDefaultMockProvider(s.mockCtrl), diff --git a/internal/agent/drain_public_test.go b/internal/agent/drain_public_test.go index 805193a51..9d0950ebf 100644 --- a/internal/agent/drain_public_test.go +++ b/internal/agent/drain_public_test.go @@ -38,7 +38,7 @@ import ( diskMocks "github.com/osapi-io/osapi/internal/provider/node/disk/mocks" hostMocks "github.com/osapi-io/osapi/internal/provider/node/host/mocks" loadMocks "github.com/osapi-io/osapi/internal/provider/node/load/mocks" - memMocks "github.com/osapi-io/osapi/internal/provider/node/mem/mocks" + memoryMocks "github.com/osapi-io/osapi/internal/provider/node/memory/mocks" processMocks "github.com/osapi-io/osapi/internal/telemetry/process/mocks" ) @@ -70,7 +70,7 @@ func (s *DrainPublicTestSuite) SetupTest() { streamName: "test-stream", hostProvider: hostMocks.NewDefaultMockProvider(s.mockCtrl), diskProvider: diskMocks.NewDefaultMockProvider(s.mockCtrl), - memProvider: memMocks.NewDefaultMockProvider(s.mockCtrl), + memoryProvider: memoryMocks.NewDefaultMockProvider(s.mockCtrl), loadProvider: loadMocks.NewDefaultMockProvider(s.mockCtrl), dnsProvider: dnsMocks.NewDefaultMockProvider(s.mockCtrl), pingProvider: pingMocks.NewDefaultMockProvider(s.mockCtrl), diff --git a/internal/agent/enrollment_public_test.go b/internal/agent/enrollment_public_test.go index 5ec3e9c72..b417aeb74 100644 --- a/internal/agent/enrollment_public_test.go +++ b/internal/agent/enrollment_public_test.go @@ -214,7 +214,7 @@ func (suite *EnrollmentPublicTestSuite) TestHandlePKIEnrollment() { "", // streamName nil, // hostProvider nil, // diskProvider - nil, // memProvider + nil, // memoryProvider nil, // loadProvider nil, // netinfoProvider nil, // processProvider diff --git a/internal/agent/export_test.go b/internal/agent/export_test.go index 3eb1588b2..e253690ae 100644 --- a/internal/agent/export_test.go +++ b/internal/agent/export_test.go @@ -44,7 +44,7 @@ import ( diskProv "github.com/osapi-io/osapi/internal/provider/node/disk" nodeHost "github.com/osapi-io/osapi/internal/provider/node/host" "github.com/osapi-io/osapi/internal/provider/node/load" - memProv "github.com/osapi-io/osapi/internal/provider/node/mem" + memory "github.com/osapi-io/osapi/internal/provider/node/memory" "github.com/osapi-io/osapi/internal/provider/node/ntp" "github.com/osapi-io/osapi/internal/provider/node/power" "github.com/osapi-io/osapi/internal/provider/node/sysctl" @@ -290,7 +290,7 @@ func ExportTransitionTime( // ExportEvaluateMemoryPressure exposes the private evaluateMemoryPressure function for testing. func ExportEvaluateMemoryPressure( - stats *memProv.Result, + stats *memory.Result, threshold int, prev []job.Condition, ) job.Condition { @@ -470,7 +470,7 @@ func SetAgentAppConfig( a.registry.processors["node"] = NewNodeProcessor( a.hostProvider, a.diskProvider, - a.memProvider, + a.memoryProvider, a.loadProvider, sysctl.Provider(nil), ntp.Provider(nil), @@ -508,7 +508,7 @@ func SetAgentHostProvider( a.registry.processors["node"] = NewNodeProcessor( p, a.diskProvider, - a.memProvider, + a.memoryProvider, a.loadProvider, sysctl.Provider(nil), ntp.Provider(nil), @@ -558,8 +558,8 @@ func ExportGetDiskProvider( // ExportGetMemProvider returns the mem provider from the registry for testing. func ExportGetMemProvider( a *Agent, -) memProv.Provider { - return a.memProvider +) memory.Provider { + return a.memoryProvider } // ExportGetLoadProvider returns the load provider from the registry for testing. diff --git a/internal/agent/facts_public_test.go b/internal/agent/facts_public_test.go index 67beb3bac..29e68ac2f 100644 --- a/internal/agent/facts_public_test.go +++ b/internal/agent/facts_public_test.go @@ -42,7 +42,7 @@ import ( diskMocks "github.com/osapi-io/osapi/internal/provider/node/disk/mocks" hostMocks "github.com/osapi-io/osapi/internal/provider/node/host/mocks" loadMocks "github.com/osapi-io/osapi/internal/provider/node/load/mocks" - memMocks "github.com/osapi-io/osapi/internal/provider/node/mem/mocks" + memoryMocks "github.com/osapi-io/osapi/internal/provider/node/memory/mocks" processMocks "github.com/osapi-io/osapi/internal/telemetry/process/mocks" ) @@ -76,7 +76,7 @@ func (s *FactsPublicTestSuite) SetupTest() { streamName: "test-stream", hostProvider: s.mockHostProvider, diskProvider: diskMocks.NewDefaultMockProvider(s.mockCtrl), - memProvider: memMocks.NewDefaultMockProvider(s.mockCtrl), + memoryProvider: memoryMocks.NewDefaultMockProvider(s.mockCtrl), loadProvider: loadMocks.NewDefaultMockProvider(s.mockCtrl), dnsProvider: dnsMocks.NewDefaultMockProvider(s.mockCtrl), pingProvider: pingMocks.NewDefaultMockProvider(s.mockCtrl), diff --git a/internal/agent/handler_public_test.go b/internal/agent/handler_public_test.go index 848f9d0d9..5d952fa4a 100644 --- a/internal/agent/handler_public_test.go +++ b/internal/agent/handler_public_test.go @@ -56,7 +56,7 @@ import ( diskMocks "github.com/osapi-io/osapi/internal/provider/node/disk/mocks" hostMocks "github.com/osapi-io/osapi/internal/provider/node/host/mocks" loadMocks "github.com/osapi-io/osapi/internal/provider/node/load/mocks" - memMocks "github.com/osapi-io/osapi/internal/provider/node/mem/mocks" + memoryMocks "github.com/osapi-io/osapi/internal/provider/node/memory/mocks" "github.com/osapi-io/osapi/internal/telemetry/metrics" processMocks "github.com/osapi-io/osapi/internal/telemetry/process/mocks" ) @@ -128,7 +128,7 @@ func (s *HandlerPublicTestSuite) SetupTest() { streamName: "test-stream", hostProvider: hostMocks.NewDefaultMockProvider(s.mockCtrl), diskProvider: diskMocks.NewDefaultMockProvider(s.mockCtrl), - memProvider: memMocks.NewDefaultMockProvider(s.mockCtrl), + memoryProvider: memoryMocks.NewDefaultMockProvider(s.mockCtrl), loadProvider: loadMocks.NewDefaultMockProvider(s.mockCtrl), dnsProvider: dnsMock, pingProvider: pingMock, diff --git a/internal/agent/heartbeat.go b/internal/agent/heartbeat.go index 9053e5f79..874f4090c 100644 --- a/internal/agent/heartbeat.go +++ b/internal/agent/heartbeat.go @@ -29,7 +29,7 @@ import ( "github.com/osapi-io/osapi/internal/job" "github.com/osapi-io/osapi/internal/provider/node/disk" "github.com/osapi-io/osapi/internal/provider/node/load" - "github.com/osapi-io/osapi/internal/provider/node/mem" + "github.com/osapi-io/osapi/internal/provider/node/memory" "github.com/osapi-io/osapi/internal/telemetry/process" ) @@ -145,8 +145,8 @@ func (a *Agent) writeRegistration( reg.LoadAverages = avg } - var memStats *mem.Result - if stats, err := a.memProvider.GetStats(); err == nil { + var memStats *memory.Result + if stats, err := a.memoryProvider.GetStats(); err == nil { memStats = stats reg.MemoryStats = stats } diff --git a/internal/agent/heartbeat_public_test.go b/internal/agent/heartbeat_public_test.go index c81d14c15..b5ea320d4 100644 --- a/internal/agent/heartbeat_public_test.go +++ b/internal/agent/heartbeat_public_test.go @@ -48,7 +48,7 @@ import ( diskMocks "github.com/osapi-io/osapi/internal/provider/node/disk/mocks" hostMocks "github.com/osapi-io/osapi/internal/provider/node/host/mocks" loadMocks "github.com/osapi-io/osapi/internal/provider/node/load/mocks" - memMocks "github.com/osapi-io/osapi/internal/provider/node/mem/mocks" + memoryMocks "github.com/osapi-io/osapi/internal/provider/node/memory/mocks" processMocks "github.com/osapi-io/osapi/internal/telemetry/process/mocks" ) @@ -156,7 +156,7 @@ func (s *HeartbeatPublicTestSuite) TestStartWithHeartbeat() { streamName: "test-stream", hostProvider: hostMocks.NewDefaultMockProvider(s.mockCtrl), diskProvider: diskMocks.NewDefaultMockProvider(s.mockCtrl), - memProvider: memMocks.NewDefaultMockProvider(s.mockCtrl), + memoryProvider: memoryMocks.NewDefaultMockProvider(s.mockCtrl), loadProvider: loadMocks.NewDefaultMockProvider(s.mockCtrl), dnsProvider: dnsMocks.NewDefaultMockProvider(s.mockCtrl), pingProvider: pingMocks.NewDefaultMockProvider(s.mockCtrl), @@ -195,7 +195,7 @@ func (s *HeartbeatPublicTestSuite) TestStartWithHeartbeat() { streamName: "test-stream", hostProvider: hostMocks.NewDefaultMockProvider(s.mockCtrl), diskProvider: diskMocks.NewDefaultMockProvider(s.mockCtrl), - memProvider: memMocks.NewDefaultMockProvider(s.mockCtrl), + memoryProvider: memoryMocks.NewDefaultMockProvider(s.mockCtrl), loadProvider: loadMocks.NewDefaultMockProvider(s.mockCtrl), dnsProvider: dnsMocks.NewDefaultMockProvider(s.mockCtrl), pingProvider: pingMocks.NewDefaultMockProvider(s.mockCtrl), @@ -255,7 +255,7 @@ func (s *HeartbeatLowLevelPublicTestSuite) SetupTest() { streamName: "test-stream", hostProvider: hostMocks.NewDefaultMockProvider(s.mockCtrl), diskProvider: diskMocks.NewDefaultMockProvider(s.mockCtrl), - memProvider: memMocks.NewDefaultMockProvider(s.mockCtrl), + memoryProvider: memoryMocks.NewDefaultMockProvider(s.mockCtrl), loadProvider: loadMocks.NewDefaultMockProvider(s.mockCtrl), dnsProvider: dnsMocks.NewDefaultMockProvider(s.mockCtrl), pingProvider: pingMocks.NewDefaultMockProvider(s.mockCtrl), @@ -559,7 +559,7 @@ func (s *HeartbeatLowLevelPublicTestSuite) TestStartHeartbeatHostnameChange() { streamName: "test-stream", hostProvider: hostMocks.NewDefaultMockProvider(ctrl), diskProvider: diskMocks.NewDefaultMockProvider(ctrl), - memProvider: memMocks.NewDefaultMockProvider(ctrl), + memoryProvider: memoryMocks.NewDefaultMockProvider(ctrl), loadProvider: loadMocks.NewDefaultMockProvider(ctrl), dnsProvider: dnsMocks.NewDefaultMockProvider(ctrl), pingProvider: pingMocks.NewDefaultMockProvider(ctrl), diff --git a/internal/agent/lifecycle_public_test.go b/internal/agent/lifecycle_public_test.go index f326ad0ed..63d14147a 100644 --- a/internal/agent/lifecycle_public_test.go +++ b/internal/agent/lifecycle_public_test.go @@ -39,7 +39,7 @@ import ( diskMocks "github.com/osapi-io/osapi/internal/provider/node/disk/mocks" hostMocks "github.com/osapi-io/osapi/internal/provider/node/host/mocks" loadMocks "github.com/osapi-io/osapi/internal/provider/node/load/mocks" - memMocks "github.com/osapi-io/osapi/internal/provider/node/mem/mocks" + memoryMocks "github.com/osapi-io/osapi/internal/provider/node/memory/mocks" processMocks "github.com/osapi-io/osapi/internal/telemetry/process/mocks" ) @@ -67,7 +67,7 @@ func (s *LifecyclePublicTestSuite) SetupTest() { streamName: "test-stream", hostProvider: hostMocks.NewDefaultMockProvider(s.mockCtrl), diskProvider: diskMocks.NewDefaultMockProvider(s.mockCtrl), - memProvider: memMocks.NewDefaultMockProvider(s.mockCtrl), + memoryProvider: memoryMocks.NewDefaultMockProvider(s.mockCtrl), loadProvider: loadMocks.NewDefaultMockProvider(s.mockCtrl), dnsProvider: dnsMocks.NewDefaultMockProvider(s.mockCtrl), pingProvider: pingMocks.NewDefaultMockProvider(s.mockCtrl), diff --git a/internal/agent/node_status_public_test.go b/internal/agent/node_status_public_test.go index 20b541c9c..d266ef9c8 100644 --- a/internal/agent/node_status_public_test.go +++ b/internal/agent/node_status_public_test.go @@ -41,7 +41,7 @@ import ( hostMocks "github.com/osapi-io/osapi/internal/provider/node/host/mocks" loadMocks "github.com/osapi-io/osapi/internal/provider/node/load/mocks" logMocks "github.com/osapi-io/osapi/internal/provider/node/log/mocks" - memMocks "github.com/osapi-io/osapi/internal/provider/node/mem/mocks" + memoryMocks "github.com/osapi-io/osapi/internal/provider/node/memory/mocks" ntpMocks "github.com/osapi-io/osapi/internal/provider/node/ntp/mocks" powerMocks "github.com/osapi-io/osapi/internal/provider/node/power/mocks" processMocks "github.com/osapi-io/osapi/internal/provider/node/process/mocks" @@ -68,11 +68,11 @@ func (s *NodeStatusPublicTestSuite) SetupTest() { // processorWith builds a node processor whose host, disk, memory and load reads // behave as the test describes. func (s *NodeStatusPublicTestSuite) processorWith( - setup func(*hostMocks.MockProvider, *diskMocks.MockProvider, *memMocks.MockProvider, *loadMocks.MockProvider), + setup func(*hostMocks.MockProvider, *diskMocks.MockProvider, *memoryMocks.MockProvider, *loadMocks.MockProvider), ) agent.ProcessorFunc { hostMock := hostMocks.NewMockProvider(s.mockCtrl) diskMock := diskMocks.NewMockProvider(s.mockCtrl) - memMock := memMocks.NewMockProvider(s.mockCtrl) + memMock := memoryMocks.NewMockProvider(s.mockCtrl) loadMock := loadMocks.NewMockProvider(s.mockCtrl) setup(hostMock, diskMock, memMock, loadMock) @@ -106,7 +106,7 @@ func (s *NodeStatusPublicTestSuite) TestGetNodeStatus() { tests := []struct { name string - setup func(*hostMocks.MockProvider, *diskMocks.MockProvider, *memMocks.MockProvider, *loadMocks.MockProvider) + setup func(*hostMocks.MockProvider, *diskMocks.MockProvider, *memoryMocks.MockProvider, *loadMocks.MockProvider) validateFunc func(map[string]any, error) }{ { @@ -114,7 +114,7 @@ func (s *NodeStatusPublicTestSuite) TestGetNodeStatus() { setup: func( h *hostMocks.MockProvider, d *diskMocks.MockProvider, - m *memMocks.MockProvider, + m *memoryMocks.MockProvider, l *loadMocks.MockProvider, ) { h.EXPECT().GetHostname().Return("web-01", nil) @@ -135,7 +135,7 @@ func (s *NodeStatusPublicTestSuite) TestGetNodeStatus() { setup: func( h *hostMocks.MockProvider, d *diskMocks.MockProvider, - m *memMocks.MockProvider, + m *memoryMocks.MockProvider, l *loadMocks.MockProvider, ) { h.EXPECT().GetHostname().Return("web-01", nil) @@ -165,7 +165,7 @@ func (s *NodeStatusPublicTestSuite) TestGetNodeStatus() { setup: func( h *hostMocks.MockProvider, d *diskMocks.MockProvider, - m *memMocks.MockProvider, + m *memoryMocks.MockProvider, l *loadMocks.MockProvider, ) { h.EXPECT().GetHostname().Return("", errors.New("no hostname")) diff --git a/internal/agent/processor.go b/internal/agent/processor.go index 4273fe07b..84c2eb363 100644 --- a/internal/agent/processor.go +++ b/internal/agent/processor.go @@ -34,7 +34,7 @@ import ( nodeHost "github.com/osapi-io/osapi/internal/provider/node/host" "github.com/osapi-io/osapi/internal/provider/node/load" logProv "github.com/osapi-io/osapi/internal/provider/node/log" - "github.com/osapi-io/osapi/internal/provider/node/mem" + "github.com/osapi-io/osapi/internal/provider/node/memory" "github.com/osapi-io/osapi/internal/provider/node/ntp" "github.com/osapi-io/osapi/internal/provider/node/power" processProv "github.com/osapi-io/osapi/internal/provider/node/process" @@ -62,7 +62,7 @@ func (a *Agent) processJobOperation( func NewNodeProcessor( hostProvider nodeHost.Provider, diskProvider disk.Provider, - memProvider mem.Provider, + memoryProvider memory.Provider, loadProvider load.Provider, sysctlProvider sysctl.Provider, ntpProvider ntp.Provider, @@ -87,7 +87,7 @@ func NewNodeProcessor( } return getNodeHostname(hostProvider, appConfig, logger) case "status": - return getNodeStatus(hostProvider, diskProvider, memProvider, loadProvider, logger) + return getNodeStatus(hostProvider, diskProvider, memoryProvider, loadProvider, logger) case "uptime": return getNodeUptime(hostProvider, logger) case "os", "osinfo": @@ -95,7 +95,7 @@ func NewNodeProcessor( case "disk": return getNodeDisk(diskProvider, logger) case "memory", "mem": - return getNodeMemory(memProvider, logger) + return getNodeMemory(memoryProvider, logger) case "load": return getNodeLoad(loadProvider, logger) case "sysctl": @@ -184,7 +184,7 @@ func setNodeHostname( func getNodeStatus( hostProvider nodeHost.Provider, diskProvider disk.Provider, - memProvider mem.Provider, + memoryProvider memory.Provider, loadProvider load.Provider, logger *slog.Logger, ) (json.RawMessage, error) { @@ -219,7 +219,7 @@ func getNodeStatus( diskUsage, err := diskProvider.GetLocalUsageStats() record("disk_usage", err) - memInfo, err := memProvider.GetStats() + memInfo, err := memoryProvider.GetStats() record("memory_stats", err) loadAvg, err := loadProvider.GetAverageStats() @@ -300,12 +300,12 @@ func getNodeDisk( // getNodeMemory retrieves memory statistics. func getNodeMemory( - memProvider mem.Provider, + memoryProvider memory.Provider, logger *slog.Logger, ) (json.RawMessage, error) { - logger.Debug("executing mem.GetStats") + logger.Debug("executing memory.GetStats") - memInfo, err := memProvider.GetStats() + memInfo, err := memoryProvider.GetStats() if err != nil { return nil, err } diff --git a/internal/agent/processor_public_test.go b/internal/agent/processor_public_test.go index 9d48fa3bf..548458b20 100644 --- a/internal/agent/processor_public_test.go +++ b/internal/agent/processor_public_test.go @@ -48,7 +48,7 @@ import ( nodeHost "github.com/osapi-io/osapi/internal/provider/node/host" hostMocks "github.com/osapi-io/osapi/internal/provider/node/host/mocks" loadMocks "github.com/osapi-io/osapi/internal/provider/node/load/mocks" - memMocks "github.com/osapi-io/osapi/internal/provider/node/mem/mocks" + memoryMocks "github.com/osapi-io/osapi/internal/provider/node/memory/mocks" processMocks "github.com/osapi-io/osapi/internal/telemetry/process/mocks" ) @@ -87,7 +87,7 @@ func (s *ProcessorPublicTestSuite) SetupTest() { Return(nil, fmt.Errorf("host: %w", provider.ErrUnsupported)). AnyTimes() diskMock := diskMocks.NewDefaultMockProvider(s.mockCtrl) - memMock := memMocks.NewDefaultMockProvider(s.mockCtrl) + memMock := memoryMocks.NewDefaultMockProvider(s.mockCtrl) loadMock := loadMocks.NewDefaultMockProvider(s.mockCtrl) // Use plain DNS mock to avoid hardcoded interface expectations @@ -128,7 +128,7 @@ func (s *ProcessorPublicTestSuite) SetupTest() { streamName: "test-stream", hostProvider: hostMock, diskProvider: diskMock, - memProvider: memMock, + memoryProvider: memMock, loadProvider: loadMock, dnsProvider: dnsMock, pingProvider: pingMock, @@ -836,7 +836,7 @@ func (s *ProcessorPublicTestSuite) TestSystemOperationErrors() { jobClient: s.mockJobClient, hostProvider: hostMock, diskProvider: diskMocks.NewPlainMockProvider(s.mockCtrl), - memProvider: memMocks.NewPlainMockProvider(s.mockCtrl), + memoryProvider: memoryMocks.NewPlainMockProvider(s.mockCtrl), loadProvider: loadMocks.NewPlainMockProvider(s.mockCtrl), dnsProvider: dnsMocks.NewPlainMockProvider(s.mockCtrl), pingProvider: pingMocks.NewPlainMockProvider(s.mockCtrl), @@ -864,7 +864,7 @@ func (s *ProcessorPublicTestSuite) TestSystemOperationErrors() { jobClient: s.mockJobClient, hostProvider: hostMock, diskProvider: diskMocks.NewPlainMockProvider(s.mockCtrl), - memProvider: memMocks.NewPlainMockProvider(s.mockCtrl), + memoryProvider: memoryMocks.NewPlainMockProvider(s.mockCtrl), loadProvider: loadMocks.NewPlainMockProvider(s.mockCtrl), dnsProvider: dnsMocks.NewPlainMockProvider(s.mockCtrl), pingProvider: pingMocks.NewPlainMockProvider(s.mockCtrl), @@ -890,7 +890,7 @@ func (s *ProcessorPublicTestSuite) TestSystemOperationErrors() { jobClient: s.mockJobClient, hostProvider: hostMock, diskProvider: diskMocks.NewPlainMockProvider(s.mockCtrl), - memProvider: memMocks.NewPlainMockProvider(s.mockCtrl), + memoryProvider: memoryMocks.NewPlainMockProvider(s.mockCtrl), loadProvider: loadMocks.NewPlainMockProvider(s.mockCtrl), dnsProvider: dnsMocks.NewPlainMockProvider(s.mockCtrl), pingProvider: pingMocks.NewPlainMockProvider(s.mockCtrl), @@ -916,7 +916,7 @@ func (s *ProcessorPublicTestSuite) TestSystemOperationErrors() { jobClient: s.mockJobClient, hostProvider: hostMocks.NewPlainMockProvider(s.mockCtrl), diskProvider: diskMock, - memProvider: memMocks.NewPlainMockProvider(s.mockCtrl), + memoryProvider: memoryMocks.NewPlainMockProvider(s.mockCtrl), loadProvider: loadMocks.NewPlainMockProvider(s.mockCtrl), dnsProvider: dnsMocks.NewPlainMockProvider(s.mockCtrl), pingProvider: pingMocks.NewPlainMockProvider(s.mockCtrl), @@ -934,7 +934,7 @@ func (s *ProcessorPublicTestSuite) TestSystemOperationErrors() { name: "memory provider error", operation: "memory.get", createAgent: func() *agent.Agent { - memMock := memMocks.NewPlainMockProvider(s.mockCtrl) + memMock := memoryMocks.NewPlainMockProvider(s.mockCtrl) memMock.EXPECT().GetStats().Return(nil, errors.New("memory unavailable")) return newTestAgent(newTestAgentParams{ appFs: memfs.New(), @@ -942,7 +942,7 @@ func (s *ProcessorPublicTestSuite) TestSystemOperationErrors() { jobClient: s.mockJobClient, hostProvider: hostMocks.NewPlainMockProvider(s.mockCtrl), diskProvider: diskMocks.NewPlainMockProvider(s.mockCtrl), - memProvider: memMock, + memoryProvider: memMock, loadProvider: loadMocks.NewPlainMockProvider(s.mockCtrl), dnsProvider: dnsMocks.NewPlainMockProvider(s.mockCtrl), pingProvider: pingMocks.NewPlainMockProvider(s.mockCtrl), @@ -968,7 +968,7 @@ func (s *ProcessorPublicTestSuite) TestSystemOperationErrors() { jobClient: s.mockJobClient, hostProvider: hostMocks.NewPlainMockProvider(s.mockCtrl), diskProvider: diskMocks.NewPlainMockProvider(s.mockCtrl), - memProvider: memMocks.NewPlainMockProvider(s.mockCtrl), + memoryProvider: memoryMocks.NewPlainMockProvider(s.mockCtrl), loadProvider: loadMock, dnsProvider: dnsMocks.NewPlainMockProvider(s.mockCtrl), pingProvider: pingMocks.NewPlainMockProvider(s.mockCtrl), @@ -1024,7 +1024,7 @@ func (s *ProcessorPublicTestSuite) TestNetworkOperationErrors() { jobClient: s.mockJobClient, hostProvider: hostMocks.NewPlainMockProvider(s.mockCtrl), diskProvider: diskMocks.NewPlainMockProvider(s.mockCtrl), - memProvider: memMocks.NewPlainMockProvider(s.mockCtrl), + memoryProvider: memoryMocks.NewPlainMockProvider(s.mockCtrl), loadProvider: loadMocks.NewPlainMockProvider(s.mockCtrl), dnsProvider: dnsMock, pingProvider: pingMocks.NewPlainMockProvider(s.mockCtrl), @@ -1054,7 +1054,7 @@ func (s *ProcessorPublicTestSuite) TestNetworkOperationErrors() { jobClient: s.mockJobClient, hostProvider: hostMocks.NewPlainMockProvider(s.mockCtrl), diskProvider: diskMocks.NewPlainMockProvider(s.mockCtrl), - memProvider: memMocks.NewPlainMockProvider(s.mockCtrl), + memoryProvider: memoryMocks.NewPlainMockProvider(s.mockCtrl), loadProvider: loadMocks.NewPlainMockProvider(s.mockCtrl), dnsProvider: dnsMock, pingProvider: pingMocks.NewPlainMockProvider(s.mockCtrl), @@ -1082,7 +1082,7 @@ func (s *ProcessorPublicTestSuite) TestNetworkOperationErrors() { jobClient: s.mockJobClient, hostProvider: hostMocks.NewPlainMockProvider(s.mockCtrl), diskProvider: diskMocks.NewPlainMockProvider(s.mockCtrl), - memProvider: memMocks.NewPlainMockProvider(s.mockCtrl), + memoryProvider: memoryMocks.NewPlainMockProvider(s.mockCtrl), loadProvider: loadMocks.NewPlainMockProvider(s.mockCtrl), dnsProvider: dnsMocks.NewPlainMockProvider(s.mockCtrl), pingProvider: pingMock, diff --git a/internal/agent/processor_schedule_public_test.go b/internal/agent/processor_schedule_public_test.go index 261914cc3..4c5215e4f 100644 --- a/internal/agent/processor_schedule_public_test.go +++ b/internal/agent/processor_schedule_public_test.go @@ -36,7 +36,7 @@ import ( diskMocks "github.com/osapi-io/osapi/internal/provider/node/disk/mocks" hostMocks "github.com/osapi-io/osapi/internal/provider/node/host/mocks" loadMocks "github.com/osapi-io/osapi/internal/provider/node/load/mocks" - memMocks "github.com/osapi-io/osapi/internal/provider/node/mem/mocks" + memoryMocks "github.com/osapi-io/osapi/internal/provider/node/memory/mocks" "github.com/osapi-io/osapi/internal/provider/scheduled/cron" cronMocks "github.com/osapi-io/osapi/internal/provider/scheduled/cron/mocks" ) @@ -555,12 +555,12 @@ func (s *ProcessorSchedulePublicTestSuite) TestProcessJobOperationScheduleCatego for _, tt := range tests { s.Run(tt.name, func() { a := newTestAgent(newTestAgentParams{ - jobClient: s.mockJobClient, - hostProvider: hostMocks.NewDefaultMockProvider(s.mockCtrl), - diskProvider: diskMocks.NewDefaultMockProvider(s.mockCtrl), - memProvider: memMocks.NewDefaultMockProvider(s.mockCtrl), - loadProvider: loadMocks.NewDefaultMockProvider(s.mockCtrl), - cronProvider: tt.setupMock(), + jobClient: s.mockJobClient, + hostProvider: hostMocks.NewDefaultMockProvider(s.mockCtrl), + diskProvider: diskMocks.NewDefaultMockProvider(s.mockCtrl), + memoryProvider: memoryMocks.NewDefaultMockProvider(s.mockCtrl), + loadProvider: loadMocks.NewDefaultMockProvider(s.mockCtrl), + cronProvider: tt.setupMock(), }) tt.validateFunc(agent.ExportProcessJobOperation(a, tt.jobRequest)) diff --git a/internal/agent/test_agent_public_test.go b/internal/agent/test_agent_public_test.go index 98720c50b..25a2130d9 100644 --- a/internal/agent/test_agent_public_test.go +++ b/internal/agent/test_agent_public_test.go @@ -39,7 +39,7 @@ import ( "github.com/osapi-io/osapi/internal/provider/node/disk" nodeHost "github.com/osapi-io/osapi/internal/provider/node/host" "github.com/osapi-io/osapi/internal/provider/node/load" - "github.com/osapi-io/osapi/internal/provider/node/mem" + "github.com/osapi-io/osapi/internal/provider/node/memory" ntpProv "github.com/osapi-io/osapi/internal/provider/node/ntp" powerProv "github.com/osapi-io/osapi/internal/provider/node/power" sysctlProv "github.com/osapi-io/osapi/internal/provider/node/sysctl" @@ -58,7 +58,7 @@ type newTestAgentParams struct { streamName string hostProvider nodeHost.Provider diskProvider disk.Provider - memProvider mem.Provider + memoryProvider memory.Provider loadProvider load.Provider dnsProvider dns.Provider pingProvider ping.Provider @@ -101,7 +101,7 @@ func newTestAgent( agent.NewNodeProcessor( p.hostProvider, p.diskProvider, - p.memProvider, + p.memoryProvider, p.loadProvider, p.sysctlProvider, p.ntpProvider, @@ -115,7 +115,7 @@ func newTestAgent( p.appConfig, logger, ), - p.hostProvider, p.diskProvider, p.memProvider, p.loadProvider, + p.hostProvider, p.diskProvider, p.memoryProvider, p.loadProvider, ) registry.Register( @@ -156,7 +156,7 @@ func newTestAgent( streamName, p.hostProvider, p.diskProvider, - p.memProvider, + p.memoryProvider, p.loadProvider, p.netinfoProvider, p.processProvider, diff --git a/internal/agent/types.go b/internal/agent/types.go index fb731e6e9..bcae6fdca 100644 --- a/internal/agent/types.go +++ b/internal/agent/types.go @@ -41,7 +41,7 @@ import ( "github.com/osapi-io/osapi/internal/provider/node/disk" "github.com/osapi-io/osapi/internal/provider/node/host" "github.com/osapi-io/osapi/internal/provider/node/load" - "github.com/osapi-io/osapi/internal/provider/node/mem" + "github.com/osapi-io/osapi/internal/provider/node/memory" "github.com/osapi-io/osapi/internal/telemetry/process" ) @@ -69,7 +69,7 @@ type Agent struct { // system info independently of job processing. hostProvider host.Provider diskProvider disk.Provider - memProvider mem.Provider + memoryProvider memory.Provider loadProvider load.Provider netinfoProvider netinfo.Provider diff --git a/internal/controller/api/agent/agent_get_public_test.go b/internal/controller/api/agent/agent_get_public_test.go index ca3e53d7d..e8a66dc8a 100644 --- a/internal/controller/api/agent/agent_get_public_test.go +++ b/internal/controller/api/agent/agent_get_public_test.go @@ -43,7 +43,7 @@ import ( jobmocks "github.com/osapi-io/osapi/internal/job/mocks" "github.com/osapi-io/osapi/internal/provider/node/host" "github.com/osapi-io/osapi/internal/provider/node/load" - "github.com/osapi-io/osapi/internal/provider/node/mem" + "github.com/osapi-io/osapi/internal/provider/node/memory" ) type AgentGetPublicTestSuite struct { @@ -108,7 +108,7 @@ func (s *AgentGetPublicTestSuite) TestGetAgentDetails() { OSInfo: &host.Result{Distribution: "Ubuntu", Version: "24.04"}, Uptime: 5 * time.Hour, LoadAverages: &load.Result{Load1: 0.5, Load5: 0.3, Load15: 0.2}, - MemoryStats: &mem.Result{Total: 8388608, Free: 4194304, Cached: 2097152}, + MemoryStats: &memory.Result{Total: 8388608, Free: 4194304, Cached: 2097152}, }, validateFunc: func(resp gen.GetAgentDetailsResponseObject) { r, ok := resp.(gen.GetAgentDetails200JSONResponse) @@ -193,7 +193,7 @@ func (s *AgentGetPublicTestSuite) TestGetAgentDetailsHTTP() { OSInfo: &host.Result{Distribution: "Ubuntu", Version: "24.04"}, Uptime: 5 * time.Hour, LoadAverages: &load.Result{Load1: 0.5, Load5: 0.3, Load15: 0.2}, - MemoryStats: &mem.Result{Total: 8388608, Free: 4194304, Cached: 2097152}, + MemoryStats: &memory.Result{Total: 8388608, Free: 4194304, Cached: 2097152}, }, nil) return mock }, diff --git a/internal/controller/api/agent/agent_list_public_test.go b/internal/controller/api/agent/agent_list_public_test.go index 841e6d3cc..82f0b8736 100644 --- a/internal/controller/api/agent/agent_list_public_test.go +++ b/internal/controller/api/agent/agent_list_public_test.go @@ -44,7 +44,7 @@ import ( jobmocks "github.com/osapi-io/osapi/internal/job/mocks" "github.com/osapi-io/osapi/internal/provider/node/host" "github.com/osapi-io/osapi/internal/provider/node/load" - "github.com/osapi-io/osapi/internal/provider/node/mem" + "github.com/osapi-io/osapi/internal/provider/node/memory" ) type AgentListPublicTestSuite struct { @@ -91,7 +91,7 @@ func (s *AgentListPublicTestSuite) TestListAgents() { OSInfo: &host.Result{Distribution: "Ubuntu", Version: "24.04"}, Uptime: 5 * time.Hour, LoadAverages: &load.Result{Load1: 0.5, Load5: 0.3, Load15: 0.2}, - MemoryStats: &mem.Result{Total: 8388608, Free: 4194304, Cached: 2097152}, + MemoryStats: &memory.Result{Total: 8388608, Free: 4194304, Cached: 2097152}, }, {Hostname: "server2"}, }, diff --git a/internal/controller/api/node/node_memory_get.go b/internal/controller/api/node/node_memory_get.go index 384e36178..7edd8d838 100644 --- a/internal/controller/api/node/node_memory_get.go +++ b/internal/controller/api/node/node_memory_get.go @@ -29,7 +29,7 @@ import ( "github.com/osapi-io/osapi/internal/controller/api/node/gen" "github.com/osapi-io/osapi/internal/job" - "github.com/osapi-io/osapi/internal/provider/node/mem" + "github.com/osapi-io/osapi/internal/provider/node/memory" ) // GetNodeMemory get the node memory stats API endpoint. @@ -82,7 +82,7 @@ func (s *Node) GetNodeMemory( }, nil } - var memStats mem.Result + var memStats memory.Result if rawResp.Data != nil { _ = json.Unmarshal(rawResp.Data, &memStats) } @@ -136,7 +136,7 @@ func (s *Node) getNodeMemoryBroadcast( item.Error = &e default: item.Status = gen.MemoryResultItemStatusOk - var memStats mem.Result + var memStats memory.Result if resp.Data != nil { _ = json.Unmarshal(resp.Data, &memStats) } @@ -154,10 +154,10 @@ func (s *Node) getNodeMemoryBroadcast( }, nil } -// buildMemoryResultItem converts mem.Result to a MemoryResultItem. +// buildMemoryResultItem converts memory.Result to a MemoryResultItem. func buildMemoryResultItem( hostname string, - memStats *mem.Result, + memStats *memory.Result, ) *gen.MemoryResultItem { changed := false item := &gen.MemoryResultItem{ diff --git a/internal/controller/api/node/node_memory_get_public_test.go b/internal/controller/api/node/node_memory_get_public_test.go index f9e58b45c..4d5c14723 100644 --- a/internal/controller/api/node/node_memory_get_public_test.go +++ b/internal/controller/api/node/node_memory_get_public_test.go @@ -41,7 +41,7 @@ import ( "github.com/osapi-io/osapi/internal/controller/api/node/gen" "github.com/osapi-io/osapi/internal/job" jobmocks "github.com/osapi-io/osapi/internal/job/mocks" - "github.com/osapi-io/osapi/internal/provider/node/mem" + "github.com/osapi-io/osapi/internal/provider/node/memory" "github.com/osapi-io/osapi/internal/validation" ) @@ -89,7 +89,7 @@ func (s *NodeMemoryGetPublicTestSuite) TestGetNodeMemory() { name: "success", request: gen.GetNodeMemoryRequestObject{Hostname: "_any"}, setupMock: func() { - memResult := mem.Result{ + memResult := memory.Result{ Total: 8192, Free: 4096, Cached: 2048, @@ -160,8 +160,8 @@ func (s *NodeMemoryGetPublicTestSuite) TestGetNodeMemory() { name: "broadcast all success", request: gen.GetNodeMemoryRequestObject{Hostname: "_all"}, setupMock: func() { - mem1 := mem.Result{Total: 8192, Free: 4096, Cached: 2048} - mem2 := mem.Result{Total: 16384, Free: 8192, Cached: 4096} + mem1 := memory.Result{Total: 8192, Free: 4096, Cached: 2048} + mem2 := memory.Result{Total: 16384, Free: 8192, Cached: 4096} data1, _ := json.Marshal(mem1) data2, _ := json.Marshal(mem2) s.mockJobClient.EXPECT(). @@ -185,7 +185,7 @@ func (s *NodeMemoryGetPublicTestSuite) TestGetNodeMemory() { name: "broadcast all with errors", request: gen.GetNodeMemoryRequestObject{Hostname: "_all"}, setupMock: func() { - mem1 := mem.Result{Total: 8192, Free: 4096, Cached: 2048} + mem1 := memory.Result{Total: 8192, Free: 4096, Cached: 2048} data1, _ := json.Marshal(mem1) s.mockJobClient.EXPECT(). QueryBroadcast(gomock.Any(), "_all", "node", job.OperationNodeMemoryGet, gomock.Any()). @@ -323,7 +323,7 @@ func (s *NodeMemoryGetPublicTestSuite) TestGetNodeMemoryValidationHTTP() { path: "/api/node/server1/memory", setupJobMock: func() *jobmocks.MockJobClient { mock := jobmocks.NewMockJobClient(s.mockCtrl) - memResult := mem.Result{Total: 8192, Free: 4096, Cached: 2048} + memResult := memory.Result{Total: 8192, Free: 4096, Cached: 2048} data, _ := json.Marshal(memResult) mock.EXPECT(). Query(gomock.Any(), "server1", "node", job.OperationNodeMemoryGet, gomock.Any()). @@ -446,7 +446,7 @@ func (s *NodeMemoryGetPublicTestSuite) TestGetNodeMemoryRBACHTTP() { }, setupJobMock: func() *jobmocks.MockJobClient { mock := jobmocks.NewMockJobClient(s.mockCtrl) - memResult := mem.Result{Total: 8192, Free: 4096, Cached: 2048} + memResult := memory.Result{Total: 8192, Free: 4096, Cached: 2048} data, _ := json.Marshal(memResult) mock.EXPECT(). Query(gomock.Any(), "server1", "node", job.OperationNodeMemoryGet, gomock.Any()). diff --git a/internal/controller/api/node/node_status_get_public_test.go b/internal/controller/api/node/node_status_get_public_test.go index 83da77199..4873c68b8 100644 --- a/internal/controller/api/node/node_status_get_public_test.go +++ b/internal/controller/api/node/node_status_get_public_test.go @@ -46,7 +46,7 @@ import ( "github.com/osapi-io/osapi/internal/provider/node/disk" "github.com/osapi-io/osapi/internal/provider/node/host" "github.com/osapi-io/osapi/internal/provider/node/load" - "github.com/osapi-io/osapi/internal/provider/node/mem" + "github.com/osapi-io/osapi/internal/provider/node/memory" "github.com/osapi-io/osapi/internal/validation" ) @@ -401,7 +401,7 @@ func (s *NodeStatusGetPublicTestSuite) TestGetNodeStatusValidationHTTP() { Load5: 0.5, Load15: 0.2, }, - MemoryStats: &mem.Result{ + MemoryStats: &memory.Result{ Total: 8388608, Free: 4194304, Cached: 2097152, @@ -601,7 +601,7 @@ func (s *NodeStatusGetPublicTestSuite) TestGetNodeStatusRBACHTTP() { Load5: 0.5, Load15: 0.2, }, - MemoryStats: &mem.Result{ + MemoryStats: &memory.Result{ Total: 8388608, Free: 4194304, Cached: 2097152, diff --git a/internal/job/types.go b/internal/job/types.go index 364f429f4..8b1a7f701 100644 --- a/internal/job/types.go +++ b/internal/job/types.go @@ -27,7 +27,7 @@ import ( "github.com/osapi-io/osapi/internal/provider/node/disk" "github.com/osapi-io/osapi/internal/provider/node/host" "github.com/osapi-io/osapi/internal/provider/node/load" - "github.com/osapi-io/osapi/internal/provider/node/mem" + "github.com/osapi-io/osapi/internal/provider/node/memory" "github.com/osapi-io/osapi/pkg/sdk/client" ) @@ -629,7 +629,7 @@ type AgentRegistration struct { // LoadAverages contains the system load averages. LoadAverages *load.Result `json:"load_averages,omitempty"` // MemoryStats contains memory usage information. - MemoryStats *mem.Result `json:"memory_stats,omitempty"` + MemoryStats *memory.Result `json:"memory_stats,omitempty"` // AgentVersion is the version of the agent binary. AgentVersion string `json:"agent_version,omitempty"` // Process holds process-level resource usage. @@ -669,7 +669,7 @@ type AgentInfo struct { // LoadAverages contains the system load averages. LoadAverages *load.Result `json:"load_averages,omitempty"` // MemoryStats contains memory usage information. - MemoryStats *mem.Result `json:"memory_stats,omitempty"` + MemoryStats *memory.Result `json:"memory_stats,omitempty"` // AgentVersion is the version of the agent binary. AgentVersion string `json:"agent_version,omitempty"` // Architecture is the CPU architecture (e.g., x86_64, aarch64). @@ -735,7 +735,7 @@ type NodeStatusResponse struct { // LoadAverages from the load provider LoadAverages *load.Result `json:"load_averages"` // MemoryStats from the memory provider - MemoryStats *mem.Result `json:"memory_stats"` + MemoryStats *memory.Result `json:"memory_stats"` // DiskUsage from the disk provider DiskUsage []disk.Result `json:"disk_usage"` // FieldErrors names the reads that failed, by the field they would have diff --git a/internal/job/types_public_test.go b/internal/job/types_public_test.go index fe592cbba..0c866b643 100644 --- a/internal/job/types_public_test.go +++ b/internal/job/types_public_test.go @@ -30,7 +30,7 @@ import ( "github.com/osapi-io/osapi/internal/job" "github.com/osapi-io/osapi/internal/provider/node/host" "github.com/osapi-io/osapi/internal/provider/node/load" - "github.com/osapi-io/osapi/internal/provider/node/mem" + "github.com/osapi-io/osapi/internal/provider/node/memory" ) type TypesPublicTestSuite struct { @@ -225,7 +225,7 @@ func (suite *TypesPublicTestSuite) TestAgentInfoFactsFieldsJSONRoundTrip() { }, Uptime: time.Duration(3600) * time.Second, LoadAverages: &load.Result{Load1: 0.5, Load5: 0.3, Load15: 0.1}, - MemoryStats: &mem.Result{Total: 1024, Free: 512}, + MemoryStats: &memory.Result{Total: 1024, Free: 512}, AgentVersion: "1.0.0", Architecture: "x86_64", KernelVersion: "6.1.0-25-generic", diff --git a/internal/provider/node/disk/debian.go b/internal/provider/node/disk/debian.go index f0a91e692..7531e6ebe 100644 --- a/internal/provider/node/disk/debian.go +++ b/internal/provider/node/disk/debian.go @@ -30,7 +30,7 @@ import ( var _ provider.FactsSetter = (*Debian)(nil) -// Debian implements the Mem interface for Debian. +// Debian implements the Disk interface for Debian. type Debian struct { provider.FactsAware diff --git a/internal/provider/node/host/debian.go b/internal/provider/node/host/debian.go index 40aa518a0..08a7ce815 100644 --- a/internal/provider/node/host/debian.go +++ b/internal/provider/node/host/debian.go @@ -33,7 +33,7 @@ import ( var _ provider.FactsSetter = (*Debian)(nil) -// Debian implements the Mem interface for Debian. +// Debian implements the Host interface for Debian. type Debian struct { provider.FactsAware diff --git a/internal/provider/node/load/debian.go b/internal/provider/node/load/debian.go index e9225096c..403821d1c 100644 --- a/internal/provider/node/load/debian.go +++ b/internal/provider/node/load/debian.go @@ -28,7 +28,7 @@ import ( var _ provider.FactsSetter = (*Debian)(nil) -// Debian implements the Mem interface for Debian. +// Debian implements the Load interface for Debian. type Debian struct { provider.FactsAware diff --git a/internal/provider/node/mem/darwin.go b/internal/provider/node/memory/darwin.go similarity index 95% rename from internal/provider/node/mem/darwin.go rename to internal/provider/node/memory/darwin.go index 010a989a5..2b0278976 100644 --- a/internal/provider/node/mem/darwin.go +++ b/internal/provider/node/memory/darwin.go @@ -18,7 +18,7 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -package mem +package memory import ( "github.com/shirou/gopsutil/v4/mem" @@ -28,7 +28,7 @@ import ( var _ provider.FactsSetter = (*Darwin)(nil) -// Darwin implements the Mem interface for Darwin (macOS). +// Darwin implements the Memory interface for Darwin (macOS). type Darwin struct { provider.FactsAware diff --git a/internal/provider/node/mem/darwin_get_vm.go b/internal/provider/node/memory/darwin_get_vm.go similarity index 99% rename from internal/provider/node/mem/darwin_get_vm.go rename to internal/provider/node/memory/darwin_get_vm.go index dfaba7415..c2f013a08 100644 --- a/internal/provider/node/mem/darwin_get_vm.go +++ b/internal/provider/node/memory/darwin_get_vm.go @@ -18,7 +18,7 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -package mem +package memory // GetStats retrieves memory statistics of the system. // It returns a Stats struct with total, free, and cached memory in diff --git a/internal/provider/node/mem/darwin_get_vm_public_test.go b/internal/provider/node/memory/darwin_get_vm_public_test.go similarity index 88% rename from internal/provider/node/mem/darwin_get_vm_public_test.go rename to internal/provider/node/memory/darwin_get_vm_public_test.go index 342bd8649..12c07e938 100644 --- a/internal/provider/node/mem/darwin_get_vm_public_test.go +++ b/internal/provider/node/memory/darwin_get_vm_public_test.go @@ -18,7 +18,7 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -package mem_test +package memory_test import ( "testing" @@ -27,7 +27,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" - "github.com/osapi-io/osapi/internal/provider/node/mem" + "github.com/osapi-io/osapi/internal/provider/node/memory" ) type DarwinGetStatsPublicTestSuite struct { @@ -42,7 +42,7 @@ func (suite *DarwinGetStatsPublicTestSuite) TestGetStats() { tests := []struct { name string setupMock func() func() (*sysMem.VirtualMemoryStat, error) - validateFunc func(*mem.Result, error) + validateFunc func(*memory.Result, error) }{ { name: "when GetStats Ok", @@ -55,10 +55,10 @@ func (suite *DarwinGetStatsPublicTestSuite) TestGetStats() { }, nil } }, - validateFunc: func(got *mem.Result, err error) { + validateFunc: func(got *memory.Result, err error) { suite.NoError(err) suite.NotNil(got) - suite.Equal(&mem.Result{ + suite.Equal(&memory.Result{ Total: 1024, Free: 512, Cached: 256, @@ -66,13 +66,13 @@ func (suite *DarwinGetStatsPublicTestSuite) TestGetStats() { }, }, { - name: "when mem.VirtualMemory errors", + name: "when memory.VirtualMemory errors", setupMock: func() func() (*sysMem.VirtualMemoryStat, error) { return func() (*sysMem.VirtualMemoryStat, error) { return nil, assert.AnError } }, - validateFunc: func(got *mem.Result, err error) { + validateFunc: func(got *memory.Result, err error) { suite.Error(err) suite.ErrorContains(err, assert.AnError.Error()) suite.Nil(got) @@ -82,7 +82,7 @@ func (suite *DarwinGetStatsPublicTestSuite) TestGetStats() { for _, tc := range tests { suite.Run(tc.name, func() { - darwin := mem.NewDarwinProvider() + darwin := memory.NewDarwinProvider() if tc.setupMock != nil { darwin.VirtualMemoryFn = tc.setupMock() diff --git a/internal/provider/node/mem/debian.go b/internal/provider/node/memory/debian.go similarity index 95% rename from internal/provider/node/mem/debian.go rename to internal/provider/node/memory/debian.go index 4fe8af833..fc9485b9a 100644 --- a/internal/provider/node/mem/debian.go +++ b/internal/provider/node/memory/debian.go @@ -18,7 +18,7 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -package mem +package memory import ( "github.com/shirou/gopsutil/v4/mem" @@ -28,7 +28,7 @@ import ( var _ provider.FactsSetter = (*Debian)(nil) -// Debian implements the Mem interface for Debian. +// Debian implements the Memory interface for Debian. type Debian struct { provider.FactsAware diff --git a/internal/provider/node/mem/debian_get_vm.go b/internal/provider/node/memory/debian_get_vm.go similarity index 99% rename from internal/provider/node/mem/debian_get_vm.go rename to internal/provider/node/memory/debian_get_vm.go index deffcf21d..7c6aef677 100644 --- a/internal/provider/node/mem/debian_get_vm.go +++ b/internal/provider/node/memory/debian_get_vm.go @@ -18,7 +18,7 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -package mem +package memory // GetStats retrieves memory statistics of the system. // It returns a Stats struct with total, free, and cached memory in diff --git a/internal/provider/node/mem/debian_get_vm_public_test.go b/internal/provider/node/memory/debian_get_vm_public_test.go similarity index 88% rename from internal/provider/node/mem/debian_get_vm_public_test.go rename to internal/provider/node/memory/debian_get_vm_public_test.go index b4eb637ec..ab31b34d8 100644 --- a/internal/provider/node/mem/debian_get_vm_public_test.go +++ b/internal/provider/node/memory/debian_get_vm_public_test.go @@ -18,7 +18,7 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -package mem_test +package memory_test import ( "testing" @@ -27,7 +27,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" - "github.com/osapi-io/osapi/internal/provider/node/mem" + "github.com/osapi-io/osapi/internal/provider/node/memory" ) type DebianGetStatsPublicTestSuite struct { @@ -42,7 +42,7 @@ func (suite *DebianGetStatsPublicTestSuite) TestGetStats() { tests := []struct { name string setupMock func() func() (*sysMem.VirtualMemoryStat, error) - validateFunc func(*mem.Result, error) + validateFunc func(*memory.Result, error) }{ { name: "when GetStats Ok", @@ -55,10 +55,10 @@ func (suite *DebianGetStatsPublicTestSuite) TestGetStats() { }, nil } }, - validateFunc: func(got *mem.Result, err error) { + validateFunc: func(got *memory.Result, err error) { suite.NoError(err) suite.NotNil(got) - suite.Equal(&mem.Result{ + suite.Equal(&memory.Result{ Total: 1024, Free: 512, Cached: 256, @@ -66,13 +66,13 @@ func (suite *DebianGetStatsPublicTestSuite) TestGetStats() { }, }, { - name: "when mem.VirtualMemory errors", + name: "when memory.VirtualMemory errors", setupMock: func() func() (*sysMem.VirtualMemoryStat, error) { return func() (*sysMem.VirtualMemoryStat, error) { return nil, assert.AnError } }, - validateFunc: func(got *mem.Result, err error) { + validateFunc: func(got *memory.Result, err error) { suite.Error(err) suite.ErrorContains(err, assert.AnError.Error()) suite.Nil(got) @@ -82,7 +82,7 @@ func (suite *DebianGetStatsPublicTestSuite) TestGetStats() { for _, tc := range tests { suite.Run(tc.name, func() { - debian := mem.NewDebianProvider() + debian := memory.NewDebianProvider() if tc.setupMock != nil { debian.VirtualMemoryFn = tc.setupMock() diff --git a/internal/provider/node/mem/linux.go b/internal/provider/node/memory/linux.go similarity index 91% rename from internal/provider/node/mem/linux.go rename to internal/provider/node/memory/linux.go index 34610fda9..3da13880e 100644 --- a/internal/provider/node/mem/linux.go +++ b/internal/provider/node/memory/linux.go @@ -18,8 +18,8 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -// Package mem provides memory usage statistics. -package mem +// Package memory provides memory usage statistics. +package memory import ( "github.com/osapi-io/osapi/internal/provider" @@ -27,7 +27,7 @@ import ( var _ provider.FactsSetter = (*Linux)(nil) -// Linux implements the Mem interface for Linux. +// Linux implements the Memory interface for Linux. type Linux struct { provider.FactsAware } diff --git a/internal/provider/node/mem/linux_get_vm.go b/internal/provider/node/memory/linux_get_vm.go similarity index 98% rename from internal/provider/node/mem/linux_get_vm.go rename to internal/provider/node/memory/linux_get_vm.go index 561ab078c..e1aeadae1 100644 --- a/internal/provider/node/mem/linux_get_vm.go +++ b/internal/provider/node/memory/linux_get_vm.go @@ -18,7 +18,7 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -package mem +package memory import ( "github.com/osapi-io/osapi/internal/provider" diff --git a/internal/provider/node/mem/linux_get_vm_public_test.go b/internal/provider/node/memory/linux_get_vm_public_test.go similarity index 90% rename from internal/provider/node/mem/linux_get_vm_public_test.go rename to internal/provider/node/memory/linux_get_vm_public_test.go index 3f1a1954e..6a75d3ea3 100644 --- a/internal/provider/node/mem/linux_get_vm_public_test.go +++ b/internal/provider/node/memory/linux_get_vm_public_test.go @@ -18,7 +18,7 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -package mem_test +package memory_test import ( "testing" @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/suite" "github.com/osapi-io/osapi/internal/provider" - "github.com/osapi-io/osapi/internal/provider/node/mem" + "github.com/osapi-io/osapi/internal/provider/node/memory" ) type LinuxGetStatsPublicTestSuite struct { @@ -40,11 +40,11 @@ func (suite *LinuxGetStatsPublicTestSuite) TearDownTest() {} func (suite *LinuxGetStatsPublicTestSuite) TestGetStats() { tests := []struct { name string - validateFunc func(*mem.Result, error) + validateFunc func(*memory.Result, error) }{ { name: "returns not implemented error", - validateFunc: func(result *mem.Result, err error) { + validateFunc: func(result *memory.Result, err error) { suite.Nil(result) suite.ErrorIs(err, provider.ErrUnsupported) }, @@ -53,7 +53,7 @@ func (suite *LinuxGetStatsPublicTestSuite) TestGetStats() { for _, tc := range tests { suite.Run(tc.name, func() { - linux := mem.NewLinuxProvider() + linux := memory.NewLinuxProvider() tc.validateFunc(linux.GetStats()) }) diff --git a/internal/provider/node/mem/mocks/generate.go b/internal/provider/node/memory/mocks/generate.go similarity index 100% rename from internal/provider/node/mem/mocks/generate.go rename to internal/provider/node/memory/mocks/generate.go diff --git a/internal/provider/node/mem/mocks/mocks.go b/internal/provider/node/memory/mocks/mocks.go similarity index 93% rename from internal/provider/node/mem/mocks/mocks.go rename to internal/provider/node/memory/mocks/mocks.go index 84a3bf0fd..8efaad12f 100644 --- a/internal/provider/node/mem/mocks/mocks.go +++ b/internal/provider/node/memory/mocks/mocks.go @@ -23,7 +23,7 @@ package mocks import ( "go.uber.org/mock/gomock" - "github.com/osapi-io/osapi/internal/provider/node/mem" + "github.com/osapi-io/osapi/internal/provider/node/memory" ) // NewPlainMockProvider creates a Mock without defaults. @@ -39,7 +39,7 @@ func NewDefaultMockProvider( ) *MockProvider { mock := NewMockProvider(ctrl) - mock.EXPECT().GetStats().Return(&mem.Result{ + mock.EXPECT().GetStats().Return(&memory.Result{ Total: 8388608, Free: 4194304, Cached: 2097152, diff --git a/internal/provider/node/mem/mocks/types.gen.go b/internal/provider/node/memory/mocks/types.gen.go similarity index 89% rename from internal/provider/node/mem/mocks/types.gen.go rename to internal/provider/node/memory/mocks/types.gen.go index d7595bc37..138c90f91 100644 --- a/internal/provider/node/mem/mocks/types.gen.go +++ b/internal/provider/node/memory/mocks/types.gen.go @@ -12,7 +12,7 @@ package mocks import ( reflect "reflect" - mem "github.com/osapi-io/osapi/internal/provider/node/mem" + memory "github.com/osapi-io/osapi/internal/provider/node/memory" gomock "go.uber.org/mock/gomock" ) @@ -41,10 +41,10 @@ func (m *MockProvider) EXPECT() *MockProviderMockRecorder { } // GetStats mocks base method. -func (m *MockProvider) GetStats() (*mem.Result, error) { +func (m *MockProvider) GetStats() (*memory.Result, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetStats") - ret0, _ := ret[0].(*mem.Result) + ret0, _ := ret[0].(*memory.Result) ret1, _ := ret[1].(error) return ret0, ret1 } diff --git a/internal/provider/node/mem/types.go b/internal/provider/node/memory/types.go similarity index 94% rename from internal/provider/node/mem/types.go rename to internal/provider/node/memory/types.go index ab851148b..a1f75673f 100644 --- a/internal/provider/node/mem/types.go +++ b/internal/provider/node/memory/types.go @@ -18,9 +18,9 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -package mem +package memory -// Provider implements the methods to interact with various Mem components. +// Provider implements the methods to interact with various memory components. type Provider interface { // GetStats retrieves memory statistics of the system. GetStats() (*Result, error)