mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2025-07-19 01:29:40 +02:00
923b3b3d9c
Fixes #8529, reverts #8527. I was able to reproduce the problem in a test: - it triggered only when the reader was an io.Reader - and the size was provided (-1 takes another code path in minio)287b1f21e1should fail when running: ``` docker run --rm -e MINIO_DOMAIN=minio -e MINIO_ROOT_USER=123456 -e MINIO_ROOT_PASSWORD=12345678 -p 9000:9000 data.forgejo.org/oci/bitnami/minio:2024.8.17 ``` and ``` TEST_MINIO_ENDPOINT=localhost:9000 go test -v -run ^TestMinioStorageIterator$ ./modules/storage ``` ### Tests - I added test coverage for Go changes... - [x] in their respective `*_test.go` for unit tests. - [ ] in the `tests/integration` directory if it involves interactions with a live Forgejo server. ### Documentation - [ ] I created a pull request [to the documentation](https://codeberg.org/forgejo/docs) to explain to Forgejo users how to use this change. - [x] I did not document these changes and I do not expect someone else to do it. ### Release notes - [x] I do not want this change to show in the release notes. - [ ] I want the title to show in the release notes with a link to this pull request. - [ ] I want the content of the `release-notes/<pull request number>.md` to be be used for the release notes instead of the title. Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/8541 Reviewed-by: Michael Kriese <michael.kriese@gmx.de> Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org> Co-authored-by: oliverpool <git@olivier.pfad.fr> Co-committed-by: oliverpool <git@olivier.pfad.fr> (cherry picked from commitdd3f24deef)
70 lines
1.7 KiB
Go
70 lines
1.7 KiB
Go
// Copyright 2023 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package storage
|
|
|
|
import (
|
|
"bytes"
|
|
"io"
|
|
"testing"
|
|
|
|
"forgejo.org/modules/setting"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
type spyCloser struct {
|
|
io.Reader
|
|
closed int
|
|
}
|
|
|
|
func (s *spyCloser) Close() error {
|
|
s.closed++
|
|
return nil
|
|
}
|
|
|
|
var _ io.ReadCloser = &spyCloser{}
|
|
|
|
func testStorageIterator(t *testing.T, typStr Type, cfg *setting.Storage) {
|
|
l, err := NewStorage(typStr, cfg)
|
|
require.NoError(t, err)
|
|
|
|
testFiles := []struct {
|
|
path, content string
|
|
size int64
|
|
}{
|
|
{"a/1.txt", "a1", -1},
|
|
{"/a/1.txt", "aa1", -1}, // same as above, but with leading slash that will be trim
|
|
{"ab/1.txt", "ab1", 3},
|
|
{"b/1.txt", "b1", 2}, // minio closes when the size is set
|
|
{"b/2.txt", "b2", -1},
|
|
{"b/3.txt", "b3", -1},
|
|
{"b/x 4.txt", "bx4", -1},
|
|
}
|
|
for _, f := range testFiles {
|
|
sc := &spyCloser{bytes.NewBufferString(f.content), 0}
|
|
_, err = l.Save(f.path, sc, f.size)
|
|
require.NoError(t, err)
|
|
assert.Equal(t, 0, sc.closed)
|
|
}
|
|
|
|
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", "ab/1.txt"},
|
|
"/": {"a/1.txt", "b/1.txt", "b/2.txt", "b/3.txt", "b/x 4.txt", "ab/1.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
|
|
})
|
|
require.NoError(t, err)
|
|
assert.Len(t, expected, count)
|
|
}
|
|
}
|