| Index: luci_config/server/cfgclient/access/access.go
|
| diff --git a/luci_config/server/cfgclient/access/access.go b/luci_config/server/cfgclient/access/access.go
|
| index 8f26f007ee1939506ffe4dd7cfd1336ef7623e6f..4b5c597f2b7a60b00ccbb2211bba6f586f3e78a1 100644
|
| --- a/luci_config/server/cfgclient/access/access.go
|
| +++ b/luci_config/server/cfgclient/access/access.go
|
| @@ -52,8 +52,8 @@ func Check(c context.Context, a backend.Authority, configSet cfgtypes.ConfigSet)
|
| var pcfg configPB.ProjectCfg
|
| if err := cfgclient.Get(c, cfgclient.AsService, projectConfigSet, cfgclient.ProjectConfigPath,
|
| textproto.Message(&pcfg), nil); err != nil {
|
| - return errors.Annotate(err).Reason("failed to load %(path)q in %(configSet)q").
|
| - D("path", cfgclient.ProjectConfigPath).D("configSet", projectConfigSet).Err()
|
| + return errors.Annotate(err, "failed to load %q in %q",
|
| + cfgclient.ProjectConfigPath, projectConfigSet).Err()
|
| }
|
|
|
| id := identity.AnonymousIdentity
|
| @@ -80,7 +80,7 @@ func Check(c context.Context, a backend.Authority, configSet cfgtypes.ConfigSet)
|
| if len(checkGroups) > 0 {
|
| switch canAccess, err := auth.IsMember(c, checkGroups...); {
|
| case err != nil:
|
| - return errors.Annotate(err).Reason("failed to check group membership").Err()
|
| + return errors.Annotate(err, "failed to check group membership").Err()
|
| case canAccess:
|
| return nil
|
| }
|
|
|