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

fixed ID value in .info; adjusted tests; fixed assert(expected, received) swap

This commit is contained in:
Markus Kienast 2017-07-16 17:08:24 +02:00
parent ba0f004df7
commit 6643a9be62
2 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
s3store/s3store.go
View File

@ -168,25 +168,10 @@ func (store S3Store) NewUpload(info tusd.FileInfo) (id string, err error) {
if info.ID == "" {
uploadId = uid.Uid()
} else {
// certain tests set info.ID in advance
uploadId = info.ID
}
infoJson, err := json.Marshal(info)
if err != nil {
return "", err
}
// Create object on S3 containing information about the file
_, err = store.Service.PutObject(&s3.PutObjectInput{
Bucket: aws.String(store.Bucket),
Key: aws.String(uploadId + ".info"),
Body: bytes.NewReader(infoJson),
ContentLength: aws.Int64(int64(len(infoJson))),
})
if err != nil {
return "", fmt.Errorf("s3store: unable to create info file:\n%s", err)
}
// Convert meta data into a map of pointers for AWS Go SDK, sigh.
metadata := make(map[string]*string, len(info.MetaData))
for key, value := range info.MetaData {
@ -207,6 +192,23 @@ func (store S3Store) NewUpload(info tusd.FileInfo) (id string, err error) {
}
id = uploadId + "+" + *res.UploadId
info.ID = id
infoJson, err := json.Marshal(info)
if err != nil {
return "", err
}
// Create object on S3 containing information about the file
_, err = store.Service.PutObject(&s3.PutObjectInput{
Bucket: aws.String(store.Bucket),
Key: aws.String(uploadId + ".info"),
Body: bytes.NewReader(infoJson),
ContentLength: aws.Int64(int64(len(infoJson))),
})
if err != nil {
return "", fmt.Errorf("s3store: unable to create info file:\n%s", err)
}
return
}

26
s3store/s3store_test.go
View File

@ -32,19 +32,13 @@ func TestNewUpload(t *testing.T) {
s3obj := NewMockS3API(mockCtrl)
store := s3store.New("bucket", s3obj)
assert.Equal(store.Bucket, "bucket")
assert.Equal(store.Service, s3obj)
assert.Equal("bucket", store.Bucket)
assert.Equal(s3obj, store.Service)
s1 := "hello"
s2 := "men?"
gomock.InOrder(
s3obj.EXPECT().PutObject(&s3.PutObjectInput{
Bucket: aws.String("bucket"),
Key: aws.String("uploadId.info"),
Body: bytes.NewReader([]byte(`{"ID":"uploadId","Size":500,"Offset":0,"MetaData":{"bar":"menü","foo":"hello"},"IsPartial":false,"IsFinal":false,"PartialUploads":null}`)),
ContentLength: aws.Int64(int64(136)),
}),
s3obj.EXPECT().CreateMultipartUpload(&s3.CreateMultipartUploadInput{
Bucket: aws.String("bucket"),
Key: aws.String("uploadId"),
@ -55,6 +49,12 @@ func TestNewUpload(t *testing.T) {
}).Return(&s3.CreateMultipartUploadOutput{
UploadId: aws.String("multipartId"),
}, nil),
s3obj.EXPECT().PutObject(&s3.PutObjectInput{
Bucket: aws.String("bucket"),
Key: aws.String("uploadId.info"),
Body: bytes.NewReader([]byte(`{"ID":"uploadId+multipartId","Size":500,"Offset":0,"MetaData":{"bar":"menü","foo":"hello"},"IsPartial":false,"IsFinal":false,"PartialUploads":null}`)),
ContentLength: aws.Int64(int64(148)),
}),
)
info := tusd.FileInfo{
@ -68,7 +68,7 @@ func TestNewUpload(t *testing.T) {
id, err := store.NewUpload(info)
assert.Nil(err)
assert.Equal(id, "uploadId+multipartId")
assert.Equal("uploadId+multipartId", id)
}
func TestGetInfoNotFound(t *testing.T) {
@ -85,7 +85,7 @@ func TestGetInfoNotFound(t *testing.T) {
}).Return(nil, awserr.New("NoSuchKey", "The specified key does not exist.", nil))
_, err := store.GetInfo("uploadId+multipartId")
assert.Equal(err, tusd.ErrNotFound)
assert.Equal(tusd.ErrNotFound, err)
}
func TestGetInfo(t *testing.T) {
@ -173,7 +173,7 @@ func TestGetReader(t *testing.T) {
content, err := store.GetReader("uploadId+multipartId")
assert.Nil(err)
assert.Equal(content, ioutil.NopCloser(bytes.NewReader([]byte(`hello world`))))
assert.Equal(ioutil.NopCloser(bytes.NewReader([]byte(`hello world`))), content)
}
func TestGetReaderNotFound(t *testing.T) {
@ -199,7 +199,7 @@ func TestGetReaderNotFound(t *testing.T) {
content, err := store.GetReader("uploadId+multipartId")
assert.Nil(content)
assert.Equal(err, tusd.ErrNotFound)
assert.Equal(tusd.ErrNotFound, err)
}
func TestGetReaderNotFinished(t *testing.T) {
@ -227,7 +227,7 @@ func TestGetReaderNotFinished(t *testing.T) {
content, err := store.GetReader("uploadId+multipartId")
assert.Nil(content)
assert.Equal(err.Error(), "cannot stream non-finished upload")
assert.Equal("cannot stream non-finished upload", err.Error())
}
func TestFinishUpload(t *testing.T) {