support tls in the command line feed client

2 files changed, 8 insertions, 1 deletions

diff --git a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/runner/CommandLineArguments.java b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/runner/CommandLineArguments.java
index 23fb788f116..48d7916b34e 100644
--- a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/runner/CommandLineArguments.java
+++ b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/runner/CommandLineArguments.java
@@ -173,6 +173,10 @@ public class CommandLineArguments {
             description = "How often to print verbose message.)")
     private int whenVerboseEnabledPrintMessageForEveryXDocuments = 1000;
 
+    @Option(name = {"--useTls"},
+            description = "Use TLS when connecting to endpoint")
+    private boolean useTls = false;
+
     int getWhenVerboseEnabledPrintMessageForEveryXDocuments() {
         return whenVerboseEnabledPrintMessageForEveryXDocuments;
     }
@@ -220,7 +224,7 @@ public class CommandLineArguments {
         Iterable<String> hosts = Splitter.on(',').trimResults().split(hostArg);
         for (String host : hosts) {
             builder.addCluster(new Cluster.Builder()
-                    .addEndpoint(Endpoint.create(host, portArg, false))
+                    .addEndpoint(Endpoint.create(host, portArg, useTls))
                     .build());
         }
         return builder.build();
diff --git a/vespa-http-client/src/test/java/com/yahoo/vespa/http/client/runner/CommandLineArgumentsTest.java b/vespa-http-client/src/test/java/com/yahoo/vespa/http/client/runner/CommandLineArgumentsTest.java
index 86d17c8d768..e0d93a7fa18 100644
--- a/vespa-http-client/src/test/java/com/yahoo/vespa/http/client/runner/CommandLineArgumentsTest.java
+++ b/vespa-http-client/src/test/java/com/yahoo/vespa/http/client/runner/CommandLineArgumentsTest.java
@@ -86,6 +86,7 @@ public class CommandLineArgumentsTest {
         assertThat(params.getClusters().get(0).getEndpoints().size(), is(1));
         assertThat(params.getClusters().get(0).getEndpoints().get(0).getHostname(), is("hostValue"));
         assertThat(params.getClusters().get(0).getEndpoints().get(0).getPort(), is(4080));
+        assertThat(params.getClusters().get(0).getEndpoints().get(0).isUseSsl(), is(false));
         assertThat(params.getConnectionParams().getUseCompression(), is(false));
         assertThat(params.getConnectionParams().getNumPersistentConnectionsPerEndpoint(), is(16));
         assertThat(params.getFeedParams().getRoute(), is("default"));
@@ -107,11 +108,13 @@ public class CommandLineArgumentsTest {
         add("maxpending", "3456");
         add("debugport", "7890");
         args.add("--verbose");
+        args.add("--useTls");
         CommandLineArguments arguments = CommandLineArguments.build(asArray());
         SessionParams params = arguments.createSessionParams(true /* use json */);
         assertThat(params.getClientQueueSize(), is(3456));
         assertThat(params.getThrottlerMinSize(), is(10));
         assertThat(params.getClusters().get(0).getEndpoints().get(0).getPort(), is(1234));
+        assertThat(params.getClusters().get(0).getEndpoints().get(0).isUseSsl(), is(true));
         assertThat(params.getConnectionParams().getUseCompression(), is(true));
         assertThat(params.getFeedParams().getRoute(), is("routeValue"));
         assertThat(params.getFeedParams().getDataFormat(), is(FeedParams.DataFormat.JSON_UTF8));