mirror of
https://codeberg.org/forgejo/forgejo
synced 2024-11-27 20:26:09 +01:00
d6dd6d641b
Follow up #22405 Fix #20703 This PR rewrites storage configuration read sequences with some breaks and tests. It becomes more strict than before and also fixed some inherit problems. - Move storage's MinioConfig struct into setting, so after the configuration loading, the values will be stored into the struct but not still on some section. - All storages configurations should be stored on one section, configuration items cannot be overrided by multiple sections. The prioioty of configuration is `[attachment]` > `[storage.attachments]` | `[storage.customized]` > `[storage]` > `default` - For extra override configuration items, currently are `SERVE_DIRECT`, `MINIO_BASE_PATH`, `MINIO_BUCKET`, which could be configured in another section. The prioioty of the override configuration is `[attachment]` > `[storage.attachments]` > `default`. - Add more tests for storages configurations. - Update the storage documentations. --------- Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
52 lines
1.3 KiB
Go
52 lines
1.3 KiB
Go
// Copyright 2023 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package storage
|
|
|
|
import (
|
|
"bytes"
|
|
"testing"
|
|
|
|
"code.gitea.io/gitea/modules/setting"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
func testStorageIterator(t *testing.T, typStr Type, cfg *setting.Storage) {
|
|
l, err := NewStorage(typStr, cfg)
|
|
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
|
|
{"ab/1.txt", "ab1"},
|
|
{"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", "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
|
|
})
|
|
assert.NoError(t, err)
|
|
assert.Len(t, expected, count)
|
|
}
|
|
}
|