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

interop: Add use_alts flag to client and server binaries (#1896)

Browse Source
This commit is contained in:
Cesar Ghali
2018-03-07 10:21:48 -08:00
committed by dfawley
parent 5190b068e2
commit 3ae2a613bc
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
interop/client/client.go
View File

@ -25,6 +25,7 @@ import (
"google.golang.org/grpc" "google.golang.org/grpc"
"google.golang.org/grpc/credentials" "google.golang.org/grpc/credentials"
"google.golang.org/grpc/credentials/alts"
"google.golang.org/grpc/credentials/oauth" "google.golang.org/grpc/credentials/oauth"
"google.golang.org/grpc/grpclog" "google.golang.org/grpc/grpclog"
"google.golang.org/grpc/interop" "google.golang.org/grpc/interop"
@ -34,7 +35,8 @@ import (
var ( var (
caFile = flag.String("ca_file", "", "The file containning the CA root cert file") caFile = flag.String("ca_file", "", "The file containning the CA root cert file")
useTLS = flag.Bool("use_tls", false, "Connection uses TLS if true, else plain TCP") useTLS = flag.Bool("use_tls", false, "Connection uses TLS if true")
useALTS = flag.Bool("use_alts", false, "Connection uses ALTS if true (this option can only be used on GCP)")
testCA = flag.Bool("use_test_ca", false, "Whether to replace platform root CAs with test CA as the CA root") testCA = flag.Bool("use_test_ca", false, "Whether to replace platform root CAs with test CA as the CA root")
serviceAccountKeyFile = flag.String("service_account_key_file", "", "Path to service account json key file") serviceAccountKeyFile = flag.String("service_account_key_file", "", "Path to service account json key file")
oauthScope = flag.String("oauth_scope", "", "The scope for OAuth2 tokens") oauthScope = flag.String("oauth_scope", "", "The scope for OAuth2 tokens")
@ -66,6 +68,9 @@ var (
func main() { func main() {
flag.Parse() flag.Parse()
if *useTLS && *useALTS {
grpclog.Fatalf("use_tls and use_alts cannot be both set to true")
}
serverAddr := net.JoinHostPort(*serverHost, strconv.Itoa(*serverPort)) serverAddr := net.JoinHostPort(*serverHost, strconv.Itoa(*serverPort))
var opts []grpc.DialOption var opts []grpc.DialOption
if *useTLS { if *useTLS {
@ -104,6 +109,9 @@ func main() {
} else if *testCase == "oauth2_auth_token" { } else if *testCase == "oauth2_auth_token" {
opts = append(opts, grpc.WithPerRPCCredentials(oauth.NewOauthAccess(interop.GetToken(*serviceAccountKeyFile, *oauthScope)))) opts = append(opts, grpc.WithPerRPCCredentials(oauth.NewOauthAccess(interop.GetToken(*serviceAccountKeyFile, *oauthScope))))
} }
} else if *useALTS {
altsTC := alts.NewClient(nil)
opts = append(opts, grpc.WithTransportCredentials(altsTC))
} else { } else {
opts = append(opts, grpc.WithInsecure()) opts = append(opts, grpc.WithInsecure())
} }

10
interop/server/server.go
View File

@ -25,6 +25,7 @@ import (
"google.golang.org/grpc" "google.golang.org/grpc"
"google.golang.org/grpc/credentials" "google.golang.org/grpc/credentials"
"google.golang.org/grpc/credentials/alts"
"google.golang.org/grpc/grpclog" "google.golang.org/grpc/grpclog"
"google.golang.org/grpc/interop" "google.golang.org/grpc/interop"
testpb "google.golang.org/grpc/interop/grpc_testing" testpb "google.golang.org/grpc/interop/grpc_testing"
@ -33,6 +34,7 @@ import (
var ( var (
useTLS = flag.Bool("use_tls", false, "Connection uses TLS if true, else plain TCP") useTLS = flag.Bool("use_tls", false, "Connection uses TLS if true, else plain TCP")
useALTS = flag.Bool("use_alts", false, "Connection uses ALTS if true (this option can only be used on GCP)")
certFile = flag.String("tls_cert_file", "", "The TLS cert file") certFile = flag.String("tls_cert_file", "", "The TLS cert file")
keyFile = flag.String("tls_key_file", "", "The TLS key file") keyFile = flag.String("tls_key_file", "", "The TLS key file")
port = flag.Int("port", 10000, "The server port") port = flag.Int("port", 10000, "The server port")
@ -40,6 +42,9 @@ var (
func main() { func main() {
flag.Parse() flag.Parse()
if *useTLS && *useALTS {
grpclog.Fatalf("use_tls and use_alts cannot be both set to true")
}
p := strconv.Itoa(*port) p := strconv.Itoa(*port)
lis, err := net.Listen("tcp", ":"+p) lis, err := net.Listen("tcp", ":"+p)
if err != nil { if err != nil {
@ -57,7 +62,10 @@ func main() {
if err != nil { if err != nil {
grpclog.Fatalf("Failed to generate credentials %v", err) grpclog.Fatalf("Failed to generate credentials %v", err)
} }
opts = []grpc.ServerOption{grpc.Creds(creds)} opts = append(opts, grpc.Creds(creds))
} else if *useALTS {
altsTC := alts.NewServer()
opts = append(opts, grpc.Creds(altsTC))
} }
server := grpc.NewServer(opts...) server := grpc.NewServer(opts...)
testpb.RegisterTestServiceServer(server, interop.NewTestServer()) testpb.RegisterTestServiceServer(server, interop.NewTestServer())