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

credentials/alts: Update ALTS "New" APIs (#1921)

Browse Source
This commit is contained in:
Cesar Ghali
2018-03-19 09:07:54 -07:00
committed by dfawley
parent fa28bef939
commit 211a7b7ec0
6 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
credentials/alts/alts.go
View File

@ -91,6 +91,14 @@ type AuthInfo interface {
PeerRPCVersions() *altspb.RpcProtocolVersions
}
// ClientOptions contains the client-side options of an ALTS channel. These
// options will be passed to the underlying ALTS handshaker.
type ClientOptions struct {
// TargetServiceAccounts contains a list of expected target service
// accounts.
TargetServiceAccounts []string
}
// altsTC is the credentials required for authenticating a connection using ALTS.
// It implements credentials.TransportCredentials interface.
type altsTC struct {
@ -100,13 +108,13 @@ type altsTC struct {
accounts []string
}
// NewClient constructs a client-side ALTS TransportCredentials object.
func NewClient(targetServiceAccounts []string) credentials.TransportCredentials {
return newALTS(core.ClientSide, targetServiceAccounts)
// NewClientCreds constructs a client-side ALTS TransportCredentials object.
func NewClientCreds(opts *ClientOptions) credentials.TransportCredentials {
return newALTS(core.ClientSide, opts.TargetServiceAccounts)
}
// NewServer constructs a server-side ALTS TransportCredentials object.
func NewServer() credentials.TransportCredentials {
// NewServerCreds constructs a server-side ALTS TransportCredentials object.
func NewServerCreds() credentials.TransportCredentials {
return newALTS(core.ServerSide, nil)
}

16
credentials/alts/alts_test.go
View File

@ -27,8 +27,8 @@ import (
func TestInfoServerName(t *testing.T) {
// This is not testing any handshaker functionality, so it's fine to only
// use NewServer and not NewClient.
alts := NewServer()
// use NewServerCreds and not NewClientCreds.
alts := NewServerCreds()
if got, want := alts.Info().ServerName, ""; got != want {
t.Fatalf("%v.Info().ServerName = %v, want %v", alts, got, want)
}
@ -37,8 +37,8 @@ func TestInfoServerName(t *testing.T) {
func TestOverrideServerName(t *testing.T) {
wantServerName := "server.name"
// This is not testing any handshaker functionality, so it's fine to only
// use NewServer and not NewClient.
c := NewServer()
// use NewServerCreds and not NewClientCreds.
c := NewServerCreds()
c.OverrideServerName(wantServerName)
if got, want := c.Info().ServerName, wantServerName; got != want {
t.Fatalf("c.Info().ServerName = %v, want %v", got, want)
@ -48,8 +48,8 @@ func TestOverrideServerName(t *testing.T) {
func TestClone(t *testing.T) {
wantServerName := "server.name"
// This is not testing any handshaker functionality, so it's fine to only
// use NewServer and not NewClient.
c := NewServer()
// use NewServerCreds and not NewClientCreds.
c := NewServerCreds()
c.OverrideServerName(wantServerName)
cc := c.Clone()
if got, want := cc.Info().ServerName, wantServerName; got != want {
@ -66,8 +66,8 @@ func TestClone(t *testing.T) {
func TestInfo(t *testing.T) {
// This is not testing any handshaker functionality, so it's fine to only
// use NewServer and not NewClient.
c := NewServer()
// use NewServerCreds and not NewClientCreds.
c := NewServerCreds()
info := c.Info()
if got, want := info.ProtocolVersion, ""; got != want {
t.Errorf("info.ProtocolVersion=%v, want %v", got, want)