Fix golangci linting. (#257)

* Trigger build

* Update our action

* Try to appease golangci-lint

Author: skarekrow

.github/workflows/golangci-lint.yaml

@@ -21,6 +21,6 @@ jobs:
         with:
           go-version: "1.24"
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v6
+        uses: golangci/golangci-lint-action@v8
         with:
-          version: v1.58
+          version: v2.3.0

.golangci.yaml

@@ -1,33 +1,21 @@
 version: "2"
-
-run:
-  timeout: 5m
-
 linters:
-  disable-all: true
+  default: none
   enable:
     - errcheck
-    - gosimple
     - govet
     - ineffassign
     - staticcheck
-    - typecheck
     - unused
-  settings:
-    errcheck:
-      ignore: ''
-
+issues:
+  max-issues-per-linter: 0
+  max-same-issues: 0
+  fix: true
 formatters:
   enable:
-    - goimports
     - gofumpt
+    - goimports
   settings:
     goimports:
-      # Put imports beginning with prefix after 3rd-party packages.
-      # It's a comma-separated list of prefixes.
-      local-prefixes: github.com/redhatinsights/export-service-go
-
-issues:
-  max-issues-per-linter: 0
-  max-same-issues: 0
-  fix: true
+      local-prefixes:
+        - github.com/redhatinsights/export-service-go

cmd/export-service/api_server.go

@@ -14,6 +14,7 @@ import (
 	chi "github.com/go-chi/chi/v5"
 	middleware "github.com/go-chi/chi/v5/middleware"
 	redoc "github.com/go-openapi/runtime/middleware"
+	"github.com/labstack/gommon/log"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	"github.com/redhatinsights/platform-go-middlewares/v2/identity"
 	"github.com/redhatinsights/platform-go-middlewares/v2/request_id"
@@ -22,6 +23,7 @@ import (
 	"github.com/confluentinc/confluent-kafka-go/kafka"
 
 	s3_manager "github.com/aws/aws-sdk-go-v2/feature/s3/manager"
+
 	"github.com/redhatinsights/export-service-go/config"
 	"github.com/redhatinsights/export-service-go/db"
 	"github.com/redhatinsights/export-service-go/exports"
@@ -136,7 +138,10 @@ func setupDocsMiddleware(handler http.Handler) http.Handler {
 
 // Handler function that responds with Hello World
 func helloWorld(w http.ResponseWriter, r *http.Request) {
-	fmt.Fprint(w, "Hello world")
+	_, err := fmt.Fprint(w, "Hello world")
+	if err != nil {
+		log.Panic("failed to respond with Hello world", "error", err)
+	}
 }
 
 // statusOK returns a simple 200 status code

cmd/export-service/expired_export_cleaner.go

@@ -9,7 +9,6 @@ import (
 )
 
 func startExpiredExportCleaner(cfg *config.ExportConfig, log *zap.SugaredLogger) {
-
 	log.Info("Starting expired export cleaner")
 
 	dbConnection, err := db.OpenDB(*cfg)

cmd/export-service/main.go

@@ -12,13 +12,12 @@ import (
 )
 
 func createRootCommand(cfg *config.ExportConfig, log *zap.SugaredLogger) *cobra.Command {
-
 	// rootCmd represents the base command when called without any subcommands
-	var rootCmd = &cobra.Command{
+	rootCmd := &cobra.Command{
 		Use: "export-service",
 	}
 
-	var expiredExportCleanerCmd = &cobra.Command{
+	expiredExportCleanerCmd := &cobra.Command{
 		Use:   "expired_export_cleaner",
 		Short: "Run the expired export cleaner",
 		Run: func(cmd *cobra.Command, args []string) {
@@ -28,7 +27,7 @@ func createRootCommand(cfg *config.ExportConfig, log *zap.SugaredLogger) *cobra.
 
 	rootCmd.AddCommand(expiredExportCleanerCmd)
 
-	var apiServerCmd = &cobra.Command{
+	apiServerCmd := &cobra.Command{
 		Use:   "api_server",
 		Short: "Run the api server",
 		Run: func(cmd *cobra.Command, args []string) {
@@ -38,13 +37,13 @@ func createRootCommand(cfg *config.ExportConfig, log *zap.SugaredLogger) *cobra.
 
 	rootCmd.AddCommand(apiServerCmd)
 
-	var migrateDbCmd = &cobra.Command{
+	migrateDbCmd := &cobra.Command{
 		Use:   "migrate_db",
 		Short: "Run the db migration",
 	}
 
 	// upCmd represents the up command
-	var upCmd = &cobra.Command{
+	upCmd := &cobra.Command{
 		Use:   "upgrade",
 		Short: "Upgrade to a later version",
 		RunE: func(cmd *cobra.Command, args []string) error {
@@ -54,7 +53,7 @@ func createRootCommand(cfg *config.ExportConfig, log *zap.SugaredLogger) *cobra.
 	}
 
 	// downCmd represents the down command
-	var downCmd = &cobra.Command{
+	downCmd := &cobra.Command{
 		Use:   "downgrade",
 		Short: "Revert to a previous version",
 		RunE: func(cmd *cobra.Command, args []string) error {

cmd/export-service/migrate_db.go

@@ -8,7 +8,6 @@ import (
 )
 
 func performDbMigration(cfg *config.ExportConfig, log *zap.SugaredLogger, direction string) error {
-
 	databaseConn, err := db.OpenPostgresDB(*cfg)
 	if err != nil {
 		log.Error("Unable to initialize database connection", "error", err)

config/config.go

@@ -285,7 +285,7 @@ func getRdsCaPath(cfg *clowder.AppConfig) (*string, error) {
 }
 
 func buildBaseHttpUrl(tlsEnabled bool, hostname string, port int) string {
-	var protocol string = "http"
+	protocol := "http"
 	if tlsEnabled {
 		protocol = "https"
 	}

db/db.go

@@ -25,7 +25,6 @@ func OpenPostgresDB(cfg config.ExportConfig) (*sql.DB, error) {
 }
 
 func buildPostgresDSN(cfg config.ExportConfig) string {
-
 	dbcfg := cfg.DBConfig
 
 	dsn := fmt.Sprintf("postgres://%s:%s@%s:%s/%s?sslmode=%s",

db/migrate_db.go

@@ -25,7 +25,6 @@ func (lw loggerWrapper) Printf(format string, v ...interface{}) {
 }
 
 func PerformDbMigration(databaseConn *sql.DB, log *zap.SugaredLogger, pathToMigrationFiles string, direction string) error {
-
 	log.Info("Starting Export Service DB migration")
 
 	driver, err := postgres.WithInstance(databaseConn, &postgres.Config{})
@@ -42,12 +41,13 @@ func PerformDbMigration(databaseConn *sql.DB, log *zap.SugaredLogger, pathToMigr
 
 	m.Log = loggerWrapper{log}
 
-	if direction == "up" {
+	switch direction {
+	case "up":
 		err = m.Up()
-	} else if direction == "down" {
+	case "down":
 		err = m.Steps(-1)
-	} else {
-		return errors.New("Invalid operation")
+	default:
+		return errors.New("invalid operation")
 	}
 
 	if errors.Is(err, migrate.ErrNoChange) {

exports/exports.go

@@ -158,7 +158,6 @@ func (e *Export) ListExports(w http.ResponseWriter, r *http.Request) {
 	}
 
 	exports, count, err := e.DB.APIList(modelUser, &params, page.Offset, page.Limit, page.SortBy, page.Dir)
-
 	if err != nil {
 		logger.Errorw("error while retrieving list from database", "error", err)
 		InternalServerError(w, err)
@@ -220,7 +219,6 @@ func (e *Export) GetExport(w http.ResponseWriter, r *http.Request) {
 
 // DeleteExport handles DELETE requests to the /exports/{exportUUID} endpoint.
 func (e *Export) DeleteExport(w http.ResponseWriter, r *http.Request) {
-
 	user := middleware.GetUserIdentity(r.Context())
 	reqID := request_id.GetReqID(r.Context())
 
@@ -327,8 +325,8 @@ func DBExportToAPI(payload models.ExportPayload) ExportPayload {
 		}
 
 		if source.SourceError != nil {
-			newSource.Message = source.SourceError.Message
-			newSource.Code = source.SourceError.Code
+			newSource.Message = source.Message
+			newSource.Code = source.Code
 		}
 
 		apiPayload.Sources = append(apiPayload.Sources, newSource)