build(deps): bump golangci/golangci-lint-action from 6 to 7 (#43)

dependabot[bot] · flc1125 · web-flow · commit c38bd1fe8c2a · 2025-03-25T21:41:32.000+08:00
* build(deps): bump golangci/golangci-lint-action from 6 to 7 Bumps [golangci/golangci-lint-action](https://github.com/golangci/golangci-lint-action) from 6 to 7. - [Release notes](https://github.com/golangci/golangci-lint-action/releases) - [Commits](golangci/golangci-lint-action@v6...v7) --- updated-dependencies: - dependency-name: golangci/golangci-lint-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * chore: update golangci-lint configuration and Makefile for v2 Signed-off-by: Flc <four_leaf_clover@foxmail.com> * refactor: replace 'interface{}' with 'any' for improved type clarity Signed-off-by: Flc <four_leaf_clover@foxmail.com> --------- Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: Flc <four_leaf_clover@foxmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Flc <four_leaf_clover@foxmail.com>
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -22,4 +22,4 @@ jobs:
         with:
           go-version: stable
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v6
+        uses: golangci/golangci-lint-action@v7
diff --git a/.golangci.yml b/.golangci.yml
@@ -1,5 +1,7 @@
+version: "2"
+
 linters:
-  disable-all: true
+  default: none
 
   enable:
     - bodyclose
@@ -8,21 +10,32 @@ linters:
     - errcheck
     - copyloopvar
     - govet
-    - gosimple
-    - gofmt
-    - gofumpt
     - goconst
-    - goimports
     - mnd
     - gocyclo
     - ineffassign
     - lll
     - prealloc
     - revive
     - staticcheck
-    - typecheck
     - unused
     - whitespace
     - wastedassign
     - unconvert
-    - misspell
+    - misspell
+  settings:
+    revive:
+      rules:
+        - name: package-comments
+          disabled: true
+
+formatters:
+  enable:
+    - gofmt
+    - gofumpt
+    - goimports
+  settings:
+    gofmt:
+      rewrite-rules:
+        - pattern: 'interface{}'
+          replacement: 'any'
diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 .PHONY: init
 init:
 	go install mvdan.cc/gofumpt@latest
-	go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest
+	go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@latest
 
 .PHONY: lint
 lint:
diff --git a/message.go b/message.go
@@ -5,7 +5,7 @@ import (
 	"net/http"
 )
 
-type InterfaceMessageRequest interface{}
+type InterfaceMessageRequest any
 
 var (
 	_ InterfaceMessageRequest = MessageRequest{}
diff --git a/request.go b/request.go
@@ -32,7 +32,7 @@ const (
 
 type requestOptions struct {
 	params          url.Values
-	body            interface{}
+	body            any
 	needEncrypt     bool
 	needAccessToken bool
 	requestType     requestType
@@ -52,7 +52,7 @@ func newRequestOptions(opts ...requestOption) *requestOptions {
 	return args
 }
 
-func (r *requestOptions) bodyReader(body interface{}) (io.Reader, error) {
+func (r *requestOptions) bodyReader(body any) (io.Reader, error) {
 	if body == nil {
 		return nil, nil
 	}
@@ -71,7 +71,7 @@ func (r *requestOptions) bodyReader(body interface{}) (io.Reader, error) {
 
 type requestOption func(*requestOptions)
 
-func withRequestBody(body interface{}) requestOption {
+func withRequestBody(body any) requestOption {
 	return func(args *requestOptions) {
 		args.body = body
 	}
@@ -170,12 +170,12 @@ func (c *Client) encodeRequestBody(opt *requestOptions) (io.Reader, error) {
 	}
 }
 
-func (c *Client) sendRequest(req *http.Request, resp interface{}, opts ...responseOption) error {
+func (c *Client) sendRequest(req *http.Request, resp any, opts ...responseOption) error {
 	res, err := c.httpClient.Do(req)
 	if err != nil {
 		return err
 	}
-	defer res.Body.Close()
+	defer res.Body.Close() // nolint:errcheck
 
 	if res.StatusCode != http.StatusOK {
 		return ErrUnexpectedResponseCode
diff --git a/response.go b/response.go
@@ -33,7 +33,7 @@ func withResponseDecrypt() responseOption {
 	}
 }
 
-func (c *Client) decodeResponse(body io.Reader, resp interface{}, opts ...responseOption) error {
+func (c *Client) decodeResponse(body io.Reader, resp any, opts ...responseOption) error {
 	opt := newResponseOptions(opts...)
 
 	if !opt.needDecrypt {
@@ -43,7 +43,7 @@ func (c *Client) decodeResponse(body io.Reader, resp interface{}, opts ...respon
 	return c.decodeResponseWithDecrypt(body, resp, opts...)
 }
 
-func (c *Client) decodeResponseWithDecrypt(body io.Reader, resp interface{}, _ ...responseOption) error {
+func (c *Client) decodeResponseWithDecrypt(body io.Reader, resp any, _ ...responseOption) error {
 	var r Response
 	if err := json.NewDecoder(body).Decode(&r); err != nil {
 		return err
diff --git a/session.go b/session.go
@@ -73,7 +73,7 @@ func (c *Client) UpdateSession(
 	return
 }
 
-type InterfaceSessionMessageRequest interface{}
+type InterfaceSessionMessageRequest any
 
 var (
 	_ InterfaceSessionMessageRequest = SessionMessageResponse{}

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import (`
`5`	`5`	`"net/http"`
`6`	`6`	`)`
`7`	`7`
`8`		`-type InterfaceMessageRequest interface{}`
	`8`	`+type InterfaceMessageRequest any`
`9`	`9`
`10`	`10`	`var (`
`11`	`11`	`_ InterfaceMessageRequest = MessageRequest{}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ const (`
`32`	`32`
`33`	`33`	`type requestOptions struct {`
`34`	`34`	`params url.Values`
`35`		`- body interface{}`
	`35`	`+ body any`
`36`	`36`	`needEncrypt bool`
`37`	`37`	`needAccessToken bool`
`38`	`38`	`requestType requestType`
`@@ -52,7 +52,7 @@ func newRequestOptions(opts ...requestOption) *requestOptions {`
`52`	`52`	`return args`
`53`	`53`	`}`
`54`	`54`
`55`		`-func (r *requestOptions) bodyReader(body interface{}) (io.Reader, error) {`
	`55`	`+func (r *requestOptions) bodyReader(body any) (io.Reader, error) {`
`56`	`56`	`if body == nil {`
`57`	`57`	`return nil, nil`
`58`	`58`	`}`
`@@ -71,7 +71,7 @@ func (r *requestOptions) bodyReader(body interface{}) (io.Reader, error) {`
`71`	`71`
`72`	`72`	`type requestOption func(*requestOptions)`
`73`	`73`
`74`		`-func withRequestBody(body interface{}) requestOption {`
	`74`	`+func withRequestBody(body any) requestOption {`
`75`	`75`	`return func(args *requestOptions) {`
`76`	`76`	`args.body = body`
`77`	`77`	`}`
`@@ -170,12 +170,12 @@ func (c Client) encodeRequestBody(opt requestOptions) (io.Reader, error) {`
`170`	`170`	`}`
`171`	`171`	`}`
`172`	`172`
`173`		`-func (c Client) sendRequest(req http.Request, resp interface{}, opts ...responseOption) error {`
	`173`	`+func (c Client) sendRequest(req http.Request, resp any, opts ...responseOption) error {`
`174`	`174`	`res, err := c.httpClient.Do(req)`
`175`	`175`	`if err != nil {`
`176`	`176`	`return err`
`177`	`177`	`}`
`178`		`- defer res.Body.Close()`
	`178`	`+ defer res.Body.Close() // nolint:errcheck`
`179`	`179`
`180`	`180`	`if res.StatusCode != http.StatusOK {`
`181`	`181`	`return ErrUnexpectedResponseCode`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ func withResponseDecrypt() responseOption {`
`33`	`33`	`}`
`34`	`34`	`}`
`35`	`35`
`36`		`-func (c *Client) decodeResponse(body io.Reader, resp interface{}, opts ...responseOption) error {`
	`36`	`+func (c *Client) decodeResponse(body io.Reader, resp any, opts ...responseOption) error {`
`37`	`37`	`opt := newResponseOptions(opts...)`
`38`	`38`
`39`	`39`	`if !opt.needDecrypt {`
`@@ -43,7 +43,7 @@ func (c *Client) decodeResponse(body io.Reader, resp interface{}, opts ...respon`
`43`	`43`	`return c.decodeResponseWithDecrypt(body, resp, opts...)`
`44`	`44`	`}`
`45`	`45`
`46`		`-func (c *Client) decodeResponseWithDecrypt(body io.Reader, resp interface{}, _ ...responseOption) error {`
	`46`	`+func (c *Client) decodeResponseWithDecrypt(body io.Reader, resp any, _ ...responseOption) error {`
`47`	`47`	`var r Response`
`48`	`48`	`if err := json.NewDecoder(body).Decode(&r); err != nil {`
`49`	`49`	`return err`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ func (c *Client) UpdateSession(`
`73`	`73`	`return`
`74`	`74`	`}`
`75`	`75`
`76`		`-type InterfaceSessionMessageRequest interface{}`
	`76`	`+type InterfaceSessionMessageRequest any`
`77`	`77`
`78`	`78`	`var (`
`79`	`79`	`_ InterfaceSessionMessageRequest = SessionMessageResponse{}`