Skip to content

Use Go 1.23 maps.Keys, slices.Sort more #4687

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lifubang merged 2 commits into from
Mar 24, 2025
Merged

Use Go 1.23 maps.Keys, slices.Sort more #4687

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
370733b
libct/cap: rm mapKeys, use maps.Keys, slices.Sorted
kolyshkin Mar 21, 2025
bc96bc8
libct/seccomp: use maps and slices pkgs
kolyshkin Mar 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 3 additions & 12 deletions libcontainer/capabilities/capabilities.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ package capabilities
import (
"errors"
"fmt"
"sort"
"maps"
"slices"
"strings"
"sync"
"syscall"
Expand Down Expand Up @@ -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
}
Expand All @@ -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
Expand Down
24 changes: 5 additions & 19 deletions libcontainer/seccomp/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ package seccomp

import (
"fmt"
"sort"
"maps"
"slices"

"github.com/opencontainers/runc/libcontainer/configs"
"github.com/opencontainers/runtime-spec/specs-go"
Expand All @@ -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{
Expand All @@ -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{
Expand All @@ -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.
Expand Down