[nifi-minifi-cpp] branch main updated: MINIFICPP-1440 PublishKafka processor's "security protocol" should have allowable values

[szaszm]

This is an automated email from the ASF dual-hosted git repository.

szaszm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git


The following commit(s) were added to refs/heads/main by this push:
     new bdb52a2  MINIFICPP-1440 PublishKafka processor's "security protocol" 
should have allowable values
bdb52a2 is described below

commit bdb52a209ad8ac1dbb8b51849e11574f8c1f9034
Author: Robert Kalmar <rkal...@cloudera.com>
AuthorDate: Tue Jan 5 10:34:11 2021 +0100

    MINIFICPP-1440 PublishKafka processor's "security protocol" should have 
allowable values
    
    This closes #961
    
    Signed-off-by: Marton Szasz <szasz...@gmail.com>
---
 extensions/librdkafka/PublishKafka.cpp | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/extensions/librdkafka/PublishKafka.cpp 
b/extensions/librdkafka/PublishKafka.cpp
index 30c8847..3a782c2 100644
--- a/extensions/librdkafka/PublishKafka.cpp
+++ b/extensions/librdkafka/PublishKafka.cpp
@@ -50,8 +50,6 @@ namespace processors {
 #define DELIVERY_BEST_EFFORT "0"
 #define SECURITY_PROTOCOL_PLAINTEXT "plaintext"
 #define SECURITY_PROTOCOL_SSL "ssl"
-#define SECURITY_PROTOCOL_SASL_PLAINTEXT "sasl_plaintext"
-#define SECURITY_PROTOCOL_SASL_SSL "sasl_ssl"
 #define KAFKA_KEY_ATTRIBUTE "kafka.key"
 
 const core::Property PublishKafka::SeedBrokers(
@@ -126,7 +124,13 @@ const core::Property PublishKafka::CompressCodec(
 const core::Property PublishKafka::MaxFlowSegSize(
     core::PropertyBuilder::createProperty("Max Flow Segment 
Size")->withDescription("Maximum flow content payload segment size for the 
kafka record. 0 B means unlimited.")
         ->isRequired(false)->withDefaultValue<core::DataSizeValue>("0 
B")->build());
-const core::Property PublishKafka::SecurityProtocol("Security Protocol", 
"Protocol used to communicate with brokers", "");
+const core::Property PublishKafka::SecurityProtocol(
+        core::PropertyBuilder::createProperty("Security Protocol")
+        ->withDescription("Protocol used to communicate with brokers")
+        ->withDefaultValue<std::string>(SECURITY_PROTOCOL_PLAINTEXT)
+        ->withAllowableValues<std::string>({SECURITY_PROTOCOL_PLAINTEXT, 
SECURITY_PROTOCOL_SSL})
+        ->isRequired(true)
+        ->build());
 const core::Property PublishKafka::SecurityCA("Security CA", "File or 
directory path to CA certificate(s) for verifying the broker's key", "");
 const core::Property PublishKafka::SecurityCert("Security Cert", "Path to 
client's public key (PEM) used for authentication", "");
 const core::Property PublishKafka::SecurityPrivateKey("Security Private Key", 
"Path to client's private key (PEM) used for authentication", "");
@@ -727,6 +731,8 @@ bool PublishKafka::configureNewConnection(const 
std::shared_ptr<core::ProcessCon
           throw Exception(PROCESS_SCHEDULE_EXCEPTION, error_msg);
         }
       }
+    } else if (value == SECURITY_PROTOCOL_PLAINTEXT) {
+      // Do nothing
     } else {
       auto error_msg = utils::StringUtils::join_pack("PublishKafka: unknown 
Security Protocol: ", value);
       throw Exception(PROCESS_SCHEDULE_EXCEPTION, error_msg);