MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-11-07 21:02:58 -05:00
Code Issues Packages Projects Releases Wiki Activity

finalize startup-banner and remove unnecessary logs (#15202)

Browse Source
This commit is contained in:
Harshavardhana
2022-06-29 16:32:04 -07:00
committed by GitHub
parent 54a061bdda
commit 8856a2d77b
5 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
internal/config/config.go
View File

@@ -1055,10 +1055,10 @@ func (c Config) GetAvailableTargets(subSys string) ([]string, error) {
func getEnvVarName(subSys, target, param string) string {
if target == Default {
return fmt.Sprintf("%s%s_%s", EnvPrefix, strings.ToUpper(subSys), strings.ToUpper(param))
return fmt.Sprintf("%s%s%s%s", EnvPrefix, strings.ToUpper(subSys), Default, strings.ToUpper(param))
}
return fmt.Sprintf("%s%s_%s_%s", EnvPrefix, strings.ToUpper(subSys), strings.ToUpper(param), target)
return fmt.Sprintf("%s%s%s%s%s%s", EnvPrefix, strings.ToUpper(subSys), Default, strings.ToUpper(param), Default, target)
}
var resolvableSubsystems = set.CreateStringSet(IdentityOpenIDSubSys)

11
internal/config/identity/openid/openid.go
View File

@@ -197,8 +197,17 @@ func LookupConfig(s config.Config, transport http.RoundTripper, closeRespFn func
seenClientIDs = set.NewStringSet()
)
// remove this since we have removed support for this already.
deprecatedKeys := []string{JwksURL}
// remove this since we have removed support for this already.
for k := range s[config.IdentityOpenIDSubSys] {
for _, dk := range deprecatedKeys {
kvs := s[config.IdentityOpenIDSubSys][k]
kvs.Delete(dk)
s[config.IdentityOpenIDSubSys][k] = kvs
}
}
if err := s.CheckValidKeys(config.IdentityOpenIDSubSys, deprecatedKeys); err != nil {
return c, err
}