Merge pull request #213 from kzys/golangci-upgrade

build(deps): bump golangci-lint from 1.60.3 to 2.7.2

Author: kzys

.github/workflows/ci.yml

@@ -35,9 +35,9 @@ jobs:
           go-version: ${{ env.GO_VERSION }}
 
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@971e284b6050e8a5849b72094c50ab08da042db8 # v6.1.1
+        uses: golangci/golangci-lint-action@1e7e51e771db61008b38414a730f564565cf7c20 # v9.2.0
         with:
-          version: v1.60.3
+          version: v2.7.2
           args: --timeout=5m
           skip-cache: true
           working-directory: src/github.com/containerd/ttrpc

.golangci.yml

@@ -1,52 +1,56 @@
+version: "2"
 linters:
   enable:
-    - staticcheck
-    - unconvert
-    - gofmt
-    - goimports
-    - revive
-    - ineffassign
-    - govet
-    - unused
     - misspell
+    - revive
+    - unconvert
   disable:
     - errcheck
-
-linters-settings:
-  revive:
-    ignore-generated-header: true
-    rules:
-      - name: blank-imports
-      - name: context-as-argument
-      - name: context-keys-type
-      - name: dot-imports
-      - name: error-return
-      - name: error-strings
-      - name: error-naming
-      - name: exported
-      - name: if-return
-      - name: increment-decrement
-      - name: var-naming
-        arguments: [["UID", "GID"], []]
-      - name: var-declaration
-      - name: package-comments
-      - name: range
-      - name: receiver-naming
-      - name: time-naming
-      - name: unexported-return
-      - name: indent-error-flow
-      - name: errorf
-      - name: empty-block
-      - name: superfluous-else
-      - name: unused-parameter
-      - name: unreachable-code
-      - name: redefines-builtin-id
-
-issues:
-  include:
-    - EXC0002
-  exclude-dirs:
-    - example
-
-run:
-  timeout: 8m
+  settings:
+    revive:
+      rules:
+        - name: blank-imports
+        - name: context-as-argument
+        - name: context-keys-type
+        - name: dot-imports
+        - name: error-return
+        - name: error-strings
+        - name: error-naming
+        - name: exported
+        - name: if-return
+        - name: increment-decrement
+        - name: var-naming
+          arguments:
+            - - UID
+              - GID
+            - []
+        - name: var-declaration
+        - name: package-comments
+        - name: range
+        - name: receiver-naming
+        - name: time-naming
+        - name: unexported-return
+        - name: indent-error-flow
+        - name: errorf
+        - name: empty-block
+        - name: superfluous-else
+        - name: unused-parameter
+        - name: unreachable-code
+        - name: redefines-builtin-id
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    paths:
+      - example
+formatters:
+  enable:
+    - gofmt
+    - goimports
+  exclusions:
+    generated: lax
+    paths:
+      - example

client.go

@@ -268,7 +268,8 @@ func (cs *clientStream) RecvMsg(m interface{}) error {
 	case msg = <-cs.s.recv:
 	}
 
-	if msg.header.Type == messageTypeResponse {
+	switch msg.header.Type {
+	case messageTypeResponse:
 		resp := &Response{}
 		err := proto.Unmarshal(msg.payload[:msg.header.Length], resp)
 		// return the payload buffer for reuse
@@ -289,7 +290,7 @@ func (cs *clientStream) RecvMsg(m interface{}) error {
 		cs.remoteClosed = true
 
 		return nil
-	} else if msg.header.Type == messageTypeData {
+	case messageTypeData:
 		if !cs.desc.StreamingServer {
 			cs.c.deleteStream(cs.s)
 			cs.remoteClosed = true
@@ -310,9 +311,9 @@ func (cs *clientStream) RecvMsg(m interface{}) error {
 			return err
 		}
 		return nil
+	default:
+		return fmt.Errorf("unexpected %q message received: %w", msg.header.Type, ErrProtocol)
 	}
-
-	return fmt.Errorf("unexpected %q message received: %w", msg.header.Type, ErrProtocol)
 }
 
 // Close closes the ttrpc connection and underlying connection

plugin/generator.go

@@ -138,10 +138,10 @@ func (p *ttrpcGenerator) genService(fullName string, service *descriptor.Service
 }
 
 func (p *ttrpcGenerator) objectNamed(name string) generator.Object {
-	p.Generator.RecordTypeUse(name)
-	return p.Generator.ObjectNamed(name)
+	p.RecordTypeUse(name)
+	return p.ObjectNamed(name)
 }
 
 func (p *ttrpcGenerator) typeName(str string) string {
-	return p.Generator.TypeName(p.objectNamed(str))
+	return p.TypeName(p.objectNamed(str))
 }

server.go

@@ -113,9 +113,7 @@ func (s *Server) Serve(ctx context.Context, l net.Listener) error {
 					backoff *= 2
 				}
 
-				if max := time.Second; backoff > max {
-					backoff = max
-				}
+				backoff = min(time.Second, backoff)
 
 				sleep := time.Duration(rand.Int63n(int64(backoff)))
 				log.G(ctx).WithError(err).Errorf("ttrpc: failed accept; backoff %v", sleep)