mirror of
				https://gitee.com/gitea/gitea
				synced 2025-11-04 08:30:25 +08:00 
			
		
		
		
	fix minio storage iterator path (#24691)
minio storage iterator shows different behavior with local fs iterator.
in local fs storage:
``` go
s.IterateObjects("prefix", func(path,obj)
     println(path) // show "prefix/xxx.file"
})
```
in minio storage:
```go
s.IterateObjects("prefix", func(path,obj)
     println(path) // show "xxx.file"
})
```
I think local fs is correct, minio use wrong `basePath` to trim storage
path prefix.
---------
Co-authored-by: Giteabot <teabot@gitea.io>
			
			
This commit is contained in:
		@@ -4,8 +4,6 @@
 | 
			
		||||
package storage
 | 
			
		||||
 | 
			
		||||
import (
 | 
			
		||||
	"bytes"
 | 
			
		||||
	"context"
 | 
			
		||||
	"os"
 | 
			
		||||
	"path/filepath"
 | 
			
		||||
	"testing"
 | 
			
		||||
@@ -57,38 +55,5 @@ func TestBuildLocalPath(t *testing.T) {
 | 
			
		||||
 | 
			
		||||
func TestLocalStorageIterator(t *testing.T) {
 | 
			
		||||
	dir := filepath.Join(os.TempDir(), "TestLocalStorageIteratorTestDir")
 | 
			
		||||
	l, err := NewLocalStorage(context.Background(), LocalStorageConfig{Path: dir})
 | 
			
		||||
	assert.NoError(t, err)
 | 
			
		||||
 | 
			
		||||
	testFiles := [][]string{
 | 
			
		||||
		{"a/1.txt", "a1"},
 | 
			
		||||
		{"/a/1.txt", "aa1"}, // same as above, but with leading slash that will be trim
 | 
			
		||||
		{"b/1.txt", "b1"},
 | 
			
		||||
		{"b/2.txt", "b2"},
 | 
			
		||||
		{"b/3.txt", "b3"},
 | 
			
		||||
		{"b/x 4.txt", "bx4"},
 | 
			
		||||
	}
 | 
			
		||||
	for _, f := range testFiles {
 | 
			
		||||
		_, err = l.Save(f[0], bytes.NewBufferString(f[1]), -1)
 | 
			
		||||
		assert.NoError(t, err)
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	expectedList := map[string][]string{
 | 
			
		||||
		"a":           {"a/1.txt"},
 | 
			
		||||
		"b":           {"b/1.txt", "b/2.txt", "b/3.txt", "b/x 4.txt"},
 | 
			
		||||
		"":            {"a/1.txt", "b/1.txt", "b/2.txt", "b/3.txt", "b/x 4.txt"},
 | 
			
		||||
		"/":           {"a/1.txt", "b/1.txt", "b/2.txt", "b/3.txt", "b/x 4.txt"},
 | 
			
		||||
		"a/b/../../a": {"a/1.txt"},
 | 
			
		||||
	}
 | 
			
		||||
	for dir, expected := range expectedList {
 | 
			
		||||
		count := 0
 | 
			
		||||
		err = l.IterateObjects(dir, func(path string, f Object) error {
 | 
			
		||||
			defer f.Close()
 | 
			
		||||
			assert.Contains(t, expected, path)
 | 
			
		||||
			count++
 | 
			
		||||
			return nil
 | 
			
		||||
		})
 | 
			
		||||
		assert.NoError(t, err)
 | 
			
		||||
		assert.Len(t, expected, count)
 | 
			
		||||
	}
 | 
			
		||||
	testStorageIterator(t, string(LocalStorageType), LocalStorageConfig{Path: dir})
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user