MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-04-25 12:34:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: error types in internal config package (#15559)

Browse Source
This commit is contained in:
Aditya Manthramurthy 2022-08-20 15:11:49 -07:00 committed by GitHub
parent ae4ee95d25
commit c54c13831a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
internal/config/config.go
View File

@ -948,7 +948,7 @@ func (c Config) SetKVS(s string, defaultKVS map[string]KVS) (dynamic bool, err e
func (c Config) CheckValidKeys(subSys string, deprecatedKeys []string) error { func (c Config) CheckValidKeys(subSys string, deprecatedKeys []string) error {
defKVS, ok := DefaultKVS[subSys] defKVS, ok := DefaultKVS[subSys]
if !ok { if !ok {
return fmt.Errorf("Subsystem %s does not exist", subSys) return Errorf("Subsystem %s does not exist", subSys)
} }
// Make a list of valid keys for the subsystem including the `comment` // Make a list of valid keys for the subsystem including the `comment`
@ -973,7 +973,7 @@ func (c Config) CheckValidKeys(subSys string, deprecatedKeys []string) error {
isSingleTarget := SubSystemsSingleTargets.Contains(subSys) isSingleTarget := SubSystemsSingleTargets.Contains(subSys)
if isSingleTarget && len(candidates) > 0 { if isSingleTarget && len(candidates) > 0 {
return fmt.Errorf("The following environment variables are unknown: %s", return Errorf("The following environment variables are unknown: %s",
strings.Join(candidates.ToSlice(), ", ")) strings.Join(candidates.ToSlice(), ", "))
} }
@ -993,7 +993,7 @@ func (c Config) CheckValidKeys(subSys string, deprecatedKeys []string) error {
// Whatever remains are invalid env vars - return an error. // Whatever remains are invalid env vars - return an error.
if len(candidates) > 0 { if len(candidates) > 0 {
return fmt.Errorf("The following environment variables are unknown: %s", return Errorf("The following environment variables are unknown: %s",
strings.Join(candidates.ToSlice(), ", ")) strings.Join(candidates.ToSlice(), ", "))
} }
} }
@ -1029,7 +1029,7 @@ func (c Config) GetAvailableTargets(subSys string) ([]string, error) {
defKVS, ok := DefaultKVS[subSys] defKVS, ok := DefaultKVS[subSys]
if !ok { if !ok {
return nil, fmt.Errorf("Subsystem %s does not exist", subSys) return nil, Errorf("Subsystem %s does not exist", subSys)
} }
kvsMap := c[subSys] kvsMap := c[subSys]
@ -1160,13 +1160,13 @@ type KVSrc struct {
func (c Config) GetResolvedConfigParams(subSys, target string) ([]KVSrc, error) { func (c Config) GetResolvedConfigParams(subSys, target string) ([]KVSrc, error) {
// Initially only support OpenID // Initially only support OpenID
if !resolvableSubsystems.Contains(subSys) { if !resolvableSubsystems.Contains(subSys) {
return nil, fmt.Errorf("unsupported subsystem: %s", subSys) return nil, Errorf("unsupported subsystem: %s", subSys)
} }
// Check if config param requested is valid. // Check if config param requested is valid.
defKVS, ok := DefaultKVS[subSys] defKVS, ok := DefaultKVS[subSys]
if !ok { if !ok {
return nil, fmt.Errorf("unknown subsystem: %s", subSys) return nil, Errorf("unknown subsystem: %s", subSys)
} }
r := make([]KVSrc, 0, len(defKVS)+1) r := make([]KVSrc, 0, len(defKVS)+1)
@ -1226,7 +1226,7 @@ func (c Config) GetSubsysInfo(subSys string) ([]SubsysInfo, error) {
// Check if config param requested is valid. // Check if config param requested is valid.
defKVS1, ok := DefaultKVS[subSys] defKVS1, ok := DefaultKVS[subSys]
if !ok { if !ok {
return nil, fmt.Errorf("unknown subsystem: %s", subSys) return nil, Errorf("unknown subsystem: %s", subSys)
} }
targets, err := c.GetAvailableTargets(subSys) targets, err := c.GetAvailableTargets(subSys)