profiles/internal/rpc: Reduce verbosity of authentication errors.
More cleanup is likely, I'd like to see errAuthErr removed completely
and instead the low level libraries (like vc.AuthenticateAsClient etc.)
return the appropriate verror.
Change-Id: Id0065d173efec9f5b4dabee7a4282ee1bb4031e5
diff --git a/profiles/internal/rpc/client.go b/profiles/internal/rpc/client.go
index 0dbad10..9905f55 100644
--- a/profiles/internal/rpc/client.go
+++ b/profiles/internal/rpc/client.go
@@ -53,7 +53,7 @@
errNotTrusted = verror.Register(pkgPath+".notTrusted", verror.NoRetry, "name {3} not trusted using blessings {4}{:5}")
- errAuthError = verror.Register(pkgPath+".authError", verror.RetryRefetch, "authentication error from server {3}{:4}")
+ errAuthError = verror.Register(pkgPath+".authError", verror.RetryRefetch, "{3}")
errSystemRetry = verror.Register(pkgPath+".sysErrorRetryConnection", verror.RetryConnection, "{:3:}")
@@ -165,7 +165,7 @@
c.vcMapMu.Lock()
if err != nil {
if strings.Contains(err.Error(), "authentication failed") {
- return nil, verror.New(errAuthError, ctx, ep, err)
+ return nil, verror.New(errAuthError, ctx, err)
} else {
return nil, verror.New(errSystemRetry, ctx, err)
}
@@ -181,12 +181,7 @@
} else {
c.vcMap[vcKey] = &vcInfo{vc: vc, remoteEP: ep}
}
- flow, err := vc.Connect()
- if err != nil {
-
- return nil, verror.New(errAuthError, ctx, ep, err)
- }
- return flow, nil
+ return vc.Connect()
}
// A randomized exponential backoff. The randomness deters error convoys
