Upgrade golangci-lint (#711)

* Upgrade golangci-lint

* Freeze version of golangci-lint

* Update changelog

Author: waybackarchiver

.github/workflows/linter.yml

@@ -37,6 +37,7 @@ jobs:
     uses: wabarc/.github/.github/workflows/reusable-golangci.yml@main
     with:
       egress-policy: audit
+      version: 'v2.5.0'
 
   shellcheck:
     name: ShellCheck

.golangci.yml

@@ -2,83 +2,110 @@
 # Use of this source code is governed by the GNU GPL v3
 # license that can be found in the LICENSE file.
 #
----
-#########################
-#########################
-## Golang Linter rules ##
-#########################
-#########################
-
-# configure golangci-lint
-# see https://github.com/golangci/golangci-lint/blob/master/.golangci.example.yml
+version: "2"
 run:
-  # default concurrency is a available CPU number.
-  # concurrency: 4 # explicitly omit this value to fully utilize available resources.
-  deadline: 5m
   issues-exit-code: 1
   tests: false
-
-issues:
-  exclude-rules:
-    - path: _test\.go
-      linters:
-      - dupl
-      - gosec
-      - goconst
 linters:
-  disable-all: true
+  default: none
   enable:
     - bodyclose
     - errcheck
     - goconst
-    - gocyclo
     - gocritic
-    - gofmt
-    - goimports
+    - gocyclo
     - gosec
-    - gosimple
     - govet
     - ineffassign
     - misspell
     - prealloc
     - staticcheck
-    - stylecheck
-    - typecheck
     - unconvert
     - unparam
     - unused
     - whitespace
-linters-settings:
-  errcheck:
-    # report about assignment of errors to blank identifier: `num, _ := strconv.Atoi(numStr)`;
-    # default is false: such cases aren't reported by default.
-    check-blank: true
-  govet:
-    # report about shadowed variables
-    check-shadowing: true
-  gocyclo:
-    # minimal code complexity to report, 30 by default
-    min-complexity: 15
-  gosec:
-    # To specify a set of rules to explicitly exclude.
-    # Available rules: https://github.com/securego/gosec#available-rules
-    excludes:
-      - G108
-    # To specify the configuration of rules.
-    # The configuration of rules is not fully documented by gosec:
-    # https://github.com/securego/gosec#configuration
-    # https://github.com/securego/gosec/blob/569328eade2ccbad4ce2d0f21ee158ab5356a5cf/rules/rulelist.go#L60-L102
-    config:
-  misspell:
-    # Correct spellings using locale preferences for US or UK.
-    # Default is to use a neutral variety of English.
-    # Setting locale to US will correct the British spelling of 'colour' to 'color'.
-    locale: US
-    ignore-words:
-      - someword
-  stylecheck:
-    go: "1.16"
-    # https://staticcheck.io/docs/options#checks
-    checks: [ "all", "-ST1003", "-ST1008", "-ST1016" ]
-    # https://staticcheck.io/docs/options#initialisms
-    initialisms: [ "ACL", "API", "ASCII", "CPU", "CSS", "DNS", "EOF", "GUID", "HTML", "HTTP", "HTTPS", "ID", "IP", "JSON", "QPS", "RAM", "RPC", "SLA", "SMTP", "SQL", "SSH", "TCP", "TLS", "TTL", "UDP", "UI", "GID", "UID", "UUID", "URI", "URL", "UTF8", "VM", "XML", "XMPP", "XSRF", "XSS" ]
+  settings:
+    errcheck:
+      check-blank: true
+    gocyclo:
+      min-complexity: 15
+    gosec:
+      excludes:
+        - G108
+    govet:
+      enable-all: true
+    misspell:
+      locale: US
+      ignore-rules:
+        - someword
+    staticcheck:
+      checks:
+        - all
+        - -ST1003
+        - -ST1008
+        - -ST1016
+      initialisms:
+        - ACL
+        - API
+        - ASCII
+        - CPU
+        - CSS
+        - DNS
+        - EOF
+        - GUID
+        - HTML
+        - HTTP
+        - HTTPS
+        - ID
+        - IP
+        - JSON
+        - QPS
+        - RAM
+        - RPC
+        - SLA
+        - SMTP
+        - SQL
+        - SSH
+        - TCP
+        - TLS
+        - TTL
+        - UDP
+        - UI
+        - GID
+        - UID
+        - UUID
+        - URI
+        - URL
+        - UTF8
+        - VM
+        - XML
+        - XMPP
+        - XSRF
+        - XSS
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    rules:
+      - linters:
+          - dupl
+          - goconst
+          - gosec
+        path: _test\.go
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  enable:
+    - gofmt
+    - goimports
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

config/config.go

@@ -7,7 +7,6 @@ package config // import "github.com/wabarc/wayback/config"
 // Opts holds parsed configuration options.
 // var Opts *Options
 
-// nolint:stylecheck
 const (
 	SLOT_IA = "ia" // Internet Archive
 	SLOT_IS = "is" // archive.today

config/options.go

@@ -121,54 +121,49 @@ var (
 
 // Options represents a configuration options in the application.
 type Options struct {
-	debug    bool
-	logTime  bool
-	logLevel string
-	overTor  bool
-	metrics  bool
-
-	// Enabled services
-	services sync.Map
-
-	ipfs     *ipfs
-	slots    map[string]bool
-	telegram *telegram
-	mastodon *mastodon
-	discord  *discord
-	twitter  *twitter
-	github   *github
-	notion   *notion
-	matrix   *matrix
-	slack    *slack
-	nostr    *nostr
-	irc      *irc
-	onion    *onion
-	xmpp     *xmpp
-	omnivore *omnivore
-	meili    *meili
-
+	nostr               *nostr
+	irc                 *irc
+	meili               *meili
+	omnivore            *omnivore
+	xmpp                *xmpp
+	discord             *discord
+	ipfs                *ipfs
+	slots               map[string]bool
+	telegram            *telegram
+	mastodon            *mastodon
+	onion               *onion
+	twitter             *twitter
+	github              *github
+	notion              *notion
+	matrix              *matrix
+	slack               *slack
+	services            sync.Map
+	maxMediaSize        string
+	storageDir          string
+	waybackUserAgent    string
+	proxy               string
+	logLevel            string
 	listenAddr          string
 	chromeRemoteAddr    string
-	enabledChromeRemote bool
 	boltPathname        string
 	poolingSize         int
-	storageDir          string
-	maxMediaSize        string
-	proxy               string
 	waybackTimeout      int
 	waybackMaxRetries   int
-	waybackUserAgent    string
+	enabledChromeRemote bool
+	debug               bool
+	logTime             bool
+	overTor             bool
+	metrics             bool
 	waybackFallback     bool
 }
 
 type ipfs struct {
-	host string
-	port int
-	mode string
-
+	host   string
+	mode   string
 	target string
 	apikey string
 	secret string
+	port   int
 }
 
 type telegram struct {
@@ -182,8 +177,8 @@ type mastodon struct {
 	clientKey    string
 	clientSecret string
 	accessToken  string
-	cw           bool
 	cwText       string
+	cw           bool
 }
 
 type discord struct {
@@ -239,19 +234,17 @@ type irc struct {
 }
 
 type onion struct {
-	pvk string
-
-	localPort   int
+	pvk         string
 	remotePorts []int
-
-	disabled bool
+	localPort   int
+	disabled    bool
 }
 
 type xmpp struct {
 	username string
 	password string
-	noTLS    bool
 	helptext string
+	noTLS    bool
 }
 
 type meili struct {

docs/changelog.md

@@ -18,6 +18,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fix playback from discord no response
 - Improve IRC publish
 - Improve type conversion ([#628](https://github.com/wabarc/wayback/pull/628))
+- Upgrade golangci-lint ([#711](https://github.com/wabarc/wayback/pull/711))
 
 ## [0.20.1] - 2024-07-02
 

entity/playback.go

@@ -9,6 +9,6 @@ const EntityPlayback = "playback"
 
 // Playback represents a Playback in the application.
 type Playback struct {
-	ID     uint64
 	Source string
+	ID     uint64
 }

pooling/pooling.go

@@ -29,18 +29,18 @@ type resource struct {
 
 // Pool represents a pool of services.
 type Pool struct {
-	mutex    sync.Mutex
+	context  context.Context
 	resource chan *resource
-	timeout  time.Duration
+	closed   chan bool
 	staging  queue.Queue
+	timeout  time.Duration
 
-	closed  chan bool
-	context context.Context
+	maxRetries uint64
+	multiplier float64
+	mutex      sync.Mutex
 
 	waiting    int32
 	processing int32
-	maxRetries uint64
-	multiplier float64
 }
 
 // A Bucket represents a wayback request is sent by a service.
@@ -51,11 +51,11 @@ type Bucket struct {
 	// Fallback defines an optional func to return a failure response for the Request func.
 	Fallback func(context.Context) error
 
-	// Count of retried attempts
-	elapsed uint64
-
 	// An object that will perform exactly one action.
 	once *sync.Once
+
+	// Count of retried attempts
+	elapsed uint64
 }
 
 func newResource(id int) *resource {

publish/meili/meili.go

@@ -38,7 +38,8 @@ var (
 
 // Meili represents a Meilisearch client.
 type Meili struct {
-	ctx context.Context
+	ctx    context.Context
+	client *http.Client
 
 	// Meilisearch server API endpoint.
 	endpoint string
@@ -51,8 +52,6 @@ type Meili struct {
 
 	// Version of the Meilisearch server.
 	version string
-
-	client *http.Client
 }
 
 // New returns a Meilisearch client.
@@ -165,11 +164,11 @@ func (m *Meili) existIndex() error {
 }
 
 type creates struct {
-	UID        int       `json:"uid"`
+	EnqueuedAt time.Time `json:"enqueuedAt"`
 	IndexUID   string    `json:"indexUid"`
 	Status     string    `json:"status"`
 	Type       string    `json:"type"`
-	EnqueuedAt time.Time `json:"enqueuedAt"`
+	UID        int       `json:"uid"`
 }
 
 // createIndex creates an index.