Adds functionality to rename fact names if there are duplicates

internal/handler/fact_filters.go

@@ -1,5 +1,9 @@
 package handler
 
+import (
+	"fmt"
+)
+
 func KeyFactsFilter(factsInput []LagoonFact) ([]LagoonFact, error) {
 	var filteredFacts []LagoonFact
 	for _, v := range factsInput {
@@ -9,3 +13,20 @@ func KeyFactsFilter(factsInput []LagoonFact) ([]LagoonFact, error) {
 	}
 	return filteredFacts, nil
 }
+
+func FactDuplicateHandler(factsInput []LagoonFact) ([]LagoonFact, error) {
+	var factOccurrenceTracker = map[string]int32{}
+
+	var filteredFacts []LagoonFact
+	for _, v := range factsInput {
+		if _, ok := factOccurrenceTracker[v.Name]; ok {
+			factOccurrenceTracker[v.Name] += 1
+			v.Name = fmt.Sprintf("%v (%v)", v.Name, v.OriginalFact.Name)
+		} else {
+			factOccurrenceTracker[v.Name] = 1
+		}
+		filteredFacts = append(filteredFacts, v)
+	}
+
+	return filteredFacts, nil
+}

internal/handler/fact_filters_test.go

@@ -0,0 +1,18 @@
+package handler
+
+import (
+	"testing"
+)
+
+func TestFactDuplicateHandler(t *testing.T) {
+	dupfacts := []LagoonFact{
+		{Name: "duplicatename"},
+		{Name: "duplicatename"},
+	}
+
+	outfacts, _ := FactDuplicateHandler(dupfacts)
+
+	if outfacts[0].Name == outfacts[1].Name {
+		t.Errorf("Fact names should not be duplicated")
+	}
+}

internal/handler/imageInspectParserFilter.go

@@ -55,6 +55,11 @@ func processImageInspectInsightsData(h *Messaging, insights InsightsData, v stri
 			return nil, "", err
 		}
 
+		facts, err = FactDuplicateHandler(facts)
+		if err != nil {
+			return nil, "", err
+		}
+
 		return facts, source, nil
 	}
 	return []LagoonFact{}, "", nil
@@ -84,7 +89,6 @@ func processFactsFromImageInspect(imageInspectData ImageData, id int, source str
 	}
 
 	for _, f := range filteredFacts {
-
 		fact := LagoonFact{
 			Environment: id,
 			Name:        f.Key,

internal/handler/insightsParserFilter.go

@@ -58,13 +58,18 @@ func processSbomInsightsData(h *Messaging, insights InsightsData, v string, apiC
 		source := fmt.Sprintf("insights:sbom:%s", resource.Service)
 
 		// Process SBOM into facts
-		facts := processFactsFromSBOM(bom.Components, environment.Id, source)
+		facts := processFactsFromSBOM(bom.Components, environment.Id, source, resource.Service)
 
 		facts, err = KeyFactsFilter(facts)
 		if err != nil {
 			return nil, "", err
 		}
 
+		facts, err = FactDuplicateHandler(facts)
+		if err != nil {
+			return nil, "", err
+		}
+
 		if len(facts) == 0 {
 			return nil, "", fmt.Errorf("no facts to process")
 		}
@@ -78,7 +83,7 @@ func processSbomInsightsData(h *Messaging, insights InsightsData, v string, apiC
 	return []LagoonFact{}, "", nil
 }
 
-func processFactsFromSBOM(facts *[]cdx.Component, environmentId int, source string) []LagoonFact {
+func processFactsFromSBOM(facts *[]cdx.Component, environmentId int, source string, service string) []LagoonFact {
 	var factsInput []LagoonFact
 	if len(*facts) == 0 {
 		return factsInput
@@ -101,9 +106,14 @@ func processFactsFromSBOM(facts *[]cdx.Component, environmentId int, source stri
 			Name:        f.Name,
 			Value:       f.Version,
 			Source:      source,
+			Service:     service,
 			Description: f.PackageURL,
 			KeyFact:     false,
-			Type:        FactTypeText,
+			OriginalFact: PreTransformedFact{
+				Name:  f.Name,
+				Value: f.Version,
+			},
+			Type: FactTypeText,
 		}
 		fmt.Println("Processing fact name " + f.Name)
 		fact, _ = ProcessLagoonFactAgainstRegisteredFilters(fact, f)

internal/handler/main.go

@@ -80,15 +80,22 @@ type InsightsData struct {
 
 // LagoonFact Here we wrap outgoing facts before passing them to genqlient
 type LagoonFact struct {
-	Id          int    `json:"id"`
-	Environment int    `json:"environment"`
-	Name        string `json:"name"`
-	Value       string `json:"value"`
-	Source      string `json:"source"`
-	Description string `json:"description"`
-	KeyFact     bool   `json:"keyFact"`
-	Type        string `json:"type"`
-	Category    string `json:"category"`
+	Id           int                `json:"id"`
+	Environment  int                `json:"environment"`
+	Name         string             `json:"name"`
+	Value        string             `json:"value"`
+	Source       string             `json:"source"`
+	Service      string             `json:"service"`
+	Description  string             `json:"description"`
+	KeyFact      bool               `json:"keyFact"`
+	Type         string             `json:"type"`
+	OriginalFact PreTransformedFact `json:"originalFact"`
+	Category     string             `json:"category"`
+}
+
+type PreTransformedFact struct {
+	Name  string
+	Value string
 }
 
 const (
@@ -375,7 +382,6 @@ func (h *Messaging) sendToLagoonAPI(incoming *InsightsMessage, resource Resource
 	// Just wrapping this in a function to clean up the calls near the bottom of this function
 	// could potentially be moved into its own method
 	var processFactList = func(facts []LagoonFact, apiClient graphql.Client, resource ResourceDestination, source string, h *Messaging) error {
-
 		project, environment, apiErr := determineResourceFromLagoonAPI(apiClient, resource)
 		log.Printf("Matched %v number of facts for project:environment '%v:%v' from source '%v'", len(facts), project, environment, source)
 
@@ -416,7 +422,6 @@ func (h *Messaging) sendToLagoonAPI(incoming *InsightsMessage, resource Resource
 
 	if insights.InputPayload == BinaryPayload {
 		for _, v := range incoming.BinaryPayload {
-
 			for _, filter := range parserFilters {
 				facts, source, err = filter(h, insights, v, apiClient, resource)
 				if err != nil {
@@ -590,6 +595,7 @@ func (h *Messaging) pushFactsToLagoonApi(facts []LagoonFact, resource ResourceDe
 			Name:        fact.Name,
 			Value:       fact.Value,
 			Source:      fact.Source,
+			Service:     fact.Service,
 			Description: fact.Description,
 			KeyFact:     fact.KeyFact,
 			Type:        lagoonclient.FactType(fact.Type),

internal/handler/registerFilters.go

@@ -46,7 +46,6 @@ func ProcessLagoonFactAgainstRegisteredFilters(fact LagoonFact, insightsRawData
 		if !pfout.isFilteredOut() {
 			fact = pfout.getFact()
 		}
-
 	}
 	return fact, nil
 }
@@ -68,15 +67,12 @@ func LoadTransformsFromDisk(filename string) ([]FactTransform, error) {
 }
 
 func GenerateFilterFromTransform(transform FactTransform) (func(filter parserFilter) parserFilter, error) {
-
 	return func(filter parserFilter) parserFilter {
-
 		if transform.Type != "" {
 			filter = filter.isOfType(transform.Type)
 		}
 
 		for i := range transform.Lookupvalue {
-
 			n := transform.Lookupvalue[i].Name
 			v := transform.Lookupvalue[i].Value
 			em := transform.Lookupvalue[i].ExactMatch
@@ -85,7 +81,6 @@ func GenerateFilterFromTransform(transform FactTransform) (func(filter parserFil
 			} else {
 				filter = filter.fieldContains(n, v)
 			}
-
 		}
 
 		for i := range transform.Transformations {
@@ -104,7 +99,6 @@ func GenerateFilterFromTransform(transform FactTransform) (func(filter parserFil
 }
 
 func RegisterFiltersFromJson(filename string) error {
-
 	transforms, err := LoadTransformsFromDisk(filename)
 	if err != nil {
 		return err

internal/lagoonclient/facts.go

@@ -7,13 +7,13 @@ import (
 )
 
 type Project struct {
-	Id   int
-	Name string
+	Id   int    `json:"id,omitempty"`
+	Name string `json:"name,omitempty"`
 }
 
 type Environment struct {
-	Id   int
-	Name string
+	Id   int    `json:"id,omitempty"`
+	Name string `json:"name,omitempty"`
 }
 
 type Fact struct {

internal/lagoonclient/schema.graphql

@@ -112,6 +112,7 @@ input AddFactInput {
   name: String!
   value: String!
   source: String!
+  service: String!
   description: String!
   keyFact: Boolean
   type: FactType
@@ -865,6 +866,7 @@ type Fact {
   name: String
   value: String
   source: String
+  service: String
   description: String
   keyFact: Boolean
   type: FactType
@@ -1954,6 +1956,7 @@ input UpdateFactInputValue {
   name: String!
   value: String!
   source: String!
+  service: String!
   description: String
   keyFact: Boolean
   type: FactType