szaszm commented on a change in pull request #1212:
URL: https://github.com/apache/nifi-minifi-cpp/pull/1212#discussion_r750263013
##########
File path: extensions/librdkafka/rdkafka_utils.cpp
##########
@@ -29,6 +29,9 @@ namespace minifi {
namespace utils {
void setKafkaConfigurationField(rd_kafka_conf_t& configuration, const
std::string& field_name, const std::string& value) {
+ if (value.empty()) {
+ return;
+ }
Review comment:
Doesn't this prevent resetting a config value?
##########
File path: docker/test/integration/minifi/core/KafkaBrokerContainer.py
##########
@@ -19,15 +19,15 @@ def deploy(self):
detach=True,
name='kafka-broker',
network=self.network.name,
- ports={'9092/tcp': 9092, '29092/tcp': 29092, '9093/tcp': 9093,
'29093/tcp': 29093},
+ ports={'9092/tcp': 9092, '29092/tcp': 29092, '9093/tcp': 9093,
'29093/tcp': 29093, '9094/tcp': 9094, '29094/tcp': 29094},
Review comment:
Are 9095 and 29095 intentionally not exposed? Or am I missing something?
##########
File path: extensions/librdkafka/ConsumeKafka.h
##########
@@ -126,7 +124,7 @@ class ConsumeKafka : public core::Processor {
private:
void create_topic_partition_list();
void extend_config_from_dynamic_properties(const core::ProcessContext&
context);
- void configure_new_connection(const core::ProcessContext& context);
+ void configure_new_connection(core::ProcessContext* context);
Review comment:
I don't see why `context` is now passed as a pointer. I'm assuming
getProperty required non-const reference to ProcessContext, but it's still UB
to call this with a null pointer. Can we make it into a reference parameter?
##########
File path: extensions/librdkafka/PublishKafka.h
##########
@@ -89,8 +84,19 @@ class PublishKafka : public core::Processor {
EXTENSIONAPI static const core::Relationship Failure;
EXTENSIONAPI static const core::Relationship Success;
+ static const std::string COMPRESSION_CODEC_NONE;
+ static const std::string COMPRESSION_CODEC_GZIP;
+ static const std::string COMPRESSION_CODEC_SNAPPY;
+ static const std::string ROUND_ROBIN_PARTITIONING;
+ static const std::string RANDOM_PARTITIONING;
+ static const std::string USER_DEFINED_PARTITIONING;
+ static const std::string DELIVERY_REPLICATED;
+ static const std::string DELIVERY_ONE_NODE;
+ static const std::string DELIVERY_BEST_EFFORT;
+ static const std::string KAFKA_KEY_ATTRIBUTE;
Review comment:
Can we make these `constexpr` and have a simpler type, like `const
char[]`, `const char* const` or `std::string_view`? I think it's better to
avoid memory allocation during static initialization unless it's really needed.
##########
File path: extensions/librdkafka/KafkaProcessorBase.cpp
##########
@@ -0,0 +1,135 @@
+/**
+ * @file KafkaProcessorBase.cpp
+ * KafkaProcessorBase class implementation
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include "KafkaProcessorBase.h"
+
+#include "rdkafka_utils.h"
+#include "utils/ProcessorConfigUtils.h"
+
+namespace org::apache::nifi::minifi::processors {
+
+const core::Property KafkaProcessorBase::SecurityProtocol(
+ core::PropertyBuilder::createProperty("Security Protocol")
+ ->withDescription("Protocol used to communicate with brokers.
Corresponds to Kafka's 'security.protocol' property.")
+
->withDefaultValue<std::string>(toString(SecurityProtocolOption::PLAINTEXT))
+ ->withAllowableValues<std::string>(SecurityProtocolOption::values())
+ ->isRequired(true)
+ ->build());
+const core::Property KafkaProcessorBase::SSLContextService(
+ core::PropertyBuilder::createProperty("SSL Context Service")
+ ->withDescription("SSL Context Service Name")
+ ->asType<minifi::controllers::SSLContextService>()
+ ->build());
+const core::Property KafkaProcessorBase::KerberosServiceName(
+ core::PropertyBuilder::createProperty("Kerberos Service Name")
+ ->withDescription("Kerberos Service Name")
+ ->build());
+const core::Property KafkaProcessorBase::KerberosPrincipal(
+ core::PropertyBuilder::createProperty("Kerberos Principal")
+ ->withDescription("Keberos Principal")
+ ->build());
+const core::Property KafkaProcessorBase::KerberosKeytabPath(
+ core::PropertyBuilder::createProperty("Kerberos Keytab Path")
+ ->withDescription("The path to the location on the local filesystem
where the kerberos keytab is located. Read permission on the file is required.")
+ ->build());
+const core::Property KafkaProcessorBase::SASLMechanism(
+ core::PropertyBuilder::createProperty("SASL Mechanism")
+ ->withDescription("The SASL mechanism to use for authentication.
Corresponds to Kafka's 'sasl.mechanism' property.")
+ ->withDefaultValue<std::string>(toString(SASLMechanismOption::GSSAPI))
+ ->withAllowableValues<std::string>(SASLMechanismOption::values())
+ ->isRequired(true)
+ ->build());
+const core::Property KafkaProcessorBase::Username(
+ core::PropertyBuilder::createProperty("Username")
+ ->withDescription("The username when the SASL Mechanism is
sasl_plaintext")
+ ->build());
+const core::Property KafkaProcessorBase::Password(
+ core::PropertyBuilder::createProperty("Password")
+ ->withDescription("The password for the given username when the SASL
Mechanism is sasl_plaintext")
+ ->build());
+
+std::optional<utils::SSL_data>
KafkaProcessorBase::getSslData(core::ProcessContext* context) const {
+ std::string ssl_service_name;
+ if (context->getProperty(SSLContextService.getName(), ssl_service_name) &&
!ssl_service_name.empty()) {
+ std::shared_ptr<core::controller::ControllerService> service =
context->getControllerService(ssl_service_name);
+ if (service) {
+ auto ssl_service =
std::static_pointer_cast<minifi::controllers::SSLContextService>(service);
+ utils::SSL_data ssl_data;
+ ssl_data.ca_loc = ssl_service->getCACertificate();
+ ssl_data.cert_loc = ssl_service->getCertificateFile();
+ ssl_data.key_loc = ssl_service->getPrivateKeyFile();
+ ssl_data.key_pw = ssl_service->getPassphrase();
+ return ssl_data;
+ } else {
+ logger_->log_warn("SSL Context Service property is set to '%s', but the
controller service could not be found.", ssl_service_name);
+ return std::nullopt;
+ }
+ } else if (security_protocol_ == SecurityProtocolOption::SSL ||
security_protocol_ == SecurityProtocolOption::SASL_SSL) {
+ logger_->log_warn("Security protocol is set to %s, but no valid SSL
Context Service property is set.", security_protocol_.toString());
+ }
+
+ return std::nullopt;
+}
+
+void
KafkaProcessorBase::setKafkaAuthenticationParameters(core::ProcessContext*
context, rd_kafka_conf_t* config) {
Review comment:
Here as well, `context` should be a reference. Maybe it could even be a
reference to `const`?
##########
File path: libminifi/include/utils/ProcessorConfigUtils.h
##########
@@ -30,7 +30,15 @@ namespace nifi {
namespace minifi {
namespace utils {
-std::string getRequiredPropertyOrThrow(const core::ProcessContext* context,
const std::string& property_name);
+template<typename PropertyType = std::string>
+PropertyType getRequiredPropertyOrThrow(const core::ProcessContext* context,
const std::string& property_name) {
Review comment:
Can we make the `context` parameter a reference instead of a pointer?
It's UB to call this with null, so we might as well reflect it in the signature
itself.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
