opensource/grpc-go
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename TransportAuthenticator to TransportCredentials

Browse Source
This commit is contained in:
Menghan Li
2016-06-08 11:10:23 -07:00
parent 3ffbd8e030
commit 59486d9c17
7 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
clientconn.go
View File

@ -170,9 +170,9 @@ func WithInsecure() DialOption {
// WithTransportCredentials returns a DialOption which configures a
// connection level security credentials (e.g., TLS/SSL).
func WithTransportCredentials(auth credentials.TransportAuthenticator) DialOption {
func WithTransportCredentials(creds credentials.TransportCredentials) DialOption {
return func(o *dialOptions) {
o.copts.Authenticator = auth
o.copts.TransportCredentials = creds
}
}
@ -369,11 +369,11 @@ func (cc *ClientConn) newAddrConn(addr Address, skipWait bool) error {
ac.events = trace.NewEventLog("grpc.ClientConn", ac.addr.Addr)
}
if !ac.dopts.insecure {
if ac.dopts.copts.Authenticator == nil {
if ac.dopts.copts.TransportCredentials == nil {
return errNoTransportSecurity
}
} else {
if ac.dopts.copts.Authenticator != nil {
if ac.dopts.copts.TransportCredentials != nil {
return errCredentialsMisuse
}
for _, cd := range ac.dopts.copts.PerRPCCredentials {