realloc/frostfs-s3-gw
1
0
Fork 0
forked from TrueCloudLab/frostfs-s3-gw
Code Issues Pull requests Projects Releases Packages Wiki Activity

[#25] Migrate layer to NeoFS API v2

Browse source 
Naive migration, without any tries to start application

closes #25

Signed-off-by: Evgeniy Kulikov <kim@nspcc.ru>
This commit is contained in:
Evgeniy Kulikov 2020-10-19 04:04:37 +03:00
parent ec56a1818e
commit 7deeb68d47
6 changed files with 420 additions and 738 deletions
Download patch file Download diff file Expand all files Collapse all files

61
api/layer/util.go
View file

@ -6,8 +6,8 @@ import (
"strings"
"time"
"github.com/nspcc-dev/neofs-api-go/object"
"github.com/nspcc-dev/neofs-api-go/refs"
"github.com/nspcc-dev/neofs-api-go/pkg/object"
"github.com/nspcc-dev/neofs-api-go/pkg/owner"
)
type (
@ -17,7 +17,7 @@ type (
Size int64
ContentType string
Created time.Time
Owner refs.OwnerID
Owner *owner.ID
Headers map[string]string
}
@ -39,7 +39,7 @@ type (
NextContinuationToken string
// List of objects info for this request.
Objects []ObjectInfo
Objects []*ObjectInfo
// List of prefixes for this request.
Prefixes []string
@ -48,65 +48,46 @@ type (
const pathSeparator = string(os.PathSeparator)
func userHeaders(h []object.Header) map[string]string {
result := make(map[string]string, len(h))
func userHeaders(attrs []*object.Attribute) map[string]string {
result := make(map[string]string, len(attrs))
for i := range h {
switch v := h[i].Value.(type) {
case *object.Header_UserHeader:
result[v.UserHeader.Key] = v.UserHeader.Value
default:
continue
}
for _, attr := range attrs {
result[attr.GetKey()] = attr.GetValue()
}
return result
}
func objectInfoFromMeta(meta *object.Object) *ObjectInfo {
aws3name := meta.SystemHeader.ID.String()
aws3name := meta.GetID().String()
userHeaders := userHeaders(meta.Headers)
userHeaders := userHeaders(meta.GetAttributes())
if name, ok := userHeaders[AWS3NameHeader]; ok {
aws3name = name
delete(userHeaders, name)
}
mimeType := http.DetectContentType(meta.Payload)
mimeType := http.DetectContentType(meta.GetPayload())
return &ObjectInfo{
Bucket: meta.SystemHeader.CID.String(),
Bucket: meta.GetContainerID().String(),
Name: aws3name,
ContentType: mimeType,
Headers: userHeaders,
Size: int64(meta.SystemHeader.PayloadLength),
Created: time.Unix(meta.SystemHeader.CreatedAt.UnixTime, 0),
Size: int64(meta.GetPayloadSize()),
Created: time.Now(), // time.Unix(meta.GetCreationEpoch(), 0),
}
}
func parseUserHeaders(h map[string]string) []object.Header {
headers := make([]object.Header, 0, len(h))
for k, v := range h {
uh := &object.UserHeader{Key: k, Value: v}
headers = append(headers, object.Header{
Value: &object.Header_UserHeader{UserHeader: uh},
})
}
return headers
}
func nameFromObject(o *object.Object) (string, string) {
var (
name string
uh = userHeaders(o.Headers)
)
var name = o.GetID().String()
if _, ok := uh[AWS3NameHeader]; !ok {
name = o.SystemHeader.ID.String()
} else {
name = uh[AWS3NameHeader]
for _, attr := range o.GetAttributes() {
if attr.GetKey() == AWS3NameHeader {
name = attr.GetValue()
break
}
}
ind := strings.LastIndex(name, pathSeparator)