Skip to content

Commit 672ed34

Browse files
sarg3ntclaude
sarg3nt
and
claude
committed
fix(agent): update tests for NewClient skipTLSVerify arg
NewClient and NewClientWithTimeout grew a skipTLSVerify bool parameter on this branch. The corresponding test files (client_test.go, functional_test.go) landed on main during the 2-month gap and used the old 2-arg signature, breaking the build after rebase. Pass false (the preserved default) at all call sites. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
1 parent d228f22 commit 672ed34

2 files changed

Lines changed: 39 additions & 39 deletions

File tree

‎gearbox/internal/framework/agent/client_test.go‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
)
1212

1313
func TestNewClient(t *testing.T) {
14-
client := NewClient("https://example.com:8405", "test-api-key")
14+
client := NewClient("https://example.com:8405", "test-api-key", false)
1515

1616
if client.baseURL != "https://example.com:8405" {
1717
t.Errorf("expected baseURL https://example.com:8405, got %s", client.baseURL)
@@ -23,7 +23,7 @@ func TestNewClient(t *testing.T) {
2323
}
2424

2525
func TestNewClientTrimsTrailingSlash(t *testing.T) {
26-
client := NewClient("https://example.com:8405/", "test-api-key")
26+
client := NewClient("https://example.com:8405/", "test-api-key", false)
2727

2828
if client.baseURL != "https://example.com:8405" {
2929
t.Errorf("expected baseURL without trailing slash, got %s", client.baseURL)
@@ -51,7 +51,7 @@ func TestHealth(t *testing.T) {
5151
}))
5252
defer server.Close()
5353

54-
client := NewClient(server.URL, "test-key")
54+
client := NewClient(server.URL, "test-key", false)
5555
resp, err := client.Health()
5656
if err != nil {
5757
t.Fatalf("unexpected error: %v", err)
@@ -90,7 +90,7 @@ func TestGetInfo(t *testing.T) {
9090
}))
9191
defer server.Close()
9292

93-
client := NewClient(server.URL, "test-key")
93+
client := NewClient(server.URL, "test-key", false)
9494
resp, err := client.GetInfo()
9595
if err != nil {
9696
t.Fatalf("unexpected error: %v", err)
@@ -125,7 +125,7 @@ func TestGetStats(t *testing.T) {
125125
}))
126126
defer server.Close()
127127

128-
client := NewClient(server.URL, "test-key")
128+
client := NewClient(server.URL, "test-key", false)
129129
resp, err := client.GetStats()
130130
if err != nil {
131131
t.Fatalf("unexpected error: %v", err)
@@ -162,7 +162,7 @@ func TestGetStatsCSV(t *testing.T) {
162162
}))
163163
defer server.Close()
164164

165-
client := NewClient(server.URL, "test-key")
165+
client := NewClient(server.URL, "test-key", false)
166166
csv, err := client.GetStatsCSV()
167167
if err != nil {
168168
t.Fatalf("unexpected error: %v", err)
@@ -196,7 +196,7 @@ func TestGetMetrics(t *testing.T) {
196196
}))
197197
defer server.Close()
198198

199-
client := NewClient(server.URL, "test-key")
199+
client := NewClient(server.URL, "test-key", false)
200200
resp, err := client.GetMetrics()
201201
if err != nil {
202202
t.Fatalf("unexpected error: %v", err)
@@ -232,7 +232,7 @@ func TestGetServices(t *testing.T) {
232232
}))
233233
defer server.Close()
234234

235-
client := NewClient(server.URL, "test-key")
235+
client := NewClient(server.URL, "test-key", false)
236236
resp, err := client.GetServices([]string{"haproxy", "nginx"})
237237
if err != nil {
238238
t.Fatalf("unexpected error: %v", err)
@@ -263,7 +263,7 @@ func TestGetLogs(t *testing.T) {
263263
}))
264264
defer server.Close()
265265

266-
client := NewClient(server.URL, "test-key")
266+
client := NewClient(server.URL, "test-key", false)
267267
resp, err := client.GetLogs("haproxy", 100)
268268
if err != nil {
269269
t.Fatalf("unexpected error: %v", err)
@@ -295,7 +295,7 @@ func TestGetLogsMaxLines(t *testing.T) {
295295
}))
296296
defer server.Close()
297297

298-
client := NewClient(server.URL, "test-key")
298+
client := NewClient(server.URL, "test-key", false)
299299
_, err := client.GetLogs("haproxy", 50000) // Request more than max
300300
if err != nil {
301301
t.Fatalf("unexpected error: %v", err)
@@ -325,7 +325,7 @@ func TestGetMetadata(t *testing.T) {
325325
}))
326326
defer server.Close()
327327

328-
client := NewClient(server.URL, "test-key")
328+
client := NewClient(server.URL, "test-key", false)
329329
resp, err := client.GetMetadata()
330330
if err != nil {
331331
t.Fatalf("unexpected error: %v", err)
@@ -363,7 +363,7 @@ func TestGetSecuritySummary(t *testing.T) {
363363
}))
364364
defer server.Close()
365365

366-
client := NewClient(server.URL, "test-key")
366+
client := NewClient(server.URL, "test-key", false)
367367
resp, err := client.GetSecuritySummary()
368368
if err != nil {
369369
t.Fatalf("unexpected error: %v", err)
@@ -407,7 +407,7 @@ func TestGetFail2BanStats(t *testing.T) {
407407
}))
408408
defer server.Close()
409409

410-
client := NewClient(server.URL, "test-key")
410+
client := NewClient(server.URL, "test-key", false)
411411
resp, err := client.GetFail2BanStats(&Fail2BanOptions{
412412
IncludeIPs: true,
413413
Recent: 10,
@@ -439,7 +439,7 @@ func TestGetSyncStatus(t *testing.T) {
439439
}))
440440
defer server.Close()
441441

442-
client := NewClient(server.URL, "test-key")
442+
client := NewClient(server.URL, "test-key", false)
443443
resp, err := client.GetSyncStatus()
444444
if err != nil {
445445
t.Fatalf("unexpected error: %v", err)
@@ -468,7 +468,7 @@ func TestGetWebSocketToken(t *testing.T) {
468468
}))
469469
defer server.Close()
470470

471-
client := NewClient(server.URL, "test-key")
471+
client := NewClient(server.URL, "test-key", false)
472472
resp, err := client.GetWebSocketToken()
473473
if err != nil {
474474
t.Fatalf("unexpected error: %v", err)
@@ -491,7 +491,7 @@ func TestHTTPError401(t *testing.T) {
491491
}))
492492
defer server.Close()
493493

494-
client := NewClient(server.URL, "bad-key")
494+
client := NewClient(server.URL, "bad-key", false)
495495
_, err := client.GetInfo()
496496
if err == nil {
497497
t.Fatal("expected error for 401 response")
@@ -521,7 +521,7 @@ func TestHTTPError404(t *testing.T) {
521521
}))
522522
defer server.Close()
523523

524-
client := NewClient(server.URL, "test-key")
524+
client := NewClient(server.URL, "test-key", false)
525525
_, err := client.GetLogs("nonexistent", 100)
526526
if err == nil {
527527
t.Fatal("expected error for 404 response")
@@ -538,7 +538,7 @@ func TestHTTPError429(t *testing.T) {
538538
}))
539539
defer server.Close()
540540

541-
client := NewClient(server.URL, "test-key")
541+
client := NewClient(server.URL, "test-key", false)
542542
_, err := client.GetStats()
543543
if err == nil {
544544
t.Fatal("expected error for 429 response")
@@ -555,7 +555,7 @@ func TestHTTPError503(t *testing.T) {
555555
}))
556556
defer server.Close()
557557

558-
client := NewClient(server.URL, "test-key")
558+
client := NewClient(server.URL, "test-key", false)
559559
_, err := client.GetMetrics()
560560
if err == nil {
561561
t.Fatal("expected error for 503 response")
@@ -573,7 +573,7 @@ func TestClientTimeout(t *testing.T) {
573573
}))
574574
defer server.Close()
575575

576-
client := NewClientWithTimeout(server.URL, "test-key", 50*time.Millisecond)
576+
client := NewClientWithTimeout(server.URL, "test-key", false, 50*time.Millisecond)
577577
_, err := client.Health()
578578
if err == nil {
579579
t.Fatal("expected timeout error")
@@ -607,7 +607,7 @@ func TestGetHAProxyConfig(t *testing.T) {
607607
}))
608608
defer server.Close()
609609

610-
client := NewClient(server.URL, "test-key")
610+
client := NewClient(server.URL, "test-key", false)
611611
resp, err := client.GetHAProxyConfig()
612612
if err != nil {
613613
t.Fatalf("unexpected error: %v", err)
@@ -666,7 +666,7 @@ func TestUpdateHAProxyConfig(t *testing.T) {
666666
}))
667667
defer server.Close()
668668

669-
client := NewClient(server.URL, "test-key")
669+
client := NewClient(server.URL, "test-key", false)
670670

671671
// Test dry run
672672
resp, err := client.UpdateHAProxyConfig(&HAProxyConfigUpdateRequest{
@@ -724,7 +724,7 @@ func TestGetHAProxyConfigBackups(t *testing.T) {
724724
}))
725725
defer server.Close()
726726

727-
client := NewClient(server.URL, "test-key")
727+
client := NewClient(server.URL, "test-key", false)
728728
resp, err := client.GetHAProxyConfigBackups()
729729
if err != nil {
730730
t.Fatalf("unexpected error: %v", err)
@@ -768,7 +768,7 @@ func TestRestoreHAProxyConfig(t *testing.T) {
768768
}))
769769
defer server.Close()
770770

771-
client := NewClient(server.URL, "test-key")
771+
client := NewClient(server.URL, "test-key", false)
772772
resp, err := client.RestoreHAProxyConfig(&HAProxyRestoreRequest{
773773
BackupID: "haproxy_20240115_103000.cfg",
774774
DryRun: false,
@@ -805,7 +805,7 @@ func TestGetFirewallConfig(t *testing.T) {
805805
}))
806806
defer server.Close()
807807

808-
client := NewClient(server.URL, "test-key")
808+
client := NewClient(server.URL, "test-key", false)
809809
resp, err := client.GetFirewallConfig()
810810
if err != nil {
811811
t.Fatalf("unexpected error: %v", err)
@@ -841,7 +841,7 @@ func TestUpdateFirewallConfig(t *testing.T) {
841841
}))
842842
defer server.Close()
843843

844-
client := NewClient(server.URL, "test-key")
844+
client := NewClient(server.URL, "test-key", false)
845845
resp, err := client.UpdateFirewallConfig(&FirewallConfigUpdateRequest{
846846
Content: "#!/usr/sbin/nft -f\ntable inet filter {\n}",
847847
ExpectedSHA: "firewall123",
@@ -883,7 +883,7 @@ func TestGetFirewallConfigBackups(t *testing.T) {
883883
}))
884884
defer server.Close()
885885

886-
client := NewClient(server.URL, "test-key")
886+
client := NewClient(server.URL, "test-key", false)
887887
resp, err := client.GetFirewallConfigBackups()
888888
if err != nil {
889889
t.Fatalf("unexpected error: %v", err)
@@ -910,7 +910,7 @@ func TestRestoreFirewallConfig(t *testing.T) {
910910
}))
911911
defer server.Close()
912912

913-
client := NewClient(server.URL, "test-key")
913+
client := NewClient(server.URL, "test-key", false)
914914
resp, err := client.RestoreFirewallConfig(&FirewallRestoreRequest{
915915
BackupID: "nftables_20240115_103000.conf",
916916
DryRun: false,
@@ -964,7 +964,7 @@ func TestListUpdateLogs(t *testing.T) {
964964
}))
965965
defer server.Close()
966966

967-
client := NewClient(server.URL, "test-key")
967+
client := NewClient(server.URL, "test-key", false)
968968
resp, err := client.ListUpdateLogs(10)
969969
if err != nil {
970970
t.Fatalf("unexpected error: %v", err)
@@ -997,7 +997,7 @@ func TestListUpdateLogs_Empty(t *testing.T) {
997997
}))
998998
defer server.Close()
999999

1000-
client := NewClient(server.URL, "test-key")
1000+
client := NewClient(server.URL, "test-key", false)
10011001
resp, err := client.ListUpdateLogs(0)
10021002
if err != nil {
10031003
t.Fatalf("unexpected error: %v", err)
@@ -1017,7 +1017,7 @@ func TestListUpdateLogs_ServerError(t *testing.T) {
10171017
}))
10181018
defer server.Close()
10191019

1020-
client := NewClient(server.URL, "test-key")
1020+
client := NewClient(server.URL, "test-key", false)
10211021
_, err := client.ListUpdateLogs(10)
10221022
if err == nil {
10231023
t.Fatal("expected error for server error response")
@@ -1055,7 +1055,7 @@ func TestGetUpdateLog(t *testing.T) {
10551055
}))
10561056
defer server.Close()
10571057

1058-
client := NewClient(server.URL, "test-key")
1058+
client := NewClient(server.URL, "test-key", false)
10591059
log, err := client.GetUpdateLog("test-log-id")
10601060
if err != nil {
10611061
t.Fatalf("unexpected error: %v", err)
@@ -1078,7 +1078,7 @@ func TestGetUpdateLog_NotFound(t *testing.T) {
10781078
}))
10791079
defer server.Close()
10801080

1081-
client := NewClient(server.URL, "test-key")
1081+
client := NewClient(server.URL, "test-key", false)
10821082
_, err := client.GetUpdateLog("nonexistent")
10831083
if err == nil {
10841084
t.Fatal("expected error for not found response")
@@ -1101,7 +1101,7 @@ func TestGetUpdateLog_FailedOperation(t *testing.T) {
11011101
}))
11021102
defer server.Close()
11031103

1104-
client := NewClient(server.URL, "test-key")
1104+
client := NewClient(server.URL, "test-key", false)
11051105
log, err := client.GetUpdateLog("failed-log")
11061106
if err != nil {
11071107
t.Fatalf("unexpected error: %v", err)
@@ -1249,7 +1249,7 @@ func TestHTTPErrorPlainText_doRequest(t *testing.T) {
12491249
}))
12501250
defer server.Close()
12511251

1252-
client := NewClient(server.URL, "test-key")
1252+
client := NewClient(server.URL, "test-key", false)
12531253
_, err := client.GetInfo()
12541254
if err == nil {
12551255
t.Fatal("expected error")
@@ -1280,7 +1280,7 @@ func TestHTTPErrorPlainText_doRequestLongRunning(t *testing.T) {
12801280
}))
12811281
defer server.Close()
12821282

1283-
client := NewClient(server.URL, "test-key")
1283+
client := NewClient(server.URL, "test-key", false)
12841284
// TriggerUpdateCheck uses doRequestLongRunning
12851285
_, err := client.TriggerUpdateCheck()
12861286
if err == nil {

‎gearbox/internal/framework/agent/functional_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ func functionalClient(t *testing.T) *Client {
3030
t.Skip("Skipping functional test: GEARBOX_FUNCTIONAL_TEST_URL and GEARBOX_FUNCTIONAL_TEST_API_KEY must be set")
3131
}
3232

33-
return NewClient(baseURL, apiKey)
33+
return NewClient(baseURL, apiKey, false)
3434
}
3535

3636
// ---------- Update Status & List ----------
@@ -753,7 +753,7 @@ func TestFunctional_BadAPIKey(t *testing.T) {
753753
t.Skip("Skipping: GEARBOX_FUNCTIONAL_TEST_URL not set")
754754
}
755755

756-
c := NewClient(baseURL, "invalid-api-key-for-testing")
756+
c := NewClient(baseURL, "invalid-api-key-for-testing", false)
757757

758758
_, err := c.GetUpdateStatus()
759759
if err == nil {
@@ -774,7 +774,7 @@ func TestFunctional_NoAPIKey(t *testing.T) {
774774
t.Skip("Skipping: GEARBOX_FUNCTIONAL_TEST_URL not set")
775775
}
776776

777-
c := NewClient(baseURL, "")
777+
c := NewClient(baseURL, "", false)
778778

779779
_, err := c.GetUpdateStatus()
780780
if err == nil {

0 commit comments

Comments
 (0)