TrueCloudLab/frostfs-node
20
1
Fork 28
Code Issues 106 Pull requests 4 Projects Releases 2 Packages 4 Activity Actions

[#1646] cli: Use Cmp() functions for ID-like structs
Some checks failed
DCO action / DCO (pull_request) Successful in 36s
Details
Vulncheck / Vulncheck (pull_request) Failing after 53s
Details
Tests and linters / Tests (pull_request) Failing after 59s
Details
Build / Build Components (pull_request) Failing after 1m5s
Details
Tests and linters / Lint (pull_request) Failing after 1m9s
Details
Tests and linters / Run gofumpt (pull_request) Failing after 1m7s
Details
Tests and linters / Staticcheck (pull_request) Failing after 1m14s
Details
Pre-commit hooks / Pre-commit (pull_request) Successful in 1m24s
Details
Tests and linters / Tests with -race (pull_request) Failing after 2m58s
Details
Tests and linters / gopls check (pull_request) Failing after 2m59s
Details

Browse source 
Signed-off-by: Alexander Chuprov <a.chuprov@yadro.com>
This commit is contained in:
Alexander Chuprov 2025-02-13 19:43:08 +03:00
parent fe0cf86dc6
commit a73fb5c462
Signed by: achuprov
GPG key ID: 2D916FFD803B0EDD
1 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
cmd/frostfs-cli/internal/client/client.go
View file

@ -6,11 +6,6 @@ import (
"context" "context"
"errors" "errors"
"fmt" "fmt"
"io"
"os"
"slices"
"strings"
"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/accounting" "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/accounting"
"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/checksum" "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/checksum"
"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client" "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client"
@ -20,6 +15,9 @@ import (
objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object"
oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id"
"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/version" "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/version"
"io"
"os"
"slices"
) )
var errMissingHeaderInResponse = errors.New("missing header in response") var errMissingHeaderInResponse = errors.New("missing header in response")
@ -77,9 +75,7 @@ func ListContainers(ctx context.Context, prm ListContainersPrm) (res ListContain
// SortedIDList returns sorted list of identifiers of user's containers. // SortedIDList returns sorted list of identifiers of user's containers.
func (x ListContainersRes) SortedIDList() []cid.ID { func (x ListContainersRes) SortedIDList() []cid.ID {
list := x.cliRes.Containers() list := x.cliRes.Containers()
slices.SortFunc(list, func(lhs, rhs cid.ID) int { slices.SortFunc(list, cid.ID.Cmp)
return strings.Compare(lhs.EncodeToString(), rhs.EncodeToString())
})
return list return list
} }
@ -687,9 +683,7 @@ func SearchObjects(ctx context.Context, prm SearchObjectsPrm) (*SearchObjectsRes
return nil, fmt.Errorf("read object list: %w", err) return nil, fmt.Errorf("read object list: %w", err)
} }
slices.SortFunc(list, func(a, b oid.ID) int { slices.SortFunc(list, oid.ID.Cmp)
return strings.Compare(a.EncodeToString(), b.EncodeToString())
})
return &SearchObjectsRes{ return &SearchObjectsRes{
ids: list, ids: list,