grpc
/
grpc-go
mirror of https://github.com/grpc/grpc-go.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rename some interop client flags

This commit is contained in:
iamqizhao 2015-10-20 16:49:37 -07:00
parent 6a026b9f10
commit 7afe4e5cec
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
interop/client/client.go
View File

@ -57,7 +57,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")
caFile = flag.String("tls_ca_file", "testdata/ca.pem", "The file containning the CA root cert file") 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")
defaultServiceAccount = flag.String("default_service_account", "", "Email of GCE default service account") defaultServiceAccount = flag.String("default_service_account", "", "Email of GCE default service account")
@ -87,6 +87,9 @@ var (
respSizes = []int{31415, 9, 2653, 58979} respSizes = []int{31415, 9, 2653, 58979}
largeReqSize = 271828 largeReqSize = 271828
largeRespSize = 314159 largeRespSize = 314159
// The test CA root cert file
testCAFile = "testdata/ca.pem"
) )
func newPayload(t testpb.PayloadType, size int) *testpb.Payload { func newPayload(t testpb.PayloadType, size int) *testpb.Payload {
@ -495,9 +498,9 @@ func main() {
sn = *tlsServerName sn = *tlsServerName
} }
var creds credentials.TransportAuthenticator var creds credentials.TransportAuthenticator
if *caFile != "" { if *testCA {
var err error var err error
creds, err = credentials.NewClientTLSFromFile(*caFile, sn) creds, err = credentials.NewClientTLSFromFile(testCAFile, sn)
if err != nil { if err != nil {
grpclog.Fatalf("Failed to create TLS credentials %v", err) grpclog.Fatalf("Failed to create TLS credentials %v", err)
} }