From a6c3df2f242908440c2ccdbff5fabcd6675dfce4 Mon Sep 17 00:00:00 2001 From: sanjaypujare Date: Mon, 30 Nov 2020 14:58:52 -0800 Subject: [PATCH] xds: fix text in the readme and the comment about the --secure flag (#7676) --- examples/example-xds/README.md | 8 ++++---- .../grpc/examples/helloworldxds/XdsHelloWorldClient.java | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/example-xds/README.md b/examples/example-xds/README.md index 93a3e3d134..92b91ea085 100644 --- a/examples/example-xds/README.md +++ b/examples/example-xds/README.md @@ -54,16 +54,16 @@ code. We will now demonstrate how the code can authorize use of xDS provided cre `XdsChannelCredentials` on the client side and using `XdsServerCredentials` on the server side. This code is enabled by providing an additional command line argument. -1. On the server side, add `--secure` on the command line to authorize use of xDS security: +1. On the server side, add `--xds-creds` on the command line to authorize use of xDS security: ``` $ export GRPC_XDS_BOOTSTRAP=/path/to/bootstrap.json -$ ./build/install/example-xds/bin/xds-hello-world-server --secure +$ ./build/install/example-xds/bin/xds-hello-world-server --xds-creds ``` -2. Similarly, add `--secure` on the command line when you run the xDS client: +2. Similarly, add `--xds-creds` on the command line when you run the xDS client: ``` $ export GRPC_XDS_BOOTSTRAP=/path/to/bootstrap.json -$ ./build/install/example-xds/bin/xds-hello-world-client --secure "xds world" xds:///yourServersName +$ ./build/install/example-xds/bin/xds-hello-world-client --xds-creds "xds world" xds:///yourServersName ``` In this case, if the xDS management server is configured to provide mTLS credentials (for example) to the client and diff --git a/examples/example-xds/src/main/java/io/grpc/examples/helloworldxds/XdsHelloWorldClient.java b/examples/example-xds/src/main/java/io/grpc/examples/helloworldxds/XdsHelloWorldClient.java index 12e29b2f02..70c684746c 100644 --- a/examples/example-xds/src/main/java/io/grpc/examples/helloworldxds/XdsHelloWorldClient.java +++ b/examples/example-xds/src/main/java/io/grpc/examples/helloworldxds/XdsHelloWorldClient.java @@ -61,7 +61,7 @@ public class XdsHelloWorldClient { /** * Greet server. If provided, the first element of {@code args} is the name to use in the - * greeting. The second argument is the target server. A {@code --secure} flag is also accepted. + * greeting. The second argument is the target server. A {@code --xds-creds} flag is also accepted. */ public static void main(String[] args) throws Exception { String user = "xds world";