Skip to content

Commit

Permalink
build(deps): Remove dot-import for types package in services (#986)
Browse files Browse the repository at this point in the history
  • Loading branch information
@JinnyYi
JinnyYi authored Nov 1, 2021
1 parent 0ba0256 commit fb2f311
Show file tree
Hide file tree
Showing 38 changed files with 582 additions and 654 deletions.
50 changes: 25 additions & 25 deletions services/azblob/storage.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ import (
ps "go.beyondstorage.io/v5/pairs"
"go.beyondstorage.io/v5/pkg/iowrap"
"go.beyondstorage.io/v5/services"
. "go.beyondstorage.io/v5/types"
"go.beyondstorage.io/v5/types"
)

func (s *Storage) commitAppend(ctx context.Context, o *Object, opt pairStorageCommitAppend) (err error) {
func (s *Storage) commitAppend(ctx context.Context, o *types.Object, opt pairStorageCommitAppend) (err error) {
return
}

func (s *Storage) create(path string, opt pairStorageCreate) (o *Object) {
func (s *Storage) create(path string, opt pairStorageCreate) (o *types.Object) {
rp := s.getAbsPath(path)

if opt.HasObjectMode && opt.ObjectMode.IsDir() {
Expand All @@ -29,18 +29,18 @@ func (s *Storage) create(path string, opt pairStorageCreate) (o *Object) {

rp += "/"
o = s.newObject(true)
o.Mode = ModeDir
o.Mode = types.ModeDir
} else {
o = s.newObject(false)
o.Mode = ModeRead
o.Mode = types.ModeRead
}

o.ID = rp
o.Path = path
return o
}

func (s *Storage) createAppend(ctx context.Context, path string, opt pairStorageCreateAppend) (o *Object, err error) {
func (s *Storage) createAppend(ctx context.Context, path string, opt pairStorageCreateAppend) (o *types.Object, err error) {
rp := s.getAbsPath(path)

headers := azblob.BlobHTTPHeaders{}
Expand All @@ -63,16 +63,16 @@ func (s *Storage) createAppend(ctx context.Context, path string, opt pairStorage
}

o = s.newObject(true)
o.Mode = ModeRead | ModeAppend
o.Mode = types.ModeRead | types.ModeAppend
o.ID = rp
o.Path = path
o.SetAppendOffset(0)
return o, nil
}

func (s *Storage) createDir(ctx context.Context, path string, opt pairStorageCreateDir) (o *Object, err error) {
func (s *Storage) createDir(ctx context.Context, path string, opt pairStorageCreateDir) (o *types.Object, err error) {
if !s.features.VirtualDir {
err = NewOperationNotImplementedError("create_dir")
err = types.NewOperationNotImplementedError("create_dir")
return
}

Expand All @@ -98,7 +98,7 @@ func (s *Storage) createDir(ctx context.Context, path string, opt pairStorageCre
o = s.newObject(true)
o.ID = rp
o.Path = path
o.Mode |= ModeDir
o.Mode |= types.ModeDir
return
}

Expand Down Expand Up @@ -128,18 +128,18 @@ func (s *Storage) delete(ctx context.Context, path string, opt pairStorageDelete
return nil
}

func (s *Storage) list(ctx context.Context, path string, opt pairStorageList) (oi *ObjectIterator, err error) {
func (s *Storage) list(ctx context.Context, path string, opt pairStorageList) (oi *types.ObjectIterator, err error) {
input := &objectPageStatus{
maxResults: 200,
prefix: s.getAbsPath(path),
}

if !opt.HasListMode {
// Support `ListModePrefix` as the default `ListMode`.
opt.ListMode = ListModePrefix
opt.ListMode = types.ListModePrefix
}

var nextFn NextObjectFunc
var nextFn types.NextObjectFunc

switch {
case opt.ListMode.IsDir():
Expand All @@ -151,11 +151,11 @@ func (s *Storage) list(ctx context.Context, path string, opt pairStorageList) (o
return nil, services.ListModeInvalidError{Actual: opt.ListMode}
}

return NewObjectIterator(ctx, nextFn, input), nil
return types.NewObjectIterator(ctx, nextFn, input), nil
}

func (s *Storage) metadata(opt pairStorageMetadata) (meta *StorageMeta) {
meta = NewStorageMeta()
func (s *Storage) metadata(opt pairStorageMetadata) (meta *types.StorageMeta) {
meta = types.NewStorageMeta()
meta.Name = s.name
meta.WorkDir = s.workDir
meta.SetWriteSizeMaximum(WriteSizeMaximum)
Expand All @@ -165,7 +165,7 @@ func (s *Storage) metadata(opt pairStorageMetadata) (meta *StorageMeta) {
return meta
}

func (s *Storage) nextObjectPageByDir(ctx context.Context, page *ObjectPage) error {
func (s *Storage) nextObjectPageByDir(ctx context.Context, page *types.ObjectPage) error {
input := page.Status.(*objectPageStatus)

output, err := s.bucket.ListBlobsHierarchySegment(ctx, input.marker, input.delimiter, azblob.ListBlobsSegmentOptions{
Expand All @@ -180,7 +180,7 @@ func (s *Storage) nextObjectPageByDir(ctx context.Context, page *ObjectPage) err
o := s.newObject(true)
o.ID = v.Name
o.Path = s.getRelPath(v.Name)
o.Mode |= ModeDir
o.Mode |= types.ModeDir

page.Data = append(page.Data, o)
}
Expand All @@ -195,14 +195,14 @@ func (s *Storage) nextObjectPageByDir(ctx context.Context, page *ObjectPage) err
}

if !output.NextMarker.NotDone() {
return IterateDone
return types.IterateDone
}

input.marker = output.NextMarker
return nil
}

func (s *Storage) nextObjectPageByPrefix(ctx context.Context, page *ObjectPage) error {
func (s *Storage) nextObjectPageByPrefix(ctx context.Context, page *types.ObjectPage) error {
input := page.Status.(*objectPageStatus)

output, err := s.bucket.ListBlobsFlatSegment(ctx, input.marker, azblob.ListBlobsSegmentOptions{
Expand All @@ -223,7 +223,7 @@ func (s *Storage) nextObjectPageByPrefix(ctx context.Context, page *ObjectPage)
}

if !output.NextMarker.NotDone() {
return IterateDone
return types.IterateDone
}

input.marker = output.NextMarker
Expand Down Expand Up @@ -271,7 +271,7 @@ func (s *Storage) read(ctx context.Context, path string, w io.Writer, opt pairSt
return io.Copy(w, rc)
}

func (s *Storage) stat(ctx context.Context, path string, opt pairStorageStat) (o *Object, err error) {
func (s *Storage) stat(ctx context.Context, path string, opt pairStorageStat) (o *types.Object, err error) {
rp := s.getAbsPath(path)

if opt.HasObjectMode && opt.ObjectMode.IsDir() {
Expand Down Expand Up @@ -301,9 +301,9 @@ func (s *Storage) stat(ctx context.Context, path string, opt pairStorageStat) (o
o.Path = path

if opt.HasObjectMode && opt.ObjectMode.IsDir() {
o.Mode |= ModeDir
o.Mode |= types.ModeDir
} else {
o.Mode |= ModeRead
o.Mode |= types.ModeRead
}

o.SetContentLength(output.ContentLength())
Expand Down Expand Up @@ -390,7 +390,7 @@ func (s *Storage) write(ctx context.Context, path string, r io.Reader, size int6
return size, nil
}

func (s *Storage) writeAppend(ctx context.Context, o *Object, r io.Reader, size int64, opt pairStorageWriteAppend) (n int64, err error) {
func (s *Storage) writeAppend(ctx context.Context, o *types.Object, r io.Reader, size int64, opt pairStorageWriteAppend) (n int64, err error) {
if size > AppendSizeMaximum {
err = fmt.Errorf("size limit exceeded: %w", services.ErrRestrictionDissatisfied)
return
Expand Down
30 changes: 15 additions & 15 deletions services/azfile/storage.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,18 @@ import (
"github.com/Azure/azure-storage-file-go/azfile"

"go.beyondstorage.io/v5/pkg/iowrap"
. "go.beyondstorage.io/v5/types"
"go.beyondstorage.io/v5/types"
)

func (s *Storage) create(path string, opt pairStorageCreate) (o *Object) {
func (s *Storage) create(path string, opt pairStorageCreate) (o *types.Object) {
rp := s.getAbsPath(path)

if opt.HasObjectMode && opt.ObjectMode.IsDir() {
o = s.newObject(true)
o.Mode |= ModeDir
o.Mode |= types.ModeDir
} else {
o = s.newObject(false)
o.Mode |= ModeRead
o.Mode |= types.ModeRead
}

o.ID = rp
Expand All @@ -32,7 +32,7 @@ func (s *Storage) create(path string, opt pairStorageCreate) (o *Object) {
return o
}

func (s *Storage) createDir(ctx context.Context, path string, opt pairStorageCreateDir) (o *Object, err error) {
func (s *Storage) createDir(ctx context.Context, path string, opt pairStorageCreateDir) (o *types.Object, err error) {
rp := s.getAbsPath(path)

attribute := azfile.FileAttributeNone
Expand Down Expand Up @@ -61,7 +61,7 @@ func (s *Storage) createDir(ctx context.Context, path string, opt pairStorageCre

o.ID = rp
o.Path = path
o.Mode |= ModeDir
o.Mode |= types.ModeDir

return
}
Expand Down Expand Up @@ -89,22 +89,22 @@ func (s *Storage) delete(ctx context.Context, path string, opt pairStorageDelete
return nil
}

func (s *Storage) list(ctx context.Context, path string, opt pairStorageList) (oi *ObjectIterator, err error) {
func (s *Storage) list(ctx context.Context, path string, opt pairStorageList) (oi *types.ObjectIterator, err error) {
input := &objectPageStatus{
maxResults: 200,
prefix: s.getRelativePath(path),
}

return NewObjectIterator(ctx, s.nextObjectPage, input), nil
return types.NewObjectIterator(ctx, s.nextObjectPage, input), nil
}

func (s *Storage) metadata(opt pairStorageMetadata) (meta *StorageMeta) {
meta = NewStorageMeta()
func (s *Storage) metadata(opt pairStorageMetadata) (meta *types.StorageMeta) {
meta = types.NewStorageMeta()
meta.WorkDir = s.workDir
return meta
}

func (s *Storage) nextObjectPage(ctx context.Context, page *ObjectPage) error {
func (s *Storage) nextObjectPage(ctx context.Context, page *types.ObjectPage) error {
input := page.Status.(*objectPageStatus)

options := azfile.ListFilesAndDirectoriesOptions{
Expand Down Expand Up @@ -136,7 +136,7 @@ func (s *Storage) nextObjectPage(ctx context.Context, page *ObjectPage) error {
}

if !output.NextMarker.NotDone() {
return IterateDone
return types.IterateDone
}

input.marker = output.NextMarker
Expand Down Expand Up @@ -174,7 +174,7 @@ func (s *Storage) read(ctx context.Context, path string, w io.Writer, opt pairSt
return io.Copy(w, rc)
}

func (s *Storage) stat(ctx context.Context, path string, opt pairStorageStat) (o *Object, err error) {
func (s *Storage) stat(ctx context.Context, path string, opt pairStorageStat) (o *types.Object, err error) {
rp := s.getAbsPath(path)

var dirOutput *azfile.DirectoryGetPropertiesResponse
Expand All @@ -195,7 +195,7 @@ func (s *Storage) stat(ctx context.Context, path string, opt pairStorageStat) (o
o.Path = path

if opt.HasObjectMode && opt.ObjectMode.IsDir() {
o.Mode |= ModeDir
o.Mode |= types.ModeDir

o.SetLastModified(dirOutput.LastModified())

Expand All @@ -209,7 +209,7 @@ func (s *Storage) stat(ctx context.Context, path string, opt pairStorageStat) (o
}
o.SetSystemMetadata(sm)
} else {
o.Mode |= ModeRead
o.Mode |= types.ModeRead

o.SetContentLength(fileOutput.ContentLength())
o.SetLastModified(fileOutput.LastModified())
Expand Down
14 changes: 7 additions & 7 deletions services/bos/service.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import (
"context"

ps "go.beyondstorage.io/v5/pairs"
. "go.beyondstorage.io/v5/types"
"go.beyondstorage.io/v5/types"
)

func (s *Service) create(ctx context.Context, name string, opt pairServiceCreate) (store Storager, err error) {
func (s *Service) create(ctx context.Context, name string, opt pairServiceCreate) (store types.Storager, err error) {
pairs := append(opt.pairs, ps.WithName(name))

st, err := s.newStorage(pairs...)
Expand All @@ -32,7 +32,7 @@ func (s *Service) delete(ctx context.Context, name string, opt pairServiceDelete
return nil
}

func (s *Service) get(ctx context.Context, name string, opt pairServiceGet) (store Storager, err error) {
func (s *Service) get(ctx context.Context, name string, opt pairServiceGet) (store types.Storager, err error) {
pairs := append(opt.pairs, ps.WithName(name))

st, err := s.newStorage(pairs...)
Expand All @@ -43,13 +43,13 @@ func (s *Service) get(ctx context.Context, name string, opt pairServiceGet) (sto
return st, nil
}

func (s *Service) list(ctx context.Context, opt pairServiceList) (sti *StoragerIterator, err error) {
func (s *Service) list(ctx context.Context, opt pairServiceList) (sti *types.StoragerIterator, err error) {
input := &storagePageStatus{}

return NewStoragerIterator(ctx, s.nextStoragePage, input), nil
return types.NewStoragerIterator(ctx, s.nextStoragePage, input), nil
}

func (s *Service) nextStoragePage(ctx context.Context, page *StoragerPage) error {
func (s *Service) nextStoragePage(ctx context.Context, page *types.StoragerPage) error {
output, err := s.service.ListBuckets()
if err != nil {
return err
Expand All @@ -63,5 +63,5 @@ func (s *Service) nextStoragePage(ctx context.Context, page *StoragerPage) error
page.Data = append(page.Data, store)
}

return IterateDone
return types.IterateDone
}
Loading

0 comments on commit fb2f311

Please sign in to comment.