Merged in feature/linting (pull request #168)

Linting Updates

* precommit

* smallerchecks

* govuln

internal/collector/parse.go

@@ -19,7 +19,7 @@ func parseDBCollector(c *repository.Fullactivecollector) (*Collector, error) {
 	if len(c.Fields) > 0 {
 		err := json.Unmarshal(c.Fields, &fields)
 		if err != nil {
-			return nil, fmt.Errorf("error unmarshalling: %s", err)
+			return nil, fmt.Errorf("error unmarshalling: %w", err)
 		}
 	} else {
 		fields = map[string]uuid.UUID{}

internal/database/migrations.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"database/sql"
 	"embed"
+	"errors"
 	"fmt"
 	"log/slog"
 
@@ -21,14 +22,14 @@ func createDB(ctx context.Context, cfg database.ConfigProvider) error {
 
 	db, err := sql.Open(cfg.GetDBDriver(), cfg.GetDBAdminDBURI())
 	if err != nil {
-		return fmt.Errorf("error opening admin database: %v", err)
+		return fmt.Errorf("error opening admin database: %w", err)
 	}
 
 	slog.Debug("pinging admin database", "uri", cfg.GetDBAdminDBURI())
 
 	err = db.PingContext(ctx)
 	if err != nil {
-		return fmt.Errorf("error pinging admin database: %v", err)
+		return fmt.Errorf("error pinging admin database: %w", err)
 	}
 
 	slog.Debug("creating admin database", "uri", cfg.GetDBAdminDBURI())
@@ -44,14 +45,14 @@ func createDB(ctx context.Context, cfg database.ConfigProvider) error {
 
 	db, err = sql.Open(cfg.GetDBDriver(), cfg.GetDBURI())
 	if err != nil {
-		return fmt.Errorf("error opening database: %v", err)
+		return fmt.Errorf("error opening database: %w", err)
 	}
 
 	slog.Debug("pinging database", "uri", cfg.GetDBAdminDBURI())
 
 	err = db.PingContext(ctx)
 	if err != nil {
-		return fmt.Errorf("error pinging database: %v", err)
+		return fmt.Errorf("error pinging database: %w", err)
 	}
 
 	return nil
@@ -73,14 +74,14 @@ func RunMigrations(ctx context.Context, cfg database.ConfigProvider) error {
 
 	m, err := migrate.NewWithSourceInstance("iofs", source, cfg.GetDBURI())
 	if err != nil {
-		return fmt.Errorf("failed to create migrate instance: %v", err)
+		return fmt.Errorf("failed to create migrate instance: %w", err)
 	}
 
 	err = m.Up()
-	if err == migrate.ErrNoChange {
+	if errors.Is(err, migrate.ErrNoChange) {
 		slog.Info("No migration changes required")
 	} else if err != nil {
-		return fmt.Errorf("failed to apply migrations: %v", err)
+		return fmt.Errorf("failed to apply migrations: %w", err)
 	} else {
 		slog.Info("Migrations applied successfully!")
 	}

internal/document/clean/contentType.go

@@ -98,7 +98,7 @@ func (s *Service) getBytesBuffer(ctx context.Context, params *CleanParams, start
 	buffer := make([]byte, length)
 	n, err := out.Body.Read(buffer)
 	if err != nil && n == 0 {
-		return nil, fmt.Errorf("unable to read object body: %v", err)
+		return nil, fmt.Errorf("unable to read object body: %w", err)
 	}
 
 	return buffer[:n], nil

internal/document/clean/create.go

@@ -13,13 +13,13 @@ import (
 func (s *Service) Clean(ctx context.Context, documentId uuid.UUID) error {
 	isclean, err := s.cfg.GetDBQueries().HasDocumentCleanEntry(ctx, documentId)
 	if err != nil {
-		return fmt.Errorf("unable to verify if document has been cleaned: %s", err)
+		return fmt.Errorf("unable to verify if document has been cleaned: %w", err)
 	}
 
 	if !isclean {
 		err = s.clean(ctx, documentId)
 		if err != nil {
-			return fmt.Errorf("unable to clean document: %s", err)
+			return fmt.Errorf("unable to clean document: %w", err)
 		}
 	}
 

internal/document/types/pdf.go

@@ -128,7 +128,7 @@ func (s *PDF) GetPageAsPNG(ctx context.Context, index int) ([]byte, error) {
 
 	img, err := fitzdoc.ImagePNG(0, float64(s.pngDPI))
 	if err != nil {
-		return nil, fmt.Errorf("failed to render page %d: %v", index, err)
+		return nil, fmt.Errorf("failed to render page %d: %w", index, err)
 	}
 
 	return img, nil

internal/query/normalize.go

@@ -36,12 +36,12 @@ func (s *Service) NormalizeConfig(config Config) error {
 
 	var data map[string]interface{}
 	if err := json.Unmarshal([]byte(trim), &data); err != nil {
-		return fmt.Errorf("error unmarshalling JSON: %s", err)
+		return fmt.Errorf("error unmarshalling JSON: %w", err)
 	}
 
 	prettyJSON, err := json.Marshal(data)
 	if err != nil {
-		return fmt.Errorf("error marshaling JSON: %s", err)
+		return fmt.Errorf("error marshaling JSON: %w", err)
 	}
 
 	strJSON := string(prettyJSON)

internal/server/api/listener.go

@@ -44,7 +44,7 @@ type BaseConfig struct {
 // experimental since it is not used yet and may pose cyclical dependency issues
 // in handlers that are called by the generated
 // swagger code. This needs to be verified.
-//func GetConfigFromContext(ctx echo.Context) (Config, error) {
+// func GetConfigFromContext(ctx echo.Context) (Config, error) {
 //	cfg, ok := ctx.Get(configContextKey).(Config)
 //	if !ok {
 //		return nil, errors.New("config not found in context")
@@ -170,13 +170,13 @@ func New(ctx context.Context, cfg Config) (*Server, error) {
 	// Put this in when refactoring is done and remove from main.go
 
 	//// This must be done before the rbac.InitializeAuthProvider then remove from main.go for service.
-	//errInitializingConfig := serviceconfig.InitializeConfig(cfg)
-	//if errInitializingConfig != nil {
+	// errInitializingConfig := serviceconfig.InitializeConfig(cfg)
+	// if errInitializingConfig != nil {
 	//	return nil, errInitializingConfig
 	//}
 	//
 	//// Initialize the rbac config here since only the API service needs it
-	//errorGettingAuthProvider := rbac.InitializeAuthProvider(cfg.GetAuthConfig())
+	// errorGettingAuthProvider := rbac.InitializeAuthProvider(cfg.GetAuthConfig())
 	//if errorGettingAuthProvider != nil {
 	//	return nil, errorGettingAuthProvider
 	//}

internal/server/runner/poll.go

@@ -43,7 +43,7 @@ func (c *Server[B]) pollMessage(ctx context.Context) error {
 		QueueURL: c.cfg.GetQueueURL(),
 	})
 	if err != nil {
-		return fmt.Errorf("message fetch fail: %v", err)
+		return fmt.Errorf("message fetch fail: %w", err)
 	}
 
 	for _, message := range result.Messages {
@@ -74,7 +74,7 @@ func (c *Server[B]) processMessage(ctx context.Context, message *types.Message)
 		ReceiptHandle: message.ReceiptHandle,
 	})
 	if err != nil {
-		return fmt.Errorf("message delete fail: %v", err)
+		return fmt.Errorf("message delete fail: %w", err)
 	}
 
 	return nil

internal/serviceconfig/auth/config.go

@@ -81,7 +81,7 @@ type ConfigProvider interface {
 // Returns an error if initialization fails, nil otherwise.
 func (c *CognitoConfig) InitializeAuthConfig(baseURL string, logger *slog.Logger) error {
 	tempConfig := InitializeConfig(baseURL, logger)
-	//fmt.Printf("base url after InitializeAuthConfig: %s\n", tempConfig.)
+	// fmt.Printf("base url after InitializeAuthConfig: %s\n", tempConfig.)
 	if tempConfig == nil {
 		return fmt.Errorf("could not initialize auth config")
 	}

internal/serviceconfig/aws/config.go

@@ -86,7 +86,7 @@ func (c *AWSConfig) SetAWSProfile(val Profile) {
 func GetAWSConfigWithOpts(ctx context.Context, opts ...func(*config.LoadOptions) error) (aws.Config, error) {
 	cfg, err := config.LoadDefaultConfig(ctx, opts...)
 	if err != nil {
-		return aws.Config{}, fmt.Errorf("unable to load SDK config: %v", err)
+		return aws.Config{}, fmt.Errorf("unable to load SDK config: %w", err)
 	}
 
 	return cfg, nil

internal/serviceconfig/observability/prometheus/generator/main.go

@@ -1,4 +1,4 @@
-//ignore go:build ignore
+// ignore go:build ignore
 
 package main
 

internal/serviceconfig/observability/prometheus/prometheus_test.go

@@ -17,12 +17,12 @@ func GetFreePortForTesting() (int, error) {
 	// Create a TCP listener on port 0 (lets OS choose a free port)
 	addr, err := net.ResolveTCPAddr("tcp", "localhost:0")
 	if err != nil {
-		return 0, fmt.Errorf("failed to resolve TCP address: %v", err)
+		return 0, fmt.Errorf("failed to resolve TCP address: %w", err)
 	}
 
 	l, err := net.ListenTCP("tcp", addr)
 	if err != nil {
-		return 0, fmt.Errorf("failed to create TCP listener: %v", err)
+		return 0, fmt.Errorf("failed to create TCP listener: %w", err)
 	}
 	defer l.Close()
 
@@ -143,7 +143,7 @@ func TestMetricsIntegration(t *testing.T) {
 
 	metricsOutput := string(body)
 	// if needed for debugging.
-	//log.Infof("Metrics output: %s", metricsOutput)
+	// log.Infof("Metrics output: %s", metricsOutput)
 
 	// Step 6: Verify that our custom metrics and go metrics are present
 	expectedMetrics := []string{
@@ -190,9 +190,11 @@ func TestMetricsIntegration(t *testing.T) {
 		// Try to connect to the server - it should fail after a short delay
 		time.Sleep(time.Second)
 		testingUrl := fmt.Sprintf("http://localhost:%d/metrics", testingPort)
-		_, err = http.Get(testingUrl)
+		resp, err := http.Get(testingUrl)
 		if err == nil {
 			t.Error("Expected server to be shutdown after context cancellation")
+		} else if resp != nil {
+			defer resp.Body.Close()
 		}
 	})
 }

internal/test/mockserver_test.go

@@ -82,6 +82,7 @@ func TestWaitForMockEndpoint(t *testing.T) {
 
 	resp, err := server.Client.Do(req)
 	require.NoError(t, err)
+	defer resp.Body.Close()
 
 	respStr, err := io.ReadAll(resp.Body)
 	require.NoError(t, err)

internal/test/runner.go

@@ -52,6 +52,8 @@ func GetRunnerEnvFromName(name RunnerName) RunnerEnv {
 	switch name {
 	case StoreEventRunnerName:
 		return StoreEventRunnerEnv
+	case DocInitRunnerName:
+		return DocInitRunnerEnv
 	case DocSyncRunnerName:
 		return DocSyncRunnerEnv
 	case DocCleanRunnerName: