Skip to content

Commit 1f396eb

Browse files
mlatazamlataza
committed
fix: macos lint issues
1 parent aab804b commit 1f396eb

File tree

8 files changed

+84
-35
lines changed

8 files changed

+84
-35
lines changed

‎internal/agent/host_darwin_test.go‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import (
1111
func TestDarwinDefaultSystemInfoProvider_MACAddress(t *testing.T) {
1212
sys := &darwinDefaultSystemInfoProvider{}
1313
result, err := sys.MACAddress()
14-
1514
if err != nil {
1615
t.Fatalf("expected no error, got %v", err)
1716
}
@@ -30,7 +29,6 @@ func TestDarwinDefaultSystemInfoProvider_Hostname(t *testing.T) {
3029
expected, _ := os.Hostname()
3130

3231
result, err := sys.Hostname()
33-
3432
if err != nil {
3533
t.Fatalf("expected no error, got %v", err)
3634
}
@@ -44,7 +42,6 @@ func TestDarwinDefaultSystemInfoProvider_HostPlatform(t *testing.T) {
4442
sys := &darwinDefaultSystemInfoProvider{}
4543

4644
_, err := sys.HostPlatform()
47-
4845
if err != nil {
4946
t.Errorf("expected no error, got %v", err)
5047
}
@@ -53,7 +50,6 @@ func TestDarwinDefaultSystemInfoProvider_HostPlatform(t *testing.T) {
5350
func TestDarwinDefaultSystemInfoProvider_CPUModelName(t *testing.T) {
5451
sys := &darwinDefaultSystemInfoProvider{}
5552
_, err := sys.CPUModelName()
56-
5753
if err != nil {
5854
t.Errorf("expected no error, got %v", err)
5955
}
@@ -62,7 +58,6 @@ func TestDarwinDefaultSystemInfoProvider_CPUModelName(t *testing.T) {
6258
func TestDarwinDefaultSystemInfoProvider_TotalMemoryBytes(t *testing.T) {
6359
sys := &darwinDefaultSystemInfoProvider{}
6460
result, err := sys.TotalMemoryBytes()
65-
6661
if err != nil {
6762
t.Errorf("expected no error, got %v", err)
6863
}
@@ -84,7 +79,6 @@ func TestNewSystemInfoProvider(t *testing.T) {
8479
func TestDarwinDefaultDomainInfoProvider_ADDomain(t *testing.T) {
8580
domain := &darwinDefaultDomainInfoProvider{}
8681
_, err := domain.ADDomain(context.Background())
87-
8882
if err != nil {
8983
t.Errorf("expected no error, got %v", err)
9084
}
@@ -93,7 +87,6 @@ func TestDarwinDefaultDomainInfoProvider_ADDomain(t *testing.T) {
9387
func TestDarwinDefaultDomainInfoProvider_IsADDomainController(t *testing.T) {
9488
domain := &darwinDefaultDomainInfoProvider{}
9589
_, err := domain.IsADDomainController(context.Background())
96-
9790
if err != nil {
9891
t.Errorf("expected no error, got %v", err)
9992
}
@@ -102,7 +95,6 @@ func TestDarwinDefaultDomainInfoProvider_IsADDomainController(t *testing.T) {
10295
func TestDarwinDefaultDomainInfoProvider_IsEntraConnectServer(t *testing.T) {
10396
domain := &darwinDefaultDomainInfoProvider{}
10497
_, err := domain.IsEntraConnectServer()
105-
10698
if err != nil {
10799
t.Errorf("expected no error, got %v", err)
108100
}
@@ -111,7 +103,6 @@ func TestDarwinDefaultDomainInfoProvider_IsEntraConnectServer(t *testing.T) {
111103
func TestDarwinDefaultDomainInfoProvider_EntraDomain(t *testing.T) {
112104
domain := &darwinDefaultDomainInfoProvider{}
113105
_, err := domain.EntraDomain(context.Background())
114-
115106
if err != nil {
116107
t.Errorf("expected no error, got %v", err)
117108
}

‎internal/agent/installation_darwin_test.go‎

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,12 @@ func TestGetAgentExecutablePath(t *testing.T) {
5656
setEnvVars(t)
5757

5858
orgId := "org123"
59-
expected := filepath.Join("/usr/local/bin", "rewst_remote_agent", orgId, "agent_smith.mac-os.bin")
59+
expected := filepath.Join(
60+
"/usr/local/bin",
61+
"rewst_remote_agent",
62+
orgId,
63+
"agent_smith.mac-os.bin",
64+
)
6065

6166
result := GetAgentExecutablePath(orgId)
6267

@@ -69,7 +74,12 @@ func TestGetConfigFilePath(t *testing.T) {
6974
setEnvVars(t)
7075

7176
orgId := "org123"
72-
expected := filepath.Join("/Library/Application Support", "rewst_remote_agent", orgId, "config.json")
77+
expected := filepath.Join(
78+
"/Library/Application Support",
79+
"rewst_remote_agent",
80+
orgId,
81+
"config.json",
82+
)
7383

7484
result := GetConfigFilePath(orgId)
7585

@@ -82,7 +92,12 @@ func TestGetLogFilePath(t *testing.T) {
8292
setEnvVars(t)
8393

8494
orgId := "org123"
85-
expected := filepath.Join("/Library/Application Support", "rewst_remote_agent", orgId, "rewst_agent.log")
95+
expected := filepath.Join(
96+
"/Library/Application Support",
97+
"rewst_remote_agent",
98+
orgId,
99+
"rewst_agent.log",
100+
)
86101

87102
result := GetLogFilePath(orgId)
88103

‎internal/agent/updater_darwin.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ func (u *defaultUpdater) SelectAsset(release Release) (Asset, error) {
1414
}
1515
}
1616

17-
return Asset{}, fmt.Errorf("No asset found for macos")
17+
return Asset{}, fmt.Errorf("no asset found for macos")
1818
}

‎internal/interpreter/executor_darwin.go‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,14 @@ type defaultExecutor struct {
3737
PwshExecutor Executor
3838
}
3939

40-
func (e *defaultExecutor) Execute(ctx context.Context, message *Message, device agent.Device, logger hclog.Logger, sys agent.SystemInfoProvider, domain agent.DomainInfoProvider) []byte {
40+
func (e *defaultExecutor) Execute(
41+
ctx context.Context,
42+
message *Message,
43+
device agent.Device,
44+
logger hclog.Logger,
45+
sys agent.SystemInfoProvider,
46+
domain agent.DomainInfoProvider,
47+
) []byte {
4148
shell := strings.ToLower(message.InterpreterOverride.Value)
4249
if shell == "pwsh" {
4350
return e.PwshExecutor.Execute(ctx, message, device, logger, sys, domain)

‎internal/service/service_darwin.go‎

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -114,14 +114,29 @@ type defaultServiceManager struct {
114114
func (s *defaultServiceManager) Create(params AgentParams) (Service, error) {
115115
serviceConfig := strings.Builder{}
116116

117-
fmt.Fprintf(&serviceConfig, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\"\n\"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n")
117+
fmt.Fprintf(
118+
&serviceConfig,
119+
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\"\n\"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n",
120+
)
118121
fmt.Fprintf(&serviceConfig, "<plist version=\"1.0\">\n<dict>\n")
119122
fmt.Fprintf(&serviceConfig, "<key>Label</key>\n<string>%s</string>\n", params.Name)
120-
fmt.Fprintf(&serviceConfig, "<key>ProgramArguments</key>\n<array>\n<string>%s</string>\n<string>--org-id</string>\n<string>%s</string>\n<string>--config-file</string>\n<string>%s</string>\n<string>--log-file</string>\n<string>%s</string>\n</array>\n",
121-
params.AgentExecutablePath, params.OrgId, params.ConfigFilePath, params.LogFilePath)
123+
fmt.Fprintf(
124+
&serviceConfig,
125+
"<key>ProgramArguments</key>\n<array>\n<string>%s</string>\n<string>--org-id</string>\n<string>%s</string>\n<string>--config-file</string>\n<string>%s</string>\n<string>--log-file</string>\n<string>%s</string>\n</array>\n",
126+
params.AgentExecutablePath,
127+
params.OrgId,
128+
params.ConfigFilePath,
129+
params.LogFilePath,
130+
)
122131
fmt.Fprintf(&serviceConfig, "<key>RunAtLoad</key>\n<false/>\n")
123-
fmt.Fprintf(&serviceConfig, "<key>KeepAlive</key>\n<dict>\n<key>SuccessfulExit</key>\n<false/>\n</dict>\n")
124-
fmt.Fprintf(&serviceConfig, "<key>EnvironmentVariables</key>\n<dict>\n<key>PATH</key>\n<string>/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin</string>\n</dict>\n")
132+
fmt.Fprintf(
133+
&serviceConfig,
134+
"<key>KeepAlive</key>\n<dict>\n<key>SuccessfulExit</key>\n<false/>\n</dict>\n",
135+
)
136+
fmt.Fprintf(
137+
&serviceConfig,
138+
"<key>EnvironmentVariables</key>\n<dict>\n<key>PATH</key>\n<string>/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin</string>\n</dict>\n",
139+
)
125140
fmt.Fprintf(&serviceConfig, "</dict>\n</plist>\n")
126141

127142
svc := &darwinService{name: params.Name, system: s.system}

‎internal/service/service_darwin_test.go‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,10 @@ func TestDarwinService_Start_LoadError(t *testing.T) {
8585
t.Error("expected error, got nil")
8686
}
8787
if len(mock.runCalls) != 1 {
88-
t.Errorf("expected start not to be called after load failure, got %d calls", len(mock.runCalls))
88+
t.Errorf(
89+
"expected start not to be called after load failure, got %d calls",
90+
len(mock.runCalls),
91+
)
8992
}
9093
}
9194

@@ -133,7 +136,10 @@ func TestDarwinService_Stop_StopError(t *testing.T) {
133136
t.Error("expected error, got nil")
134137
}
135138
if len(mock.runCalls) != 1 {
136-
t.Errorf("expected unload not to be called after stop failure, got %d calls", len(mock.runCalls))
139+
t.Errorf(
140+
"expected unload not to be called after stop failure, got %d calls",
141+
len(mock.runCalls),
142+
)
137143
}
138144
}
139145

@@ -152,7 +158,7 @@ func TestDarwinService_Stop_UnloadError(t *testing.T) {
152158

153159
func TestDarwinService_Delete(t *testing.T) {
154160
tmpFile := newTempPlistPath(t)
155-
if err := os.WriteFile(tmpFile, []byte{}, 0600); err != nil {
161+
if err := os.WriteFile(tmpFile, []byte{}, 0o600); err != nil {
156162
t.Fatal(err)
157163
}
158164
mock := &mockLaunchCtl{plistPath: tmpFile}
@@ -161,7 +167,8 @@ func TestDarwinService_Delete(t *testing.T) {
161167
if err := svc.Delete(); err != nil {
162168
t.Fatalf("expected no error, got %v", err)
163169
}
164-
if len(mock.runCalls) != 1 || mock.runCalls[0][0] != "unload" || mock.runCalls[0][1] != "test-svc" {
170+
if len(mock.runCalls) != 1 || mock.runCalls[0][0] != "unload" ||
171+
mock.runCalls[0][1] != "test-svc" {
165172
t.Errorf("expected Run(unload, test-svc), got %v", mock.runCalls)
166173
}
167174
if _, err := os.Stat(tmpFile); !os.IsNotExist(err) {
@@ -256,7 +263,6 @@ func TestDefaultServiceManager_Create_Success(t *testing.T) {
256263
}
257264

258265
svc, err := sm.Create(params)
259-
260266
if err != nil {
261267
t.Fatalf("expected no error, got %v", err)
262268
}
@@ -328,14 +334,14 @@ func TestDefaultServiceManager_Open_Success(t *testing.T) {
328334
sm := &defaultServiceManager{system: mock}
329335

330336
svc, err := sm.Open("test-svc")
331-
332337
if err != nil {
333338
t.Fatalf("expected no error, got %v", err)
334339
}
335340
if svc == nil {
336341
t.Fatal("expected service, got nil")
337342
}
338-
if len(mock.runCalls) != 1 || mock.runCalls[0][0] != "print" || mock.runCalls[0][1] != "system/test-svc" {
343+
if len(mock.runCalls) != 1 || mock.runCalls[0][0] != "print" ||
344+
mock.runCalls[0][1] != "system/test-svc" {
339345
t.Errorf("expected Run(print, system/test-svc), got %v", mock.runCalls)
340346
}
341347
}
@@ -365,7 +371,6 @@ func (r *immediateRunner) Execute(stop <-chan struct{}, running chan<- struct{})
365371

366372
func TestRun_ReturnsZeroExitCode(t *testing.T) {
367373
code, err := Run(&immediateRunner{exitCode: 0})
368-
369374
if err != nil {
370375
t.Fatalf("expected no error, got %v", err)
371376
}
@@ -376,7 +381,6 @@ func TestRun_ReturnsZeroExitCode(t *testing.T) {
376381

377382
func TestRun_ReturnsNonZeroExitCode(t *testing.T) {
378383
code, err := Run(&immediateRunner{exitCode: GenericError})
379-
380384
if err != nil {
381385
t.Fatalf("expected no error, got %v", err)
382386
}

‎internal/syslog/syslog_darwin.go‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,10 @@ func (s *darwinSyslog) Write(data []byte) (int, error) {
3535
priority = "daemon.warning"
3636
}
3737

38-
s.runner.Run(priority, s.source, message)
38+
err := s.runner.Run(priority, s.source, message)
39+
if err != nil {
40+
return 0, err
41+
}
3942

4043
return s.out.Write(data)
4144
}

‎internal/syslog/syslog_darwin_test.go‎

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,10 @@ func TestDarwinSyslog_Write_InfoPriority(t *testing.T) {
2626
runner := &mockCommandRunner{}
2727
s := &darwinSyslog{out: &bytes.Buffer{}, source: "test", runner: runner}
2828

29-
s.Write([]byte("[INFO] info message"))
29+
_, err := s.Write([]byte("[INFO] info message"))
30+
if err != nil {
31+
t.Fatalf("expected no error, got %v", err)
32+
}
3033

3134
if !runner.called {
3235
t.Fatal("expected runner to be called")
@@ -40,7 +43,10 @@ func TestDarwinSyslog_Write_WarningPriority(t *testing.T) {
4043
runner := &mockCommandRunner{}
4144
s := &darwinSyslog{out: &bytes.Buffer{}, source: "test", runner: runner}
4245

43-
s.Write([]byte("[WARNING] warning message"))
46+
_, err := s.Write([]byte("[WARNING] warning message"))
47+
if err != nil {
48+
t.Fatalf("expected no error, got %v", err)
49+
}
4450

4551
if runner.priority != "daemon.warning" {
4652
t.Errorf("expected priority 'daemon.warning', got %q", runner.priority)
@@ -51,7 +57,10 @@ func TestDarwinSyslog_Write_ErrorPriority(t *testing.T) {
5157
runner := &mockCommandRunner{}
5258
s := &darwinSyslog{out: &bytes.Buffer{}, source: "test", runner: runner}
5359

54-
s.Write([]byte("[ERROR] error message"))
60+
_, err := s.Write([]byte("[ERROR] error message"))
61+
if err != nil {
62+
t.Fatalf("expected no error, got %v", err)
63+
}
5564

5665
if runner.priority != "daemon.err" {
5766
t.Errorf("expected priority 'daemon.err', got %q", runner.priority)
@@ -62,7 +71,10 @@ func TestDarwinSyslog_Write_DefaultsToInfo(t *testing.T) {
6271
runner := &mockCommandRunner{}
6372
s := &darwinSyslog{out: &bytes.Buffer{}, source: "test", runner: runner}
6473

65-
s.Write([]byte("[DEBUG] debug message"))
74+
_, err := s.Write([]byte("[DEBUG] debug message"))
75+
if err != nil {
76+
t.Fatalf("expected no error, got %v", err)
77+
}
6678

6779
if runner.priority != "daemon.info" {
6880
t.Errorf("expected default priority 'daemon.info', got %q", runner.priority)
@@ -73,7 +85,10 @@ func TestDarwinSyslog_Write_PassesSourceAndMessage(t *testing.T) {
7385
runner := &mockCommandRunner{}
7486
s := &darwinSyslog{out: &bytes.Buffer{}, source: "my-app", runner: runner}
7587

76-
s.Write([]byte("[INFO] hello world"))
88+
_, err := s.Write([]byte("[INFO] hello world"))
89+
if err != nil {
90+
t.Fatalf("expected no error, got %v", err)
91+
}
7792

7893
if runner.source != "my-app" {
7994
t.Errorf("expected source 'my-app', got %q", runner.source)
@@ -90,7 +105,6 @@ func TestDarwinSyslog_Write_ForwardsToOut(t *testing.T) {
90105

91106
data := []byte("[INFO] forwarded")
92107
n, err := s.Write(data)
93-
94108
if err != nil {
95109
t.Fatalf("expected no error, got %v", err)
96110
}

0 commit comments

Comments
 (0)