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

Do not call testdata.Path when defining flags (#1394)

Browse Source
This commit is contained in:
Menghan Li
2017-07-27 14:00:18 -07:00
committed by dfawley
parent 3ddcdc268d
commit e64ff5d75c
3 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
examples/route_guide/client/client.go
View File

@ -38,7 +38,7 @@ import (
var ( var (
tls = flag.Bool("tls", false, "Connection uses TLS if true, else plain TCP") tls = flag.Bool("tls", false, "Connection uses TLS if true, else plain TCP")
caFile = flag.String("ca_file", testdata.Path("ca.pem"), "The file containning the CA root cert file") caFile = flag.String("ca_file", "", "The file containning the CA root cert file")
serverAddr = flag.String("server_addr", "127.0.0.1:10000", "The server address in the format of host:port") serverAddr = flag.String("server_addr", "127.0.0.1:10000", "The server address in the format of host:port")
serverHostOverride = flag.String("server_host_override", "x.test.youtube.com", "The server name use to verify the hostname returned by TLS handshake") serverHostOverride = flag.String("server_host_override", "x.test.youtube.com", "The server name use to verify the hostname returned by TLS handshake")
) )
@ -146,19 +146,12 @@ func main() {
flag.Parse() flag.Parse()
var opts []grpc.DialOption var opts []grpc.DialOption
if *tls { if *tls {
var sn string if *caFile == "" {
if *serverHostOverride != "" { *caFile = testdata.Path("ca.pem")
sn = *serverHostOverride
} }
var creds credentials.TransportCredentials creds, err := credentials.NewClientTLSFromFile(*caFile, *serverHostOverride)
if *caFile != "" { if err != nil {
var err error grpclog.Fatalf("Failed to create TLS credentials %v", err)
creds, err = credentials.NewClientTLSFromFile(*caFile, sn)
if err != nil {
grpclog.Fatalf("Failed to create TLS credentials %v", err)
}
} else {
creds = credentials.NewClientTLSFromCert(nil, sn)
} }
opts = append(opts, grpc.WithTransportCredentials(creds)) opts = append(opts, grpc.WithTransportCredentials(creds))
} else { } else {

10
examples/route_guide/server/server.go
View File

@ -46,8 +46,8 @@ import (
var ( var (
tls = flag.Bool("tls", false, "Connection uses TLS if true, else plain TCP") tls = flag.Bool("tls", false, "Connection uses TLS if true, else plain TCP")
certFile = flag.String("cert_file", testdata.Path("server1.pem"), "The TLS cert file") certFile = flag.String("cert_file", "", "The TLS cert file")
keyFile = flag.String("key_file", testdata.Path("server1.key"), "The TLS key file") keyFile = flag.String("key_file", "", "The TLS key file")
jsonDBFile = flag.String("json_db_file", "testdata/route_guide_db.json", "A json file containing a list of features") jsonDBFile = flag.String("json_db_file", "testdata/route_guide_db.json", "A json file containing a list of features")
port = flag.Int("port", 10000, "The server port") port = flag.Int("port", 10000, "The server port")
) )
@ -213,6 +213,12 @@ func main() {
} }
var opts []grpc.ServerOption var opts []grpc.ServerOption
if *tls { if *tls {
if *certFile == "" {
testdata.Path("server1.pem")
}
if *keyFile == "" {
testdata.Path("server1.key")
}
creds, err := credentials.NewServerTLSFromFile(*certFile, *keyFile) creds, err := credentials.NewServerTLSFromFile(*certFile, *keyFile)
if err != nil { if err != nil {
grpclog.Fatalf("Failed to generate credentials %v", err) grpclog.Fatalf("Failed to generate credentials %v", err)

10
interop/server/server.go
View File

@ -33,8 +33,8 @@ 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")
certFile = flag.String("tls_cert_file", testdata.Path("server1.pem"), "The TLS cert file") certFile = flag.String("tls_cert_file", "", "The TLS cert file")
keyFile = flag.String("tls_key_file", testdata.Path("server1.key"), "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")
) )
@ -47,6 +47,12 @@ func main() {
} }
var opts []grpc.ServerOption var opts []grpc.ServerOption
if *useTLS { if *useTLS {
if *certFile == "" {
testdata.Path("server1.pem")
}
if *keyFile == "" {
testdata.Path("server1.key")
}
creds, err := credentials.NewServerTLSFromFile(*certFile, *keyFile) creds, err := credentials.NewServerTLSFromFile(*certFile, *keyFile)
if err != nil { if err != nil {
grpclog.Fatalf("Failed to generate credentials %v", err) grpclog.Fatalf("Failed to generate credentials %v", err)