diff options
author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2022-01-26 11:49:23 +0100 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2022-01-26 11:49:23 +0100 |
commit | 769739117e9a893979134f977dcbcf3aa482f48b (patch) | |
tree | 97bd428cb9dee6748a3c2fa39aedc16cc6a907ed /vespa-hadoop | |
parent | 1ecbb8ced4c2599155a2438625987b78e174bd5a (diff) |
Use SSL by default for vespa-feed-client, non-SSL for vespa-http-client
Diffstat (limited to 'vespa-hadoop')
3 files changed, 7 insertions, 5 deletions
diff --git a/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/LegacyVespaRecordWriter.java b/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/LegacyVespaRecordWriter.java index 89e48a16909..42abe9e6131 100644 --- a/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/LegacyVespaRecordWriter.java +++ b/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/LegacyVespaRecordWriter.java @@ -148,7 +148,7 @@ public class LegacyVespaRecordWriter extends RecordWriter { while (tokenizer.hasMoreTokens()) { String endpoint = tokenizer.nextToken().trim(); sessionParams.addCluster(new Cluster.Builder().addEndpoint( - Endpoint.create(endpoint, configuration.defaultPort(), configuration.useSSL()) + Endpoint.create(endpoint, configuration.defaultPort(), configuration.useSSL().orElse(false)) ).build()); } diff --git a/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/VespaRecordWriter.java b/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/VespaRecordWriter.java index 54de9e6c1c0..c381ec87492 100644 --- a/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/VespaRecordWriter.java +++ b/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/VespaRecordWriter.java @@ -147,7 +147,7 @@ public class VespaRecordWriter extends RecordWriter<Object, Object> { } private static List<URI> endpointUris(VespaConfiguration config) { - String scheme = config.useSSL() ? "https" : "http"; + String scheme = config.useSSL().orElse(true) ? "https" : "http"; return Arrays.stream(config.endpoint().split(",")) .map(hostname -> URI.create(String.format("%s://%s:%d/", scheme, hostname, config.defaultPort()))) .collect(toList()); diff --git a/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/util/VespaConfiguration.java b/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/util/VespaConfiguration.java index fad14532d38..1421a3fcd43 100644 --- a/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/util/VespaConfiguration.java +++ b/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/util/VespaConfiguration.java @@ -54,8 +54,10 @@ public class VespaConfiguration { } - public boolean useSSL() { - return getBoolean(USE_SSL, false); + public Optional<Boolean> useSSL() { + String raw = getString(USE_SSL); + if (raw == null || raw.trim().isEmpty()) return Optional.empty(); + return Optional.of(Boolean.parseBoolean(raw)); } @@ -181,7 +183,7 @@ public class VespaConfiguration { StringBuilder sb = new StringBuilder(); sb.append(ENDPOINT + ": " + endpoint() + "\n"); sb.append(DEFAULT_PORT + ": " + defaultPort() + "\n"); - sb.append(USE_SSL + ": " + useSSL() + "\n"); + sb.append(USE_SSL + ": " + useSSL().map(Object::toString).orElse("<empty>") + "\n"); sb.append(PROXY_HOST + ": " + proxyHost() + "\n"); sb.append(PROXY_PORT + ": " + proxyPort() + "\n"); sb.append(DRYRUN + ": " + dryrun() +"\n"); |