Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: fix single object cases for sync #740

Merged
merged 5 commits into from
Jul 12, 2024
Merged

fix: fix single object cases for sync #740

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b1fa847
fix: add nested directory cases for object sync
tarikozyurtt Jul 10, 2024
e363680
fix problematic test cases
tarikozyurtt Jul 11, 2024
efe2204
fix single object sync
tarikozyurtt Jul 11, 2024
df52429
Merge branch 'master' into sync-object-fail-tests
tarikozyurtt Jul 11, 2024
aa9ca7f
fix style
tarikozyurtt Jul 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions command/sync.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ func (s Sync) Run(c *cli.Context) error {
isBatch = obj != nil && obj.Type.IsDir()
}

onlySource, onlyDest, commonObjects := compareObjects(sourceObjects, destObjects)
onlySource, onlyDest, commonObjects := compareObjects(sourceObjects, destObjects, isBatch)

sourceObjects = nil
destObjects = nil
Expand Down Expand Up @@ -242,7 +242,7 @@ func (s Sync) Run(c *cli.Context) error {
// sourceObjects and destObjects channels are already sorted in ascending order.
// Returns objects those in only source, only destination
// and both.
func compareObjects(sourceObjects, destObjects chan *storage.Object) (chan *url.URL, chan *url.URL, chan *ObjectPair) {
func compareObjects(sourceObjects, destObjects chan *storage.Object, isSrcBatch bool) (chan *url.URL, chan *url.URL, chan *ObjectPair) {
var (
srcOnly = make(chan *url.URL, extsortChannelBufferSize)
dstOnly = make(chan *url.URL, extsortChannelBufferSize)
Expand All @@ -262,6 +262,9 @@ func compareObjects(sourceObjects, destObjects chan *storage.Object) (chan *url.
for {
if srcOk {
srcName = filepath.ToSlash(src.URL.Relative())
if !isSrcBatch {
srcName = src.URL.Base()
}
}
if dstOk {
dstName = filepath.ToSlash(dst.URL.Relative())
Expand Down
204 changes: 204 additions & 0 deletions e2e/sync_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,100 @@ func TestSyncSingleS3ObjectToLocalTwice(t *testing.T) {
assertLines(t, result.Stdout(), map[int]compareFunc{})
}

// sync s3://bucket/dir/source.go .
func TestSyncSinglePrefixedS3ObjectToCurrentDirectory(t *testing.T) {
t.Parallel()

s3client, s5cmd := setup(t)

const (
dirname = "dir"
filename = "source.go"
)

bucket := s3BucketFromTestName(t)
createBucket(t, s3client, bucket)
putFile(t, s3client, bucket, fmt.Sprintf("%s/%s", dirname, filename), "content")

srcpath := fmt.Sprintf("s3://%s/%s/%s", bucket, dirname, filename)

cmd := s5cmd("sync", srcpath, ".")
result := icmd.RunCmd(cmd)
result.Assert(t, icmd.Success)

assertLines(t, result.Stdout(), map[int]compareFunc{
0: equals(`cp %v %v`, srcpath, filename),
})

// rerunning same command should not download object, empty result expected
result = icmd.RunCmd(cmd)
result.Assert(t, icmd.Success)
assertLines(t, result.Stdout(), map[int]compareFunc{})
}

// sync s3://bucket/prefix/source.go dir/
func TestSyncPrefixedSingleS3ObjectToLocalDirectory(t *testing.T) {
t.Parallel()

s3client, s5cmd := setup(t)

const (
dirname = "dir"
filename = "source.go"
)

bucket := s3BucketFromTestName(t)
createBucket(t, s3client, bucket)
putFile(t, s3client, bucket, fmt.Sprintf("%s/%s", dirname, filename), "content")

srcpath := fmt.Sprintf("s3://%s/%s/%s", bucket, dirname, filename)
dstpath := "folder"

cmd := s5cmd("sync", srcpath, fmt.Sprintf("%v/", dstpath))
result := icmd.RunCmd(cmd)
result.Assert(t, icmd.Success)

assertLines(t, result.Stdout(), map[int]compareFunc{
0: equals(`cp %v %v/%v`, srcpath, dstpath, filename),
})

// rerunning same command should not download object, empty result expected
result = icmd.RunCmd(cmd)
result.Assert(t, icmd.Success)
assertLines(t, result.Stdout(), map[int]compareFunc{})
}

// sync s3://bucket/source.go dir/
func TestSyncSingleS3ObjectToLocalDirectory(t *testing.T) {
t.Parallel()

s3client, s5cmd := setup(t)

const (
filename = "source.go"
)

bucket := s3BucketFromTestName(t)
createBucket(t, s3client, bucket)
putFile(t, s3client, bucket, filename, "content")

srcpath := fmt.Sprintf("s3://%s/%s", bucket, filename)
dstpath := "folder"

cmd := s5cmd("sync", srcpath, fmt.Sprintf("%v/", dstpath))
result := icmd.RunCmd(cmd)
result.Assert(t, icmd.Success)

assertLines(t, result.Stdout(), map[int]compareFunc{
0: equals(`cp %v %v/%v`, srcpath, dstpath, filename),
})

// rerunning same command should not download object, empty result expected
result = icmd.RunCmd(cmd)
result.Assert(t, icmd.Success)
assertLines(t, result.Stdout(), map[int]compareFunc{})
}

// sync file s3://bucket
func TestSyncLocalFileToS3Twice(t *testing.T) {
t.Parallel()
Expand Down Expand Up @@ -127,6 +221,116 @@ func TestSyncLocalFileToS3Twice(t *testing.T) {
assertLines(t, result.Stdout(), map[int]compareFunc{})
}

// sync file s3://bucket/prefix/
func TestSyncLocalFileToS3Prefix(t *testing.T) {
t.Parallel()

s3client, s5cmd := setup(t)

const (
filename = "testfile1.txt"
content = "this is the content"
dirname = "dir"
)

bucket := s3BucketFromTestName(t)
createBucket(t, s3client, bucket)

workdir := fs.NewDir(t, t.Name(), fs.WithFile(filename, content))
defer workdir.Remove()

dstpath := fmt.Sprintf("s3://%v/%v", bucket, dirname)

cmd := s5cmd("sync", filename, fmt.Sprintf("%v/", dstpath))
result := icmd.RunCmd(cmd, withWorkingDir(workdir))

result.Assert(t, icmd.Success)

assertLines(t, result.Stdout(), map[int]compareFunc{
0: equals(`cp %v %v/%v`, filename, dstpath, filename),
})

// rerunning same command should not upload files, empty result expected
result = icmd.RunCmd(cmd, withWorkingDir(workdir))
result.Assert(t, icmd.Success)

assertLines(t, result.Stdout(), map[int]compareFunc{})
}

// sync dir/file s3://bucket
func TestSyncLocalFileInDirectoryToS3(t *testing.T) {
t.Parallel()

s3client, s5cmd := setup(t)

const (
dirname = "dir"
filename = "testfile1.txt"
content = "this is the content"
)

bucket := s3BucketFromTestName(t)
createBucket(t, s3client, bucket)

workdir := fs.NewDir(t, t.Name(), fs.WithDir(dirname, fs.WithFile(filename, content)))
defer workdir.Remove()

srcpath := fmt.Sprintf("%v/%v", dirname, filename)
dstpath := fmt.Sprintf("s3://%v", bucket)

cmd := s5cmd("sync", srcpath, dstpath)
result := icmd.RunCmd(cmd, withWorkingDir(workdir))

result.Assert(t, icmd.Success)

assertLines(t, result.Stdout(), map[int]compareFunc{
0: equals(`cp %v/%v %v/%v`, dirname, filename, dstpath, filename),
})

// rerunning same command should not upload files, empty result expected
result = icmd.RunCmd(cmd, withWorkingDir(workdir))
result.Assert(t, icmd.Success)

assertLines(t, result.Stdout(), map[int]compareFunc{})
}

// sync dir/file s3://bucket/prefix/
func TestSyncLocalFileInDirectoryToS3Prefix(t *testing.T) {
t.Parallel()

s3client, s5cmd := setup(t)

const (
dirname = "dir"
filename = "testfile1.txt"
content = "this is the content"
)

bucket := s3BucketFromTestName(t)
createBucket(t, s3client, bucket)

workdir := fs.NewDir(t, t.Name(), fs.WithDir(dirname, fs.WithFile(filename, content)))
defer workdir.Remove()

srcpath := fmt.Sprintf("%v/%v", dirname, filename)
dstpath := fmt.Sprintf("s3://%v/%v", bucket, dirname)

cmd := s5cmd("sync", srcpath, fmt.Sprintf("%v/", dstpath))
result := icmd.RunCmd(cmd, withWorkingDir(workdir))

result.Assert(t, icmd.Success)

assertLines(t, result.Stdout(), map[int]compareFunc{
0: equals(`cp %v/%v %v/%v`, dirname, filename, dstpath, filename),
})

// rerunning same command should not upload files, empty result expected
result = icmd.RunCmd(cmd, withWorkingDir(workdir))
result.Assert(t, icmd.Success)

assertLines(t, result.Stdout(), map[int]compareFunc{})
}

// sync --raw object* s3://bucket/prefix/
func TestCopyLocalFilestoS3WithRawFlag(t *testing.T) {
if runtime.GOOS == "windows" {
Expand Down
Loading