Update to buf v2 config and latest golangci-lint (#76)

Update grpchealth-go to use buf v2 config files, golangci-lint v2, and
update the Go version in go.mod to 1.23 (reflecting last two releases
support).

Author: pkwarren

.github/workflows/ci.yaml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go-version: [1.21.x, 1.22.x, 1.23.x]
+        go-version: [1.23.x, 1.24.x]
     steps:
       - name: Checkout Code
         uses: actions/checkout@v4
@@ -30,5 +30,5 @@ jobs:
       - name: Lint
         # Often, lint & gofmt guidelines depend on the Go version. To prevent
         # conflicting guidance, run only on the most recent supported version.
-        if: matrix.go-version == '1.23.x'
+        if: matrix.go-version == '1.24.x'
         run: make checkgenerate && make lint

.golangci.yml

@@ -1,52 +1,62 @@
-linters-settings:
-  errcheck:
-    check-type-assertions: true
-  exhaustruct:
-    include:
-      # No zero values for param structs.
-      - 'connectrpc\.com/grpchealth\..*[pP]arams'
-  forbidigo:
-    forbid:
-      - '^fmt\.Print'
-      - '^log\.'
-      - '^print$'
-      - '^println$'
-      - '^panic$'
-  godox:
-    # TODO, OPT, etc. comments are fine to commit. Use FIXME comments for
-    # temporary hacks, and use godox to prevent committing them.
-    keywords: [FIXME]
-  varnamelen:
-    ignore-decls:
-      - T any
-      - i int
-      - 't *testing.T'
-      - tb testing.TB
-      - wg sync.WaitGroup
+version: "2"
 linters:
-  enable-all: true
+  default: all
   disable:
     - cyclop            # covered by gocyclo
     - depguard          # unnecessary for small libraries
-    - execinquery       # deprecated in golangci 1.58.0
     - funlen            # rely on code review to limit function length
     - gocognit          # dubious "cognitive overhead" quantification
-    - gofumpt           # prefer standard gofmt
-    - goimports         # rely on gci instead
-    - gomnd             # some unnamed constants are okay
     - inamedparam       # convention is not followed
     - ireturn           # "accept interfaces, return structs" isn't ironclad
     - lll               # don't want hard limits for line length
     - maintidx          # covered by gocyclo
+    - mnd               # some unnamed constants are okay
     - nlreturn          # generous whitespace violates house style
     - nonamedreturns    # named returns are fine; it's *bare* returns that are bad
-    - protogetter       # too many false positives
     - testpackage       # internal tests are fine
     - wrapcheck         # don't _always_ need to wrap errors
     - wsl               # generous whitespace violates house style
-issues:
-  exclude-dirs-use-default: false
-  exclude:
-    # Don't ban use of fmt.Errorf to create new errors, but the remaining
-    # checks from err113 are useful.
-    - "do not define dynamic errors.*"
+  settings:
+    errcheck:
+      check-type-assertions: true
+    exhaustruct:
+      include:
+        # No zero values for param structs.
+        - connectrpc\.com/grpchealth\..*[pP]arams
+    forbidigo:
+      forbid:
+        - pattern: ^fmt\.Print
+        - pattern: ^log\.
+        - pattern: ^print$
+        - pattern: ^println$
+        - pattern: ^panic$
+    godox:
+      # TODO, OPT, etc. comments are fine to commit. Use FIXME comments for
+      # temporary hacks, and use godox to prevent committing them.
+      keywords:
+        - FIXME
+    varnamelen:
+      ignore-decls:
+        - T any
+        - i int
+        - t *testing.T
+        - tb testing.TB
+        - wg sync.WaitGroup
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    rules:
+      - linters:
+          - err113
+        path: (.+)\.go$
+        text: do not define dynamic errors.*
+formatters:
+  enable:
+    - gci
+    - gofmt
+  exclusions:
+    generated: lax

Makefile

@@ -39,11 +39,13 @@ lint: $(BIN)/golangci-lint $(BIN)/buf ## Lint Go and protobuf
 	test -z "$$($(BIN)/buf format -d . | tee /dev/stderr)"
 	go vet ./...
 	golangci-lint run
+	golangci-lint fmt --diff
 	buf lint
 
 .PHONY: lintfix
 lintfix: $(BIN)/golangci-lint $(BIN)/buf ## Automatically fix some lint errors
 	golangci-lint run --fix
+	golangci-lint fmt
 	buf format -w .
 
 .PHONY: generate
@@ -66,15 +68,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.51.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.51.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/v2/cmd/golangci-lint@v2.0.2
 
 $(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/grpchealth/internal/gen/go
+  override:
+    - file_option: go_package_prefix
+      value: connectrpc.com/grpchealth/internal/gen/go
 plugins:
-  - plugin: go
+  - local: protoc-gen-go
     out: internal/gen/go
     opt: paths=source_relative

buf.work.yaml

@@ -0,0 +1,13 @@
+version: v2
+modules:
+  - path: internal/proto
+lint:
+  use:
+    - STANDARD
+  ignore:
+    - internal/proto/connectext/grpc/health/v1/health.proto
+    - internal/proto/connectext/grpc/reflection/v1alpha/reflection.proto
+    - internal/proto/connectext/grpc/status/v1/status.proto
+breaking:
+  use:
+    - WIRE_JSON

buf.yaml

@@ -1,6 +1,6 @@
 module connectrpc.com/grpchealth
 
-go 1.21
+go 1.23
 
 retract v1.1.1 // module cache poisoned, use v1.1.2
 

go.mod

@@ -1,5 +1,6 @@
 connectrpc.com/connect v1.11.0 h1:Av2KQXxSaX4vjqhf5Cl01SX4dqYADQ38eBtr84JSUBk=
 connectrpc.com/connect v1.11.0/go.mod h1:3AGaO6RRGMx5IKFfqbe3hvK1NqLosFNP2BxDYTPmNPo=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
+github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
 google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=

go.sum

@@ -91,7 +91,7 @@ func NewHandler(checker Checker, options ...connect.HandlerOption) (string, http
 		) (*connect.Response[healthv1.HealthCheckResponse], error) {
 			var checkRequest CheckRequest
 			if req.Msg != nil {
-				checkRequest.Service = req.Msg.Service
+				checkRequest.Service = req.Msg.GetService()
 			}
 			checkResponse, err := checker.Check(ctx, &checkRequest)
 			if err != nil {

grpchealth.go

@@ -85,8 +85,8 @@ func TestHealth(t *testing.T) {
 		if err != nil {
 			t.Fatal(err.Error())
 		}
-		if Status(res.Msg.Status) != expect {
-			t.Fatalf("got status %v, expected %v", res.Msg.Status, expect)
+		if Status(res.Msg.GetStatus()) != expect { //nolint:gosec // Conversion is safe here
+			t.Fatalf("got status %v, expected %v", res.Msg.GetStatus(), expect)
 		}
 	}
 	assertUnknown := func(