Skip to content

Commit 1d6cd2e

Browse files
bomokobomoko
authored
Merge pull request #114 from uselagoon/revert-111-adds-service-to-lagoon-fact
Revert "Change: Adds Service to lagoonFact"
2 parents b63c0c5 + dfe798d commit 1d6cd2e

File tree

10 files changed

+112
-159
lines changed

10 files changed

+112
-159
lines changed

‎internal/handler/FactDataTransformer_test.go‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ func TestFactProcessor_TestMultipleFilters(t *testing.T) {
1717
KeyFact: false,
1818
Type: "",
1919
Category: "",
20-
Service: "",
2120
}
2221

2322
fp1 := FactProcessor{
@@ -70,7 +69,6 @@ func TestFactProcessor_ProcessLagoonFactAgainstRegisteredFilters(t *testing.T) {
7069
KeyFact: false,
7170
Type: "",
7271
Category: "",
73-
Service: "",
7472
}
7573

7674
poppedFactFilters := KeyFactFilters
@@ -183,7 +181,6 @@ func TestFactProcessor_TestSetFriendlyName(t *testing.T) {
183181
KeyFact: false,
184182
Type: "",
185183
Category: "",
186-
Service: "",
187184
},
188185
InsightsData: EnvironmentVariable{
189186
Key: "testkey",
@@ -216,7 +213,6 @@ func TestFactProcessor_TestExactMatchLookup(t *testing.T) {
216213
KeyFact: false,
217214
Type: "",
218215
Category: "",
219-
Service: "",
220216
},
221217
InsightsData: EnvironmentVariable{
222218
Key: "testkey",

‎internal/handler/imageInspectParserFilter.go‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ type ImageData struct {
2525

2626
func processImageInspectInsightsData(h *Messaging, insights InsightsData, v string, apiClient graphql.Client, resource ResourceDestination) ([]LagoonFact, string, error) {
2727
source := fmt.Sprintf("insights:image:%s", resource.Service)
28-
service := resource.Service
2928
logger := slog.With("ProjectName", resource.Project, "EnvironmentName", resource.Environment, "Source", source)
3029
if insights.InsightsType == Image {
3130

@@ -35,12 +34,12 @@ func processImageInspectInsightsData(h *Messaging, insights InsightsData, v stri
3534
}
3635
environmentId := environment.Id
3736

38-
return ProcessImageInspectData(v, logger, environmentId, source, service)
37+
return ProcessImageInspectData(v, logger, environmentId, source)
3938
}
4039
return []LagoonFact{}, "", nil
4140
}
4241

43-
func ProcessImageInspectData(v string, logger *slog.Logger, environmentId int, source string, service string) ([]LagoonFact, string, error) {
42+
func ProcessImageInspectData(v string, logger *slog.Logger, environmentId int, source string) ([]LagoonFact, string, error) {
4443
decoded, err := decodeGzipString(v)
4544
if err != nil {
4645
return nil, "", err
@@ -54,7 +53,7 @@ func ProcessImageInspectData(v string, logger *slog.Logger, environmentId int, s
5453
return nil, "", err
5554
}
5655

57-
facts, err := processFactsFromImageInspect(logger, imageInspect, environmentId, source, service)
56+
facts, err := processFactsFromImageInspect(logger, imageInspect, environmentId, source)
5857
if err != nil {
5958
return nil, "", err
6059
}
@@ -67,7 +66,7 @@ func ProcessImageInspectData(v string, logger *slog.Logger, environmentId int, s
6766
return facts, source, nil
6867
}
6968

70-
func processFactsFromImageInspect(logger *slog.Logger, imageInspectData ImageData, id int, source string, service string) ([]LagoonFact, error) {
69+
func processFactsFromImageInspect(logger *slog.Logger, imageInspectData ImageData, id int, source string) ([]LagoonFact, error) {
7170

7271
var factsInput []LagoonFact
7372

@@ -102,7 +101,6 @@ func processFactsFromImageInspect(logger *slog.Logger, imageInspectData ImageDat
102101
Description: "Environment Variable",
103102
KeyFact: false,
104103
Type: FactTypeText,
105-
Service: service,
106104
}
107105

108106
logger.Debug("Processing environment fact", "name", f.Key, "value", f.Value)

‎internal/handler/imageInspectParserFilter_test.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ func Test_processFactsFromImageInspect(t *testing.T) {
1414
imageInspectDataSource string
1515
id int
1616
source string
17-
service string
1817
}
1918
tests := []struct {
2019
name string
@@ -55,7 +54,7 @@ func Test_processFactsFromImageInspect(t *testing.T) {
5554
panic(1)
5655
}
5756

58-
got, err := processFactsFromImageInspect(tt.args.logger, imageInspectData, tt.args.id, tt.args.source, tt.args.service)
57+
got, err := processFactsFromImageInspect(tt.args.logger, imageInspectData, tt.args.id, tt.args.source)
5958
if (err != nil) != tt.wantErr {
6059
t.Errorf("processFactsFromImageInspect() error = %v, wantErr %v", err, tt.wantErr)
6160
return

‎internal/handler/insightsParserFilter.go‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ func processSbomInsightsData(h *Messaging, insights InsightsData, v string, apiC
1111

1212
source := fmt.Sprintf("insights:sbom:%s", resource.Service)
1313
logger := slog.With("ProjectName", resource.Project, "EnvironmentName", resource.Environment, "Source", source)
14-
service := resource.Service
14+
1515
if insights.InsightsType != Sbom {
1616
return []LagoonFact{}, "", nil
1717
}
@@ -45,7 +45,7 @@ func processSbomInsightsData(h *Messaging, insights InsightsData, v string, apiC
4545
}
4646

4747
// Process SBOM into facts
48-
facts := processFactsFromSBOM(logger, bom.Components, environment.Id, source, service)
48+
facts := processFactsFromSBOM(logger, bom.Components, environment.Id, source)
4949

5050
facts, err = KeyFactsFilter(facts)
5151
if err != nil {
@@ -66,7 +66,7 @@ func processSbomInsightsData(h *Messaging, insights InsightsData, v string, apiC
6666
return facts, source, nil
6767
}
6868

69-
func processFactsFromSBOM(logger *slog.Logger, facts *[]cdx.Component, environmentId int, source string, service string) []LagoonFact {
69+
func processFactsFromSBOM(logger *slog.Logger, facts *[]cdx.Component, environmentId int, source string) []LagoonFact {
7070
var factsInput []LagoonFact
7171
if facts == nil || len(*facts) == 0 {
7272
return factsInput
@@ -92,7 +92,6 @@ func processFactsFromSBOM(logger *slog.Logger, facts *[]cdx.Component, environme
9292
Description: f.PackageURL,
9393
KeyFact: false,
9494
Type: FactTypeText,
95-
Service: service,
9695
}
9796
//if EnableDebug {
9897
// log.Println("[DEBUG] processing fact name " + f.Name)

‎internal/handler/main.go‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,6 @@ type InsightsMessage struct {
6767
Annotations map[string]string `json:"annotations"`
6868
Labels map[string]string `json:"labels"`
6969
Type string `json:"type,omitempty"`
70-
Environment string `json:"environment"`
71-
Project string `json:"project"`
72-
Service string `json:"service"`
7370
}
7471

7572
type PayloadInput struct {
@@ -138,7 +135,6 @@ type LagoonFact struct {
138135
KeyFact bool `json:"keyFact"`
139136
Type string `json:"type"`
140137
Category string `json:"category"`
141-
Service string `json:"service"`
142138
}
143139

144140
const (
@@ -577,7 +573,6 @@ func (h *Messaging) pushFactsToLagoonApi(facts []LagoonFact, resource ResourceDe
577573
KeyFact: fact.KeyFact,
578574
Type: lagoonclient.FactType(fact.Type),
579575
Category: fact.Category,
580-
Service: fact.Service,
581576
}
582577

583578
}

‎internal/handler/main_test.go‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,6 @@ func Test_processFactsFromSBOM(t *testing.T) {
140140
bom *[]cdx.Component
141141
environmentId int
142142
source string
143-
service string
144143
}
145144

146145
testResponse, err := ioutil.ReadFile("./testassets/testSbomPayload.json")
@@ -202,7 +201,7 @@ func Test_processFactsFromSBOM(t *testing.T) {
202201
}
203202
for _, tt := range tests {
204203
t.Run(tt.name, func(t *testing.T) {
205-
got := processFactsFromSBOM(slog.Default(), tt.args.bom, tt.args.environmentId, tt.args.source, tt.args.service)
204+
got := processFactsFromSBOM(slog.Default(), tt.args.bom, tt.args.environmentId, tt.args.source)
206205
if len(got) != len(tt.want) {
207206
t.Errorf("processFactsFromSBOM() returned %d results, want %d", len(got), len(tt.want))
208207
}
@@ -225,7 +224,6 @@ func Test_processFactsFromSBOMWithNoComponents(t *testing.T) {
225224
bom *[]cdx.Component
226225
environmentId int
227226
source string
228-
service string
229227
}
230228

231229
testResponse, err := ioutil.ReadFile("./testassets/testSbomPayloadNoComponents.json")
@@ -268,7 +266,7 @@ func Test_processFactsFromSBOMWithNoComponents(t *testing.T) {
268266
}
269267
for _, tt := range tests {
270268
t.Run(tt.name, func(t *testing.T) {
271-
got := processFactsFromSBOM(slog.Default(), tt.args.bom, tt.args.environmentId, tt.args.source, tt.args.service)
269+
got := processFactsFromSBOM(slog.Default(), tt.args.bom, tt.args.environmentId, tt.args.source)
272270
if len(got) != len(tt.want) {
273271
t.Errorf("processFactsFromSBOM() returned %d results, want %d", len(got), len(tt.want))
274272
}

‎internal/handler/messaging.go‎

Lines changed: 11 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -171,34 +171,6 @@ func preprocessIncomingMessageData(incoming *InsightsMessage) (ResourceDestinati
171171
OutputFileMIMEType: "application/json",
172172
}
173173

174-
// Prioritize the insights data over labels
175-
if incoming.Project != "" {
176-
resource.Project = incoming.Project
177-
} else if label, ok := incoming.Labels["lagoon.sh/project"]; ok {
178-
resource.Project = label
179-
}
180-
181-
if incoming.Environment != "" {
182-
resource.Environment = incoming.Environment
183-
} else if label, ok := incoming.Labels["lagoon.sh/environment"]; ok {
184-
resource.Environment = label
185-
}
186-
187-
if incoming.Service != "" {
188-
resource.Service = incoming.Service
189-
} else if label, ok := incoming.Labels["lagoon.sh/service"]; ok {
190-
resource.Service = label
191-
}
192-
193-
if incoming.Type != "" {
194-
insights.InputType = incoming.Type
195-
} else if label, ok := incoming.Labels["lagoon.sh/insightsType"]; ok {
196-
insights.InputType = label
197-
if label == "image-gz" {
198-
insights.LagoonType = ImageFacts
199-
}
200-
}
201-
202174
// Check labels for insights data from message
203175
if incoming.Labels != nil {
204176
labelKeys := make([]string, 0, len(incoming.Labels))
@@ -209,6 +181,17 @@ func preprocessIncomingMessageData(incoming *InsightsMessage) (ResourceDestinati
209181

210182
for _, label := range labelKeys {
211183
switch label {
184+
case "lagoon.sh/project":
185+
resource.Project = incoming.Labels["lagoon.sh/project"]
186+
case "lagoon.sh/environment":
187+
resource.Environment = incoming.Labels["lagoon.sh/environment"]
188+
case "lagoon.sh/service":
189+
resource.Service = incoming.Labels["lagoon.sh/service"]
190+
case "lagoon.sh/insightsType":
191+
insights.InputType = incoming.Labels["lagoon.sh/insightsType"]
192+
if incoming.Labels["lagoon.sh/insightsType"] == "image-gz" {
193+
insights.LagoonType = ImageFacts
194+
}
212195
case "lagoon.sh/insightsOutputCompressed":
213196
compressed, _ := strconv.ParseBool(incoming.Labels["lagoon.sh/insightsOutputCompressed"])
214197
insights.OutputCompressed = compressed

‎internal/handler/processing.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ func processFactsDirectly(message mq.Message, h *Messaging) string {
5757
KeyFact: false,
5858
Type: lagoonclient.FactType(vartypeString),
5959
Category: fact.Category,
60-
Service: fact.Service,
6160
}
6261
factSources[fact.Source] = fact.Source
6362
}

0 commit comments

Comments
 (0)