Merge #51

51: Cleanups r=xen0n a=xen0n



Co-authored-by: WANG Xuerui <wangxuerui@qiniu.com>

Author: bors[bot]

.golangci.yml

@@ -0,0 +1,39 @@
+run:
+  timeout: 2m
+
+linters:
+  enable:
+    # enabled by default
+    # https://golangci-lint.run/usage/linters/
+    - govet
+    - errcheck
+    - staticcheck
+    - unused
+    - gosimple
+    - structcheck
+    - varcheck
+    - ineffassign
+    - deadcode
+    - typecheck
+    # project additions
+    # keep this list alphabetically sorted
+    - bodyclose
+    - goconst
+    # - gofmt  -- goimports contains this
+    - goimports
+    - gosec
+    - misspell
+    - nakedret
+    - nolintlint
+    - prealloc
+    - unconvert
+
+linters-settings:
+  gofmt:
+    simplify: true
+  goimports:
+    local-prefixes: github.com/xen0n/go-workwx
+  misspell:
+    locale: US
+  nakedret:
+    max-func-lines: 1

.travis.yml

@@ -1,8 +1,8 @@
 language: go
 go:
-  - "1.12.x"
   - "1.13.x"
   - "1.14.x"
+  - "1.15.x"
 go_import_path: github.com/xen0n/go-workwx
 branches:
   # https://bors.tech/documentation/getting-started/
@@ -18,9 +18,9 @@ cache:
   - $GOPATH/pkg/mod
 before_install:
   - export GO111MODULE=on
-  - go get -u -v honnef.co/go/tools/cmd/staticcheck
+  - curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.33.0
+  - ./ci/run-lint.sh
 install:
   - go install -v ./...
 script:
-  - ./ci/run-lint.sh
   - go test -v ./...

README.md

@@ -36,6 +36,7 @@ in at least 2 of Qiniu's internal systems.
 
 ## Features
 
+* 支持最近 3 个 Go 版本
 * 包名短
 * 支持覆盖 API `Host`，用于自己拦一层网关、临时调试等等奇葩需求
 * 支持使用自定义 `http.Client`

ci/run-lint.sh

@@ -12,20 +12,5 @@ die() {
 }
 
 
-# gofmt conformance check
-check_gofmt() {
-    # record the list of non-conforming source files
-    local output="$(gofmt -s -l $@)"
-    if [[ "x${output}" != "x" ]]; then
-        # report the offending files then die
-        die "the following files violate gofmt -s style: ${output}"
-    fi
-}
-
-# exclude vendored files
-# TODO: write this more elegantly
-check_gofmt *.go cmd
-
-
-# staticcheck for known problems
-staticcheck . || die "staticcheck reported error(s)"
+# golangci-lint for known problems
+golangci-lint run || die "staticcheck reported error(s)"

cmd/workwxctl/commands/cmd_send_message.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 
 	"github.com/urfave/cli/v2"
+
 	"github.com/xen0n/go-workwx"
 )
 

cmd/workwxctl/commands/cmd_upload_temp_media.go

@@ -5,6 +5,7 @@ import (
 	"os"
 
 	"github.com/urfave/cli/v2"
+
 	"github.com/xen0n/go-workwx"
 )
 

cmd/workwxctl/commands/flags.go

@@ -6,6 +6,7 @@ import (
 	"os"
 
 	"github.com/urfave/cli/v2"
+
 	"github.com/xen0n/go-workwx"
 )
 

cmd/workwxctl/commands/tls_key_log_helper.go

@@ -13,6 +13,7 @@ import (
 // newTransportWithKeyLog initializes a HTTP Transport with KeyLogWriter
 func newTransportWithKeyLog(keyLog io.Writer) *http.Transport {
 	transport := &http.Transport{
+		//nolint: gosec  // this transport is delibrately made to be a side channel
 		TLSClientConfig: &tls.Config{KeyLogWriter: keyLog, InsecureSkipVerify: true},
 
 		// Copy of http.DefaultTransport

cmd/workwxctl/main.go

@@ -8,5 +8,6 @@ import (
 
 func main() {
 	app := commands.InitApp()
-	app.Run(os.Args)
+	// ignore errors
+	_ = app.Run(os.Args)
 }