Merge pull request #271 from nspcc-dev/upd-sdk

Use new iterators from NeoFS SDK

Author: roman-khimov

cmd/neofs-rest-gw/integration_test.go

@@ -8,6 +8,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
+	"maps"
 	"mime/multipart"
 	"net/http"
 	"net/url"
@@ -1665,10 +1666,7 @@ func restContainerPut(ctx context.Context, t *testing.T, clientPool *pool.Pool)
 	cnr, err := clientPool.ContainerGet(ctx, CID, client.PrmContainerGet{})
 	require.NoError(t, err)
 
-	cnrAttr := make(map[string]string)
-	cnr.IterateAttributes(func(key, val string) {
-		cnrAttr[key] = val
-	})
+	cnrAttr := maps.Collect(cnr.Attributes())
 
 	for key, val := range userAttributes {
 		require.Equal(t, val, cnrAttr[key])

go.mod

@@ -7,7 +7,7 @@ require (
 	github.com/google/uuid v1.6.0
 	github.com/labstack/echo/v4 v4.12.0
 	github.com/nspcc-dev/neo-go v0.108.1
-	github.com/nspcc-dev/neofs-sdk-go v1.0.0-rc.13
+	github.com/nspcc-dev/neofs-sdk-go v1.0.0-rc.13.0.20250311165714-441b37a4bc03
 	github.com/oapi-codegen/echo-middleware v1.0.2
 	github.com/oapi-codegen/runtime v1.1.1
 	github.com/spf13/pflag v1.0.5

go.sum

@@ -147,8 +147,8 @@ github.com/nspcc-dev/hrw/v2 v2.0.3 h1:GUIitIiDpAaQat9SZccp7XVAuwtqaM40+uZ9D8Q4A8
 github.com/nspcc-dev/hrw/v2 v2.0.3/go.mod h1:VWlFSGGPcHG1abuIDJb5u83tIF2EqOatC8Z7svZmgWQ=
 github.com/nspcc-dev/neo-go v0.108.1 h1:XbtNtDL7O8G1B70WmlPcFXA3fsBGOgXzHxQVfBh6Yv0=
 github.com/nspcc-dev/neo-go v0.108.1/go.mod h1:DlISaevW5zhfzg2KgCxtR/m8wQObPuht03kEXSf0g2w=
-github.com/nspcc-dev/neofs-sdk-go v1.0.0-rc.13 h1:q1ne/4d10NuHSqs+fA5XVVBRJ9jSap4cjrsxYzNvYZA=
-github.com/nspcc-dev/neofs-sdk-go v1.0.0-rc.13/go.mod h1:ycdDlPq8Wy+w5ePCmCfbHuEWQXbP7ZjBL5rj3QDiiM0=
+github.com/nspcc-dev/neofs-sdk-go v1.0.0-rc.13.0.20250311165714-441b37a4bc03 h1:hHAt6pUuhkmcCRXKKYa93FGwDMC13kN7sAq3mXR1YAw=
+github.com/nspcc-dev/neofs-sdk-go v1.0.0-rc.13.0.20250311165714-441b37a4bc03/go.mod h1:ycdDlPq8Wy+w5ePCmCfbHuEWQXbP7ZjBL5rj3QDiiM0=
 github.com/nspcc-dev/rfc6979 v0.2.3 h1:QNVykGZ3XjFwM/88rGfV3oj4rKNBy+nYI6jM7q19hDI=
 github.com/nspcc-dev/rfc6979 v0.2.3/go.mod h1:q3sCL1Ed7homjqYK8KmFSzEmm+7Ngyo7PePbZanhaDE=
 github.com/nspcc-dev/tzhash v1.8.2 h1:ebRCbPoEuoqrhC6sSZmrT/jI3h1SzCWakxxV6gp5QAg=

handlers/containers.go

@@ -297,12 +297,12 @@ func getContainerInfo(ctx context.Context, p *pool.Pool, cnrID cid.ID) (*apiserv
 	}
 
 	var attrs []apiserver.Attribute
-	cnr.IterateAttributes(func(key, val string) {
+	for key, val := range cnr.Attributes() {
 		attrs = append(attrs, apiserver.Attribute{
 			Key:   key,
 			Value: val,
 		})
-	})
+	}
 
 	var sb strings.Builder
 	if err = cnr.PlacementPolicy().WriteStringTo(&sb); err != nil {