chore(refact): move sorting after filtering

pepov · pepov · commit 7ca6841ab357 · 2023-10-17T16:37:12.000+02:00
Signed-off-by: Peter Wilcsinszky &lt;peter.wilcsinszky@axoflow.com&gt;
diff --git a/pkg/resources/model/repository.go b/pkg/resources/model/repository.go
@@ -148,16 +148,17 @@ func (r LoggingResourceRepository) ClusterFlowsFor(ctx context.Context, logging
 		return nil, err
 	}
 
-	sort.Slice(list.Items, func(i, j int) bool {
-		return lessByNamespacedName(&list.Items[i], &list.Items[j])
-	})
-
 	var res []v1beta1.ClusterFlow
 	for _, i := range list.Items {
 		if i.Spec.LoggingRef == logging.Spec.LoggingRef {
 			res = append(res, i)
 		}
 	}
+
+	sort.Slice(res, func(i, j int) bool {
+		return lessByNamespacedName(&res[i], &res[j])
+	})
+
 	return res, nil
 }
 
@@ -167,16 +168,17 @@ func (r LoggingResourceRepository) ClusterOutputsFor(ctx context.Context, loggin
 		return nil, err
 	}
 
-	sort.Slice(list.Items, func(i, j int) bool {
-		return lessByNamespacedName(&list.Items[i], &list.Items[j])
-	})
-
 	var res []v1beta1.ClusterOutput
 	for _, i := range list.Items {
 		if i.Spec.LoggingRef == logging.Spec.LoggingRef {
 			res = append(res, i)
 		}
 	}
+
+	sort.Slice(res, func(i, j int) bool {
+		return lessByNamespacedName(&res[i], &res[j])
+	})
+
 	return res, nil
 }
 
@@ -186,16 +188,17 @@ func (r LoggingResourceRepository) FlowsInNamespaceFor(ctx context.Context, name
 		return nil, err
 	}
 
-	sort.Slice(list.Items, func(i, j int) bool {
-		return lessByNamespacedName(&list.Items[i], &list.Items[j])
-	})
-
 	var res []v1beta1.Flow
 	for _, i := range list.Items {
 		if i.Spec.LoggingRef == logging.Spec.LoggingRef {
 			res = append(res, i)
 		}
 	}
+
+	sort.Slice(res, func(i, j int) bool {
+		return lessByNamespacedName(&res[i], &res[j])
+	})
+
 	return res, nil
 }
 
@@ -205,16 +208,16 @@ func (r LoggingResourceRepository) OutputsInNamespaceFor(ctx context.Context, na
 		return nil, err
 	}
 
-	sort.Slice(list.Items, func(i, j int) bool {
-		return lessByNamespacedName(&list.Items[i], &list.Items[j])
-	})
-
 	var res []v1beta1.Output
 	for _, i := range list.Items {
 		if i.Spec.LoggingRef == logging.Spec.LoggingRef {
 			res = append(res, i)
 		}
 	}
+
+	sort.Slice(res, func(i, j int) bool {
+		return lessByNamespacedName(&res[i], &res[j])
+	})
 	return res, nil
 }
 
@@ -224,16 +227,16 @@ func (r LoggingResourceRepository) SyslogNGClusterFlowsFor(ctx context.Context,
 		return nil, err
 	}
 
-	sort.Slice(list.Items, func(i, j int) bool {
-		return lessByNamespacedName(&list.Items[i], &list.Items[j])
-	})
-
 	var res []v1beta1.SyslogNGClusterFlow
 	for _, i := range list.Items {
 		if i.Spec.LoggingRef == logging.Spec.LoggingRef {
 			res = append(res, i)
 		}
 	}
+
+	sort.Slice(res, func(i, j int) bool {
+		return lessByNamespacedName(&res[i], &res[j])
+	})
 	return res, nil
 }
 
@@ -243,16 +246,15 @@ func (r LoggingResourceRepository) SyslogNGClusterOutputsFor(ctx context.Context
 		return nil, err
 	}
 
-	sort.Slice(list.Items, func(i, j int) bool {
-		return lessByNamespacedName(&list.Items[i], &list.Items[j])
-	})
-
 	var res []v1beta1.SyslogNGClusterOutput
 	for _, i := range list.Items {
 		if i.Spec.LoggingRef == logging.Spec.LoggingRef {
 			res = append(res, i)
 		}
 	}
+	sort.Slice(res, func(i, j int) bool {
+		return lessByNamespacedName(&res[i], &res[j])
+	})
 	return res, nil
 }
 
@@ -262,16 +264,15 @@ func (r LoggingResourceRepository) SyslogNGFlowsInNamespaceFor(ctx context.Conte
 		return nil, err
 	}
 
-	sort.Slice(list.Items, func(i, j int) bool {
-		return lessByNamespacedName(&list.Items[i], &list.Items[j])
-	})
-
 	var res []v1beta1.SyslogNGFlow
 	for _, i := range list.Items {
 		if i.Spec.LoggingRef == logging.Spec.LoggingRef {
 			res = append(res, i)
 		}
 	}
+	sort.Slice(res, func(i, j int) bool {
+		return lessByNamespacedName(&res[i], &res[j])
+	})
 	return res, nil
 }
 
@@ -281,16 +282,15 @@ func (r LoggingResourceRepository) SyslogNGOutputsInNamespaceFor(ctx context.Con
 		return nil, err
 	}
 
-	sort.Slice(list.Items, func(i, j int) bool {
-		return lessByNamespacedName(&list.Items[i], &list.Items[j])
-	})
-
 	var res []v1beta1.SyslogNGOutput
 	for _, i := range list.Items {
 		if i.Spec.LoggingRef == logging.Spec.LoggingRef {
 			res = append(res, i)
 		}
 	}
+	sort.Slice(res, func(i, j int) bool {
+		return lessByNamespacedName(&res[i], &res[j])
+	})
 	return res, nil
 }
 
@@ -305,16 +305,15 @@ func (r LoggingResourceRepository) NodeAgentsFor(ctx context.Context, logging v1
 		return nil, err
 	}
 
-	sort.Slice(list.Items, func(i, j int) bool {
-		return lessByNamespacedName(&list.Items[i], &list.Items[j])
-	})
-
 	var res []v1beta1.NodeAgent
 	for _, i := range list.Items {
 		if i.Spec.LoggingRef == logging.Spec.LoggingRef {
 			res = append(res, i)
 		}
 	}
+	sort.Slice(res, func(i, j int) bool {
+		return lessByNamespacedName(&res[i], &res[j])
+	})
 	return res, nil
 }
 
@@ -324,16 +323,15 @@ func (r LoggingResourceRepository) FluentbitsFor(ctx context.Context, logging v1
 		return nil, err
 	}
 
-	sort.Slice(list.Items, func(i, j int) bool {
-		return lessByNamespacedName(&list.Items[i], &list.Items[j])
-	})
-
 	var res []v1beta1.FluentbitAgent
 	for _, i := range list.Items {
 		if i.Spec.LoggingRef == logging.Spec.LoggingRef {
 			res = append(res, i)
 		}
 	}
+	sort.Slice(res, func(i, j int) bool {
+		return lessByNamespacedName(&res[i], &res[j])
+	})
 	return res, nil
 }
 
@@ -343,16 +341,15 @@ func (r LoggingResourceRepository) LoggingRoutesFor(ctx context.Context, logging
 		return nil, err
 	}
 
-	sort.Slice(list.Items, func(i, j int) bool {
-		return lessByNamespacedName(&list.Items[i], &list.Items[j])
-	})
-
 	var res []v1beta1.LoggingRoute
 	for _, i := range list.Items {
 		if i.Spec.Source == logging.Spec.LoggingRef {
 			res = append(res, i)
 		}
 	}
+	sort.Slice(res, func(i, j int) bool {
+		return lessByNamespacedName(&res[i], &res[j])
+	})
 	return res, nil
 }
 

Original file line number	Diff line number	Diff line change
`@@ -148,16 +148,17 @@ func (r LoggingResourceRepository) ClusterFlowsFor(ctx context.Context, logging`
`148`	`148`	`return nil, err`
`149`	`149`	`}`
`150`	`150`
`151`		`- sort.Slice(list.Items, func(i, j int) bool {`
`152`		`- return lessByNamespacedName(&list.Items[i], &list.Items[j])`
`153`		`- })`
`154`		`-`
`155`	`151`	`var res []v1beta1.ClusterFlow`
`156`	`152`	`for _, i := range list.Items {`
`157`	`153`	`if i.Spec.LoggingRef == logging.Spec.LoggingRef {`
`158`	`154`	`res = append(res, i)`
`159`	`155`	`}`
`160`	`156`	`}`
	`157`	`+`
	`158`	`+ sort.Slice(res, func(i, j int) bool {`
	`159`	`+ return lessByNamespacedName(&res[i], &res[j])`
	`160`	`+ })`
	`161`	`+`
`161`	`162`	`return res, nil`
`162`	`163`	`}`
`163`	`164`
`@@ -167,16 +168,17 @@ func (r LoggingResourceRepository) ClusterOutputsFor(ctx context.Context, loggin`
`167`	`168`	`return nil, err`
`168`	`169`	`}`
`169`	`170`
`170`		`- sort.Slice(list.Items, func(i, j int) bool {`
`171`		`- return lessByNamespacedName(&list.Items[i], &list.Items[j])`
`172`		`- })`
`173`		`-`
`174`	`171`	`var res []v1beta1.ClusterOutput`
`175`	`172`	`for _, i := range list.Items {`
`176`	`173`	`if i.Spec.LoggingRef == logging.Spec.LoggingRef {`
`177`	`174`	`res = append(res, i)`
`178`	`175`	`}`
`179`	`176`	`}`
	`177`	`+`
	`178`	`+ sort.Slice(res, func(i, j int) bool {`
	`179`	`+ return lessByNamespacedName(&res[i], &res[j])`
	`180`	`+ })`
	`181`	`+`
`180`	`182`	`return res, nil`
`181`	`183`	`}`
`182`	`184`
`@@ -186,16 +188,17 @@ func (r LoggingResourceRepository) FlowsInNamespaceFor(ctx context.Context, name`
`186`	`188`	`return nil, err`
`187`	`189`	`}`
`188`	`190`
`189`		`- sort.Slice(list.Items, func(i, j int) bool {`
`190`		`- return lessByNamespacedName(&list.Items[i], &list.Items[j])`
`191`		`- })`
`192`		`-`
`193`	`191`	`var res []v1beta1.Flow`
`194`	`192`	`for _, i := range list.Items {`
`195`	`193`	`if i.Spec.LoggingRef == logging.Spec.LoggingRef {`
`196`	`194`	`res = append(res, i)`
`197`	`195`	`}`
`198`	`196`	`}`
	`197`	`+`
	`198`	`+ sort.Slice(res, func(i, j int) bool {`
	`199`	`+ return lessByNamespacedName(&res[i], &res[j])`
	`200`	`+ })`
	`201`	`+`
`199`	`202`	`return res, nil`
`200`	`203`	`}`
`201`	`204`
`@@ -205,16 +208,16 @@ func (r LoggingResourceRepository) OutputsInNamespaceFor(ctx context.Context, na`
`205`	`208`	`return nil, err`
`206`	`209`	`}`
`207`	`210`
`208`		`- sort.Slice(list.Items, func(i, j int) bool {`
`209`		`- return lessByNamespacedName(&list.Items[i], &list.Items[j])`
`210`		`- })`
`211`		`-`
`212`	`211`	`var res []v1beta1.Output`
`213`	`212`	`for _, i := range list.Items {`
`214`	`213`	`if i.Spec.LoggingRef == logging.Spec.LoggingRef {`
`215`	`214`	`res = append(res, i)`
`216`	`215`	`}`
`217`	`216`	`}`
	`217`	`+`
	`218`	`+ sort.Slice(res, func(i, j int) bool {`
	`219`	`+ return lessByNamespacedName(&res[i], &res[j])`
	`220`	`+ })`
`218`	`221`	`return res, nil`
`219`	`222`	`}`
`220`	`223`
`@@ -224,16 +227,16 @@ func (r LoggingResourceRepository) SyslogNGClusterFlowsFor(ctx context.Context,`
`224`	`227`	`return nil, err`
`225`	`228`	`}`
`226`	`229`
`227`		`- sort.Slice(list.Items, func(i, j int) bool {`
`228`		`- return lessByNamespacedName(&list.Items[i], &list.Items[j])`
`229`		`- })`
`230`		`-`
`231`	`230`	`var res []v1beta1.SyslogNGClusterFlow`
`232`	`231`	`for _, i := range list.Items {`
`233`	`232`	`if i.Spec.LoggingRef == logging.Spec.LoggingRef {`
`234`	`233`	`res = append(res, i)`
`235`	`234`	`}`
`236`	`235`	`}`
	`236`	`+`
	`237`	`+ sort.Slice(res, func(i, j int) bool {`
	`238`	`+ return lessByNamespacedName(&res[i], &res[j])`
	`239`	`+ })`
`237`	`240`	`return res, nil`
`238`	`241`	`}`
`239`	`242`
`@@ -243,16 +246,15 @@ func (r LoggingResourceRepository) SyslogNGClusterOutputsFor(ctx context.Context`
`243`	`246`	`return nil, err`
`244`	`247`	`}`
`245`	`248`
`246`		`- sort.Slice(list.Items, func(i, j int) bool {`
`247`		`- return lessByNamespacedName(&list.Items[i], &list.Items[j])`
`248`		`- })`
`249`		`-`
`250`	`249`	`var res []v1beta1.SyslogNGClusterOutput`
`251`	`250`	`for _, i := range list.Items {`
`252`	`251`	`if i.Spec.LoggingRef == logging.Spec.LoggingRef {`
`253`	`252`	`res = append(res, i)`
`254`	`253`	`}`
`255`	`254`	`}`
	`255`	`+ sort.Slice(res, func(i, j int) bool {`
	`256`	`+ return lessByNamespacedName(&res[i], &res[j])`
	`257`	`+ })`
`256`	`258`	`return res, nil`
`257`	`259`	`}`
`258`	`260`
`@@ -262,16 +264,15 @@ func (r LoggingResourceRepository) SyslogNGFlowsInNamespaceFor(ctx context.Conte`
`262`	`264`	`return nil, err`
`263`	`265`	`}`
`264`	`266`
`265`		`- sort.Slice(list.Items, func(i, j int) bool {`
`266`		`- return lessByNamespacedName(&list.Items[i], &list.Items[j])`
`267`		`- })`
`268`		`-`
`269`	`267`	`var res []v1beta1.SyslogNGFlow`
`270`	`268`	`for _, i := range list.Items {`
`271`	`269`	`if i.Spec.LoggingRef == logging.Spec.LoggingRef {`
`272`	`270`	`res = append(res, i)`
`273`	`271`	`}`
`274`	`272`	`}`
	`273`	`+ sort.Slice(res, func(i, j int) bool {`
	`274`	`+ return lessByNamespacedName(&res[i], &res[j])`
	`275`	`+ })`
`275`	`276`	`return res, nil`
`276`	`277`	`}`
`277`	`278`
`@@ -281,16 +282,15 @@ func (r LoggingResourceRepository) SyslogNGOutputsInNamespaceFor(ctx context.Con`
`281`	`282`	`return nil, err`
`282`	`283`	`}`
`283`	`284`
`284`		`- sort.Slice(list.Items, func(i, j int) bool {`
`285`		`- return lessByNamespacedName(&list.Items[i], &list.Items[j])`
`286`		`- })`
`287`		`-`
`288`	`285`	`var res []v1beta1.SyslogNGOutput`
`289`	`286`	`for _, i := range list.Items {`
`290`	`287`	`if i.Spec.LoggingRef == logging.Spec.LoggingRef {`
`291`	`288`	`res = append(res, i)`
`292`	`289`	`}`
`293`	`290`	`}`
	`291`	`+ sort.Slice(res, func(i, j int) bool {`
	`292`	`+ return lessByNamespacedName(&res[i], &res[j])`
	`293`	`+ })`
`294`	`294`	`return res, nil`
`295`	`295`	`}`
`296`	`296`
`@@ -305,16 +305,15 @@ func (r LoggingResourceRepository) NodeAgentsFor(ctx context.Context, logging v1`
`305`	`305`	`return nil, err`
`306`	`306`	`}`
`307`	`307`
`308`		`- sort.Slice(list.Items, func(i, j int) bool {`
`309`		`- return lessByNamespacedName(&list.Items[i], &list.Items[j])`
`310`		`- })`
`311`		`-`
`312`	`308`	`var res []v1beta1.NodeAgent`
`313`	`309`	`for _, i := range list.Items {`
`314`	`310`	`if i.Spec.LoggingRef == logging.Spec.LoggingRef {`
`315`	`311`	`res = append(res, i)`
`316`	`312`	`}`
`317`	`313`	`}`
	`314`	`+ sort.Slice(res, func(i, j int) bool {`
	`315`	`+ return lessByNamespacedName(&res[i], &res[j])`
	`316`	`+ })`
`318`	`317`	`return res, nil`
`319`	`318`	`}`
`320`	`319`
`@@ -324,16 +323,15 @@ func (r LoggingResourceRepository) FluentbitsFor(ctx context.Context, logging v1`
`324`	`323`	`return nil, err`
`325`	`324`	`}`
`326`	`325`
`327`		`- sort.Slice(list.Items, func(i, j int) bool {`
`328`		`- return lessByNamespacedName(&list.Items[i], &list.Items[j])`
`329`		`- })`
`330`		`-`
`331`	`326`	`var res []v1beta1.FluentbitAgent`
`332`	`327`	`for _, i := range list.Items {`
`333`	`328`	`if i.Spec.LoggingRef == logging.Spec.LoggingRef {`
`334`	`329`	`res = append(res, i)`
`335`	`330`	`}`
`336`	`331`	`}`
	`332`	`+ sort.Slice(res, func(i, j int) bool {`
	`333`	`+ return lessByNamespacedName(&res[i], &res[j])`
	`334`	`+ })`
`337`	`335`	`return res, nil`
`338`	`336`	`}`
`339`	`337`
`@@ -343,16 +341,15 @@ func (r LoggingResourceRepository) LoggingRoutesFor(ctx context.Context, logging`
`343`	`341`	`return nil, err`
`344`	`342`	`}`
`345`	`343`
`346`		`- sort.Slice(list.Items, func(i, j int) bool {`
`347`		`- return lessByNamespacedName(&list.Items[i], &list.Items[j])`
`348`		`- })`
`349`		`-`
`350`	`344`	`var res []v1beta1.LoggingRoute`
`351`	`345`	`for _, i := range list.Items {`
`352`	`346`	`if i.Spec.Source == logging.Spec.LoggingRef {`
`353`	`347`	`res = append(res, i)`
`354`	`348`	`}`
`355`	`349`	`}`
	`350`	`+ sort.Slice(res, func(i, j int) bool {`
	`351`	`+ return lessByNamespacedName(&res[i], &res[j])`
	`352`	`+ })`
`356`	`353`	`return res, nil`
`357`	`354`	`}`
`358`	`355`