[several] Refactor, stage 2, take 2 #185
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -28,10 +28,12 @@ set(IRODS_MINIMUM_VERSION "4.90.0") | |
| set(IRODS_MAXIMUM_VERSION "6.0.0") | ||
| find_package(IRODS "${IRODS_MINIMUM_VERSION}...<${IRODS_MAXIMUM_VERSION}" REQUIRED) | ||
|
|
||
| set(IRODS_PLUGIN_VERSION "5.1.0") | ||
|
Contributor
There was a problem hiding this comment. NTS: Update milestone.
Contributor
There was a problem hiding this comment. Just making sure: As far as we know, no interfaces have changed and no behavioral changes are considered breaking, right? In other words, no need for a major version with these changes?
Member
Author
There was a problem hiding this comment. The new block-by-default failsafe mode could be considered a breaking change, though a configuration tweak would restore the previous behavior.
Member
There was a problem hiding this comment. i have zero concerns with this being a major release of the plugin, for the record. that said, the behavior as i understand it today, is that if the AMQP endpoint was not happy... iRODS just stopped/blocked/appeared broken. So... this could be argued is a bugfix from a certain perspective. I defer on the versioning thing. I think it's fine either way.
Contributor
There was a problem hiding this comment. Based on the explanation in #192, I think the failsafe mode is in fact making unintended-yet-desirable behavior into an official (and actually functioning) feature, and a configurable one. So, yes, in some sense it is in fact a bug fix. Anyway, it doesn't necessarily seem worthy of a major version bump after seeing these comments - minor seems fine. |
||
|
|
||
| set(IRODS_PACKAGE_REVISION "0") | ||
|
|
||
| set(IRODS_RULE_ENGINE_PLUGIN_NAME "audit_amqp") | ||
| set(IRODS_PLUGIN_FULL_NAME "irods_rule_engine_plugin-${IRODS_RULE_ENGINE_PLUGIN_NAME}") | ||
| set(PLUGIN irods_rule_engine_plugin-audit_amqp) | ||
|
|
||
| include(IrodsCXXCompiler) | ||
|
|
@@ -46,10 +48,10 @@ include(IrodsExternals) | |
|
|
||
| IRODS_MACRO_CHECK_DEPENDENCY_SET_FULLPATH_ADD_TO_IRODS_PACKAGE_DEPENDENCIES_LIST(QPID_PROTON qpid-proton0.36.0-3) | ||
|
|
||
| string(REPLACE ";" ", " ${IRODS_PLUGIN_FULL_NAME}_PACKAGE_DEPENDENCIES_STRING "${IRODS_PACKAGE_DEPENDENCIES_LIST}") | ||
| unset(IRODS_PACKAGE_DEPENDENCIES_LIST) | ||
|
|
||
| project("${IRODS_PLUGIN_FULL_NAME}" | ||
| VERSION "${IRODS_PLUGIN_VERSION}" | ||
| LANGUAGES CXX) | ||
|
|
||
|
|
@@ -62,58 +64,111 @@ endif() | |
|
|
||
| include(GNUInstallDirs) | ||
| include(CheckCXXSymbolExists) | ||
| include(ObjectTargetHelpers) | ||
|
|
||
| find_package(Threads REQUIRED) | ||
| find_package(OpenSSL REQUIRED COMPONENTS Crypto SSL) | ||
| find_package(nlohmann_json "3.6.1" REQUIRED) | ||
| find_package(fmt "8.1.1" REQUIRED) | ||
|
|
||
| set( | ||
| ${IRODS_PLUGIN_FULL_NAME}_SOURCES | ||
| "${CMAKE_CURRENT_SOURCE_DIR}/src/main.cpp" | ||
| "${CMAKE_CURRENT_SOURCE_DIR}/src/amqp_config.cpp" | ||
| "${CMAKE_CURRENT_SOURCE_DIR}/src/amqp_sender.cpp" | ||
| "${CMAKE_CURRENT_SOURCE_DIR}/src/audit_config.cpp" | ||
| ) | ||
| set( | ||
| ${IRODS_PLUGIN_FULL_NAME}_HEADERS | ||
| "${CMAKE_CURRENT_SOURCE_DIR}/include/irods/private/amqp_config.hpp" | ||
| "${CMAKE_CURRENT_SOURCE_DIR}/include/irods/private/amqp_sender.hpp" | ||
| "${CMAKE_CURRENT_SOURCE_DIR}/include/irods/private/audit_amqp.hpp" | ||
| "${CMAKE_CURRENT_SOURCE_DIR}/include/irods/private/audit_config.hpp" | ||
| "${CMAKE_CURRENT_SOURCE_DIR}/include/irods/private/audit_b64enc.hpp" | ||
| "${CMAKE_CURRENT_SOURCE_DIR}/include/irods/private/proton_formatters.hpp" | ||
| ) | ||
| set( | ||
| ${IRODS_PLUGIN_FULL_NAME}_HEADERS_GENERATORS | ||
| "${CMAKE_CURRENT_SOURCE_DIR}/include/irods/private/audit_amqp_version.hpp.in" | ||
| ) | ||
| set( | ||
| ${IRODS_PLUGIN_FULL_NAME}_HEADERS_GENERATED | ||
| "${CMAKE_CURRENT_SOURCE_DIR}/include/irods/private/audit_amqp_version.hpp" | ||
| ) | ||
|
|
||
| set_source_files_properties( | ||
| "${${IRODS_PLUGIN_FULL_NAME}_HEADERS_GENERATORS}" | ||
| PROPERTIES | ||
| HEADER_FILE_ONLY ON | ||
| ) | ||
| set_source_files_properties( | ||
| "${${IRODS_PLUGIN_FULL_NAME}_HEADERS_GENERATED}" | ||
| PROPERTIES | ||
| GENERATED ON | ||
| ) | ||
|
korydraughn marked this conversation as resolved.
|
||
|
|
||
| configure_file( | ||
| "${CMAKE_CURRENT_SOURCE_DIR}/include/irods/private/audit_amqp_version.hpp.in" | ||
| "${CMAKE_CURRENT_BINARY_DIR}/include/irods/private/audit_amqp_version.hpp" | ||
| @ONLY | ||
| ) | ||
|
|
||
| add_library( | ||
| ${IRODS_PLUGIN_FULL_NAME}_obj | ||
| OBJECT | ||
| "${${IRODS_PLUGIN_FULL_NAME}_SOURCES}" | ||
| "${${IRODS_PLUGIN_FULL_NAME}_HEADERS}" | ||
| "${${IRODS_PLUGIN_FULL_NAME}_HEADERS_GENERATORS}" | ||
| "${${IRODS_PLUGIN_FULL_NAME}_HEADERS_GENERATED}" | ||
| ) | ||
| target_compile_options(${IRODS_PLUGIN_FULL_NAME}_obj PRIVATE -Wno-write-strings) | ||
| target_compile_definitions(${IRODS_PLUGIN_FULL_NAME}_obj PRIVATE ${IRODS_COMPILE_DEFINITIONS} ${IRODS_COMPILE_DEFINITIONS_PRIVATE} IRODS_ENABLE_SYSLOG) | ||
| target_include_directories( | ||
| ${IRODS_PLUGIN_FULL_NAME}_obj | ||
| PUBLIC | ||
| $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> | ||
| $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include> | ||
| PRIVATE | ||
| ${IRODS_INCLUDE_DIRS} | ||
| ${IRODS_EXTERNALS_FULLPATH_BOOST}/include | ||
| ${IRODS_EXTERNALS_FULLPATH_QPID_PROTON}/include | ||
| ) | ||
|
|
||
| target_link_libraries( | ||
| ${IRODS_PLUGIN_FULL_NAME}_obj | ||
| PUBLIC | ||
| irods_server | ||
| irods_common | ||
| nlohmann_json::nlohmann_json | ||
| fmt::fmt | ||
| PRIVATE | ||
| ${IRODS_EXTERNALS_FULLPATH_QPID_PROTON}/lib/libqpid-proton-cpp.so | ||
| ${IRODS_EXTERNALS_FULLPATH_BOOST}/lib/libboost_system.so | ||
| ${IRODS_EXTERNALS_FULLPATH_BOOST}/lib/libboost_url.so | ||
| ${CMAKE_DL_LIBS} | ||
| ) | ||
|
|
||
| if (CMAKE_BUILD_TYPE STREQUAL "Debug") | ||
| target_compile_definitions(${IRODS_PLUGIN_FULL_NAME}_obj PRIVATE IRODS_AUDIT_EXTRA_TRACE) | ||
| endif() | ||
|
|
||
| check_cxx_symbol_exists(__cpp_lib_filesystem "version" HAVE_STD_FILESYSTEM) | ||
| if (NOT HAVE_STD_FILESYSTEM) | ||
| target_link_libraries( | ||
| ${IRODS_PLUGIN_FULL_NAME}_obj | ||
| PRIVATE | ||
| ${IRODS_EXTERNALS_FULLPATH_BOOST}/lib/libboost_filesystem.so | ||
| ) | ||
| endif() | ||
|
|
||
| add_library(${IRODS_PLUGIN_FULL_NAME} MODULE) | ||
| target_link_objects( | ||
| ${IRODS_PLUGIN_FULL_NAME} | ||
| PRIVATE | ||
| ${IRODS_PLUGIN_FULL_NAME}_obj | ||
| ) | ||
|
|
||
| install(TARGETS ${IRODS_PLUGIN_FULL_NAME} LIBRARY DESTINATION ${IRODS_PLUGINS_DIRECTORY}/rule_engines) | ||
|
|
||
| install( | ||
| FILES | ||
|
|
@@ -163,10 +218,10 @@ set(CPACK_RPM_FILE_NAME RPM-DEFAULT) | |
| set(CPACK_ARCHIVE_COMPONENT_INSTALL OFF) | ||
|
|
||
| set(CPACK_DEBIAN_PACKAGE_NAME ${PLUGIN_PACKAGE_NAME}) | ||
| set(CPACK_DEBIAN_PACKAGE_DEPENDS "${IRODS_PACKAGE_DEPENDENCIES_STRING}, ${${IRODS_PLUGIN_FULL_NAME}_PACKAGE_DEPENDENCIES_STRING}, irods-runtime (= ${IRODS_VERSION})") | ||
|
|
||
| set(CPACK_RPM_PACKAGE_NAME ${PLUGIN_PACKAGE_NAME}) | ||
| set(CPACK_RPM_PACKAGE_REQUIRES "${IRODS_PACKAGE_DEPENDENCIES_STRING}, ${${IRODS_PLUGIN_FULL_NAME}_PACKAGE_DEPENDENCIES_STRING}, irods-runtime = ${IRODS_VERSION}") | ||
|
|
||
|
|
||
| if (NOT CPACK_GENERATOR) | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.