mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-11-26 09:09:36 -05: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>
97 lines
3 KiB
Go
97 lines
3 KiB
Go
// Copyright 2023 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package setting
|
|
|
|
import (
|
|
"path/filepath"
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
func Test_getStorageInheritNameSectionTypeForActions(t *testing.T) {
|
|
iniStr := `
|
|
[storage]
|
|
STORAGE_TYPE = minio
|
|
`
|
|
cfg, err := NewConfigProviderFromData(iniStr)
|
|
assert.NoError(t, err)
|
|
assert.NoError(t, loadActionsFrom(cfg))
|
|
|
|
assert.EqualValues(t, "minio", Actions.LogStorage.Type)
|
|
assert.EqualValues(t, "actions_log/", Actions.LogStorage.MinioConfig.BasePath)
|
|
assert.EqualValues(t, "minio", Actions.ArtifactStorage.Type)
|
|
assert.EqualValues(t, "actions_artifacts/", Actions.ArtifactStorage.MinioConfig.BasePath)
|
|
|
|
iniStr = `
|
|
[storage.actions_log]
|
|
STORAGE_TYPE = minio
|
|
`
|
|
cfg, err = NewConfigProviderFromData(iniStr)
|
|
assert.NoError(t, err)
|
|
assert.NoError(t, loadActionsFrom(cfg))
|
|
|
|
assert.EqualValues(t, "minio", Actions.LogStorage.Type)
|
|
assert.EqualValues(t, "actions_log/", Actions.LogStorage.MinioConfig.BasePath)
|
|
assert.EqualValues(t, "local", Actions.ArtifactStorage.Type)
|
|
assert.EqualValues(t, "actions_artifacts", filepath.Base(Actions.ArtifactStorage.Path))
|
|
|
|
iniStr = `
|
|
[storage.actions_log]
|
|
STORAGE_TYPE = my_storage
|
|
|
|
[storage.my_storage]
|
|
STORAGE_TYPE = minio
|
|
`
|
|
cfg, err = NewConfigProviderFromData(iniStr)
|
|
assert.NoError(t, err)
|
|
assert.NoError(t, loadActionsFrom(cfg))
|
|
|
|
assert.EqualValues(t, "minio", Actions.LogStorage.Type)
|
|
assert.EqualValues(t, "actions_log/", Actions.LogStorage.MinioConfig.BasePath)
|
|
assert.EqualValues(t, "local", Actions.ArtifactStorage.Type)
|
|
assert.EqualValues(t, "actions_artifacts", filepath.Base(Actions.ArtifactStorage.Path))
|
|
|
|
iniStr = `
|
|
[storage.actions_artifacts]
|
|
STORAGE_TYPE = my_storage
|
|
|
|
[storage.my_storage]
|
|
STORAGE_TYPE = minio
|
|
`
|
|
cfg, err = NewConfigProviderFromData(iniStr)
|
|
assert.NoError(t, err)
|
|
assert.NoError(t, loadActionsFrom(cfg))
|
|
|
|
assert.EqualValues(t, "local", Actions.LogStorage.Type)
|
|
assert.EqualValues(t, "actions_log", filepath.Base(Actions.LogStorage.Path))
|
|
assert.EqualValues(t, "minio", Actions.ArtifactStorage.Type)
|
|
assert.EqualValues(t, "actions_artifacts/", Actions.ArtifactStorage.MinioConfig.BasePath)
|
|
|
|
iniStr = `
|
|
[storage.actions_artifacts]
|
|
STORAGE_TYPE = my_storage
|
|
|
|
[storage.my_storage]
|
|
STORAGE_TYPE = minio
|
|
`
|
|
cfg, err = NewConfigProviderFromData(iniStr)
|
|
assert.NoError(t, err)
|
|
assert.NoError(t, loadActionsFrom(cfg))
|
|
|
|
assert.EqualValues(t, "local", Actions.LogStorage.Type)
|
|
assert.EqualValues(t, "actions_log", filepath.Base(Actions.LogStorage.Path))
|
|
assert.EqualValues(t, "minio", Actions.ArtifactStorage.Type)
|
|
assert.EqualValues(t, "actions_artifacts/", Actions.ArtifactStorage.MinioConfig.BasePath)
|
|
|
|
iniStr = ``
|
|
cfg, err = NewConfigProviderFromData(iniStr)
|
|
assert.NoError(t, err)
|
|
assert.NoError(t, loadActionsFrom(cfg))
|
|
|
|
assert.EqualValues(t, "local", Actions.LogStorage.Type)
|
|
assert.EqualValues(t, "actions_log", filepath.Base(Actions.LogStorage.Path))
|
|
assert.EqualValues(t, "local", Actions.ArtifactStorage.Type)
|
|
assert.EqualValues(t, "actions_artifacts", filepath.Base(Actions.ArtifactStorage.Path))
|
|
}
|