Use errors.Join() to join errors

Co-authored-by: Tim Möhlmann <muhlemmer@gmail.com>
This commit is contained in:
Ayato 2024-09-17 23:10:07 +09:00 committed by GitHub
parent aadfd3017f
commit 973611612e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -42,7 +42,7 @@ func Discover(ctx context.Context, issuer string, httpClient *http.Client, wellK
discoveryConfig := new(oidc.DiscoveryConfiguration) discoveryConfig := new(oidc.DiscoveryConfiguration)
err = httphelper.HttpRequest(httpClient, req, &discoveryConfig) err = httphelper.HttpRequest(httpClient, req, &discoveryConfig)
if err != nil { if err != nil {
return nil, fmt.Errorf("%w: %w", oidc.ErrDiscoveryFailed, err) return nil, errors.Join(err, oidc.ErrDiscoveryFailed)
} }
if logger, ok := logging.FromContext(ctx); ok { if logger, ok := logging.FromContext(ctx); ok {
logger.Debug("discover", "config", discoveryConfig) logger.Debug("discover", "config", discoveryConfig)