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
commit 99d521d4a8bb0ea68b4ad7dac1a3d54c3f1dfdff Author: Gabor Gyimesi <[email protected]> AuthorDate: Wed Apr 20 18:10:12 2022 +0200 MINIFICPP-1801 Remove unused configuration properties Closes #1305 Signed-off-by: Marton Szasz <[email protected]> --- CONFIGURE.md | 4 ---- conf/minifi.properties | 5 ++--- .../minifi.properties | 3 --- encrypt-config/tests/ConfigFileEncryptorTests.cpp | 2 +- encrypt-config/tests/ConfigFileTests.cpp | 9 ++++----- encrypt-config/tests/resources/minifi.properties | 1 - ...th-additional-sensitive-props.minifi.properties | 1 - extensions/coap/tests/CoapC2VerifyHeartbeat.cpp | 1 - extensions/http-curl/protocols/RESTSender.cpp | 5 +---- extensions/http-curl/tests/C2NullConfiguration.cpp | 1 - .../http-curl/tests/C2VerifyServeResults.cpp | 1 - extensions/http-curl/tests/HTTPSiteToSiteTests.cpp | 2 -- .../http-curl/tests/TimeoutHTTPSiteToSiteTests.cpp | 2 -- extensions/rocksdb-repos/FlowFileRepository.h | 9 --------- libminifi/include/RemoteProcessorGroupPort.h | 2 -- libminifi/include/properties/Configuration.h | 7 ------- libminifi/src/Configuration.cpp | 7 ------- libminifi/src/RemoteProcessorGroupPort.cpp | 10 ---------- libminifi/src/c2/C2Client.cpp | 2 +- libminifi/src/core/yaml/YamlConfiguration.cpp | 22 +++------------------- .../test/resources/encrypted.minifi.properties | 1 - python/getFile.py | 2 -- 22 files changed, 12 insertions(+), 87 deletions(-) diff --git a/CONFIGURE.md b/CONFIGURE.md index 58b015eb0..8d9346c7b 100644 --- a/CONFIGURE.md +++ b/CONFIGURE.md @@ -131,10 +131,6 @@ for TCP and secure HTTPS communications. CA Certificate: <CA cert path> ### HTTP SiteToSite Configuration -To enable HTTPSiteToSite globally you must set the following flag to true. - - nifi.remote.input.http.enabled=true - To enable HTTPSiteToSite for a remote process group. Remote Processing Groups: - name: NiFi Flow diff --git a/conf/minifi.properties b/conf/minifi.properties index 2379fecad..752b11e19 100644 --- a/conf/minifi.properties +++ b/conf/minifi.properties @@ -14,7 +14,6 @@ # limitations under the License. # Core Properties # -nifi.version=0.12.0 nifi.flow.configuration.file=./conf/config.yml nifi.administrative.yield.duration=30 sec # If a component has no work to do (is "bored"), how long should we wait before checking again for work? @@ -85,7 +84,7 @@ nifi.c2.root.classes=DeviceInfoNode,AgentInformation,FlowInformation nifi.c2.full.heartbeat=false ## heartbeat 4 times a second #nifi.c2.agent.heartbeat.period=250 -## define parameters about your agent +## define parameters about your agent #nifi.c2.agent.class= #nifi.c2.agent.identifier= ## define metrics reported @@ -114,6 +113,6 @@ nifi.framework.dir=${MINIFI_HOME}/minifi-jni/lib nifi.nar.directory=${MINIFI_HOME}/minifi-jni/nars nifi.nar.deploy.directory=${MINIFI_HOME}/minifi-jni/nardeploy nifi.nar.docs.directory=${MINIFI_HOME}/minifi-jni/nardocs -# must be comma separated +# must be comma separated nifi.jvm.options=-Xmx1G nifi.python.processor.dir=${MINIFI_HOME}/minifi-python/ diff --git a/docker/test/integration/resources/minifi_cpp_with_provenance_repo/minifi.properties b/docker/test/integration/resources/minifi_cpp_with_provenance_repo/minifi.properties index 9ef59f374..578f8edb0 100644 --- a/docker/test/integration/resources/minifi_cpp_with_provenance_repo/minifi.properties +++ b/docker/test/integration/resources/minifi_cpp_with_provenance_repo/minifi.properties @@ -1,4 +1,3 @@ -nifi.version=0.12.0 nifi.flow.configuration.file=./conf/config.yml nifi.administrative.yield.duration=30 sec nifi.bored.yield.duration=10 millis @@ -23,10 +22,8 @@ nifi.c2.full.heartbeat=false nifi.c2.rest.url=http://local-cem-efm:10091/efm/api/c2-protocol/heartbeat nifi.c2.rest.url.ack=http://local-cem-efm:10091/efm/api/c2-protocol/acknowledge nifi.c2.rest.listener.port=8765 -nifi.c2.rest.listener.heartbeat.rooturi=/path nifi.c2.root.classes=DeviceInfoNode,AgentInformation,FlowInformation,RepositoryMetrics nifi.c2.root.class.definitions.DeviceInfo.name=deviceinfo nifi.c2.root.class.definitions.DeviceInfo.classes=DeviceInfoNode nifi.flow.metrics.class.definitions=15 nifi.flow.engine.threads=10 -nifi.remote.input.http.enabled=true diff --git a/encrypt-config/tests/ConfigFileEncryptorTests.cpp b/encrypt-config/tests/ConfigFileEncryptorTests.cpp index 3807f3135..32894da4a 100644 --- a/encrypt-config/tests/ConfigFileEncryptorTests.cpp +++ b/encrypt-config/tests/ConfigFileEncryptorTests.cpp @@ -83,7 +83,7 @@ TEST_CASE("ConfigFileEncryptor can encrypt the sensitive properties", "[encrypt- uint32_t num_properties_encrypted = encryptSensitivePropertiesInFile(test_file, KEY); REQUIRE(num_properties_encrypted == 1); - REQUIRE(test_file.size() == 102); + REQUIRE(test_file.size() == 101); REQUIRE(check_encryption(test_file, Configuration::nifi_rest_api_password, original_password.length())); SECTION("calling encryptSensitiveProperties a second time does nothing") { diff --git a/encrypt-config/tests/ConfigFileTests.cpp b/encrypt-config/tests/ConfigFileTests.cpp index ab5d9bd78..04e2258a5 100644 --- a/encrypt-config/tests/ConfigFileTests.cpp +++ b/encrypt-config/tests/ConfigFileTests.cpp @@ -90,12 +90,11 @@ TEST_CASE("ConfigFile creates an empty object from a nonexistent file", "[encryp TEST_CASE("ConfigFile can parse a simple config file", "[encrypt-config][constructor]") { ConfigFile test_file{std::ifstream{"resources/minifi.properties"}}; - REQUIRE(test_file.size() == 101); + REQUIRE(test_file.size() == 100); } TEST_CASE("ConfigFile can test whether a key is present", "[encrypt-config][hasValue]") { ConfigFile test_file{std::ifstream{"resources/minifi.properties"}}; - REQUIRE(test_file.hasValue(Configuration::nifi_version)); REQUIRE(test_file.hasValue(Configuration::nifi_c2_flow_id)); // present but blank REQUIRE(!test_file.hasValue(Configuration::nifi_remote_input_secure)); // commented out REQUIRE(!test_file.hasValue("nifi.this.property.does.not.exist")); @@ -103,7 +102,7 @@ TEST_CASE("ConfigFile can test whether a key is present", "[encrypt-config][hasV TEST_CASE("ConfigFile can read empty properties correctly", "[encrypt-config][constructor]") { ConfigFile test_file{std::ifstream{"resources/with-additional-sensitive-props.minifi.properties"}}; - REQUIRE(test_file.size() == 103); + REQUIRE(test_file.size() == 102); auto empty_property = test_file.getValue(Configuration::nifi_security_need_ClientAuth); REQUIRE(empty_property); @@ -144,7 +143,7 @@ TEST_CASE("ConfigFile can add a new setting after an existing setting", "[encryp SECTION("valid key") { test_file.insertAfter(Configuration::nifi_rest_api_password, "nifi.rest.api.password.protected", "my-cipher-name"); - REQUIRE(test_file.size() == 102); + REQUIRE(test_file.size() == 101); REQUIRE(test_file.getValue("nifi.rest.api.password.protected") == "my-cipher-name"); } @@ -159,7 +158,7 @@ TEST_CASE("ConfigFile can add a new setting at the end", "[encrypt-config][appen const std::string KEY = "nifi.bootstrap.sensitive.key"; const std::string VALUE = "aa411f289c91685ef9d5a9e5a4fad9393ff4c7a78ab978484323488caed7a9ab"; test_file.append(KEY, VALUE); - REQUIRE(test_file.size() == 102); + REQUIRE(test_file.size() == 101); REQUIRE(test_file.getValue(KEY) == std::make_optional(VALUE)); } diff --git a/encrypt-config/tests/resources/minifi.properties b/encrypt-config/tests/resources/minifi.properties index 1cf254991..d7cb215e0 100644 --- a/encrypt-config/tests/resources/minifi.properties +++ b/encrypt-config/tests/resources/minifi.properties @@ -14,7 +14,6 @@ # limitations under the License. # Core Properties # -nifi.version=0.7.0 nifi.flow.configuration.file=./conf/config.yml nifi.administrative.yield.duration=30 sec # If a component has no work to do (is "bored"), how long should we wait before checking again for work? diff --git a/encrypt-config/tests/resources/with-additional-sensitive-props.minifi.properties b/encrypt-config/tests/resources/with-additional-sensitive-props.minifi.properties index 2ca29b985..e7f4b00bd 100644 --- a/encrypt-config/tests/resources/with-additional-sensitive-props.minifi.properties +++ b/encrypt-config/tests/resources/with-additional-sensitive-props.minifi.properties @@ -14,7 +14,6 @@ # limitations under the License. # Core Properties # -nifi.version=0.7.0 nifi.flow.configuration.file=./conf/config.yml nifi.administrative.yield.duration=30 sec # If a component has no work to do (is "bored"), how long should we wait before checking again for work? diff --git a/extensions/coap/tests/CoapC2VerifyHeartbeat.cpp b/extensions/coap/tests/CoapC2VerifyHeartbeat.cpp index 0d2ae274d..ed3acea28 100644 --- a/extensions/coap/tests/CoapC2VerifyHeartbeat.cpp +++ b/extensions/coap/tests/CoapC2VerifyHeartbeat.cpp @@ -164,7 +164,6 @@ class VerifyCoAPServer : public CoapIntegrationBase { configuration->set(minifi::Configuration::nifi_c2_agent_coap_host, "127.0.0.1"); configuration->set(minifi::Configuration::nifi_c2_agent_coap_port, new_port_str); configuration->set(minifi::Configuration::nifi_c2_agent_heartbeat_period, "10"); - configuration->set(minifi::Configuration::nifi_c2_rest_listener_heartbeat_rooturi, path); } protected: diff --git a/extensions/http-curl/protocols/RESTSender.cpp b/extensions/http-curl/protocols/RESTSender.cpp index ca98223b6..64c7408ea 100644 --- a/extensions/http-curl/protocols/RESTSender.cpp +++ b/extensions/http-curl/protocols/RESTSender.cpp @@ -73,10 +73,7 @@ C2Payload RESTSender::consumePayload(const C2Payload &payload, Direction directi return consumePayload(rest_uri_, payload, direction, async); } -void RESTSender::update(const std::shared_ptr<Configure> &configure) { - std::string url; - configure->get(Configuration::nifi_c2_rest_url, "c2.rest.url", url); - configure->get(Configuration::nifi_c2_rest_url_ack, "c2.rest.url.ack", url); +void RESTSender::update(const std::shared_ptr<Configure> &) { } void RESTSender::setSecurityContext(utils::HTTPClient &client, const std::string &type, const std::string &url) { diff --git a/extensions/http-curl/tests/C2NullConfiguration.cpp b/extensions/http-curl/tests/C2NullConfiguration.cpp index 1869a08ab..3a773ea93 100644 --- a/extensions/http-curl/tests/C2NullConfiguration.cpp +++ b/extensions/http-curl/tests/C2NullConfiguration.cpp @@ -82,7 +82,6 @@ class VerifyC2Server : public HTTPIntegrationBase { configuration->set(Configuration::nifi_c2_agent_heartbeat_reporter_classes, "null"); configuration->set(Configuration::nifi_c2_rest_listener_port, "null"); configuration->set(Configuration::nifi_c2_agent_heartbeat_period, "null"); - configuration->set(Configuration::nifi_c2_rest_listener_heartbeat_rooturi, "null"); } protected: diff --git a/extensions/http-curl/tests/C2VerifyServeResults.cpp b/extensions/http-curl/tests/C2VerifyServeResults.cpp index b7f4615c7..fc54fd7aa 100644 --- a/extensions/http-curl/tests/C2VerifyServeResults.cpp +++ b/extensions/http-curl/tests/C2VerifyServeResults.cpp @@ -77,7 +77,6 @@ class VerifyC2Server : public HTTPIntegrationBase { configuration->set(org::apache::nifi::minifi::Configuration::nifi_c2_agent_protocol_class, "RESTSender"); configuration->set(org::apache::nifi::minifi::Configuration::nifi_c2_rest_listener_port, port); configuration->set(org::apache::nifi::minifi::Configuration::nifi_c2_agent_heartbeat_period, "10"); - configuration->set(org::apache::nifi::minifi::Configuration::nifi_c2_rest_listener_heartbeat_rooturi, path); } protected: diff --git a/extensions/http-curl/tests/HTTPSiteToSiteTests.cpp b/extensions/http-curl/tests/HTTPSiteToSiteTests.cpp index 2672e6b6a..74209118a 100644 --- a/extensions/http-curl/tests/HTTPSiteToSiteTests.cpp +++ b/extensions/http-curl/tests/HTTPSiteToSiteTests.cpp @@ -62,8 +62,6 @@ class SiteToSiteTestHarness : public HTTPIntegrationBase { file.close(); configuration->set(org::apache::nifi::minifi::Configuration::nifi_c2_enable, "false"); - configuration->set(org::apache::nifi::minifi::Configuration::nifi_remote_input_http, "true"); - configuration->set(org::apache::nifi::minifi::Configuration::nifi_remote_input_socket_port, "8099"); } void runAssertions() override { diff --git a/extensions/http-curl/tests/TimeoutHTTPSiteToSiteTests.cpp b/extensions/http-curl/tests/TimeoutHTTPSiteToSiteTests.cpp index 89cf70c55..3161e8b54 100644 --- a/extensions/http-curl/tests/TimeoutHTTPSiteToSiteTests.cpp +++ b/extensions/http-curl/tests/TimeoutHTTPSiteToSiteTests.cpp @@ -63,8 +63,6 @@ class SiteToSiteTestHarness : public HTTPIntegrationBase { file.close(); configuration->set(org::apache::nifi::minifi::Configuration::nifi_c2_enable, "false"); - configuration->set(org::apache::nifi::minifi::Configuration::nifi_remote_input_http, "true"); - configuration->set(org::apache::nifi::minifi::Configuration::nifi_remote_input_socket_port, "8099"); } void runAssertions() override { diff --git a/extensions/rocksdb-repos/FlowFileRepository.h b/extensions/rocksdb-repos/FlowFileRepository.h index ef87bed2e..efcbb556f 100644 --- a/extensions/rocksdb-repos/FlowFileRepository.h +++ b/extensions/rocksdb-repos/FlowFileRepository.h @@ -104,15 +104,6 @@ class FlowFileRepository : public core::Repository { directory_ = value; } logger_->log_debug("NiFi FlowFile Repository Directory %s", directory_); - if (configure->get(Configure::nifi_flowfile_repository_max_storage_size, value)) { - Property::StringToInt(value, max_partition_bytes_); - } - logger_->log_debug("NiFi FlowFile Max Partition Bytes %d", max_partition_bytes_); - if (configure->get(Configure::nifi_flowfile_repository_max_storage_time, value)) { - if (auto max_partition = utils::timeutils::StringToDuration<std::chrono::milliseconds>(value)) - max_partition_millis_ = *max_partition; - } - logger_->log_debug("NiFi FlowFile Max Storage Time: [%" PRId64 "] ms", int64_t{max_partition_millis_.count()}); const auto encrypted_env = createEncryptingEnv(utils::crypto::EncryptionManager{configure->getHome()}, DbEncryptionOptions{directory_, ENCRYPTION_KEY_NAME}); logger_->log_info("Using %s FlowFileRepository", encrypted_env ? "encrypted" : "plaintext"); diff --git a/libminifi/include/RemoteProcessorGroupPort.h b/libminifi/include/RemoteProcessorGroupPort.h index 140165572..b1a7e795d 100644 --- a/libminifi/include/RemoteProcessorGroupPort.h +++ b/libminifi/include/RemoteProcessorGroupPort.h @@ -88,7 +88,6 @@ class RemoteProcessorGroupPort : public core::Processor { direction_(sitetosite::SEND), transmitting_(false), timeout_(0), - http_enabled_(false), bypass_rest_api_(false), ssl_service(nullptr), logger_(core::logging::LoggerFactory<RemoteProcessorGroupPort>::getLogger()) { @@ -213,7 +212,6 @@ class RemoteProcessorGroupPort : public core::Processor { // rest API end point info std::vector<struct RPG> nifi_instances_; - bool http_enabled_; // http proxy utils::HTTPProxy proxy_; diff --git a/libminifi/include/properties/Configuration.h b/libminifi/include/properties/Configuration.h index 6f7a3394c..d0b7343ae 100644 --- a/libminifi/include/properties/Configuration.h +++ b/libminifi/include/properties/Configuration.h @@ -40,11 +40,9 @@ class Configuration : public Properties { static constexpr const char *nifi_volatile_repository_options = "nifi.volatile.repository.options."; // nifi.flow.configuration.file - static constexpr const char *nifi_version = "nifi.version"; static constexpr const char *nifi_default_directory = "nifi.default.directory"; static constexpr const char *nifi_flow_configuration_file = "nifi.flow.configuration.file"; static constexpr const char *nifi_flow_configuration_encrypt = "nifi.flow.configuration.encrypt"; - static constexpr const char *nifi_flow_configuration_file_exit_failure = "nifi.flow.configuration.file.exit.onfailure"; static constexpr const char *nifi_flow_configuration_file_backup_update = "nifi.flow.configuration.backup.on.update"; static constexpr const char *nifi_flow_engine_threads = "nifi.flow.engine.threads"; static constexpr const char *nifi_flow_engine_alert_period = "nifi.flow.engine.alert.period"; @@ -70,13 +68,9 @@ class Configuration : public Properties { static constexpr const char *nifi_provenance_repository_max_storage_size = "nifi.provenance.repository.max.storage.size"; static constexpr const char *nifi_provenance_repository_max_storage_time = "nifi.provenance.repository.max.storage.time"; static constexpr const char *nifi_provenance_repository_directory_default = "nifi.provenance.repository.directory.default"; - static constexpr const char *nifi_flowfile_repository_max_storage_size = "nifi.flowfile.repository.max.storage.size"; - static constexpr const char *nifi_flowfile_repository_max_storage_time = "nifi.flowfile.repository.max.storage.time"; static constexpr const char *nifi_flowfile_repository_directory_default = "nifi.flowfile.repository.directory.default"; static constexpr const char *nifi_dbcontent_repository_directory_default = "nifi.database.content.repository.directory.default"; static constexpr const char *nifi_remote_input_secure = "nifi.remote.input.secure"; - static constexpr const char *nifi_remote_input_http = "nifi.remote.input.http.enabled"; - static constexpr const char *nifi_remote_input_socket_port = "nifi.remote.input.socket.port"; static constexpr const char *nifi_security_need_ClientAuth = "nifi.security.need.ClientAuth"; static constexpr const char *nifi_sensitive_props_additional_keys = "nifi.sensitive.props.additional.keys"; static constexpr const char *nifi_python_processor_dir = "nifi.python.processor.dir"; @@ -121,7 +115,6 @@ class Configuration : public Properties { static constexpr const char *nifi_c2_rest_url = "nifi.c2.rest.url"; static constexpr const char *nifi_c2_rest_url_ack = "nifi.c2.rest.url.ack"; static constexpr const char *nifi_c2_rest_ssl_context_service = "nifi.c2.rest.ssl.context.service"; - static constexpr const char *nifi_c2_rest_listener_heartbeat_rooturi = "nifi.c2.rest.listener.heartbeat.rooturi"; static constexpr const char *nifi_c2_rest_heartbeat_minimize_updates = "nifi.c2.rest.heartbeat.minimize.updates"; static constexpr const char *nifi_c2_mqtt_connector_service = "nifi.c2.mqtt.connector.service"; static constexpr const char *nifi_c2_mqtt_heartbeat_topic = "nifi.c2.mqtt.heartbeat.topic"; diff --git a/libminifi/src/Configuration.cpp b/libminifi/src/Configuration.cpp index 91a50cff0..78e3e36af 100644 --- a/libminifi/src/Configuration.cpp +++ b/libminifi/src/Configuration.cpp @@ -22,11 +22,9 @@ namespace org::apache::nifi::minifi { const std::vector<core::ConfigurationProperty> Configuration::CONFIGURATION_PROPERTIES{ - core::ConfigurationProperty{Configuration::nifi_version}, core::ConfigurationProperty{Configuration::nifi_default_directory}, core::ConfigurationProperty{Configuration::nifi_flow_configuration_file}, core::ConfigurationProperty{Configuration::nifi_flow_configuration_encrypt, gsl::make_not_null(core::StandardValidators::get().BOOLEAN_VALIDATOR.get())}, - core::ConfigurationProperty{Configuration::nifi_flow_configuration_file_exit_failure, gsl::make_not_null(core::StandardValidators::get().BOOLEAN_VALIDATOR.get())}, core::ConfigurationProperty{Configuration::nifi_flow_configuration_file_backup_update, gsl::make_not_null(core::StandardValidators::get().BOOLEAN_VALIDATOR.get())}, core::ConfigurationProperty{Configuration::nifi_flow_engine_threads, gsl::make_not_null(core::StandardValidators::get().UNSIGNED_INT_VALIDATOR.get())}, core::ConfigurationProperty{Configuration::nifi_flow_engine_alert_period, gsl::make_not_null(core::StandardValidators::get().UNSIGNED_INT_VALIDATOR.get())}, @@ -52,13 +50,9 @@ const std::vector<core::ConfigurationProperty> Configuration::CONFIGURATION_PROP core::ConfigurationProperty{Configuration::nifi_provenance_repository_max_storage_size, gsl::make_not_null(core::StandardValidators::get().DATA_SIZE_VALIDATOR.get())}, core::ConfigurationProperty{Configuration::nifi_provenance_repository_max_storage_time, gsl::make_not_null(core::StandardValidators::get().TIME_PERIOD_VALIDATOR.get())}, core::ConfigurationProperty{Configuration::nifi_provenance_repository_directory_default}, - core::ConfigurationProperty{Configuration::nifi_flowfile_repository_max_storage_size, gsl::make_not_null(core::StandardValidators::get().DATA_SIZE_VALIDATOR.get())}, - core::ConfigurationProperty{Configuration::nifi_flowfile_repository_max_storage_time, gsl::make_not_null(core::StandardValidators::get().TIME_PERIOD_VALIDATOR.get())}, core::ConfigurationProperty{Configuration::nifi_flowfile_repository_directory_default}, core::ConfigurationProperty{Configuration::nifi_dbcontent_repository_directory_default}, core::ConfigurationProperty{Configuration::nifi_remote_input_secure, gsl::make_not_null(core::StandardValidators::get().BOOLEAN_VALIDATOR.get())}, - core::ConfigurationProperty{Configuration::nifi_remote_input_http, gsl::make_not_null(core::StandardValidators::get().BOOLEAN_VALIDATOR.get())}, - core::ConfigurationProperty{Configuration::nifi_remote_input_socket_port, gsl::make_not_null(core::StandardValidators::get().PORT_VALIDATOR.get())}, core::ConfigurationProperty{Configuration::nifi_security_need_ClientAuth, gsl::make_not_null(core::StandardValidators::get().BOOLEAN_VALIDATOR.get())}, core::ConfigurationProperty{Configuration::nifi_sensitive_props_additional_keys}, core::ConfigurationProperty{Configuration::nifi_python_processor_dir}, @@ -97,7 +91,6 @@ const std::vector<core::ConfigurationProperty> Configuration::CONFIGURATION_PROP core::ConfigurationProperty{Configuration::nifi_c2_rest_url}, core::ConfigurationProperty{Configuration::nifi_c2_rest_url_ack}, core::ConfigurationProperty{Configuration::nifi_c2_rest_ssl_context_service}, - core::ConfigurationProperty{Configuration::nifi_c2_rest_listener_heartbeat_rooturi}, core::ConfigurationProperty{Configuration::nifi_c2_rest_heartbeat_minimize_updates, gsl::make_not_null(core::StandardValidators::get().BOOLEAN_VALIDATOR.get())}, core::ConfigurationProperty{Configuration::nifi_c2_mqtt_connector_service}, core::ConfigurationProperty{Configuration::nifi_c2_mqtt_heartbeat_topic}, diff --git a/libminifi/src/RemoteProcessorGroupPort.cpp b/libminifi/src/RemoteProcessorGroupPort.cpp index 45a980f5c..f0924a3c3 100644 --- a/libminifi/src/RemoteProcessorGroupPort.cpp +++ b/libminifi/src/RemoteProcessorGroupPort.cpp @@ -142,16 +142,6 @@ void RemoteProcessorGroupPort::onSchedule(const std::shared_ptr<core::ProcessCon protocol_uuid_ = value; } - std::string http_enabled_str; - if (configure_->get(Configure::nifi_remote_input_http, http_enabled_str)) { - http_enabled_ = utils::StringUtils::toBool(http_enabled_str).value_or(false); - if (http_enabled_) { - if (client_type_ == sitetosite::CLIENT_TYPE::RAW) { - logger_->log_trace("Remote Input HTTP Enabled, but raw has been suggested for %s", protocol_uuid_.to_string()); - } - } - } - std::string context_name; if (!context->getProperty(SSLContext.getName(), context_name) || IsNullOrEmpty(context_name)) { context_name = RPG_SSL_CONTEXT_SERVICE_NAME; diff --git a/libminifi/src/c2/C2Client.cpp b/libminifi/src/c2/C2Client.cpp index f6f067ec7..14009c5b2 100644 --- a/libminifi/src/c2/C2Client.cpp +++ b/libminifi/src/c2/C2Client.cpp @@ -135,7 +135,7 @@ void C2Client::initialize(core::controller::ControllerServiceProvider *controlle initializeComponentMetrics(); - loadC2ResponseConfiguration("nifi.c2.root.class.definitions"); + loadC2ResponseConfiguration(Configuration::nifi_c2_root_class_definitions); std::lock_guard<std::mutex> lock(initialization_mutex_); if (!initialized_) { diff --git a/libminifi/src/core/yaml/YamlConfiguration.cpp b/libminifi/src/core/yaml/YamlConfiguration.cpp index e08954cd4..4d09d49c1 100644 --- a/libminifi/src/core/yaml/YamlConfiguration.cpp +++ b/libminifi/src/core/yaml/YamlConfiguration.cpp @@ -664,22 +664,6 @@ void YamlConfiguration::parsePropertyValueSequence(const std::string& propertyNa } } -namespace { - void handleExceptionOnValidatedProcessorPropertyRead(const core::Property& propertyFromProcessor, const YAML::Node& propertyValueNode, - const std::shared_ptr<Configure>& config, const std::type_index& defaultType, std::shared_ptr<logging::Logger>& logger) { - std::string eof; - bool const exit_on_failure = (config->get(Configure::nifi_flow_configuration_file_exit_failure, eof) && utils::StringUtils::toBool(eof).value_or(false)); - logger->log_error("Invalid conversion for field %s. Value %s", propertyFromProcessor.getName(), propertyValueNode.as<std::string>()); - if (exit_on_failure) { - // We do not exit here even if exit_on_failure is set. Maybe we should? - logger->log_error("Invalid conversion for %s to %s.", propertyFromProcessor.getName(), defaultType.name()); - } - } -} // namespace - -// coerce the types. upon failure we will either exit or use the default value. -// we do this here ( in addition to the PropertyValue class ) to get the earliest -// possible YAML failure. PropertyValue YamlConfiguration::getValidatedProcessorPropertyForDefaultTypeInfo(const core::Property& propertyFromProcessor, const YAML::Node& propertyValueNode) { PropertyValue defaultValue; defaultValue = propertyFromProcessor.getDefaultValue(); @@ -705,9 +689,9 @@ PropertyValue YamlConfiguration::getValidatedProcessorPropertyForDefaultTypeInfo return coercedValue; } catch (const std::exception& e) { logger_->log_error("Fetching property failed with an exception of %s", e.what()); - handleExceptionOnValidatedProcessorPropertyRead(propertyFromProcessor, propertyValueNode, configuration_, defaultType, logger_); - } catch (...) { - handleExceptionOnValidatedProcessorPropertyRead(propertyFromProcessor, propertyValueNode, configuration_, defaultType, logger_); + logger_->log_error("Invalid conversion for field %s. Value %s", propertyFromProcessor.getName(), propertyValueNode.as<std::string>()); + } catch (...) { + logger_->log_error("Invalid conversion for field %s. Value %s", propertyFromProcessor.getName(), propertyValueNode.as<std::string>()); } return defaultValue; } diff --git a/libminifi/test/resources/encrypted.minifi.properties b/libminifi/test/resources/encrypted.minifi.properties index c37a5a904..43d49f823 100644 --- a/libminifi/test/resources/encrypted.minifi.properties +++ b/libminifi/test/resources/encrypted.minifi.properties @@ -14,7 +14,6 @@ # limitations under the License. # Core Properties # -nifi.version=0.7.0 nifi.flow.configuration.file=./conf/config.yml nifi.administrative.yield.duration=30 sec # If a component has no work to do (is "bored"), how long should we wait before checking again for work? diff --git a/python/getFile.py b/python/getFile.py index 95c37c940..8b27fb5ee 100644 --- a/python/getFile.py +++ b/python/getFile.py @@ -60,8 +60,6 @@ args = parser.parse_args() """ dll_file is the path to the shared object """ minifi = MiNiFi(dll_file=args.dll_file, url=args.nifi_instance.encode('utf-8'), port=args.input_port.encode('utf-8')) # noqa F405 -minifi.set_property("nifi.remote.input.http.enabled", "true") - processor = minifi.add_processor(GetFile()) # noqa F405 processor.set_property("Input Directory", args.dir)
