Skip to content

Commit 88f3a9b

Browse files
authored
Merge pull request #2610 from traPtitech/fix/s3-head-object
🐛 ErrFileNotFound を返す条件を追加
2 parents 28b3931 + 2b46258 commit 88f3a9b

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

utils/storage/s3.go

+4-2
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,8 @@ func (fs *S3FileStorage) OpenFileByKey(key string, fileType model.FileType) (rea
7676
file, err := fs.getObject(context.Background(), input)
7777
if err != nil {
7878
var nsk *types.NoSuchKey
79-
if errors.As(err, &nsk) {
79+
var nf *types.NotFound
80+
if errors.As(err, &nsk) || errors.As(err, &nf) {
8081
return nil, ErrFileNotFound
8182
}
8283
return nil, err
@@ -90,7 +91,8 @@ func (fs *S3FileStorage) OpenFileByKey(key string, fileType model.FileType) (rea
9091
remote, err := fs.getObject(context.Background(), input)
9192
if err != nil {
9293
var nsk *types.NoSuchKey
93-
if errors.As(err, &nsk) {
94+
var nf *types.NotFound
95+
if errors.As(err, &nsk) || errors.As(err, &nf) {
9496
return nil, ErrFileNotFound
9597
}
9698
return nil, err

0 commit comments

Comments
 (0)