[+] bump golangci/golangci-lint-action from 6 to 7 (#690)

dependabot[bot] · pashagolub · web-flow · commit 549dce0d4a4d · 2025-03-27T18:33:50.000+01:00
* 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> * migrate .golangci.yml to v2 * fix ST105: capitalized error messages * rewrite complex ifs with switch * use latest version of golangci/golangci-lint-action --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Pavlo Golub <pavlo.golub@gmail.com>
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -54,9 +54,9 @@ jobs:
         path: internal/webui/build
 
     - name: GolangCI-Lint
-      uses: golangci/golangci-lint-action@v6
+      uses: golangci/golangci-lint-action@v7
       with:
-        version: v1.64
+        version: latest
   
   test:
     if: true # false to skip job during debug
diff --git a/.golangci.yml b/.golangci.yml
@@ -1,21 +1,35 @@
+version: "2"
 linters:
   enable:
+    - misspell
     - revive
-    - misspell 
   disable:
     - gocyclo
-
-    
-linters-settings:
-  gocyclo:
-    # minimal code complexity to report, 30 by default (but we recommend 10-20)
-    min-complexity: 20
-
-issues:
-  # List of regexps of issue texts to exclude, empty list by default.
-  # But independently of this option we use default exclude patterns,
-  # it can be disabled by `exclude-use-default: false`. To list all
-  # excluded by default patterns execute `golangci-lint run --help`
-  exclude:
-    - SA1019  # CPUTimesStat.Total is deprecated
-    - SA5008  # duplicate struct tag "choice" (staticcheck)
+  settings:
+    gocyclo:
+      min-complexity: 20
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    rules:
+      - path: (.+)\.go$
+        text: SA1019    # CPUTimesStat.Total is deprecated
+      - path: (.+)\.go$
+        text: SA5008    # duplicate struct tag "choice" (staticcheck)
+      - path: (.+)\.go$
+        text: QF1001    # could apply De Morgan's law
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
diff --git a/internal/reaper/cache.go b/internal/reaper/cache.go
@@ -49,7 +49,7 @@ func GetMonitoredDatabaseByUniqueName(name string) (*sources.SourceConn, error)
 	defer monitoredDbCacheLock.RUnlock()
 	md, exists := monitoredDbCache[name]
 	if !exists || md == nil {
-		return nil, fmt.Errorf("Database %s not found in cache", name)
+		return nil, fmt.Errorf("database %s not found in cache", name)
 	}
 	return md, nil
 }
diff --git a/internal/reaper/database.go b/internal/reaper/database.go
@@ -154,7 +154,7 @@ func GetMonitoredDatabaseSettings(ctx context.Context, md *sources.SourceConn, n
 		}
 		matches := rBouncerAndPgpoolVerMatch.FindStringSubmatch(dbNewSettings.VersionStr)
 		if len(matches) != 1 {
-			return dbSettings, fmt.Errorf("Unexpected PgBouncer version input: %s", dbNewSettings.VersionStr)
+			return dbSettings, fmt.Errorf("unexpected PgBouncer version input: %s", dbNewSettings.VersionStr)
 		}
 		dbNewSettings.Version = VersionToInt(matches[0])
 	case sources.SourcePgPool:
@@ -164,7 +164,7 @@ func GetMonitoredDatabaseSettings(ctx context.Context, md *sources.SourceConn, n
 
 		matches := rBouncerAndPgpoolVerMatch.FindStringSubmatch(dbNewSettings.VersionStr)
 		if len(matches) != 1 {
-			return dbSettings, fmt.Errorf("Unexpected PgPool version input: %s", dbNewSettings.VersionStr)
+			return dbSettings, fmt.Errorf("unexpected PgPool version input: %s", dbNewSettings.VersionStr)
 		}
 		dbNewSettings.Version = VersionToInt(matches[0])
 	default:
@@ -708,11 +708,12 @@ func FetchMetricsPgpool(ctx context.Context, msg MetricFetchConfig, vme Monitore
 					retRow[k] = vs
 					if k == "status" { // was changed from numeric to string at some pgpool version so leave the string
 						// but also add "status_num" field
-						if vs == "up" {
+						switch vs {
+						case "up":
 							retRow["status_num"] = 1
-						} else if vs == "down" {
+						case "down":
 							retRow["status_num"] = 0
-						} else {
+						default:
 							i, err := strconv.ParseInt(vs, 10, 64)
 							if err == nil {
 								retRow["status_num"] = i
diff --git a/internal/sinks/postgres.go b/internal/sinks/postgres.go
@@ -295,7 +295,8 @@ func (pgw *PostgresWriter) flush(msgs []metrics.MeasurementEnvelope) {
 
 			rowsBatched++
 
-			if pgw.metricSchema == DbStorageSchemaTimescale {
+			switch pgw.metricSchema {
+			case DbStorageSchemaTimescale:
 				// set min/max timestamps to check/create partitions
 				bounds, ok := pgPartBounds[msg.MetricName]
 				if !ok || (ok && epochTime.Before(bounds.StartTime)) {
@@ -306,7 +307,7 @@ func (pgw *PostgresWriter) flush(msgs []metrics.MeasurementEnvelope) {
 					bounds.EndTime = epochTime
 					pgPartBounds[msg.MetricName] = bounds
 				}
-			} else if pgw.metricSchema == DbStorageSchemaPostgres {
+			case DbStorageSchemaPostgres:
 				_, ok := pgPartBoundsDbName[msg.MetricName]
 				if !ok {
 					pgPartBoundsDbName[msg.MetricName] = make(map[string]ExistingPartitionInfo)
@@ -320,6 +321,8 @@ func (pgw *PostgresWriter) flush(msgs []metrics.MeasurementEnvelope) {
 					bounds.EndTime = epochTime
 					pgPartBoundsDbName[msg.MetricName][msg.DBName] = bounds
 				}
+			default:
+				logger.Fatal("unknown storage schema...")
 			}
 		}
 	}
diff --git a/internal/sinks/prometheus.go b/internal/sinks/prometheus.go
@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"net"
 	"net/http"
-	"reflect"
 	"slices"
 	"strconv"
 	"strings"
@@ -230,21 +229,17 @@ func (promw *PrometheusWriter) MetricStoreMessageToPromMetrics(msg metrics.Measu
 				tag := k[4:]
 				labels[tag] = fmt.Sprintf("%v", v)
 			} else {
-				dataType := reflect.TypeOf(v).String()
-				if dataType == "float64" || dataType == "float32" || dataType == "int64" || dataType == "int32" || dataType == "int" {
+				switch t := v.(type) {
+				case int, int32, int64, float32, float64:
 					f, err := strconv.ParseFloat(fmt.Sprintf("%v", v), 64)
 					if err != nil {
-						logger.Debugf("Skipping scraping column %s of [%s:%s]: %v", k, msg.DBName, msg.MetricName, err)
+						logger.Debugf("skipping scraping column %s of [%s:%s]: %v", k, msg.DBName, msg.MetricName, err)
 					}
 					fields[k] = f
-				} else if dataType == "bool" {
-					if v.(bool) {
-						fields[k] = 1
-					} else {
-						fields[k] = 0
-					}
-				} else {
-					logger.Debugf("Skipping scraping column %s of [%s:%s], unsupported datatype: %s", k, msg.DBName, msg.MetricName, dataType)
+				case bool:
+					fields[k] = map[bool]float64{true: 1, false: 0}[t]
+				default:
+					logger.Debugf("skipping scraping column %s of [%s:%s], unsupported datatype: %v", k, msg.DBName, msg.MetricName, t)
 					continue
 				}
 			}
diff --git a/internal/sources/resolver.go b/internal/sources/resolver.go
@@ -139,7 +139,7 @@ func getEtcdClusterMembers(s Source) ([]PatroniClusterMember, error) {
 	var cfg client.Config
 
 	if len(s.HostConfig.DcsEndpoints) == 0 {
-		return ret, errors.New("Missing ETCD connect info, make sure host config has a 'dcs_endpoints' key")
+		return ret, errors.New("missing ETCD connect info, make sure host config has a 'dcs_endpoints' key")
 	}
 
 	tlsConfig, err := getTransport(s.HostConfig)
@@ -168,10 +168,10 @@ func getEtcdClusterMembers(s Source) ([]PatroniClusterMember, error) {
 
 	if s.Kind == SourcePatroniNamespace { // all scopes, all DBs (regex filtering applies if defined)
 		if len(s.GetDatabaseName()) > 0 {
-			return ret, fmt.Errorf("Skipping Patroni entry %s - cannot specify a DB name when monitoring all scopes (regex patterns are supported though)", s.Name)
+			return ret, fmt.Errorf("skipping Patroni entry %s - cannot specify a DB name when monitoring all scopes (regex patterns are supported though)", s.Name)
 		}
 		if s.HostConfig.Namespace == "" {
-			return ret, fmt.Errorf("Skipping Patroni entry %s - search 'namespace' not specified", s.Name)
+			return ret, fmt.Errorf("skipping Patroni entry %s - search 'namespace' not specified", s.Name)
 		}
 		resp, err := kapi.Get(ctx, s.HostConfig.Namespace, client.WithPrefix(), client.WithKeysOnly())
 		if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ func GetMonitoredDatabaseByUniqueName(name string) (*sources.SourceConn, error)`
`49`	`49`	`defer monitoredDbCacheLock.RUnlock()`
`50`	`50`	`md, exists := monitoredDbCache[name]`
`51`	`51`	`if !exists \|\| md == nil {`
`52`		`- return nil, fmt.Errorf("Database %s not found in cache", name)`
	`52`	`+ return nil, fmt.Errorf("database %s not found in cache", name)`
`53`	`53`	`}`
`54`	`54`	`return md, nil`
`55`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -295,7 +295,8 @@ func (pgw *PostgresWriter) flush(msgs []metrics.MeasurementEnvelope) {`
`295`	`295`
`296`	`296`	`rowsBatched++`
`297`	`297`
`298`		`- if pgw.metricSchema == DbStorageSchemaTimescale {`
	`298`	`+ switch pgw.metricSchema {`
	`299`	`+ case DbStorageSchemaTimescale:`
`299`	`300`	`// set min/max timestamps to check/create partitions`
`300`	`301`	`bounds, ok := pgPartBounds[msg.MetricName]`
`301`	`302`	`if !ok \|\| (ok && epochTime.Before(bounds.StartTime)) {`
`@@ -306,7 +307,7 @@ func (pgw *PostgresWriter) flush(msgs []metrics.MeasurementEnvelope) {`
`306`	`307`	`bounds.EndTime = epochTime`
`307`	`308`	`pgPartBounds[msg.MetricName] = bounds`
`308`	`309`	`}`
`309`		`- } else if pgw.metricSchema == DbStorageSchemaPostgres {`
	`310`	`+ case DbStorageSchemaPostgres:`
`310`	`311`	`_, ok := pgPartBoundsDbName[msg.MetricName]`
`311`	`312`	`if !ok {`
`312`	`313`	`pgPartBoundsDbName[msg.MetricName] = make(map[string]ExistingPartitionInfo)`
`@@ -320,6 +321,8 @@ func (pgw *PostgresWriter) flush(msgs []metrics.MeasurementEnvelope) {`
`320`	`321`	`bounds.EndTime = epochTime`
`321`	`322`	`pgPartBoundsDbName[msg.MetricName][msg.DBName] = bounds`
`322`	`323`	`}`
	`324`	`+ default:`
	`325`	`+ logger.Fatal("unknown storage schema...")`
`323`	`326`	`}`
`324`	`327`	`}`
`325`	`328`	`}`
Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ func getEtcdClusterMembers(s Source) ([]PatroniClusterMember, error) {`
`139`	`139`	`var cfg client.Config`
`140`	`140`
`141`	`141`	`if len(s.HostConfig.DcsEndpoints) == 0 {`
`142`		`- return ret, errors.New("Missing ETCD connect info, make sure host config has a 'dcs_endpoints' key")`
	`142`	`+ return ret, errors.New("missing ETCD connect info, make sure host config has a 'dcs_endpoints' key")`
`143`	`143`	`}`
`144`	`144`
`145`	`145`	`tlsConfig, err := getTransport(s.HostConfig)`
`@@ -168,10 +168,10 @@ func getEtcdClusterMembers(s Source) ([]PatroniClusterMember, error) {`
`168`	`168`
`169`	`169`	`if s.Kind == SourcePatroniNamespace { // all scopes, all DBs (regex filtering applies if defined)`
`170`	`170`	`if len(s.GetDatabaseName()) > 0 {`
`171`		`- return ret, fmt.Errorf("Skipping Patroni entry %s - cannot specify a DB name when monitoring all scopes (regex patterns are supported though)", s.Name)`
	`171`	`+ return ret, fmt.Errorf("skipping Patroni entry %s - cannot specify a DB name when monitoring all scopes (regex patterns are supported though)", s.Name)`
`172`	`172`	`}`
`173`	`173`	`if s.HostConfig.Namespace == "" {`
`174`		`- return ret, fmt.Errorf("Skipping Patroni entry %s - search 'namespace' not specified", s.Name)`
	`174`	`+ return ret, fmt.Errorf("skipping Patroni entry %s - search 'namespace' not specified", s.Name)`
`175`	`175`	`}`
`176`	`176`	`resp, err := kapi.Get(ctx, s.HostConfig.Namespace, client.WithPrefix(), client.WithKeysOnly())`
`177`	`177`	`if err != nil {`