Merge pull request #4687 from kolyshkin/maps-slices

Use Go 1.23 maps.Keys, slices.Sort more

libcontainer/capabilities/capabilities.go

@@ -5,7 +5,8 @@ package capabilities
 import (
 	"errors"
 	"fmt"
-	"sort"
+	"maps"
+	"slices"
 	"strings"
 	"sync"
 	"syscall"
@@ -67,7 +68,7 @@ func New(capConfig *configs.Capabilities) (*Caps, error) {
 		return nil, err
 	}
 	if len(unknownCaps) > 0 {
-		logrus.Warn("ignoring unknown or unavailable capabilities: ", mapKeys(unknownCaps))
+		logrus.Warn("ignoring unknown or unavailable capabilities: ", slices.Sorted(maps.Keys(unknownCaps)))
 	}
 	return &c, nil
 }
@@ -88,16 +89,6 @@ func capSlice(caps []string, unknownCaps map[string]struct{}) []capability.Cap {
 	return out
 }
 
-// mapKeys returns the keys of input in sorted order
-func mapKeys(input map[string]struct{}) []string {
-	keys := make([]string, 0, len(input))
-	for c := range input {
-		keys = append(keys, c)
-	}
-	sort.Strings(keys)
-	return keys
-}
-
 // Caps holds the capabilities for a container.
 type Caps struct {
 	pid  capability.Capabilities

libcontainer/seccomp/config.go

@@ -2,7 +2,8 @@ package seccomp
 
 import (
 	"fmt"
-	"sort"
+	"maps"
+	"slices"
 
 	"github.com/opencontainers/runc/libcontainer/configs"
 	"github.com/opencontainers/runtime-spec/specs-go"
@@ -25,12 +26,7 @@ var operators = map[string]configs.Operator{
 // KnownOperators returns the list of the known operations.
 // Used by `runc features`.
 func KnownOperators() []string {
-	var res []string
-	for k := range operators {
-		res = append(res, k)
-	}
-	sort.Strings(res)
-	return res
+	return slices.Sorted(maps.Keys(operators))
 }
 
 var actions = map[string]configs.Action{
@@ -48,12 +44,7 @@ var actions = map[string]configs.Action{
 // KnownActions returns the list of the known actions.
 // Used by `runc features`.
 func KnownActions() []string {
-	var res []string
-	for k := range actions {
-		res = append(res, k)
-	}
-	sort.Strings(res)
-	return res
+	return slices.Sorted(maps.Keys(actions))
 }
 
 var archs = map[string]string{
@@ -79,12 +70,7 @@ var archs = map[string]string{
 // KnownArchs returns the list of the known archs.
 // Used by `runc features`.
 func KnownArchs() []string {
-	var res []string
-	for k := range archs {
-		res = append(res, k)
-	}
-	sort.Strings(res)
-	return res
+	return slices.Sorted(maps.Keys(archs))
 }
 
 // ConvertStringToOperator converts a string into a Seccomp comparison operator.