summaryrefslogtreecommitdiffstats
path: root/modules/storage/helper.go
diff options
context:
space:
mode:
authorLunny Xiao <xiaolunwen@gmail.com>2023-06-14 11:42:38 +0800
committerGitHub <noreply@github.com>2023-06-14 11:42:38 +0800
commitd6dd6d641b593c54fe1a1041c153111ce81dbc20 (patch)
treef9e7959356124bd830ce0b9e9e51c1373aa71932 /modules/storage/helper.go
parentdc0a7168f1450d45164fde63c56f04a1e5bbb949 (diff)
downloadgitea-d6dd6d641b593c54fe1a1041c153111ce81dbc20.tar.gz
gitea-d6dd6d641b593c54fe1a1041c153111ce81dbc20.zip
Fix all possible setting error related storages and added some tests (#23911)
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>
Diffstat (limited to 'modules/storage/helper.go')
-rw-r--r--modules/storage/helper.go56
1 files changed, 0 insertions, 56 deletions
diff --git a/modules/storage/helper.go b/modules/storage/helper.go
index d1959830b9..f8dff9e64d 100644
--- a/modules/storage/helper.go
+++ b/modules/storage/helper.go
@@ -8,64 +8,8 @@ import (
"io"
"net/url"
"os"
- "reflect"
-
- "code.gitea.io/gitea/modules/json"
)
-// Mappable represents an interface that can MapTo another interface
-type Mappable interface {
- MapTo(v interface{}) error
-}
-
-// toConfig will attempt to convert a given configuration cfg into the provided exemplar type.
-//
-// It will tolerate the cfg being passed as a []byte or string of a json representation of the
-// exemplar or the correct type of the exemplar itself
-func toConfig(exemplar, cfg interface{}) (interface{}, error) {
- // First of all check if we've got the same type as the exemplar - if so it's all fine.
- if reflect.TypeOf(cfg).AssignableTo(reflect.TypeOf(exemplar)) {
- return cfg, nil
- }
-
- // Now if not - does it provide a MapTo function we can try?
- if mappable, ok := cfg.(Mappable); ok {
- newVal := reflect.New(reflect.TypeOf(exemplar))
- if err := mappable.MapTo(newVal.Interface()); err == nil {
- return newVal.Elem().Interface(), nil
- }
- // MapTo has failed us ... let's try the json route ...
- }
-
- // OK we've been passed a byte array right?
- configBytes, ok := cfg.([]byte)
- if !ok {
- // oh ... it's a string then?
- var configStr string
-
- configStr, ok = cfg.(string)
- configBytes = []byte(configStr)
- }
- if !ok {
- // hmm ... can we marshal it to json?
- var err error
- configBytes, err = json.Marshal(cfg)
- ok = err == nil
- }
- if !ok {
- // no ... we've tried hard enough at this point - throw an error!
- return nil, ErrInvalidConfiguration{cfg: cfg}
- }
-
- // OK unmarshal the byte array into a new copy of the exemplar
- newVal := reflect.New(reflect.TypeOf(exemplar))
- if err := json.Unmarshal(configBytes, newVal.Interface()); err != nil {
- // If we can't unmarshal it then return an error!
- return nil, ErrInvalidConfiguration{cfg: cfg, err: err}
- }
- return newVal.Elem().Interface(), nil
-}
-
var uninitializedStorage = discardStorage("uninitialized storage")
type discardStorage string