Fix lint

connectrpc · Feb 22, 2024 · 11df18e · 11df18e
1 parent c30ee59
commit 11df18e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -37,13 +37,16 @@ linters:
     - golint            # deprecated by Go team
     - gomnd             # some unnamed constants are okay
     - ifshort           # deprecated by author
+    - inamedparam       # convention is not followed
     - interfacer        # deprecated by author
     - ireturn           # "accept interfaces, return structs" isn't ironclad
     - lll               # don't want hard limits for line length
     - maintidx          # covered by gocyclo
     - maligned          # readability trumps efficient struct packing
     - nlreturn          # generous whitespace violates house style
+    - nonamedreturns    # named returns are fine; it's *bare* returns that are bad
     - nosnakecase       # deprecated in https://github.com/golangci/golangci-lint/pull/3065
+    - protogetter       # too many false positives
     - scopelint         # deprecated by author
     - structcheck       # abandoned
     - testpackage       # internal tests are fine

diff --git a/Makefile b/Makefile
@@ -78,7 +78,7 @@ $(BIN)/license-header: Makefile
 
 $(BIN)/golangci-lint: Makefile
 	@mkdir -p $(@D)
-	go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.54.1
+	go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.56.2
 
 $(BIN)/protoc-gen-connect-go: Makefile go.mod
 	@mkdir -p $(@D)

diff --git a/validate_test.go b/validate_test.go
@@ -61,7 +61,7 @@ func TestInterceptorUnary(t *testing.T) {
 		},
 		{
 			name: "underlying_error",
-			svc: func(_ context.Context, req *connect.Request[userv1.CreateUserRequest]) (*connect.Response[userv1.CreateUserResponse], error) {
+			svc: func(_ context.Context, _ *connect.Request[userv1.CreateUserRequest]) (*connect.Response[userv1.CreateUserResponse], error) {
 				return nil, connect.NewError(connect.CodeInternal, errors.New("oh no"))
 			},
 			req: &userv1.CreateUserRequest{
@@ -92,7 +92,7 @@ func TestInterceptorUnary(t *testing.T) {
 			if test.wantCode > 0 {
 				require.Error(t, err)
 				var connectErr *connect.Error
-				require.True(t, errors.As(err, &connectErr))
+				require.ErrorAs(t, err, &connectErr)
 				assert.Equal(t, test.wantCode, connectErr.Code())
 				if test.wantPath != "" {
 					details := connectErr.Details()
@@ -178,7 +178,7 @@ func TestInterceptorStreamingHandler(t *testing.T) {
 			if test.wantCode > 0 {
 				require.Error(t, err)
 				var connectErr *connect.Error
-				assert.True(t, errors.As(err, &connectErr))
+				require.ErrorAs(t, err, &connectErr)
 				assert.Equal(t, test.wantCode, connectErr.Code())
 				if test.wantPath != "" {
 					details := connectErr.Details()
@@ -264,7 +264,7 @@ func TestInterceptorStreamingClient(t *testing.T) {
 			if test.wantCode > 0 {
 				require.Error(t, err)
 				var connectErr *connect.Error
-				assert.True(t, errors.As(err, &connectErr))
+				require.ErrorAs(t, err, &connectErr)
 				t.Log(connectErr)
 				assert.Equal(t, test.wantCode, connectErr.Code())
 				if test.wantPath != "" {
@@ -281,7 +281,7 @@ func TestInterceptorStreamingClient(t *testing.T) {
 				require.NoError(t, err)
 				got, receiveErr := stream.Receive()
 				if test.wantReceiveCode > 0 {
-					require.Equal(t, connect.CodeOf(receiveErr), test.wantReceiveCode)
+					require.Equal(t, test.wantReceiveCode, connect.CodeOf(receiveErr))
 				} else {
 					require.NoError(t, receiveErr)
 					require.NotZero(t, got.Sum)