Further logging

Makefile

@@ -5,6 +5,6 @@ gettrivy:
 
 .PHONY: runlocal
 runlocal:
-	go run main.go --problems-from-sbom=true --rabbitmq-username=guest  --rabbitmq-password=guest --lagoon-api-host=http://localhost:8888/graphql   --jwt-token-signing-key=secret   --access-key-id=minio     --secret-access-key=minio123 --disable-s3-upload=true
+	go run main.go --problems-from-sbom=true --rabbitmq-username=guest  --rabbitmq-password=guest --lagoon-api-host=http://localhost:8888/graphql   --jwt-token-signing-key=secret   --access-key-id=minio     --secret-access-key=minio123 --disable-s3-upload=true --debug=true
 
 

internal/handler/insightsFactsParserFilter.go

@@ -25,7 +25,7 @@ func processFactsInsightsData(h *Messaging, insights InsightsData, v string, api
 		//dec := base64.NewDecoder(base64.StdEncoding, r)
 		res, err := ioutil.ReadAll(r)
 		if err != nil {
-			fmt.Println("err: ", err)
+			slog.Error("Error reading insights data", "Error", err)
 		}
 
 		facts := processFactsFromJSON(logger, res, source)

internal/handler/main.go

@@ -447,7 +447,7 @@ func (h *Messaging) sendToLagoonS3(incoming *InsightsMessage, insights InsightsD
 			return err
 		}
 	} else {
-		log.Printf("Successfully created %s", h.S3Config.Bucket)
+		slog.Info(fmt.Sprintf("Successfully created %s", h.S3Config.Bucket))
 	}
 
 	if len(incoming.Payload) != 0 {
@@ -466,14 +466,14 @@ func (h *Messaging) sendToLagoonS3(incoming *InsightsMessage, insights InsightsD
 			return putObjErr
 		}
 
-		log.Printf("Successfully uploaded %s of size %d", objectName, info.Size)
+		slog.Info(fmt.Sprintf("Successfully uploaded %s of size %d", objectName, info.Size))
 	}
 
 	if len(incoming.BinaryPayload) != 0 {
 		for _, p := range incoming.BinaryPayload {
 			result, err := decodeGzipString(p)
 			if err != nil {
-				fmt.Errorf(err.Error())
+				return err
 			}
 			resultJson, _ := json.MarshalIndent(result, "", " ")
 
@@ -491,7 +491,7 @@ func (h *Messaging) sendToLagoonS3(incoming *InsightsMessage, insights InsightsD
 			if insights.OutputCompressed != true {
 				err = ioutil.WriteFile(tempFilePath, resultJson, 0644)
 				if err != nil {
-					fmt.Errorf(err.Error())
+					return err
 				}
 			} else {
 				var buf bytes.Buffer
@@ -500,7 +500,7 @@ func (h *Messaging) sendToLagoonS3(incoming *InsightsMessage, insights InsightsD
 				gz.Close()
 				err = ioutil.WriteFile(tempFilePath, buf.Bytes(), 0644)
 				if err != nil {
-					fmt.Errorf(err.Error())
+					return err
 				}
 			}
 
@@ -510,13 +510,13 @@ func (h *Messaging) sendToLagoonS3(incoming *InsightsMessage, insights InsightsD
 				ContentEncoding: contentEncoding,
 			})
 			if err != nil {
-				fmt.Errorf(err.Error())
+				return err
 			}
-			log.Printf("Successfully uploaded %s of size %d\n", s3FilePath, info.Size)
+			slog.Info(fmt.Sprintf("Successfully uploaded %s of size %d\n", s3FilePath, info.Size))
 
 			err = os.Remove(tempFilePath)
 			if err != nil {
-				fmt.Errorf(err.Error())
+				return err
 			}
 		}
 	}
@@ -533,10 +533,6 @@ func (h *Messaging) pushFactsToLagoonApi(facts []LagoonFact, resource ResourceDe
 	)
 	apiClient := graphql.NewClient(h.LagoonAPI.Endpoint, &http.Client{Transport: &authedTransport{wrapped: http.DefaultTransport, h: h}})
 
-	//if EnableDebug {
-	//	log.Printf("[DEBUG] attempting to add %d fact(s)...", len(facts))
-	//}
-
 	slog.Debug("Attempting to add facts",
 		"Number", len(facts),
 	)
@@ -568,7 +564,9 @@ func (h *Messaging) pushFactsToLagoonApi(facts []LagoonFact, resource ResourceDe
 		}
 	}
 
-	log.Println(result)
+	logger.Debug("Response from API",
+		"result", result,
+	)
 	return nil
 }
 

internal/handler/processing.go

@@ -6,7 +6,6 @@ import (
 	"github.com/Khan/genqlient/graphql"
 	"github.com/cheshir/go-mq"
 	"github.com/uselagoon/lagoon/services/insights-handler/internal/lagoonclient"
-	"log"
 	"log/slog"
 	"net/http"
 	"strconv"
@@ -93,10 +92,8 @@ func processFactsDirectly(message mq.Message, h *Messaging) string {
 func processProblemsDirectly(message mq.Message, h *Messaging) ([]string, error) {
 	var directProblems DirectProblems
 	json.Unmarshal(message.Body(), &directProblems)
-	log.Println(directProblems)
 	err := json.Unmarshal(message.Body(), &directProblems)
 	if err != nil {
-		//log.Println("Error unmarshaling JSON:", err)
 		slog.Error("Could not unmarshal JSON", "Error", err)
 		return []string{}, err
 	}
@@ -131,7 +128,7 @@ func processProblemsDirectly(message mq.Message, h *Messaging) ([]string, error)
 		if err != nil {
 			return []string{}, err
 		}
-		log.Printf("Deleted Problems on '%v:%v' for source %v\n", directProblems.ProjectName, directProblems.EnvironmentName, s)
+
 		slog.Info("Deleted problems",
 			"Project", directProblems.ProjectName,
 			"Environment", directProblems.EnvironmentName,

internal/handler/trivyProcessing_test.go

@@ -2,7 +2,6 @@ package handler
 
 import (
 	"encoding/json"
-	"fmt"
 	"github.com/CycloneDX/cyclonedx-go"
 	"github.com/aquasecurity/trivy/pkg/types"
 	"github.com/goccy/go-yaml"
@@ -43,7 +42,6 @@ func Test_convertBOMToProblemsArray(t *testing.T) {
 			var bom cyclonedx.BOM
 			json.Unmarshal(bomText, &bom)
 			got, err := convertBOMToProblemsArray(tt.args.environment, tt.args.source, tt.args.service, bom)
-			fmt.Print(len(got))
 			if (err != nil) != tt.wantErr {
 				t.Errorf("convertBOMToProblemsArray() error = %v, wantErr %v", err, tt.wantErr)
 				return

main.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"github.com/cheshir/go-mq"
 	"github.com/uselagoon/lagoon/services/insights-handler/internal/handler"
-	"log"
 	"log/slog"
 	"os"
 	"strconv"
@@ -109,6 +108,7 @@ func main() {
 	if enableDebug {
 		debugLevel = slog.LevelDebug
 	}
+
 	slog.SetDefault(slog.New(slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{
 		Level: debugLevel,
 	})))
@@ -151,7 +151,8 @@ func main() {
 
 	err := handler.RegisterFiltersFromDisk(filterTransformerFile)
 	if err != nil {
-		log.Println(err)
+		// TODO: BETTER ERROR HANDLING
+		slog.Error("Unable to register filters from disk", "Error", err)
 	}
 
 	config := mq.Config{