Skip to content

Commit 6c086f0

Browse files
committed
chore(deps): upgrade dependencies and modernize code
- Upgraded all dependencies to latest versions - Replaced interface{} with any alias for cleaner code - All tests passing with race detection - golangci-lint v2.9.0 compliance verified
1 parent ce581fb commit 6c086f0

10 files changed

Lines changed: 36 additions & 36 deletions

File tree

examples/simple/cmd/client/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ func main() {
1818
}
1919

2020
jobType := "example_job"
21-
payload := map[string]interface{}{
21+
payload := map[string]any{
2222
"input": "Hello, Queue!",
2323
}
2424
_, err = client.Enqueue(jobType, payload, queue.WithQueue("critical"), queue.WithRetention(time.Hour))

info.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ type ActiveJobInfo struct {
4444
JobPayload string `json:"job_payload"`
4545
Queue string `json:"queue"`
4646
StartedAt time.Time `json:"started_at"`
47-
DeadlineAt time.Time `json:"deadline_at,omitempty"`
47+
DeadlineAt time.Time `json:"deadline_at"`
4848
}
4949

5050
// Convert Asynq WorkerInfo to ActiveJobInfo.

manager.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -586,8 +586,8 @@ func (s *Manager) fetchQueueLocations() ([]*QueueLocation, error) {
586586
// parseRedisInfo parses the INFO command's output into a key-value map.
587587
func parseRedisInfo(infoStr string) map[string]string {
588588
info := make(map[string]string)
589-
lines := strings.Split(infoStr, "\r\n")
590-
for _, line := range lines {
589+
lines := strings.SplitSeq(infoStr, "\r\n")
590+
for line := range lines {
591591
if key, value, ok := strings.Cut(line, ":"); ok {
592592
info[key] = value
593593
}

tests/benchmarks_test.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ import (
88
)
99

1010
func BenchmarkJobCreation(b *testing.B) {
11-
payload := map[string]interface{}{"key": "value", "count": 123}
11+
payload := map[string]any{"key": "value", "count": 123}
1212

1313
for b.Loop() {
1414
_ = queue.NewJob("test_job", payload)
1515
}
1616
}
1717

1818
func BenchmarkJobCreationWithOptions(b *testing.B) {
19-
payload := map[string]interface{}{"key": "value", "count": 123}
19+
payload := map[string]any{"key": "value", "count": 123}
2020

2121
for b.Loop() {
2222
_ = queue.NewJob("test_job", payload,
@@ -27,7 +27,7 @@ func BenchmarkJobCreationWithOptions(b *testing.B) {
2727
}
2828

2929
func BenchmarkJobConvertToAsynqTask(b *testing.B) {
30-
payload := map[string]interface{}{"key": "value", "count": 123}
30+
payload := map[string]any{"key": "value", "count": 123}
3131
job := queue.NewJob("test_job", payload, queue.WithQueue("default"))
3232

3333
for b.Loop() {
@@ -53,7 +53,7 @@ func BenchmarkHandlerProcess(b *testing.B) {
5353
return nil
5454
})
5555

56-
job := queue.NewJob("test_job", map[string]interface{}{"key": "value"})
56+
job := queue.NewJob("test_job", map[string]any{"key": "value"})
5757
ctx := context.Background()
5858

5959
for b.Loop() {
@@ -70,7 +70,7 @@ func BenchmarkJobDecodePayload(b *testing.B) {
7070
Count int `json:"count"`
7171
}
7272

73-
payload := map[string]interface{}{"key": "value", "count": 123}
73+
payload := map[string]any{"key": "value", "count": 123}
7474
job := queue.NewJob("test_job", payload)
7575

7676
for b.Loop() {
@@ -90,7 +90,7 @@ func BenchmarkClientEnqueue(b *testing.B) {
9090
}
9191
defer func() { _ = client.Stop() }()
9292

93-
payload := map[string]interface{}{"key": "value"}
93+
payload := map[string]any{"key": "value"}
9494

9595
for b.Loop() {
9696
_, err := client.Enqueue("benchmark_job", payload)
@@ -109,7 +109,7 @@ func BenchmarkClientEnqueueJob(b *testing.B) {
109109
defer func() { _ = client.Stop() }()
110110

111111
for b.Loop() {
112-
job := queue.NewJob("benchmark_job", map[string]interface{}{"key": "value"})
112+
job := queue.NewJob("benchmark_job", map[string]any{"key": "value"})
113113
_, err := client.EnqueueJob(job)
114114
if err != nil {
115115
b.Fatal(err)

tests/client_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ func TestClientEnqueue(t *testing.T) {
2020
}()
2121

2222
jobType := "testEnqueueJob"
23-
payload := map[string]interface{}{"key": "value"}
23+
payload := map[string]any{"key": "value"}
2424

2525
_, err = client.Enqueue(jobType, payload)
2626
require.NoError(t, err, "Enqueue failed")
@@ -36,7 +36,7 @@ func TestClientEnqueueJob(t *testing.T) {
3636
}()
3737

3838
jobType := "testEnqueueJobJob"
39-
payload := map[string]interface{}{"key": "value"}
39+
payload := map[string]any{"key": "value"}
4040
job := queue.NewJob(jobType, payload)
4141

4242
_, err = client.EnqueueJob(job)
@@ -67,7 +67,7 @@ func TestClientWithClientErrorHandler(t *testing.T) {
6767

6868
// Create a job with an invalid configuration that is known to cause ConvertToAsynqTask to return an error
6969
jobType := "" // Intentionally left blank to trigger an error in ConvertToAsynqTask
70-
payload := map[string]interface{}{"key": "value"}
70+
payload := map[string]any{"key": "value"}
7171

7272
// Attempt to enqueue the job, which should fail at the job conversion step
7373
_, err = client.Enqueue(jobType, payload)

tests/group_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ func TestGroupMiddleware(t *testing.T) {
6262
// Enqueue jobs to be processed by the handler within the email group.
6363
client, err := queue.NewClient(redisConfig)
6464
require.NoError(t, err, "Failed to create client")
65-
for i := 0; i < 5; i++ {
66-
_, err := client.Enqueue(jobType, map[string]interface{}{"key": "value"})
65+
for range 5 {
66+
_, err := client.Enqueue(jobType, map[string]any{"key": "value"})
6767
require.NoError(t, err, "Failed to enqueue job")
6868
}
6969

tests/job_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515

1616
func TestNewJob(t *testing.T) {
1717
jobType := "testJob"
18-
payload := map[string]interface{}{"key": "value"}
18+
payload := map[string]any{"key": "value"}
1919
job := queue.NewJob(jobType, payload)
2020

2121
assert.Equal(t, jobType, job.Type, "Job type should match")
@@ -24,15 +24,15 @@ func TestNewJob(t *testing.T) {
2424

2525
func TestJob_ConvertToAsynqTask(t *testing.T) {
2626
jobType := "testConversion"
27-
payload := map[string]interface{}{"key": "value"}
27+
payload := map[string]any{"key": "value"}
2828
job := queue.NewJob(jobType, payload)
2929

3030
task, _, err := job.ConvertToAsynqTask()
3131
require.NoError(t, err, "ConvertToAsynqTask should not fail")
3232

3333
assert.Equal(t, jobType, task.Type(), "Task type should match job type")
3434

35-
var taskPayload map[string]interface{}
35+
var taskPayload map[string]any
3636
err = json.Unmarshal(task.Payload(), &taskPayload)
3737
require.NoError(t, err, "json.Unmarshal should not fail")
3838

@@ -150,7 +150,7 @@ func TestWriteResultAndRetrieve(t *testing.T) {
150150
var wg sync.WaitGroup
151151

152152
// Define expected result
153-
expectedResult := map[string]interface{}{
153+
expectedResult := map[string]any{
154154
"status": "completed",
155155
"detail": "Job processed successfully",
156156
}
@@ -202,7 +202,7 @@ func TestWriteResultAndRetrieve(t *testing.T) {
202202
require.NoError(t, err, "Failed to get job info")
203203

204204
// Deserialize the job result to verify it
205-
var result map[string]interface{}
205+
var result map[string]any
206206
err = json.Unmarshal([]byte(*jobInfo.Result), &result)
207207
require.NoError(t, err, "Failed to unmarshal job result")
208208

tests/middleware_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ func TestGlobalMiddleware(t *testing.T) {
5959
// Enqueue a couple of jobs
6060
client, err := queue.NewClient(redisConfig)
6161
require.NoError(t, err, "Failed to create client")
62-
for i := 0; i < 5; i++ {
63-
_, err := client.Enqueue(jobType, map[string]interface{}{"key": "value"})
62+
for range 5 {
63+
_, err := client.Enqueue(jobType, map[string]any{"key": "value"})
6464
require.NoError(t, err, "Failed to enqueue job")
6565
}
6666

@@ -122,8 +122,8 @@ func TestScopedMiddleware(t *testing.T) {
122122
// Enqueue jobs to be processed by the scoped middleware-enhanced handler.
123123
client, err := queue.NewClient(redisConfig)
124124
require.NoError(t, err, "Failed to create client")
125-
for i := 0; i < 3; i++ {
126-
_, err := client.Enqueue(jobType, map[string]interface{}{"key": "value"})
125+
for range 3 {
126+
_, err := client.Enqueue(jobType, map[string]any{"key": "value"})
127127
require.NoError(t, err, "Failed to enqueue job")
128128
}
129129

tests/scheduler_test.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,20 @@ type mockLogger struct {
2020

2121
type mockLogEntry struct {
2222
level string
23-
args []interface{}
23+
args []any
2424
}
2525

26-
func (l *mockLogger) log(level string, args ...interface{}) {
26+
func (l *mockLogger) log(level string, args ...any) {
2727
l.mu.Lock()
2828
defer l.mu.Unlock()
2929
l.messages = append(l.messages, mockLogEntry{level: level, args: args})
3030
}
3131

32-
func (l *mockLogger) Debug(args ...interface{}) { l.log("debug", args...) }
33-
func (l *mockLogger) Info(args ...interface{}) { l.log("info", args...) }
34-
func (l *mockLogger) Warn(args ...interface{}) { l.log("warn", args...) }
35-
func (l *mockLogger) Error(args ...interface{}) { l.log("error", args...) }
36-
func (l *mockLogger) Fatal(args ...interface{}) { l.log("fatal", args...) }
32+
func (l *mockLogger) Debug(args ...any) { l.log("debug", args...) }
33+
func (l *mockLogger) Info(args ...any) { l.log("info", args...) }
34+
func (l *mockLogger) Warn(args ...any) { l.log("warn", args...) }
35+
func (l *mockLogger) Error(args ...any) { l.log("error", args...) }
36+
func (l *mockLogger) Fatal(args ...any) { l.log("fatal", args...) }
3737

3838
func (l *mockLogger) hasLevel(level string) bool {
3939
l.mu.Lock()
@@ -99,7 +99,7 @@ func TestSchedulerPreEnqueueHook(t *testing.T) {
9999
require.NoError(t, err, "Failed to create scheduler with pre enqueue hook")
100100

101101
jobType := "pre_enqueue_test"
102-
payload := map[string]interface{}{"data": "pre"}
102+
payload := map[string]any{"data": "pre"}
103103

104104
_, err = scheduler.RegisterCron("@every 1s", jobType, payload)
105105
require.NoError(t, err, "Failed to register cron job")
@@ -131,7 +131,7 @@ func TestSchedulerPostEnqueueHook(t *testing.T) {
131131
require.NoError(t, err, "Failed to create scheduler with post enqueue hook")
132132

133133
jobType := "post_enqueue_test"
134-
payload := map[string]interface{}{"data": "post"}
134+
payload := map[string]any{"data": "post"}
135135

136136
_, err = scheduler.RegisterCron("@every 1s", jobType, payload)
137137
require.NoError(t, err, "Failed to register cron job")
@@ -159,7 +159,7 @@ func TestSchedulerPostEnqueueUsesConfiguredLogger(t *testing.T) {
159159
)
160160
require.NoError(t, err, "Failed to create scheduler with custom logger")
161161

162-
_, err = scheduler.RegisterCron("@every 1s", "logger_test", map[string]interface{}{"key": "value"})
162+
_, err = scheduler.RegisterCron("@every 1s", "logger_test", map[string]any{"key": "value"})
163163
require.NoError(t, err, "Failed to register cron job")
164164

165165
go func() {

tests/worker_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ func TestWorkerWithWorkerErrorHandler(t *testing.T) {
9292

9393
client, err := queue.NewClient(redisConfig)
9494
require.NoError(t, err, "Failed to create client")
95-
_, err = client.Enqueue(jobType, map[string]interface{}{"key": "value"})
95+
_, err = client.Enqueue(jobType, map[string]any{"key": "value"})
9696
require.NoError(t, err, "Failed to enqueue job")
9797

9898
time.Sleep(2 * time.Second) // Adjusted wait time for job processing

0 commit comments

Comments
 (0)