diff options
author | Lunny Xiao <xiaolunwen@gmail.com> | 2023-06-14 11:42:38 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-06-14 11:42:38 +0800 |
commit | d6dd6d641b593c54fe1a1041c153111ce81dbc20 (patch) | |
tree | f9e7959356124bd830ce0b9e9e51c1373aa71932 /modules/setting/actions.go | |
parent | dc0a7168f1450d45164fde63c56f04a1e5bbb949 (diff) | |
download | gitea-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/setting/actions.go')
-rw-r--r-- | modules/setting/actions.go | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/modules/setting/actions.go b/modules/setting/actions.go index eb1b637a1c..1c8075cd6c 100644 --- a/modules/setting/actions.go +++ b/modules/setting/actions.go @@ -4,14 +4,14 @@ package setting import ( - "code.gitea.io/gitea/modules/log" + "fmt" ) // Actions settings var ( Actions = struct { - LogStorage Storage // how the created logs should be stored - ArtifactStorage Storage // how the created artifacts should be stored + LogStorage *Storage // how the created logs should be stored + ArtifactStorage *Storage // how the created artifacts should be stored Enabled bool DefaultActionsURL string `ini:"DEFAULT_ACTIONS_URL"` }{ @@ -20,15 +20,22 @@ var ( } ) -func loadActionsFrom(rootCfg ConfigProvider) { +func loadActionsFrom(rootCfg ConfigProvider) error { sec := rootCfg.Section("actions") - if err := sec.MapTo(&Actions); err != nil { - log.Fatal("Failed to map Actions settings: %v", err) + err := sec.MapTo(&Actions) + if err != nil { + return fmt.Errorf("failed to map Actions settings: %v", err) } - actionsSec := rootCfg.Section("actions.artifacts") - storageType := actionsSec.Key("STORAGE_TYPE").MustString("") + // don't support to read configuration from [actions] + Actions.LogStorage, err = getStorage(rootCfg, "actions_log", "", nil) + if err != nil { + return err + } + + actionsSec, _ := rootCfg.GetSection("actions.artifacts") + + Actions.ArtifactStorage, err = getStorage(rootCfg, "actions_artifacts", "", actionsSec) - Actions.LogStorage = getStorage(rootCfg, "actions_log", "", nil) - Actions.ArtifactStorage = getStorage(rootCfg, "actions_artifacts", storageType, actionsSec) + return err } |