From de4bbe8df39d487534189bfa6517021635327451 Mon Sep 17 00:00:00 2001 From: Rajan Dhabalia Date: Wed, 27 Feb 2019 21:33:58 -0800 Subject: [PATCH] [pulsar-admin-cli] add tls-trust-cert-path option to cli input (#3709) --- .../org/apache/pulsar/admin/cli/PulsarAdminTool.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/PulsarAdminTool.java b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/PulsarAdminTool.java index b68a1d8fc04..a2c5e7240c3 100644 --- a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/PulsarAdminTool.java +++ b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/PulsarAdminTool.java @@ -49,8 +49,10 @@ public class PulsarAdminTool { @Parameter(names = { "--tls-allow-insecure" }, description = "Allow TLS insecure connection") Boolean tlsAllowInsecureConnection; - - + + @Parameter(names = { "--tls-trust-cert-path" }, description = "Allow TLS trust cert file path") + String tlsTrustCertsFilePath; + @Parameter(names = { "--tls-enable-hostname-verification" }, description = "Enable TLS common name verification") Boolean tlsEnableHostnameVerification; @@ -70,7 +72,9 @@ public class PulsarAdminTool { boolean tlsEnableHostnameVerification = this.tlsEnableHostnameVerification != null ? this.tlsEnableHostnameVerification : Boolean.parseBoolean(properties.getProperty("tlsEnableHostnameVerification", "false")); - String tlsTrustCertsFilePath = properties.getProperty("tlsTrustCertsFilePath"); + final String tlsTrustCertsFilePath = StringUtils.isNotBlank(this.tlsTrustCertsFilePath) + ? this.tlsTrustCertsFilePath + : properties.getProperty("tlsTrustCertsFilePath"); adminBuilder = PulsarAdmin.builder().allowTlsInsecureConnection(tlsAllowInsecureConnection) .enableTlsHostnameVerification(tlsEnableHostnameVerification) -- GitLab