LumeWeb
/
tusd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add isAwsError helper method

This commit is contained in:
Marius 2016-01-12 22:21:05 +01:00
parent e64e99eec3
commit cb0f8dac6a
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
s3store/s3store.go
View File

@ -158,7 +158,7 @@ func (store S3Store) GetInfo(id string) (info tusd.FileInfo, err error) {
Key: aws.String(uploadId + ".info"), Key: aws.String(uploadId + ".info"),
}) })
if err != nil { if err != nil {
if err, ok := err.(awserr.Error); ok && err.Code() == "NoSuchKey" { if isAwsError(err, "NoSuchKey") {
return info, tusd.ErrNotFound return info, tusd.ErrNotFound
} }
@ -180,7 +180,7 @@ func (store S3Store) GetInfo(id string) (info tusd.FileInfo, err error) {
// when the multipart upload has already been completed or aborted. Since // when the multipart upload has already been completed or aborted. Since
// we already found the info object, we know that the upload has been // we already found the info object, we know that the upload has been
// completed and therefore can ensure the the offset is the size. // completed and therefore can ensure the the offset is the size.
if err, ok := err.(awserr.Error); ok && err.Code() == "NoSuchUpload" { if isAwsError(err, "NoSuchUpload") {
info.Offset = info.Size info.Offset = info.Size
return info, nil return info, nil
} else { } else {
@ -204,7 +204,7 @@ func (store S3Store) GetInfo(id string) (info tusd.FileInfo, err error) {
func (store S3Store) GetReader(id string) (io.Reader, error) { func (store S3Store) GetReader(id string) (io.Reader, error) {
uploadId, multipartId := splitIds(id) uploadId, multipartId := splitIds(id)
// Get file info stored in seperate object // Attempt to get upload content
res, err := store.Service.GetObject(&s3.GetObjectInput{ res, err := store.Service.GetObject(&s3.GetObjectInput{
Bucket: aws.String(store.Bucket), Bucket: aws.String(store.Bucket),
Key: aws.String(uploadId), Key: aws.String(uploadId),
@ -214,7 +214,10 @@ func (store S3Store) GetReader(id string) (io.Reader, error) {
return res.Body, nil return res.Body, nil
} }
if err, ok := err.(awserr.Error); !ok || err.Code() != "NoSuchKey" { // If the file cannot be found, we ignore this error and continue since the
// upload may not have been finished yet. In this case we do not want to
// return a ErrNotFound but a more meaning-full message.
if !isAwsError(err, "NoSuchKey") {
return nil, err return nil, err
} }
@ -231,7 +234,7 @@ func (store S3Store) GetReader(id string) (io.Reader, error) {
return nil, errors.New("cannot stream non-finished upload") return nil, errors.New("cannot stream non-finished upload")
} }
if err, ok := err.(awserr.Error); ok && err.Code() == "NoSuchUpload" { if isAwsError(err, "NoSuchUpload") {
// Neither the object nor the multipart upload exists, so we return a 404 // Neither the object nor the multipart upload exists, so we return a 404
return nil, tusd.ErrNotFound return nil, tusd.ErrNotFound
} }
@ -310,3 +313,12 @@ func splitIds(id string) (uploadId, multipartId string) {
multipartId = id[index+1:] multipartId = id[index+1:]
return return
} }
// isAwsError tests whether an error object is an instance of the AWS error
// specified by its code.
func isAwsError(err error, code string) bool {
if err, ok := err.(awserr.Error); ok && err.Code() == code {
return true
}
return false
}