ff65663867
* adds foundation for bucketStore * adds prefixedObjStore to buckets package, adjusts gateway-storj accordingly * fixes multi value assignment problems in gateway-storj * fixes more multi value assignment errors in gateway-storj * starts changing miniogw tests to accommodate buckets * creates bucket store mock * wip - fixing test cases in object tests * adds get, put, and list object tests, comments out two test cases * adds happy scenario tests for bucket methods * fixes bug in list, removes redundant parts from gateway tests * fixes nit * Clean up tests from #188 * Fix bug with timestamp conversion in segment store * fixes segments.Meta test * Fix regression in listing objects in a bucket * adds check to see if bucket is empty before deleting * updates DeleteBucket test to account for empty/full bucket * adds TODOs for DeleteBucket and MakeBucket for some cases, adjusts tests, filters out minio errors in logging.go * adds checks for if buckets already exist or not in DeleteBucket and MakeBucket functions; adjusts tests * adds BucketNotFound error check in bucket store, removes todo * adds make_bucket to Travis test, updates boltdb client constructor to always create a bucket (table)
123 lines
3.0 KiB
Go
123 lines
3.0 KiB
Go
// Copyright (C) 2018 Storj Labs, Inc.
|
|
// See LICENSE for copying information.
|
|
|
|
package buckets
|
|
|
|
import (
|
|
"bytes"
|
|
"context"
|
|
"time"
|
|
|
|
minio "github.com/minio/minio/cmd"
|
|
"storj.io/storj/storage"
|
|
|
|
monkit "gopkg.in/spacemonkeygo/monkit.v2"
|
|
"storj.io/storj/pkg/paths"
|
|
"storj.io/storj/pkg/storage/meta"
|
|
"storj.io/storj/pkg/storage/objects"
|
|
)
|
|
|
|
var (
|
|
mon = monkit.Package()
|
|
)
|
|
|
|
// Store creates an interface for interacting with buckets
|
|
type Store interface {
|
|
Get(ctx context.Context, bucket string) (meta Meta, err error)
|
|
Put(ctx context.Context, bucket string) (meta Meta, err error)
|
|
Delete(ctx context.Context, bucket string) (err error)
|
|
List(ctx context.Context, startAfter, endBefore string, limit int) (
|
|
items []ListItem, more bool, err error)
|
|
GetObjectStore(ctx context.Context, bucketName string) (store objects.Store, err error)
|
|
}
|
|
|
|
// ListItem is a single item in a listing
|
|
type ListItem struct {
|
|
Bucket string
|
|
Meta Meta
|
|
}
|
|
|
|
// BucketStore contains objects store
|
|
type BucketStore struct {
|
|
o objects.Store
|
|
}
|
|
|
|
// Meta is the bucket metadata struct
|
|
type Meta struct {
|
|
Created time.Time
|
|
}
|
|
|
|
// NewStore instantiates BucketStore
|
|
func NewStore(obj objects.Store) Store {
|
|
return &BucketStore{o: obj}
|
|
}
|
|
|
|
// GetObjectStore returns an implementation of objects.Store
|
|
func (b *BucketStore) GetObjectStore(ctx context.Context, bucket string) (objects.Store, error) {
|
|
_, err := b.Get(ctx, bucket)
|
|
if err != nil {
|
|
if storage.ErrKeyNotFound.Has(err) {
|
|
return nil, minio.BucketNotFound{Bucket: bucket}
|
|
}
|
|
return nil, err
|
|
}
|
|
prefixed := prefixedObjStore{
|
|
o: b.o,
|
|
prefix: bucket,
|
|
}
|
|
return &prefixed, nil
|
|
}
|
|
|
|
// Get calls objects store Get
|
|
func (b *BucketStore) Get(ctx context.Context, bucket string) (meta Meta, err error) {
|
|
defer mon.Task()(&ctx)(&err)
|
|
p := paths.New(bucket)
|
|
objMeta, err := b.o.Meta(ctx, p)
|
|
if err != nil {
|
|
return Meta{}, err
|
|
}
|
|
return convertMeta(objMeta), nil
|
|
}
|
|
|
|
// Put calls objects store Put
|
|
func (b *BucketStore) Put(ctx context.Context, bucket string) (meta Meta, err error) {
|
|
defer mon.Task()(&ctx)(&err)
|
|
p := paths.New(bucket)
|
|
r := bytes.NewReader(nil)
|
|
var exp time.Time
|
|
m, err := b.o.Put(ctx, p, r, objects.SerializableMeta{}, exp)
|
|
if err != nil {
|
|
return Meta{}, err
|
|
}
|
|
return convertMeta(m), nil
|
|
}
|
|
|
|
// Delete calls objects store Delete
|
|
func (b *BucketStore) Delete(ctx context.Context, bucket string) (err error) {
|
|
defer mon.Task()(&ctx)(&err)
|
|
p := paths.New(bucket)
|
|
return b.o.Delete(ctx, p)
|
|
}
|
|
|
|
// List calls objects store List
|
|
func (b *BucketStore) List(ctx context.Context, startAfter, endBefore string, limit int) (
|
|
items []ListItem, more bool, err error) {
|
|
defer mon.Task()(&ctx)(&err)
|
|
objItems, more, err := b.o.List(ctx, nil, paths.New(startAfter), paths.New(endBefore), false, limit, meta.Modified)
|
|
items = make([]ListItem, len(objItems))
|
|
for i, itm := range objItems {
|
|
items[i] = ListItem{
|
|
Bucket: itm.Path.String(),
|
|
Meta: convertMeta(itm.Meta),
|
|
}
|
|
}
|
|
return items, more, nil
|
|
}
|
|
|
|
// convertMeta converts stream metadata to object metadata
|
|
func convertMeta(m objects.Meta) Meta {
|
|
return Meta{
|
|
Created: m.Modified,
|
|
}
|
|
}
|