This is an automated email from the ASF dual-hosted git repository.
rdhabalia pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/master by this push:
new 31f27a09192 [fix][cli] Fix Pulsar-Client to allow consume encrypted
messages with appropriate crypto-failure-action (#23346)
31f27a09192 is described below
commit 31f27a091920dfcdd9ae44a1c738d701294b318b
Author: Rajan Dhabalia <[email protected]>
AuthorDate: Wed Sep 25 14:01:08 2024 -0700
[fix][cli] Fix Pulsar-Client to allow consume encrypted messages with
appropriate crypto-failure-action (#23346)
---
.../src/main/java/org/apache/pulsar/client/cli/CmdConsume.java | 5 +++++
.../src/main/java/org/apache/pulsar/client/cli/CmdRead.java | 5 +++++
2 files changed, 10 insertions(+)
diff --git
a/pulsar-client-tools/src/main/java/org/apache/pulsar/client/cli/CmdConsume.java
b/pulsar-client-tools/src/main/java/org/apache/pulsar/client/cli/CmdConsume.java
index 71c172b6337..46adc45e2ea 100644
---
a/pulsar-client-tools/src/main/java/org/apache/pulsar/client/cli/CmdConsume.java
+++
b/pulsar-client-tools/src/main/java/org/apache/pulsar/client/cli/CmdConsume.java
@@ -31,6 +31,7 @@ import java.util.regex.Pattern;
import org.apache.pulsar.client.api.AuthenticationDataProvider;
import org.apache.pulsar.client.api.Consumer;
import org.apache.pulsar.client.api.ConsumerBuilder;
+import org.apache.pulsar.client.api.ConsumerCryptoFailureAction;
import org.apache.pulsar.client.api.Message;
import org.apache.pulsar.client.api.PulsarClient;
import org.apache.pulsar.client.api.Schema;
@@ -111,6 +112,9 @@ public class CmdConsume extends AbstractCmdConsume {
@Option(names = {"-rs", "--replicated" }, description = "Whether the
subscription status should be replicated")
private boolean replicateSubscriptionState = false;
+ @Option(names = { "-ca", "--crypto-failure-action" }, description =
"Crypto Failure Action")
+ private ConsumerCryptoFailureAction cryptoFailureAction =
ConsumerCryptoFailureAction.FAIL;
+
public CmdConsume() {
// Do nothing
super();
@@ -174,6 +178,7 @@ public class CmdConsume extends AbstractCmdConsume {
}
builder.autoAckOldestChunkedMessageOnQueueFull(this.autoAckOldestChunkedMessageOnQueueFull);
+ builder.cryptoFailureAction(cryptoFailureAction);
if (isNotBlank(this.encKeyValue)) {
builder.defaultCryptoKeyReader(this.encKeyValue);
diff --git
a/pulsar-client-tools/src/main/java/org/apache/pulsar/client/cli/CmdRead.java
b/pulsar-client-tools/src/main/java/org/apache/pulsar/client/cli/CmdRead.java
index daab4364992..51bf2d6898b 100644
---
a/pulsar-client-tools/src/main/java/org/apache/pulsar/client/cli/CmdRead.java
+++
b/pulsar-client-tools/src/main/java/org/apache/pulsar/client/cli/CmdRead.java
@@ -30,6 +30,7 @@ import java.util.concurrent.TimeUnit;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.pulsar.client.api.AuthenticationDataProvider;
+import org.apache.pulsar.client.api.ConsumerCryptoFailureAction;
import org.apache.pulsar.client.api.Message;
import org.apache.pulsar.client.api.MessageId;
import org.apache.pulsar.client.api.PulsarClient;
@@ -101,6 +102,9 @@ public class CmdRead extends AbstractCmdConsume {
@Option(names = { "-pm", "--pool-messages" }, description = "Use the
pooled message", arity = "1")
private boolean poolMessages = true;
+ @Option(names = { "-ca", "--crypto-failure-action" }, description =
"Crypto Failure Action")
+ private ConsumerCryptoFailureAction cryptoFailureAction =
ConsumerCryptoFailureAction.FAIL;
+
public CmdRead() {
// Do nothing
super();
@@ -153,6 +157,7 @@ public class CmdRead extends AbstractCmdConsume {
}
builder.autoAckOldestChunkedMessageOnQueueFull(this.autoAckOldestChunkedMessageOnQueueFull);
+ builder.cryptoFailureAction(cryptoFailureAction);
if (isNotBlank(this.encKeyValue)) {
builder.defaultCryptoKeyReader(this.encKeyValue);