szaszm commented on code in PR #1993:
URL: https://github.com/apache/nifi-minifi-cpp/pull/1993#discussion_r2297918142
##########
minifi-api/include/minifi-cpp/properties/Configure.h:
##########
Review Comment:
I don't see a reason to change this file
##########
minifi_main/MainHelper.cpp:
##########
@@ -106,8 +108,50 @@ std::filesystem::path determineMinifiHome(const
std::shared_ptr<logging::Logger>
}
/* Set the valid MINIFI_HOME in our environment */
- logger->log_info("Using " MINIFI_HOME_ENV_KEY "={}", minifi_home);
- utils::Environment::setEnvironmentVariable(MINIFI_HOME_ENV_KEY,
minifi_home.string().c_str());
+ logger->log_info("Using {}={}", MINIFI_HOME_ENV_KEY, minifi_home);
+ utils::Environment::setEnvironmentVariable(MINIFI_HOME_ENV_KEY.data(),
minifi_home.string().c_str());
return minifi_home;
}
+
+Locations getFromMinifiHome(const std::filesystem::path& minifi_home) {
+ return {
+ .working_dir_ = minifi_home,
+ .lock_path_ = minifi_home / "LOCK",
+ .log_properties_path_ = minifi_home / DEFAULT_LOG_PROPERTIES_FILE,
+ .uid_properties_path_ = minifi_home / DEFAULT_UID_PROPERTIES_FILE,
+ .properties_path_ = minifi_home / DEFAULT_NIFI_PROPERTIES_FILE,
+ .logs_dir_ = minifi_home / "logs",
+ .fips_bin_path_ = minifi_home / "fips",
+ .fips_conf_path_ = minifi_home / "fips",
+ };
+}
+
+Locations getFromFHS() {
+ return {
+ .working_dir_ = std::filesystem::path(RPM_WORK_DIR),
+ .lock_path_ = std::filesystem::path(RPM_WORK_DIR) / "LOCK",
+ .log_properties_path_ = std::filesystem::path(RPM_CONFIG_DIR) /
"minifi-log.properties",
+ .uid_properties_path_ = std::filesystem::path(RPM_CONFIG_DIR) /
"minifi-uid.properties",
+ .properties_path_ = std::filesystem::path(RPM_CONFIG_DIR) /
"minifi.properties",
+ .logs_dir_ = std::filesystem::path(RPM_LOG_DIR),
+ .fips_bin_path_ = std::filesystem::path(RPM_LIB_DIR) / "fips",
+ .fips_conf_path_ = std::filesystem::path(RPM_CONFIG_DIR) / "fips"
+ };
+}
+
+std::optional<Locations> determineLocations(const
std::shared_ptr<logging::Logger>& logger) {
+ if (const auto minifi_home_env =
utils::Environment::getEnvironmentVariable(MINIFI_HOME_ENV_KEY.data())) {
+ if (minifi_home_env == MINIFI_HOME_ENV_VALUE_FHS) {
+ return getFromFHS();
+ }
+ }
+ if (const auto executable_path = utils::file::get_executable_path();
executable_path.parent_path() == "/usr/bin") {
+ return getFromFHS();
+ }
Review Comment:
One of the "nice to haves" was to be able to package the same binaries in a
tarball and an RPM package format. This means we need runtime heuristics to
decide if we look for the config in /etc or in ../conf.
##########
packaging/rpm/expected-rpm-contents.in:
##########
@@ -0,0 +1,67 @@
+/etc/nifi-minifi-cpp
+/etc/nifi-minifi-cpp/config.yml
+/etc/nifi-minifi-cpp/fips
+/etc/nifi-minifi-cpp/fips/openssl.cnf
+/etc/nifi-minifi-cpp/minifi-log.properties
+/etc/nifi-minifi-cpp/minifi-uid.properties
+/etc/nifi-minifi-cpp/minifi.properties
+/usr/bin/minifi
+/usr/bin/minifi-controller
+/usr/bin/minifi-encrypt-config
+/usr/lib64/nifi-minifi-cpp
+/usr/lib64/nifi-minifi-cpp/extensions
+@RPM_EXPECTED_EXTENSION_LIST@
+/usr/lib64/nifi-minifi-cpp/fips
+/usr/lib64/nifi-minifi-cpp/fips/fips.so
+/usr/lib64/nifi-minifi-cpp/fips/openssl
+/usr/lib64/nifi-minifi-cpp/libcore-minifi.so
+/usr/lib64/systemd/system/minifi.service
+/usr/share/doc/nifi-minifi-cpp
+/usr/share/doc/nifi-minifi-cpp/C2.md
+/usr/share/doc/nifi-minifi-cpp/CONAN.md
+/usr/share/doc/nifi-minifi-cpp/CONFIGURE.md
+/usr/share/doc/nifi-minifi-cpp/CONTRIBUTING.md
+/usr/share/doc/nifi-minifi-cpp/CONTROLLERS.md
+/usr/share/doc/nifi-minifi-cpp/EXPRESSIONS.md
+/usr/share/doc/nifi-minifi-cpp/Extensions.md
+/usr/share/doc/nifi-minifi-cpp/LICENSE
+/usr/share/doc/nifi-minifi-cpp/METRICS.md
+/usr/share/doc/nifi-minifi-cpp/NOTICE
+/usr/share/doc/nifi-minifi-cpp/OPS.md
+/usr/share/doc/nifi-minifi-cpp/PARAMETER_PROVIDERS.md
+/usr/share/doc/nifi-minifi-cpp/PROCESSORS.md
+/usr/share/doc/nifi-minifi-cpp/README.md
+/usr/share/doc/nifi-minifi-cpp/FIPS.md
+/usr/share/doc/nifi-minifi-cpp/ThirdParties.md
+/usr/share/doc/nifi-minifi-cpp/Windows.md
+/usr/share/doc/nifi-minifi-cpp/pythonprocessor-examples
+/usr/share/doc/nifi-minifi-cpp/pythonprocessor-examples/AddPythonAttribute.py
+/usr/share/doc/nifi-minifi-cpp/pythonprocessor-examples/CountingProcessor.py
+/usr/share/doc/nifi-minifi-cpp/pythonprocessor-examples/GaussianDistributionWithNumpy.py
+/usr/share/doc/nifi-minifi-cpp/pythonprocessor-examples/MoveContentToJson.py
+/usr/share/doc/nifi-minifi-cpp/pythonprocessor-examples/RemoveFlowFile.py
+/usr/share/doc/nifi-minifi-cpp/pythonprocessor-examples/SentimentAnalysis.py
+/usr/share/doc/nifi-minifi-cpp/pythonprocessor-examples/google
+/usr/share/doc/nifi-minifi-cpp/pythonprocessor-examples/google/SentimentAnalyzer.py
+/usr/share/doc/nifi-minifi-cpp/pythonprocessor-examples/h2o
+/usr/share/doc/nifi-minifi-cpp/pythonprocessor-examples/h2o/ConvertDsToCsv.py
+/usr/share/doc/nifi-minifi-cpp/pythonprocessor-examples/h2o/h2o3
+/usr/share/doc/nifi-minifi-cpp/pythonprocessor-examples/h2o/h2o3/mojo
+/usr/share/doc/nifi-minifi-cpp/pythonprocessor-examples/h2o/h2o3/mojo/ExecuteH2oMojoScoring.py
+/var/lib/nifi-minifi-cpp
+/var/lib/nifi-minifi-cpp/minifi-python
+/var/lib/nifi-minifi-cpp/minifi-python/nifi_python_processors
Review Comment:
I'm thinking maybe python processors should go under /usr/lib, and only the
virtualenvs remain in /var/lib
##########
minifi_main/CMakeLists.txt:
##########
@@ -81,10 +81,18 @@ if (NOT WIN32)
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" AND NOT APPLE)
target_link_options(minifiexe PRIVATE "-Wl,--disable-new-dtags")
endif()
- if (APPLE)
- set_target_properties(minifiexe PROPERTIES INSTALL_RPATH
"@loader_path")
+
+ if (MINIFI_PACKAGING_TYPE STREQUAL "RPM")
+ set_target_properties(minifiexe PROPERTIES
+ INSTALL_RPATH "/usr/${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}")
Review Comment:
Ideally we shouldn't hardcode `/usr` at all, and have every path depend on
the configure-time specified prefix
--
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]
