MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2024-12-26 15:15:55 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: parse the subsys env error (#18319)

Browse Source
This commit is contained in:
jiuker 2023-10-26 23:12:57 +08:00 committed by GitHub
parent 54aed421b8
commit dbc2368a7b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
internal/config/config.go
View File

@ -1091,6 +1091,8 @@ func (c Config) GetAvailableTargets(subSys string) ([]string, error) {
seen.Add(k) seen.Add(k)
} }
// env:prefix
filterMap := map[string]string{}
// Add targets that are configured via environment variables. // Add targets that are configured via environment variables.
for _, param := range defKVS { for _, param := range defKVS {
envVarPrefix := getEnvVarName(subSys, Default, param.Key) + Default envVarPrefix := getEnvVarName(subSys, Default, param.Key) + Default
@ -1098,11 +1100,21 @@ func (c Config) GetAvailableTargets(subSys string) ([]string, error) {
for _, k := range envsWithPrefix { for _, k := range envsWithPrefix {
tgtName := strings.TrimPrefix(k, envVarPrefix) tgtName := strings.TrimPrefix(k, envVarPrefix)
if tgtName != "" { if tgtName != "" {
seen.Add(tgtName) if v, ok := filterMap[k]; ok {
if strings.HasPrefix(envVarPrefix, v) {
filterMap[k] = envVarPrefix
}
} else {
filterMap[k] = envVarPrefix
}
} }
} }
} }
for k, v := range filterMap {
seen.Add(strings.TrimPrefix(k, v))
}
seen.Remove(Default) seen.Remove(Default)
targets := seen.ToSlice() targets := seen.ToSlice()
sort.Strings(targets) sort.Strings(targets)