strings.Sort() --> slices.Sort()

Signed-off-by: Dale Haiducek <[email protected]>

Author: dhaiducek

controllers/configurationpolicy_utils.go

@@ -6,6 +6,7 @@ package controllers
 import (
 	"fmt"
 	"reflect"
+	"slices"
 	"sort"
 	"strconv"
 	"strings"
@@ -441,7 +442,7 @@ func fmtMetadataForCompare(
 
 // Format name of resource with its namespace (if it has one)
 func identifierStr(names []string, namespace string) (nameStr string) {
-	sort.Strings(names)
+	slices.Sort(names)
 
 	nameStr = "["
 
@@ -535,7 +536,7 @@ func createStatus(
 		}
 	}
 
-	sort.Strings(otherReasons)
+	slices.Sort(otherReasons)
 	orderedReasons = append(orderedReasons, otherReasons...)
 
 	// The "reason" is more specific in the compliancyDetails section than in the relatedObjects section.
@@ -552,7 +553,7 @@ func createStatus(
 			sortedNamespaces = append(sortedNamespaces, ns)
 		}
 
-		sort.Strings(sortedNamespaces)
+		slices.Sort(sortedNamespaces)
 
 		// If the object template was unnamed, then the object names can be different per namespace. If it was named,
 		// all will be the same, but this accounts for both.
@@ -574,7 +575,7 @@ func createStatus(
 			objectNameStrsToNamespaces[namesStr] = append(objectNameStrsToNamespaces[namesStr], ns)
 		}
 
-		sort.Strings(sortedObjectNamesStrs)
+		slices.Sort(sortedObjectNamesStrs)
 
 		// Process the object name strings in order to ensure a deterministic reason and message.
 		for i, namesStr := range sortedObjectNamesStrs {

controllers/operatorpolicy_controller.go

@@ -12,7 +12,6 @@ import (
 	"reflect"
 	"regexp"
 	"slices"
-	"sort"
 	"strconv"
 	"strings"
 	"time"
@@ -1851,7 +1850,7 @@ func (r *OperatorPolicyReconciler) getRemainingCSVApprovals(
 
 	unapprovedCSVs := requiredCSVs.Difference(approvedCSVs).UnsortedList()
 
-	sort.Strings(unapprovedCSVs)
+	slices.Sort(unapprovedCSVs)
 
 	return unapprovedCSVs, nil
 }

controllers/operatorpolicy_status.go

@@ -3,6 +3,7 @@ package controllers
 import (
 	"context"
 	"fmt"
+	"slices"
 	"sort"
 	"strings"
 	"time"
@@ -701,13 +702,13 @@ func installPlanUpgradeCond(
 		Reason: "InstallPlanRequiresApproval",
 	}
 
-	sort.Strings(csvsInInstallPlan)
+	slices.Sort(csvsInInstallPlan)
 	cond.Message = fmt.Sprintf(
 		"an InstallPlan to update to [%s] is available for approval", strings.Join(csvsInInstallPlan, ", "),
 	)
 
 	if len(remainingCSVsToApprove) > 0 {
-		sort.Strings(remainingCSVsToApprove)
+		slices.Sort(remainingCSVsToApprove)
 
 		cond.Message += fmt.Sprintf(
 			" but approval for [%v] is required", strings.Join(remainingCSVsToApprove, ", "),

pkg/common/namespace_selection.go

@@ -7,7 +7,7 @@ import (
 	"context"
 	"fmt"
 	"reflect"
-	"sort"
+	"slices"
 	"strings"
 	"sync"
 
@@ -254,7 +254,7 @@ func (r *NamespaceSelectorReconciler) Get(objNS string, objName string, t policy
 	}
 
 	selected, err := Matches(nsToMatch, t.Include, t.Exclude)
-	sort.Strings(selected)
+	slices.Sort(selected)
 
 	log.V(2).Info("Updating selection from Reconcile with matches",
 		"namespace", objNS, "policy", objName, "selection", selected, "error", err)
@@ -345,7 +345,7 @@ func filter(allNSList corev1.NamespaceList, t policyv1.Target) ([]string, error)
 	}
 
 	namespaces, err := Matches(nsToFilter, t.Include, t.Exclude)
-	sort.Strings(namespaces)
+	slices.Sort(namespaces)
 
 	return namespaces, err
 }

test/e2e/case38_install_operator_test.go

@@ -7,7 +7,6 @@ import (
 	"reflect"
 	"regexp"
 	"slices"
-	"sort"
 	"strconv"
 	"strings"
 	"time"
@@ -3593,7 +3592,7 @@ var _ = Describe("Testing OperatorPolicy", Ordered, Label("supports-hosted"), fu
 						installPlan.Object, "spec", "clusterServiceVersionNames",
 					)
 
-					sort.Strings(csvNames)
+					slices.Sort(csvNames)
 
 					if !reflect.DeepEqual(
 						csvNames, []string{"argocd-operator.v0.9.1", "strimzi-cluster-operator.v0.35.0"},