Merge branch 'master' into forbidigo-update

Author: pohly

.github/CONTRIBUTING.md

@@ -1 +1 @@
-See [contibuting quick start](https://golangci-lint.run/contributing/quick-start/) on our website.
+See [contributing quick start](https://golangci-lint.run/contributing/quick-start/) on our website.

.github/contributors/generate.ts

@@ -124,6 +124,7 @@ const main = async () => {
       fossabot: true,
       golangcibot: true,
       kortschak: true,
+      "golanci-releaser": true,
     }
 
     const res: DataJSON = {

.github/workflows/post-release.yml

@@ -12,7 +12,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Install Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v4
         with:
           # https://github.com/actions/setup-go#supported-version-syntax
           # ex:

.github/workflows/pr-extra.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-go@v3
+      - uses: actions/setup-go@v4
         with:
           # https://github.com/actions/setup-go#supported-version-syntax
           # ex:
@@ -21,4 +21,4 @@ jobs:
       - name: Run go list
         run: go list -json -m all > go.list
       - name: Nancy
-        uses: sonatype-nexus-community/nancy-github-action@v1.0.2
+        uses: sonatype-nexus-community/nancy-github-action@v1.0.3

.github/workflows/pr.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Install Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v4
         with:
           # https://github.com/actions/setup-go#supported-version-syntax
           # ex:
@@ -35,7 +35,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Install Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v4
         with:
           # https://github.com/actions/setup-go#supported-version-syntax
           # ex:
@@ -56,7 +56,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Install Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v4
         with:
           # https://github.com/actions/setup-go#supported-version-syntax
           # ex:
@@ -72,7 +72,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Install Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v4
         with:
           # https://github.com/actions/setup-go#supported-version-syntax
           # ex:
@@ -93,7 +93,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Install Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v4
         with:
           # https://github.com/actions/setup-go#supported-version-syntax
           # ex:
@@ -120,7 +120,7 @@ jobs:
       - name: Unshallow
         run: git fetch --prune --unshallow
       - name: Install Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v4
         with:
           # https://github.com/actions/setup-go#supported-version-syntax
           # ex:

.github/workflows/tag.yml

@@ -12,7 +12,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Install Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v4
         with:
           # https://github.com/actions/setup-go#supported-version-syntax
           # ex:
@@ -42,7 +42,7 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Install Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v4
         with:
           # https://github.com/actions/setup-go#supported-version-syntax
           # ex:

.golangci.reference.yml

@@ -27,7 +27,8 @@ run:
     - mytag
 
   # Which dirs to skip: issues from them won't be reported.
-  # Can use regexp here: `generated.*`, regexp is applied on full path.
+  # Can use regexp here: `generated.*`, regexp is applied on full path,
+  # including the path prefix if one is set.
   # Default value is empty list,
   # but default dirs are skipped independently of this option's value (see skip-dirs-use-default).
   # "/" will be replaced by current OS file path separator to properly work on Windows.
@@ -75,7 +76,7 @@ run:
 
 # output configuration options
 output:
-  # Format: colored-line-number|line-number|json|tab|checkstyle|code-climate|junit-xml|github-actions|teamcity
+  # Format: colored-line-number|line-number|json|colored-tab|tab|checkstyle|code-climate|junit-xml|github-actions|teamcity
   #
   # Multiple can be specified by separating them by comma, output can be provided
   # for each of them by separating format name and path by colon symbol.
@@ -435,6 +436,18 @@ linters-settings:
     # Default: false
     suppress-err-assertion: true
 
+    # Suppress the wrong comparison assertion warning.
+    # Default: false
+    suppress-compare-assertion: true
+
+    # Suppress the function all in async assertion warning.
+    # Default: false
+    suppress-async-assertion: true
+
+    # Don't trigger warnings for HaveLen(0)
+    # Default: false
+    allow-havelen-zero: true
+
   gocognit:
     # Minimal code complexity to report.
     # Default: 30 (but we recommend 10-20)
@@ -634,8 +647,6 @@ linters-settings:
         replacement: 'a[b:]'
 
   gofumpt:
-    # Select the Go version to target.
-    # Default: "1.15"
     # Deprecated: use the global `run.go` instead.
     lang-version: "1.17"
 
@@ -779,8 +790,6 @@ linters-settings:
       local_replace_directives: false
 
   gosimple:
-    # Select the Go version to target.
-    # Default: 1.13
     # Deprecated: use the global `run.go` instead.
     go: "1.15"
     # Sxxxx checks in https://staticcheck.io/docs/configuration/options/#checks
@@ -960,6 +969,37 @@ linters-settings:
       # Default: "0600"
       G306: "0600"
 
+  gosmopolitan:
+    # Allow and ignore `time.Local` usages.
+    #
+    # Default: false
+    allow-time-local: true
+    # List of fully qualified names in the `full/pkg/path.name` form, to act as "i18n escape hatches".
+    # String literals inside call-like expressions to, or struct literals of those names,
+    # are exempt from the writing system check.
+    #
+    # Default: []
+    escape-hatches:
+      - 'github.com/nicksnyder/go-i18n/v2/i18n.Message'
+      - 'example.com/your/project/i18n/markers.Raw'
+      - 'example.com/your/project/i18n/markers.OK'
+      - 'example.com/your/project/i18n/markers.TODO'
+      - 'command-line-arguments.Simple'
+    # Ignore test files.
+    #
+    # Default: true
+    ignore-tests: false
+    # List of Unicode scripts to watch for any usage in string literals.
+    # https://pkg.go.dev/unicode#pkg-variables
+    #
+    # Default: ["Han"]
+    watch-for-scripts:
+      - Devanagari
+      - Han
+      - Hangul
+      - Hiragana
+      - Katakana
+
   govet:
     # Report about shadowed variables.
     # Default: false
@@ -1618,6 +1658,9 @@ linters-settings:
             - must not contain line breaks
       # https://github.com/mgechev/revive/blob/master/RULES_DESCRIPTIONS.md#struct-tag
       - name: struct-tag
+        arguments:
+          - "json,inline"
+          - "bson,outline,gnu"
         severity: warning
         disabled: false
       # https://github.com/mgechev/revive/blob/master/RULES_DESCRIPTIONS.md#superfluous-else
@@ -1694,17 +1737,13 @@ linters-settings:
       - github.com/jmoiron/sqlx
 
   staticcheck:
-    # Select the Go version to target.
-    # Default: "1.13"
     # Deprecated: use the global `run.go` instead.
     go: "1.15"
     # SAxxxx checks in https://staticcheck.io/docs/configuration/options/#checks
     # Default: ["*"]
     checks: [ "all" ]
 
   stylecheck:
-    # Select the Go version to target.
-    # Default: 1.13
     # Deprecated: use the global `run.go` instead.
     go: "1.15"
     # STxxxx checks in https://staticcheck.io/docs/configuration/options/#checks
@@ -1721,6 +1760,39 @@ linters-settings:
     # Default: ["200", "400", "404", "500"]
     http-status-code-whitelist: [ "200", "400", "404", "500" ]
 
+  tagalign:
+    # Align and sort can be used together or separately.
+    #
+    # Whether enable align. If true, the struct tags will be aligned.
+    # eg:
+    # type FooBar struct {
+    #     Bar    string `json:"bar" validate:"required"`
+    #     FooFoo int8   `json:"foo_foo" validate:"required"`
+    # }
+    # will be formatted to:
+    # type FooBar struct {
+    #     Bar    string `json:"bar"     validate:"required"`
+    #     FooFoo int8   `json:"foo_foo" validate:"required"`
+    # }
+    # Default: true.
+    align: false
+    # Whether enable tags sort.
+    # If true, the tags will be sorted by name in ascending order.
+    # eg: `xml:"bar" json:"bar" validate:"required"` -> `json:"bar" validate:"required" xml:"bar"`
+    # Default: true
+    sort: false
+    # Specify the order of tags, the other tags will be sorted by name.
+    # This option will be ignored if `sort` is false.
+    # Default: []
+    order:
+      - json
+      - yaml
+      - yml
+      - toml
+      - mapstructure
+      - binding
+      - validate
+
   tagliatelle:
     # Check the struct tag name case.
     case:
@@ -2062,6 +2134,7 @@ linters:
     - goprintffuncname
     - gosec
     - gosimple
+    - gosmopolitan
     - govet
     - grouper
     - ifshort
@@ -2099,6 +2172,7 @@ linters:
     - staticcheck
     - structcheck
     - stylecheck
+    - tagalign
     - tagliatelle
     - tenv
     - testableexamples
@@ -2172,6 +2246,7 @@ linters:
     - goprintffuncname
     - gosec
     - gosimple
+    - gosmopolitan
     - govet
     - grouper
     - ifshort
@@ -2209,6 +2284,7 @@ linters:
     - staticcheck
     - structcheck
     - stylecheck
+    - tagalign
     - tagliatelle
     - tenv
     - testableexamples

.golangci.yml

@@ -10,7 +10,7 @@ linters-settings:
   dupl:
     threshold: 100
   funlen:
-    lines: 100
+    lines: -1 # the number of lines (code + empty lines) is not a right metric and leads to code without empty line or one-liner.
     statements: 50
   goconst:
     min-len: 2
@@ -63,6 +63,10 @@ linters-settings:
     allow-unused: false # report any unused nolint directives
     require-explanation: false # don't require an explanation for nolint directives
     require-specific: false # don't require nolint directives to be specific about which linter is being skipped
+  revive:
+    rules:
+      - name: unexported-return
+        disabled: true
 
 linters:
   disable-all: true
@@ -91,6 +95,7 @@ linters:
     - nakedret
     - noctx
     - nolintlint
+    - revive
     - staticcheck
     - stylecheck
     - typecheck
@@ -112,7 +117,6 @@ linters:
   # - nestif
   # - prealloc
   # - testpackage
-  # - revive
   # - wsl
 
 issues:

.pre-commit-hooks.yaml

@@ -1,7 +1,8 @@
 - id: golangci-lint
   name: golangci-lint
   description: Fast linters runner for Go.
-  entry: golangci-lint run --fix
+  entry: golangci-lint run --new-from-rev HEAD --fix
   types: [go]
   language: golang
+  require_serial: true
   pass_filenames: false