build: fix linter issues after upgrade

Author: TenSt

base/database/database.go

@@ -12,11 +12,11 @@ func OnConflictUpdate(db *gorm.DB, key string, updateCols ...string) *gorm.DB {
 
 // Appends `ON CONFLICT (key...) DO UPDATE SET (fields) to following insert query with multiple key fields
 func OnConflictUpdateMulti(db *gorm.DB, keys []string, updateCols ...string) *gorm.DB {
-	confilctColumns := []clause.Column{}
-	for _, key := range keys {
-		confilctColumns = append(confilctColumns, clause.Column{Name: key})
+	conflictColumns := make([]clause.Column, len(keys))
+	for i, key := range keys {
+		conflictColumns[i] = clause.Column{Name: key}
 	}
-	onConflict := clause.OnConflict{Columns: confilctColumns}
+	onConflict := clause.OnConflict{Columns: conflictColumns}
 	if len(updateCols) > 0 {
 		onConflict.DoUpdates = clause.AssignmentColumns(updateCols)
 	} else {
@@ -31,17 +31,17 @@ type UpExpr struct {
 }
 
 func OnConflictDoUpdateExpr(db *gorm.DB, keys []string, updateExprs ...UpExpr) *gorm.DB {
-	updateColsValues := make(map[string]interface{})
+	updateColsValues := make(map[string]interface{}, len(updateExprs))
 	for _, v := range updateExprs {
 		updateColsValues[v.Name] = v.Expr
 	}
-	confilctColumns := []clause.Column{}
-	for _, key := range keys {
-		confilctColumns = append(confilctColumns, clause.Column{Name: key})
+	conflictColumns := make([]clause.Column, len(keys))
+	for i, key := range keys {
+		conflictColumns[i] = clause.Column{Name: key}
 	}
 	if len(updateColsValues) > 0 {
 		return db.Clauses(clause.OnConflict{
-			Columns:   confilctColumns,
+			Columns:   conflictColumns,
 			DoUpdates: clause.Assignments(updateColsValues),
 		})
 	}

base/database/setup.go

@@ -67,7 +67,7 @@ type PostgreSQLConfig struct {
 	Port        int
 	User        string
 	Database    string
-	Passwd      string
+	Passwd      string // #nosec G117
 	SSLMode     string
 	SSLRootCert string
 	Debug       bool

base/utils/awscloudwatch.go

@@ -8,7 +8,9 @@ import (
 	"os"
 	"time"
 
+	// nolint: staticcheck
 	"github.com/aws/aws-sdk-go/aws"
+	// nolint: staticcheck
 	"github.com/aws/aws-sdk-go/aws/credentials"
 	lc "github.com/redhatinsights/platform-go-middlewares/logging/cloudwatch"
 	log "github.com/sirupsen/logrus"

base/utils/http.go

@@ -56,7 +56,7 @@ func CallAPI(client *http.Client, request *http.Request, debugEnabled bool) (*ht
 		LogDebug("dump", fmt.Sprintf("\n%s\n", string(dump)), "http call")
 	}
 
-	resp, err := client.Do(request)
+	resp, err := client.Do(request) // #nosec G704
 	if err != nil {
 		return resp, err
 	}

manager/middlewares/logger.go

@@ -15,7 +15,9 @@ func RequestResponseLogger() gin.HandlerFunc {
 	return func(c *gin.Context) {
 		tStart := time.Now()
 		c.Next()
-		var fields []interface{}
+		// 17 is the number of fields that are always logged
+		// 2 is the number of fields for each parameter
+		var fields = make([]any, 0, 17+2*len(c.Params))
 
 		duration := time.Since(tStart).Nanoseconds() / 1e6
 		fields = append(fields, "durationMs", duration,

turnpike/controllers/pprof.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"io"
 	"net/http"
-	"regexp"
+	"slices"
 	"time"
 
 	"github.com/gin-gonic/gin"
@@ -21,7 +21,7 @@ import (
 // @Failure 500 {object} map[string]interface{}
 // @Router /pprof/evaluator_upload/{param} [get]
 func GetEvaluatorUploadPprof(c *gin.Context) {
-	pprofHandler(c, utils.CoreCfg.EvaluatorUploadPrivateAddress)
+	pprofHandler(c, "evaluator-upload")
 }
 
 // @Summary Get profile info
@@ -34,7 +34,7 @@ func GetEvaluatorUploadPprof(c *gin.Context) {
 // @Failure 500 {object} map[string]interface{}
 // @Router /pprof/evaluator_recalc/{param} [get]
 func GetEvaluatorRecalcPprof(c *gin.Context) {
-	pprofHandler(c, utils.CoreCfg.EvaluatorRecalcPrivateAddress)
+	pprofHandler(c, "evaluator-recalc")
 }
 
 // @Summary Get profile info
@@ -47,7 +47,7 @@ func GetEvaluatorRecalcPprof(c *gin.Context) {
 // @Failure 500 {object} map[string]interface{}
 // @Router /pprof/listener/{param} [get]
 func GetListenerPprof(c *gin.Context) {
-	pprofHandler(c, utils.CoreCfg.ListenerPrivateAddress)
+	pprofHandler(c, "listener")
 }
 
 // @Summary Get profile info
@@ -60,20 +60,19 @@ func GetListenerPprof(c *gin.Context) {
 // @Failure 500 {object} map[string]interface{}
 // @Router /pprof/manager/{param} [get]
 func GetManagerPprof(c *gin.Context) {
-	pprofHandler(c, utils.CoreCfg.ManagerPrivateAddress)
+	pprofHandler(c, "manager")
 }
 
-var paramRegexp = regexp.MustCompile("^(heap|profile|block|mutex|trace)$")
+var allowedParams = []string{"heap", "profile", "block", "mutex", "trace"}
 
-func pprofHandler(c *gin.Context, address string) {
+func pprofHandler(c *gin.Context, serviceName string) {
 	query := c.Request.URL.RawQuery
 	param := c.Param("param")
-	match := paramRegexp.FindStringSubmatch(param)
-	if len(match) < 1 {
+	if !slices.Contains(allowedParams, param) {
 		c.Status(http.StatusBadRequest)
 		return
 	}
-	data, err := getPprof(address, match[0], query)
+	data, err := getPprof(serviceName, param, query)
 	if err != nil {
 		c.JSON(http.StatusInternalServerError, gin.H{"err": err.Error()})
 		return
@@ -82,19 +81,32 @@ func pprofHandler(c *gin.Context, address string) {
 	c.Data(http.StatusOK, "application/octet-stream", data)
 }
 
-func getPprof(address, param, query string) ([]byte, error) {
+func getPprof(serviceName, param, query string) ([]byte, error) {
 	client := &http.Client{
 		Timeout: time.Second * 60,
 	}
 	if len(query) > 0 {
 		param = param + "?" + query
 	}
+	var address string
+	switch serviceName {
+	case "manager":
+		address = utils.CoreCfg.ManagerPrivateAddress
+	case "listener":
+		address = utils.CoreCfg.ListenerPrivateAddress
+	case "evaluator-upload":
+		address = utils.CoreCfg.EvaluatorUploadPrivateAddress
+	case "evaluator-recalc":
+		address = utils.CoreCfg.EvaluatorRecalcPrivateAddress
+	default:
+		return nil, fmt.Errorf("invalid service name: %s", serviceName)
+	}
 	urlPath := fmt.Sprintf("%s/debug/pprof/%s", address, param)
-	req, err := http.NewRequest(http.MethodGet, urlPath, nil)
+	req, err := http.NewRequest(http.MethodGet, urlPath, nil) // #nosec G704
 	if err != nil {
 		return nil, err
 	}
-	res, err := client.Do(req)
+	res, err := client.Do(req) // #nosec G704
 	if err != nil {
 		return nil, err
 	}