Update tools (#86)

This updates the buf yamls to v2, tools version, regenerates and fixes
lint issue.

---------

Signed-off-by: Edward McFarlane <[email protected]>

Author: emcfarlane

LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2022 The Connect Authors
+   Copyright 2022-2025 The Connect Authors
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

Makefile

@@ -9,7 +9,7 @@ MAKEFLAGS += --no-print-directory
 BIN=$(abspath .tmp/bin)
 export PATH := $(BIN):$(PATH)
 export GOBIN := $(abspath $(BIN))
-COPYRIGHT_YEARS := 2022-2024
+COPYRIGHT_YEARS := 2022-2025
 LICENSE_IGNORE := --ignore /testdata/ --ignore internal/proto/connectext/
 
 .PHONY: help
@@ -71,15 +71,15 @@ checkgenerate:
 
 $(BIN)/buf: Makefile
 	@mkdir -p $(@D)
-	go install github.com/bufbuild/buf/cmd/buf@v1.29.0
+	go install github.com/bufbuild/buf/cmd/buf@v1.50.0
 
 $(BIN)/license-header: Makefile
 	@mkdir -p $(@D)
-	go install github.com/bufbuild/buf/private/pkg/licenseheader/cmd/license-header@v1.29.0
+	go install github.com/bufbuild/buf/private/pkg/licenseheader/cmd/license-header@v1.50.0
 
 $(BIN)/golangci-lint: Makefile
 	@mkdir -p $(@D)
-	go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.60.0
+	go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.64.5
 
 $(BIN)/protoc-gen-go: Makefile
 	@mkdir -p $(@D)

buf.gen.yaml

@@ -1,9 +1,10 @@
-version: v1
+version: v2
 managed:
   enabled: true
-  go_package_prefix:
-    default: connectrpc.com/grpcreflect/internal/gen/go
+  override:
+    - file_option: go_package_prefix
+      value: connectrpc.com/grpcreflect/internal/gen/go
 plugins:
-  - plugin: go
+  - local: protoc-gen-go
     out: internal/gen/go
     opt: paths=source_relative

buf.work.yaml

@@ -0,0 +1,20 @@
+version: v2
+modules:
+  - path: internal/proto
+lint:
+  use:
+    - STANDARD
+  except:
+    - FIELD_NOT_REQUIRED
+    - PACKAGE_NO_IMPORT_CYCLE
+  ignore:
+    - internal/proto/connectext/grpc/health/v1/health.proto
+    - internal/proto/connectext/grpc/reflection/v1/reflection.proto
+    - internal/proto/connectext/grpc/status/v1/status.proto
+  disallow_comment_ignores: true
+breaking:
+  use:
+    - WIRE_JSON
+  except:
+    - FIELD_SAME_DEFAULT
+

buf.yaml

@@ -1,4 +1,4 @@
-// Copyright 2022-2024 The Connect Authors
+// Copyright 2022-2025 The Connect Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -366,7 +366,11 @@ func (cs *ClientStream) send(req *reflectionv1.ServerReflectionRequest) (*reflec
 			return nil, &streamError{err: err}
 		}
 		if errResp := resp.GetErrorResponse(); errResp != nil {
-			return nil, connect.NewWireError(connect.Code(errResp.ErrorCode), errors.New(errResp.ErrorMessage))
+			code := connect.CodeInternal
+			if errResp.ErrorCode > 0 {
+				code = connect.Code(errResp.ErrorCode)
+			}
+			return nil, connect.NewWireError(code, errors.New(errResp.ErrorMessage))
 		}
 		return resp, nil
 	}
@@ -439,7 +443,10 @@ func respType(msg *reflectionv1.ServerReflectionResponse) string {
 	case *reflectionv1.ServerReflectionResponse_ListServicesResponse:
 		return "list_services_response"
 	case *reflectionv1.ServerReflectionResponse_ErrorResponse:
-		return fmt.Sprintf("error_response: %v", connect.Code(resp.ErrorResponse.ErrorCode))
+		if errorCode := resp.ErrorResponse.ErrorCode; errorCode > 0 {
+			return fmt.Sprintf("error_response: %v", connect.Code(errorCode))
+		}
+		return fmt.Sprintf("error_response: %d", resp.ErrorResponse.ErrorCode)
 	case nil:
 		return "empty?"
 	default:

client.go

@@ -1,4 +1,4 @@
-// Copyright 2022-2024 The Connect Authors
+// Copyright 2022-2025 The Connect Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

client_example_test.go

@@ -1,4 +1,4 @@
-// Copyright 2022-2024 The Connect Authors
+// Copyright 2022-2025 The Connect Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

client_test.go

@@ -3,7 +3,7 @@ module connectrpc.com/grpcreflect
 go 1.21
 
 require (
-	connectrpc.com/connect v1.11.0
-	github.com/google/go-cmp v0.5.9
-	google.golang.org/protobuf v1.33.0
+	connectrpc.com/connect v1.18.1
+	github.com/google/go-cmp v0.7.0
+	google.golang.org/protobuf v1.36.5
 )

go.mod

@@ -1,6 +1,12 @@
 connectrpc.com/connect v1.11.0 h1:Av2KQXxSaX4vjqhf5Cl01SX4dqYADQ38eBtr84JSUBk=
 connectrpc.com/connect v1.11.0/go.mod h1:3AGaO6RRGMx5IKFfqbe3hvK1NqLosFNP2BxDYTPmNPo=
+connectrpc.com/connect v1.18.1 h1:PAg7CjSAGvscaf6YZKUefjoih5Z/qYkyaTrBW8xvYPw=
+connectrpc.com/connect v1.18.1/go.mod h1:0292hj1rnx8oFrStN7cB4jjVBeqs+Yx5yDIC2prWDO8=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
+github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
 google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
 google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
+google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM=
+google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=