Skip to content

Commit f3bad57

Browse files
authored
Merge pull request #10 from knights-analytics/master
fix: bugs in copying folders from s3 to s3
2 parents b40d6ac + 9674e31 commit f3bad57

3 files changed

Lines changed: 3 additions & 2 deletions

File tree

s3/const.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@ const (
55
contentMD5MetaKey = "ContentMD5"
66
noSuchKeyMessage = "NoSuchKey"
77
doesNotExistsMessage = "does not exist"
8+
notFoundMessage = "NotFound"
89
)

s3/copy.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func (s *Storager) Copy(ctx context.Context, sourcePath, destBucket, destPath st
3636
}
3737
for i := 1; i < len(infoList); i++ {
3838
name := infoList[i].Name()
39-
if err = s.Move(ctx, path.Join(sourcePath, name), destBucket, path.Join(destPath, name)); err != nil {
39+
if err = s.Copy(ctx, path.Join(sourcePath, name), destBucket, path.Join(destPath, name)); err != nil {
4040
return err
4141
}
4242
}

s3/helper.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,5 @@ func isNotFound(err error) bool {
3030
if err == nil {
3131
return false
3232
}
33-
return strings.Contains(err.Error(), noSuchKeyMessage) || strings.Contains(err.Error(), doesNotExistsMessage)
33+
return strings.Contains(err.Error(), noSuchKeyMessage) || strings.Contains(err.Error(), doesNotExistsMessage) || strings.Contains(err.Error(), notFoundMessage)
3434
}

0 commit comments

Comments
 (0)