mirror of
https://github.com/go-gitea/gitea
synced 2024-11-09 11:31:34 +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>
61 lines
1.3 KiB
Go
61 lines
1.3 KiB
Go
// Copyright 2022 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package storage
|
|
|
|
import (
|
|
"os"
|
|
"path/filepath"
|
|
"testing"
|
|
|
|
"code.gitea.io/gitea/modules/setting"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
func TestBuildLocalPath(t *testing.T) {
|
|
kases := []struct {
|
|
localDir string
|
|
path string
|
|
expected string
|
|
}{
|
|
{
|
|
"/a",
|
|
"0/a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a14",
|
|
"/a/0/a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a14",
|
|
},
|
|
{
|
|
"/a",
|
|
"../0/a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a14",
|
|
"/a/0/a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a14",
|
|
},
|
|
{
|
|
"/a",
|
|
"0\\a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a14",
|
|
"/a/0/a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a14",
|
|
},
|
|
{
|
|
"/b",
|
|
"a/../0/a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a14",
|
|
"/b/0/a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a14",
|
|
},
|
|
{
|
|
"/b",
|
|
"a\\..\\0/a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a14",
|
|
"/b/0/a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a14",
|
|
},
|
|
}
|
|
|
|
for _, k := range kases {
|
|
t.Run(k.path, func(t *testing.T) {
|
|
l := LocalStorage{dir: k.localDir}
|
|
|
|
assert.EqualValues(t, k.expected, l.buildLocalPath(k.path))
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestLocalStorageIterator(t *testing.T) {
|
|
dir := filepath.Join(os.TempDir(), "TestLocalStorageIteratorTestDir")
|
|
testStorageIterator(t, setting.LocalStorageType, &setting.Storage{Path: dir})
|
|
}
|