gaspersic/transfer.sh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Wrap Errors and rename class

Browse Source
This commit is contained in:
stefanbenten
2019-08-29 22:14:48 +02:00
parent 1e815d382c
commit 5bb0e84fa5
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
server/storage.go
View File

@ -565,7 +565,7 @@ func saveGDriveToken(path string, token *oauth2.Token, logger *log.Logger) {
json.NewEncoder(f).Encode(token) json.NewEncoder(f).Encode(token)
} }
var uplinkFailure = errs.Class("uplink failure") var uplinkFailure = errs.Class("storj failure")
type StorjStorage struct { type StorjStorage struct {
Storage Storage
@ -583,29 +583,29 @@ func NewStorjStorage(endpoint, apiKey, bucket, encKey string, logger *log.Logger
instance.uplink, err = uplink.NewUplink(ctx, nil) instance.uplink, err = uplink.NewUplink(ctx, nil)
if err != nil { if err != nil {
return nil, uplinkFailure.New("could not create new Uplink Instance: %v", err) return nil, uplinkFailure.Wrap(err)
} }
key, err := uplink.ParseAPIKey(apiKey) key, err := uplink.ParseAPIKey(apiKey)
if err != nil { if err != nil {
return nil, uplinkFailure.New("could not parse api key: %v", err) return nil, uplinkFailure.Wrap(err)
} }
instance.project, err = instance.uplink.OpenProject(ctx, endpoint, key) instance.project, err = instance.uplink.OpenProject(ctx, endpoint, key)
if err != nil { if err != nil {
return nil, uplinkFailure.New("could not open project: %v", err) return nil, uplinkFailure.Wrap(err)
} }
saltenckey, err := instance.project.SaltedKeyFromPassphrase(ctx, encKey) saltenckey, err := instance.project.SaltedKeyFromPassphrase(ctx, encKey)
if err != nil { if err != nil {
return nil, uplinkFailure.New("could not generate salted enc key: %v", err) return nil, uplinkFailure.Wrap(err)
} }
access := uplink.NewEncryptionAccessWithDefaultKey(*saltenckey) access := uplink.NewEncryptionAccessWithDefaultKey(*saltenckey)
instance.bucket, err = instance.project.OpenBucket(ctx, bucket, access) instance.bucket, err = instance.project.OpenBucket(ctx, bucket, access)
if err != nil { if err != nil {
return nil, uplinkFailure.New("could not open bucket %q: %v", bucket, err) return nil, uplinkFailure.Wrap(err)
} }
instance.logger = logger instance.logger = logger
@ -624,7 +624,7 @@ func (s *StorjStorage) Head(token string, filename string) (contentType string,
obj, err := s.bucket.OpenObject(ctx, key) obj, err := s.bucket.OpenObject(ctx, key)
if err != nil { if err != nil {
return "", 0, fmt.Errorf("unable to open object %v", err) return "", 0, uplinkFailure.Wrap(err)
} }
contentType = obj.Meta.ContentType contentType = obj.Meta.ContentType
contentLength = uint64(obj.Meta.Size) contentLength = uint64(obj.Meta.Size)
@ -641,7 +641,7 @@ func (s *StorjStorage) Get(token string, filename string) (reader io.ReadCloser,
obj, err := s.bucket.OpenObject(ctx, key) obj, err := s.bucket.OpenObject(ctx, key)
if err != nil { if err != nil {
return nil, "", 0, uplinkFailure.New("unable to open object %v", err) return nil, "", 0, uplinkFailure.Wrap(err)
} }
contentType = obj.Meta.ContentType contentType = obj.Meta.ContentType
contentLength = uint64(obj.Meta.Size) contentLength = uint64(obj.Meta.Size)
@ -670,7 +670,7 @@ func (s *StorjStorage) Put(token string, filename string, reader io.Reader, cont
err = s.bucket.UploadObject(ctx, key, reader, &uplink.UploadOptions{ContentType: contentType}) err = s.bucket.UploadObject(ctx, key, reader, &uplink.UploadOptions{ContentType: contentType})
if err != nil { if err != nil {
return uplinkFailure.New("could not upload: %v", err) return uplinkFailure.Wrap(err)
} }
return nil return nil
} }