Prioritize getting s3 object with the key, which equals to valid FrostFS OID, rather than getting non-existent object with OID via native protocol for GET and HEAD requests

Signed-off-by: Nikita Zinkevich <n.zinkevich@yadro.com>

@@ -35,0 +42,4 @@
+		return
+	}
+
+	foundOid, err := h.checkS3ObjectExist(ctx, bktInfo, oidParam)

@@ -0,0 +23,4 @@
+	Versioning        string
+	LockConfiguration *ObjectLockConfiguration
+	CannedACL         string
+	OwnerKey          *keys.PublicKey

@@ -0,0 +12,4 @@
+	BaseNodeVersion
+	DeleteMarker  bool
+	IsPrefixNode  bool
+	IsUnversioned bool

@@ -0,0 +31,4 @@
+// Basically used for "system" object.
+type BaseNodeVersion struct {
+	ID             uint64
+	ParentID       uint64

@@ -36,0 +38,4 @@
+	}
+
+	_, s3checkErr := h.tree.GetSettingsNode(ctx, bktInfo)
+	if s3checkErr != nil && !strings.Contains(s3checkErr.Error(), "tree not found") {

@@ -111,0 +130,4 @@
+	} else if err = objID.DecodeString(oidParam); err == nil {
+		// Head object via native protocol
+		addr := newAddress(bktInfo.CID, objID)
+		h.headObject(ctx, h.newRequest(c, log), addr)

@@ -210,15 +240,6 @@ func (c *Tree) GetVersions(ctx context.Context, cnrID *cid.ID, objectName string
 	return c.service.GetNodes(ctx, p)
 }
 
-func (c *Tree) CheckSettingsNodeExist(ctx context.Context, bktInfo *data.BucketInfo) error {

@@ -23,3 +27,2 @@
 	ServiceClient interface {
-		GetNodes(ctx context.Context, p *GetNodesParams) ([]NodeResponse, error)
-		GetSubTree(ctx context.Context, bktInfo *data.BucketInfo, treeID string, rootID []uint64, depth uint32, sort bool) ([]NodeResponse, error)
+		GetNodes(ctx context.Context, p *GetNodesParams) ([]data.NodeResponse, error)

@@ -500,3 +500,3 @@
 	}()
 
-	handler := handler.New(a.AppParams(), a.settings, tree.NewTree(frostfs.NewPoolWrapper(a.treePool)), workerPool)
+	handle := handler.New(a.AppParams(), a.settings, tree.NewTree(frostfs.NewPoolWrapper(a.treePool), a.log), workerPool)

@@ -0,0 +18,4 @@
+}
+
+// BucketSettings stores settings such as versioning.
+type BucketSettings struct {

@@ -324,4 +288,0 @@
-
-// resolveContainer decode container id, if it's not a valid container id
-// then trey to resolve name using provided resolver.
-func (h *Handler) resolveContainer(ctx context.Context, containerID string) (*cid.ID, error) {

@@ -31,0 +31,4 @@
+		ParentID  []uint64
+		ObjID     oid.ID
+		TimeStamp []uint64
+		Size      uint64

@@ -64,0 +57,4 @@
+	versioningKV        = "Versioning"
+	cannedACLKV         = "cannedACL"
+	ownerKeyKV          = "ownerKey"
+	lockConfigurationKV = "LockConfiguration"

@@ -135,1 +121,4 @@
+func newNodeVersionFromTreeNode(treeNode *treeNode) *data.NodeVersion {
+	version := &data.NodeVersion{
+		BaseNodeVersion: data.BaseNodeVersion{
 			OID: treeNode.ObjID,

@@ -0,0 +12,4 @@
+type TreeService interface {
+	GetLatestVersion(ctx context.Context, cnrID *cid.ID, objectName string) (*data.NodeVersion, error)
+	GetSubTreeByPrefix(ctx context.Context, bktInfo *data.BucketInfo, prefix string, latestOnly bool) ([]tree.NodeResponse, string, error)
+	CheckSettingsNodeExists(ctx context.Context, bktInfo *data.BucketInfo) error

@@ -354,3 +311,3 @@
 	if err != nil {
 		cnrID, err = h.containerResolver.Resolve(ctx, containerID)
-		if err != nil && strings.Contains(err.Error(), "not found") {
+		if err != nil && !errors.Is(err, layer.ErrNodeNotFound) {