[nspcc-dev#112] Fix comments from PR

Signed-off-by: Angira Kekteeva <kira@nspcc.ru>
masterSplinter01 · Jul 28, 2021 · 2152105 · 2152105
1 parent 17b49f7
commit 2152105
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 38 deletions.
diff --git a/api/handler/put.go b/api/handler/put.go
@@ -1,7 +1,6 @@
 package handler
 
 import (
-	"context"
 	"encoding/xml"
 	"fmt"
 	"net/http"
@@ -13,7 +12,6 @@ import (
 	"github.com/nspcc-dev/neofs-node/pkg/policy"
 	"github.com/nspcc-dev/neofs-s3-gw/api"
 	"github.com/nspcc-dev/neofs-s3-gw/api/layer"
-	"github.com/nspcc-dev/neofs-s3-gw/creds/accessbox"
 	"go.uber.org/zap"
 )
 
@@ -107,7 +105,7 @@ func (h *handler) CreateBucketHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	p.BoxData, err = getBoxData(r.Context())
+	p.BoxData, err = layer.GetBoxData(r.Context())
 	if err != nil {
 		h.registerAndSendError(w, r, err, "could not get boxData")
 		return
@@ -172,17 +170,3 @@ func parseBasicACL(basicACL string) (uint32, error) {
 		return uint32(value), nil
 	}
 }
-
-func getBoxData(ctx context.Context) (*accessbox.Box, error) {
-	var boxData *accessbox.Box
-	data, ok := ctx.Value(api.BoxData).(*accessbox.Box)
-	if !ok || data == nil {
-		return nil, fmt.Errorf("couldn't get box data from context")
-	}
-
-	boxData = data
-	if boxData.Gate == nil {
-		boxData.Gate = &accessbox.GateData{}
-	}
-	return boxData, nil
-}
diff --git a/api/layer/layer.go b/api/layer/layer.go
@@ -128,11 +128,10 @@ const (
 // NewLayer creates instance of layer. It checks credentials
 // and establishes gRPC connection with node.
 func NewLayer(log *zap.Logger, conns pool.Pool) Client {
-	cache := newListObjectsCache()
 	return &layer{
 		pool:  conns,
 		log:   log,
-		cache: cache,
+		cache: newListObjectsCache(),
 	}
 }
 

diff --git a/api/layer/object.go b/api/layer/object.go
@@ -14,7 +14,6 @@ import (
 	cid "github.com/nspcc-dev/neofs-api-go/pkg/container/id"
 	"github.com/nspcc-dev/neofs-api-go/pkg/object"
 	"github.com/nspcc-dev/neofs-s3-gw/api"
-	"github.com/nspcc-dev/neofs-s3-gw/creds/accessbox"
 	"go.uber.org/zap"
 )
 
@@ -272,7 +271,7 @@ func (n *layer) ListObjectsV2(ctx context.Context, p *ListObjectsParamsV2) (*Lis
 		return nil, err
 	}
 
-	if data, ok := ctx.Value(api.BoxData).(*accessbox.Box); ok && data != nil {
+	if data, err := GetBoxData(ctx); data != nil && err == nil {
 		accessKey = data.Gate.AccessKey
 	} else {
 		return nil, fmt.Errorf("couldn't get access key from the accessbox: %s", err)
@@ -297,12 +296,7 @@ func (n *layer) ListObjectsV2(ctx context.Context, p *ListObjectsParamsV2) (*Lis
 		}
 
 		if p.ContinuationToken != "" {
-			for i, obj := range allObjects {
-				if obj.ID().String() == p.ContinuationToken {
-					allObjects = allObjects[i:]
-					break
-				}
-			}
+			allObjects = trimAfterObjectID(p.ContinuationToken, allObjects)
 		}
 	}
 
@@ -381,3 +375,12 @@ func trimStartAfter(startAfter string, objects []*ObjectInfo) []*ObjectInfo {
 	}
 	return objects
 }
+
+func trimAfterObjectID(id string, objects []*ObjectInfo) []*ObjectInfo {
+	for i, obj := range objects {
+		if obj.ID().String() == id {
+			return objects[i:]
+		}
+	}
+	return objects
+}
diff --git a/api/layer/object_cache.go b/api/layer/object_cache.go
@@ -40,26 +40,21 @@ type (
 		mtx    sync.RWMutex
 	}
 	cache struct {
-		list    []*ObjectInfo
-		created time.Time
+		list []*ObjectInfo
 	}
 )
 
 func newListObjectsCache() *listObjectsCache {
-	c := listObjectsCache{}
-	c.caches = make(map[string]cache)
-	return &c
+	return &listObjectsCache{
+		caches: make(map[string]cache),
+	}
 }
 
 func (l *listObjectsCache) GetCache(token, key string) []*ObjectInfo {
 	l.mtx.RLock()
 	defer l.mtx.RUnlock()
 	if val, ok := l.caches[key]; ok {
-		for i, obj := range val.list {
-			if obj.ID().String() == token {
-				return val.list[i:]
-			}
-		}
+		return trimAfterObjectID(token, val.list)
 	}
 
 	return nil
@@ -72,7 +67,6 @@ func (l *listObjectsCache) PutCache(key string, objects []*ObjectInfo) {
 	l.mtx.Lock()
 	defer l.mtx.Unlock()
 	c.list = objects
-	c.created = time.Now()
 	l.caches[key] = c
 	time.AfterFunc(defaultCacheLifetime, func() {
 		l.mtx.Lock()

diff --git a/api/layer/util.go b/api/layer/util.go
@@ -1,13 +1,17 @@
 package layer
 
 import (
+	"context"
+	"fmt"
 	"os"
 	"strconv"
 	"strings"
 	"time"
 
 	"github.com/nspcc-dev/neofs-api-go/pkg/object"
 	"github.com/nspcc-dev/neofs-api-go/pkg/owner"
+	"github.com/nspcc-dev/neofs-s3-gw/api"
+	"github.com/nspcc-dev/neofs-s3-gw/creds/accessbox"
 )
 
 type (
@@ -172,3 +176,18 @@ func (o *ObjectInfo) ID() *object.ID { return o.id }
 
 // IsDir allows to check if object is a directory.
 func (o *ObjectInfo) IsDir() bool { return o.isDir }
+
+// GetBoxData  extracts accessbox.Box from context. 
+func GetBoxData(ctx context.Context) (*accessbox.Box, error) {
+	var boxData *accessbox.Box
+	data, ok := ctx.Value(api.BoxData).(*accessbox.Box)
+	if !ok || data == nil {
+		return nil, fmt.Errorf("couldn't get box data from context")
+	}
+
+	boxData = data
+	if boxData.Gate == nil {
+		boxData.Gate = &accessbox.GateData{}
+	}
+	return boxData, nil
+}