Update golangci-lint to v1.63.4 (#733)

* use golangci-lint v1.63.4

* golangci-lint auto fixes for json comparison

* ensure workCtx is always cancelled (lint fix)

.github/workflows/ci.yaml

@@ -218,7 +218,7 @@ jobs:
     name: lint
     runs-on: ubuntu-latest
     env:
-      GOLANGCI_LINT_VERSION: v1.61.0
+      GOLANGCI_LINT_VERSION: v1.63.4
     permissions:
       contents: read
       # allow read access to pull request. Use with `only-new-issues` option.

client.go

@@ -752,6 +752,7 @@ func (c *Client[TTx]) Start(ctx context.Context) error {
 		workCtx, workCancel := context.WithCancelCause(withClient[TTx](ctx, c))
 
 		if err := startstop.StartAll(fetchCtx, c.services...); err != nil {
+			workCancel(err)
 			stopServicesOnError()
 			return err
 		}
@@ -761,6 +762,7 @@ func (c *Client[TTx]) Start(ctx context.Context) error {
 
 			if err := producer.StartWorkContext(fetchCtx, workCtx); err != nil {
 				startstop.StopAllParallel(producersAsServices()...)
+				workCancel(err)
 				stopServicesOnError()
 				return err
 			}
@@ -814,6 +816,8 @@ func (c *Client[TTx]) Start(ctx context.Context) error {
 		startstop.StopAllParallel(producersAsServices()...)
 		c.baseService.Logger.DebugContext(ctx, c.baseService.Name+": All producers stopped")
 
+		c.workCancel(rivercommon.ErrShutdown)
+
 		// Stop all mainline services where stop order isn't important.
 		startstop.StopAllParallel(append(
 			// This list of services contains the completer, which should always

client_test.go

@@ -5515,7 +5515,7 @@ func TestInsertParamsFromJobArgsAndOptions(t *testing.T) {
 
 		insertParams, err := insertParamsFromConfigArgsAndOptions(archetype, config, noOpArgs{}, nil)
 		require.NoError(t, err)
-		require.Equal(t, `{"name":""}`, string(insertParams.EncodedArgs))
+		require.JSONEq(t, `{"name":""}`, string(insertParams.EncodedArgs))
 		require.Equal(t, (noOpArgs{}).Kind(), insertParams.Kind)
 		require.Equal(t, config.MaxAttempts, insertParams.MaxAttempts)
 		require.Equal(t, rivercommon.PriorityDefault, insertParams.Priority)

internal/maintenance/periodic_job_enqueuer_test.go

@@ -114,7 +114,7 @@ func TestPeriodicJobEnqueuer(t *testing.T) {
 
 		jobs, err := exec.JobGetByKindMany(ctx, []string{kind})
 		require.NoError(t, err)
-		require.Len(t, jobs, n, fmt.Sprintf("Expected to find exactly %d job(s) of kind: %s, but found %d", n, kind, len(jobs)))
+		require.Len(t, jobs, n, "Expected to find exactly %d job(s) of kind: %s, but found %d", n, kind, len(jobs))
 
 		return jobs
 	}

internal/riverinternaltest/riverdrivertest/riverdrivertest.go

@@ -905,12 +905,12 @@ func Exercise[TTx any](ctx context.Context, t *testing.T,
 				require.Nil(t, job.AttemptedAt)
 				require.Empty(t, job.AttemptedBy)
 				require.WithinDuration(t, now, job.CreatedAt, 2*time.Second)
-				require.Equal(t, []byte(`{"encoded": "args"}`), job.EncodedArgs)
+				require.JSONEq(t, `{"encoded": "args"}`, string(job.EncodedArgs))
 				require.Empty(t, job.Errors)
 				require.Nil(t, job.FinalizedAt)
 				require.Equal(t, "test_kind", job.Kind)
 				require.Equal(t, rivercommon.MaxAttemptsDefault, job.MaxAttempts)
-				require.Equal(t, []byte(`{"meta": "data"}`), job.Metadata)
+				require.JSONEq(t, `{"meta": "data"}`, string(job.Metadata))
 				require.Equal(t, rivercommon.PriorityDefault, job.Priority)
 				require.Equal(t, rivercommon.QueueDefault, job.Queue)
 				requireEqualTime(t, now.Add(time.Duration(i)*time.Minute), job.ScheduledAt)
@@ -989,12 +989,12 @@ func Exercise[TTx any](ctx context.Context, t *testing.T,
 				require.Equal(t, 0, job.Attempt)
 				require.Nil(t, job.AttemptedAt)
 				require.WithinDuration(t, time.Now().UTC(), job.CreatedAt, 2*time.Second)
-				require.Equal(t, []byte(`{"encoded": "args"}`), job.EncodedArgs)
+				require.JSONEq(t, `{"encoded": "args"}`, string(job.EncodedArgs))
 				require.Empty(t, job.Errors)
 				require.Nil(t, job.FinalizedAt)
 				require.Equal(t, "test_kind", job.Kind)
 				require.Equal(t, rivercommon.MaxAttemptsDefault, job.MaxAttempts)
-				require.Equal(t, []byte(`{"meta": "data"}`), job.Metadata)
+				require.JSONEq(t, `{"meta": "data"}`, string(job.Metadata))
 				require.Equal(t, rivercommon.PriorityDefault, job.Priority)
 				require.Equal(t, rivercommon.QueueDefault, job.Queue)
 				requireEqualTime(t, now, job.ScheduledAt)
@@ -1054,7 +1054,7 @@ func Exercise[TTx any](ctx context.Context, t *testing.T,
 			require.Equal(t, 0, job.Attempt)
 			require.Nil(t, job.AttemptedAt)
 			require.WithinDuration(t, time.Now().UTC(), job.CreatedAt, 2*time.Second)
-			require.Equal(t, []byte(`{"encoded": "args"}`), job.EncodedArgs)
+			require.JSONEq(t, `{"encoded": "args"}`, string(job.EncodedArgs))
 			require.Empty(t, job.Errors)
 			require.Nil(t, job.FinalizedAt)
 			require.Equal(t, "test_kind", job.Kind)
@@ -1091,12 +1091,12 @@ func Exercise[TTx any](ctx context.Context, t *testing.T,
 			require.Equal(t, 3, job.Attempt)
 			requireEqualTime(t, now, *job.AttemptedAt)
 			requireEqualTime(t, now, job.CreatedAt)
-			require.Equal(t, []byte(`{"encoded": "args"}`), job.EncodedArgs)
+			require.JSONEq(t, `{"encoded": "args"}`, string(job.EncodedArgs))
 			require.Equal(t, "message", job.Errors[0].Error)
 			requireEqualTime(t, now, *job.FinalizedAt)
 			require.Equal(t, "test_kind", job.Kind)
 			require.Equal(t, 6, job.MaxAttempts)
-			require.Equal(t, []byte(`{"meta": "data"}`), job.Metadata)
+			require.JSONEq(t, `{"meta": "data"}`, string(job.Metadata))
 			require.Equal(t, 2, job.Priority)
 			require.Equal(t, "queue_name", job.Queue)
 			requireEqualTime(t, now, job.ScheduledAt)