Skip to content

Commit 7abb3db

Browse files
committed
default to STANDARD as AWS S3
1 parent 21a04fb commit 7abb3db

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

internal/goofys_test.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import (
2626
"os/exec"
2727
"os/user"
2828
"runtime"
29+
"sort"
2930
"strconv"
3031
"strings"
3132
"sync"
@@ -1356,7 +1357,8 @@ func (s *GoofysTest) TestXAttrGet(t *C) {
13561357

13571358
names, err := file1.ListXattr(s.fs)
13581359
t.Assert(err, IsNil)
1359-
t.Assert(names, DeepEquals, []string{"s3.etag", "user.name"})
1360+
sort.Strings(names)
1361+
t.Assert(names, DeepEquals, []string{"s3.etag", "s3.storage-class", "user.name"})
13601362

13611363
_, err = file1.GetXattr(s.fs, "user.foobar")
13621364
t.Assert(xattr.IsNotExist(err), Equals, true)
@@ -1398,9 +1400,8 @@ func (s *GoofysTest) TestXAttrGet(t *C) {
13981400

13991401
names, err = emptyDir2.ListXattr(s.fs)
14001402
t.Assert(err, IsNil)
1401-
// https://github.com/andrewgaul/s3proxy/issues/234 means that
1402-
// s3proxy may or may not return the storage class
1403-
t.Assert(len(names) == 2 || len(names) == 3, Equals, true)
1403+
sort.Strings(names)
1404+
t.Assert(names, DeepEquals, []string{"s3.etag", "s3.storage-class", "user.name"})
14041405

14051406
emptyDir, err := s.LookUpInode(t, "empty_dir")
14061407
t.Assert(err, IsNil)

internal/handles.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -492,6 +492,8 @@ func (inode *Inode) fillXattrFromHead(resp *s3.HeadObjectOutput) {
492492
}
493493
if resp.StorageClass != nil {
494494
inode.s3Metadata["storage-class"] = []byte(*resp.StorageClass)
495+
} else {
496+
inode.s3Metadata["storage-class"] = []byte("STANDARD")
495497
}
496498

497499
for k, v := range resp.Metadata {

0 commit comments

Comments
 (0)