This is an automated email from the ASF dual-hosted git repository.
lordgamez pushed a change to branch MINIFICPP-2558
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
omit c152211e5 Fix clang tidy issues
omit 221e910b5 Fix linter
omit 294fc8d79 MINIFICPP-2558 Revamp site to site communication
add fd0eacbd3 MINIFICPP-2584 Linux Filesystem Hierarchy Standard support,
RPM package
add f65f14543 MINIFICPP-2589 Refactor ConsumeWindowsEventLog
add 434646feb MINIFICPP-2622 Replace Bitnami Kafka image with Apache in
tests
add 1121e3e34 MINIFICPP-2623 - Use same compiler
add 54000432a MINIFICPP-2620 DatabaseContentRepository should be the
default
add 68c27b98c MINIFICPP-2600 Change RecordSetReader interface
add 91d3c0568 MINIFICPP-2625 minifi.service should be in /usr/lib (rpm
package)
add 1b32c49e2 MINIFICPP-2448 Add minifi.sh flowStatus command
add 9ce51ca94 MINIFICPP-2626 Update RPM package description
add f28961cfb MINIFICPP-2594 Add XMLReader controller service
add ef7dbcb97 MINIFICPP-2595 Create ConvertRecord processor
add 8f83e3d66 MINIFICPP-2596 Add XMLRecordSetWriter controller service
add d9205afdb MINIFICPP-2628 CMake4 compatibility
add e25a247a4 MINIFICPP-2458 Create EvaluateJsonPath processor
add 107598b95 MINIFICPP-2577 Create SplitJson processor
add 5406747f7 MINIFICPP-2305 Fix various C2 integration test issues
add 857ed5bf2 MINIFICPP-2627 Fix ${MINIFI_HOME} in config files
add be873d380 MINIFICPP-2631 Fix various Windows build issues
add 498229f88 MINIFICPP-2558 Revamp site to site communication
add 18abbbe81 Fix linter
add 947e67878 Fix clang tidy issues
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (c152211e5)
\
N -- N -- N refs/heads/MINIFICPP-2558 (947e67878)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
.github/workflows/verify-package.yml | 21 +-
.gitignore | 2 +-
CMakeLists.txt | 167 ++++---
CONFIGURE.md | 72 ++-
CONTROLLERS.md | 41 ++
LICENSE | 57 ++-
NOTICE | 3 +-
OPS.md | 101 ++++-
PROCESSORS.md | 99 +++++
README.md | 13 +
bin/CMakeLists.txt | 71 +++
bin/flowstatus-minifi.bat | 46 ++
bin/{minifi.service => minifi.service.in} | 5 +-
bin/minifi.sh | 24 +-
cmake/BundledOpenCV.cmake | 8 +-
cmake/BundledOpenSSL.cmake | 31 +-
cmake/BundledPugiXml.cmake | 59 ---
cmake/DockerConfig.cmake | 15 +-
cmake/Extensions.cmake | 12 +-
cmake/{Sol2.cmake => Jsoncons.cmake} | 11 +-
cmake/MiNiFiOptions.cmake | 1 +
cmake/{Catch2.cmake => PugiXml.cmake} | 13 +-
cmake/VerifyPackageWithDocker.cmake | 4 +
cmake/Zstd.cmake | 9 +-
conanfile.py | 2 +-
conf/CMakeLists.txt | 91 ++++
conf/{config.yml => config.yml.in} | 0
...ifi-log.properties => minifi-log.properties.in} | 2 +-
...ifi-uid.properties => minifi-uid.properties.in} | 0
conf/{minifi.properties => minifi.properties.in} | 16 +-
controller/CMakeLists.txt | 27 +-
controller/Controller.cpp | 46 +-
controller/Controller.h | 1 +
controller/MiNiFiController.cpp | 28 +-
controller/tests/CMakeLists.txt | 20 +-
controller/tests/ControllerTests.cpp | 35 ++
core-framework/include/Defaults.h | 32 ++
core-framework/include/core/ProcessContext.h | 9 -
core-framework/include/utils/Environment.h | 2 +-
core-framework/include/utils/Locations.h | 51 +++
core-framework/include/utils/net/AsioSocketUtils.h | 2 +
.../src/utils/crypto/EncryptionManager.cpp | 6 +-
deploy.sh | 2 +-
docker/DockerBuild.sh | 3 +-
docker/DockerVerify.sh | 2 +-
.../installed.Dockerfile | 0
.../installed.dockerignore | 0
.../rpm.Dockerfile} | 16 +-
docker/rockylinux/Dockerfile | 19 +-
docker/test/integration/cluster/ContainerStore.py | 3 +
.../test/integration/cluster/DockerTestCluster.py | 5 +-
docker/test/integration/cluster/ImageStore.py | 70 +--
.../cluster/MinifiControllerExecutor.py | 23 +-
.../integration/cluster/checkers/KafkaHelper.py | 8 +-
.../cluster/containers/KafkaBrokerContainer.py | 68 +--
.../containers/MinifiAsPodInKubernetesCluster.py | 2 +-
.../cluster/containers/MinifiContainer.py | 51 ++-
.../features/MiNiFi_integration_test_driver.py | 3 +
.../features/core_functionality.feature | 15 +
docker/test/integration/features/couchbase.feature | 16 +-
docker/test/integration/features/environment.py | 3 +
.../features/evaluate_json_path.feature | 50 +++
.../test/integration/features/kubernetes.feature | 1 +
.../test/integration/features/split_json.feature | 42 ++
docker/test/integration/features/steps/steps.py | 10 +-
.../{JsonTreeReader.py => XMLReader.py} | 8 +-
.../{ExecuteScript.py => ConvertRecord.py} | 8 +-
.../{AttributesToJSON.py => EvaluateJsonPath.py} | 4 +-
.../processors/{SplitText.py => SplitJson.py} | 10 +-
.../kubernetes/minifi-conf/minifi.properties | 10 +
.../integration/resources/minifi/minifi.properties | 7 -
encrypt-config/CMakeLists.txt | 22 +-
encrypt-config/EncryptConfig.cpp | 6 +-
encrypt-config/FlowConfigEncryptor.cpp | 13 +-
extensions/civetweb/tests/C2VerifyServeResults.cpp | 7 +-
extensions/civetweb/tests/CMakeLists.txt | 19 +-
.../civetweb/tests/HttpPostIntegrationTest.cpp | 14 +-
.../tests/ExpressionLanguageTests.cpp | 10 +-
.../integration/UpdateAttributeIntegrationTest.cpp | 7 +-
extensions/python/CMakeLists.txt | 22 +-
extensions/python/PythonCreator.h | 40 +-
.../utils/dependency_installer.py | 1 +
extensions/python/tests/PythonManifestTests.cpp | 8 +-
extensions/python/types/PyRecordSetReader.cpp | 7 +-
.../rocksdb-repos/DatabaseContentRepository.cpp | 19 +-
extensions/rocksdb-repos/FlowFileRepository.cpp | 13 +-
.../controllers/RocksDbStateStorage.cpp | 13 +-
.../rocksdb-repos/tests/ContentSessionTests.cpp | 7 +-
.../tests/DBContentRepositoryTests.cpp | 12 -
extensions/rocksdb-repos/tests/EncryptionTests.cpp | 1 -
extensions/rocksdb-repos/tests/RepoTests.cpp | 19 -
extensions/rocksdb-repos/tests/SwapTests.cpp | 1 -
extensions/sftp/tests/ListSFTPTests.cpp | 8 +-
extensions/standard-processors/CMakeLists.txt | 3 +-
.../controllers/JsonTreeReader.cpp | 12 +-
.../controllers/JsonTreeReader.h | 4 +-
.../standard-processors/controllers/XMLReader.cpp | 207 +++++++++
.../standard-processors/controllers/XMLReader.h | 96 ++++
.../controllers/XMLRecordSetWriter.cpp | 164 +++++++
.../controllers/XMLRecordSetWriter.h | 133 ++++++
.../processors/ConvertRecord.cpp | 65 +++
.../processors/{SplitRecord.h => ConvertRecord.h} | 53 +--
.../processors/EvaluateJsonPath.cpp | 174 ++++++++
.../processors/EvaluateJsonPath.h | 196 +++++++++
.../standard-processors/processors/SplitJson.cpp | 133 ++++++
.../standard-processors/processors/SplitJson.h | 125 ++++++
.../standard-processors/processors/SplitRecord.cpp | 6 +-
.../tests/integration/ProcessGroupTest.cpp | 7 +-
.../tests/integration/TailFileIntegrationTest.cpp | 7 +-
.../tests/integration/VerifyInvokeHTTP.h | 19 +-
.../tests/integration/VerifyInvokeHTTPGetTest.cpp | 10 +-
.../tests/integration/VerifyInvokeHTTPPostTest.cpp | 74 +++-
.../tests/unit/ConvertRecordTests.cpp | 103 +++++
.../tests/unit/EvaluateJsonPathTests.cpp | 325 ++++++++++++++
.../tests/unit/JsonRecordTests.cpp | 8 +-
.../tests/unit/RecordSetTests.cpp | 2 +-
.../tests/unit/SplitJsonTests.cpp | 150 +++++++
.../tests/unit/TailFileTests.cpp | 13 +-
.../tests/unit/XMLReaderTests.cpp | 252 +++++++++++
.../tests/unit/XMLRecordSetWriterTests.cpp | 339 ++++++++++++++
extensions/windows-event-log/CMakeLists.txt | 5 +-
.../windows-event-log/ConsumeWindowsEventLog.cpp | 275 ++++++------
.../windows-event-log/ConsumeWindowsEventLog.h | 59 +--
.../windows-event-log/tests/BookmarkTests.cpp | 11 +-
extensions/windows-event-log/tests/CMakeLists.txt | 2 +-
.../tests/ConsumeWindowsEventLogTests.cpp | 2 +-
.../tests/MetadataWalkerTests.cpp | 130 +++---
.../tests/StringSplitterTests.cpp | 45 ++
.../windows-event-log/tests/WindowsErrorTests.cpp | 33 +-
.../windows-event-log/{ => wel}/Bookmark.cpp | 29 +-
extensions/windows-event-log/{ => wel}/Bookmark.h | 15 +-
extensions/windows-event-log/wel/EventPath.h | 2 +-
.../windows-event-log/wel/MetadataWalker.cpp | 60 +--
extensions/windows-event-log/wel/MetadataWalker.h | 21 +-
extensions/windows-event-log/wel/StringSplitter.h | 56 +++
extensions/windows-event-log/wel/UniqueEvtHandle.h | 15 +-
.../wel/{LookupCacher.cpp => WindowsError.h} | 31 +-
.../windows-event-log/wel/WindowsEventLog.cpp | 28 +-
extensions/windows-event-log/wel/WindowsEventLog.h | 77 +---
fips/openssl.cnf | 2 +-
generateVersion.bat | 2 +-
generateVersion.sh | 2 +-
libminifi/CMakeLists.txt | 10 +-
libminifi/include/Defaults.h | 25 --
libminifi/include/FlowController.h | 3 +-
libminifi/include/RootProcessGroupWrapper.h | 6 +
.../include/c2/ControllerSocketMetricsPublisher.h | 6 +
libminifi/include/c2/ControllerSocketProtocol.h | 2 +
libminifi/include/c2/ControllerSocketReporter.h | 10 +
libminifi/include/c2/FlowStatusBuilder.h | 63 +++
...trollerSocketReporter.h => FlowStatusRequest.h} | 37 +-
libminifi/include/core/BulletinStore.h | 1 +
libminifi/include/core/logging/LoggerProperties.h | 8 +-
libminifi/include/properties/Properties.h | 15 -
libminifi/src/FlowController.cpp | 4 +-
libminifi/src/RootProcessGroupWrapper.cpp | 6 +
.../src/c2/ControllerSocketMetricsPublisher.cpp | 19 +
libminifi/src/c2/ControllerSocketProtocol.cpp | 37 ++
libminifi/src/c2/FlowStatusBuilder.cpp | 385 ++++++++++++++++
libminifi/src/c2/FlowStatusRequest.cpp | 55 +++
libminifi/src/core/BulletinStore.cpp | 8 +
libminifi/src/core/ProcessContext.cpp | 8 +-
libminifi/src/core/extension/ExtensionManager.cpp | 18 +-
libminifi/src/core/flow/AdaptiveConfiguration.cpp | 6 +-
libminifi/src/core/logging/LoggerConfiguration.cpp | 10 +-
.../src/core/repository/FileSystemRepository.cpp | 9 +-
libminifi/src/properties/Properties.cpp | 8 +-
libminifi/src/utils/file/AssetManager.cpp | 17 +-
libminifi/test/integration/AlertTests.cpp | 8 +-
libminifi/test/integration/C2AssetSyncTest.cpp | 15 +-
.../integration/C2ClearCoreComponentStateTest.cpp | 9 +-
libminifi/test/integration/C2CompressTest.cpp | 1 +
libminifi/test/integration/C2ConfigEncryption.cpp | 15 +-
.../integration/C2ControllerEnableFailureTest.cpp | 8 +-
libminifi/test/integration/C2DebugBundleTest.cpp | 10 +-
.../C2DescribeCoreComponentStateTest.cpp | 9 +-
.../test/integration/C2DescribeManifestTest.cpp | 7 +-
.../test/integration/C2DescribeMetricsTest.cpp | 7 +-
libminifi/test/integration/C2EmptyMetricTest.cpp | 7 +-
libminifi/test/integration/C2FailedUpdateTest.cpp | 5 +-
.../test/integration/C2FetchFlowIfMissingTest.cpp | 5 +-
libminifi/test/integration/C2JstackTest.cpp | 5 +-
libminifi/test/integration/C2LogHeartbeatTest.cpp | 1 +
libminifi/test/integration/C2MetricsTest.cpp | 10 +-
.../test/integration/C2MultipleCommandsTest.cpp | 10 +-
libminifi/test/integration/C2NullConfiguration.cpp | 10 +-
libminifi/test/integration/C2PauseResumeTest.cpp | 10 +-
.../test/integration/C2PropertiesUpdateTests.cpp | 18 +-
.../test/integration/C2SameProcessorMetrics.cpp | 7 +-
libminifi/test/integration/C2UpdateAssetTest.cpp | 5 +
libminifi/test/integration/C2UpdateTest.cpp | 4 +-
.../test/integration/C2VerifyHeartbeatAndStop.cpp | 6 +-
.../C2VerifyLightweightHeartbeatAndStop.cpp | 6 +-
.../C2VerifyResourceConsumptionInHeartbeat.cpp | 6 +-
libminifi/test/integration/HTTPSiteToSiteTests.cpp | 13 +-
.../integration/OnScheduleErrorHandlingTests.cpp | 14 +-
libminifi/test/integration/SiteToSiteRestTest.cpp | 10 +-
.../integration/StateTransactionalityTests.cpp | 16 +-
.../integration/TimeoutHTTPSiteToSiteTests.cpp | 13 +-
.../test/libtest/integration/HTTPIntegrationBase.h | 18 +-
.../test/libtest/integration/IntegrationBase.cpp | 33 +-
.../test/libtest/integration/IntegrationBase.h | 37 +-
libminifi/test/libtest/unit/Catch.h | 1 +
libminifi/test/libtest/unit/RecordSetTesters.h | 11 +-
libminifi/test/libtest/unit/TestBase.cpp | 13 +-
.../test/libtest/unit/TestControllerWithFlow.cpp | 1 -
libminifi/test/libtest/unit/TestUtils.h | 10 +-
.../test/persistence-tests/PersistenceTests.cpp | 2 -
libminifi/test/unit/BulletinStoreTests.cpp | 26 +-
.../unit/ControllerSocketMetricsPublisherTest.cpp | 11 +
libminifi/test/unit/DecryptorTests.cpp | 3 +-
libminifi/test/unit/FlowStatusBuilderTests.cpp | 486 +++++++++++++++++++++
libminifi/test/unit/LogMetricsPublisherTests.cpp | 1 -
libminifi/test/unit/LoggerConfigurationTests.cpp | 2 +-
libminifi/test/unit/LoggerTests.cpp | 20 +-
libminifi/test/unit/ProcessSessionTests.cpp | 1 -
.../performance/VolatileRepositoryPerfTests.cpp | 2 +-
.../minifi-cpp/controllers/RecordSetReader.h | 5 +-
.../include/minifi-cpp/core/ProcessContext.h | 2 -
minifi-api/include/minifi-cpp/core/Record.h | 1 +
.../include/minifi-cpp/properties/Configure.h | 3 +-
.../include/minifi-cpp/properties/Properties.h | 2 -
minifi_main/CMakeLists.txt | 16 +-
minifi_main/Fips.cpp | 63 +--
minifi_main/Fips.h | 4 +-
minifi_main/MainHelper.cpp | 75 +++-
minifi_main/MainHelper.h | 52 ++-
minifi_main/MiNiFiMain.cpp | 96 ++--
minifi_main/MiNiFiWindowsService.cpp | 2 +-
.../FindLibSSH2.cmake => packaging/CMakeLists.txt | 9 +-
{msi => packaging/msi}/MergeModulesFeature.xml | 0
.../msi}/VSRedistributablesComponent.xml | 0
.../msi}/VSRedistributablesFeature.xml | 0
{msi => packaging/msi}/WixWin.wsi.in | 0
{msi => packaging/msi}/bgr.png | Bin
{msi => packaging/msi}/minifi-logo-ico.ico | Bin
{msi => packaging/msi}/minifi-logo-png-banner.png | Bin
{msi => packaging/msi}/x64.wsi | 0
{msi => packaging/msi}/x86.wsi | 0
packaging/rpm/check_rpm_contents.sh | 43 ++
packaging/rpm/expected-rpm-contents.in | 67 +++
packaging/rpm/pre_install.sh | 11 +
.../google-cloud-cpp/remove_installation.patch | 258 +++++++++++
.../0003-remove_FindLZ4_installation.patch | 22 +
thirdparty/opencv/windows-install-path.patch | 34 ++
245 files changed, 6540 insertions(+), 1514 deletions(-)
create mode 100644 bin/CMakeLists.txt
create mode 100644 bin/flowstatus-minifi.bat
rename bin/{minifi.service => minifi.service.in} (60%)
delete mode 100644 cmake/BundledPugiXml.cmake
copy cmake/{Sol2.cmake => Jsoncons.cmake} (73%)
copy cmake/{Catch2.cmake => PugiXml.cmake} (76%)
create mode 100644 conf/CMakeLists.txt
rename conf/{config.yml => config.yml.in} (100%)
rename conf/{minifi-log.properties => minifi-log.properties.in} (98%)
rename conf/{minifi-uid.properties => minifi-uid.properties.in} (100%)
rename conf/{minifi.properties => minifi.properties.in} (93%)
create mode 100644 core-framework/include/Defaults.h
create mode 100644 core-framework/include/utils/Locations.h
copy docker/{python-verify => installed}/installed.Dockerfile (100%)
rename docker/{python-verify => installed}/installed.dockerignore (100%)
rename docker/{python-verify/installed.Dockerfile => installed/rpm.Dockerfile}
(66%)
create mode 100644 docker/test/integration/features/evaluate_json_path.feature
create mode 100644 docker/test/integration/features/split_json.feature
copy docker/test/integration/minifi/controllers/{JsonTreeReader.py =>
XMLReader.py} (85%)
copy docker/test/integration/minifi/processors/{ExecuteScript.py =>
ConvertRecord.py} (89%)
copy docker/test/integration/minifi/processors/{AttributesToJSON.py =>
EvaluateJsonPath.py} (87%)
copy docker/test/integration/minifi/processors/{SplitText.py => SplitJson.py}
(85%)
create mode 100644
docker/test/integration/resources/kubernetes/minifi-conf/minifi.properties
create mode 100644 extensions/standard-processors/controllers/XMLReader.cpp
create mode 100644 extensions/standard-processors/controllers/XMLReader.h
create mode 100644
extensions/standard-processors/controllers/XMLRecordSetWriter.cpp
create mode 100644
extensions/standard-processors/controllers/XMLRecordSetWriter.h
create mode 100644 extensions/standard-processors/processors/ConvertRecord.cpp
copy extensions/standard-processors/processors/{SplitRecord.h =>
ConvertRecord.h} (50%)
create mode 100644
extensions/standard-processors/processors/EvaluateJsonPath.cpp
create mode 100644 extensions/standard-processors/processors/EvaluateJsonPath.h
create mode 100644 extensions/standard-processors/processors/SplitJson.cpp
create mode 100644 extensions/standard-processors/processors/SplitJson.h
create mode 100644
extensions/standard-processors/tests/unit/ConvertRecordTests.cpp
create mode 100644
extensions/standard-processors/tests/unit/EvaluateJsonPathTests.cpp
create mode 100644 extensions/standard-processors/tests/unit/SplitJsonTests.cpp
create mode 100644 extensions/standard-processors/tests/unit/XMLReaderTests.cpp
create mode 100644
extensions/standard-processors/tests/unit/XMLRecordSetWriterTests.cpp
create mode 100644 extensions/windows-event-log/tests/StringSplitterTests.cpp
copy libminifi/test/unit/SpanTests.cpp =>
extensions/windows-event-log/tests/WindowsErrorTests.cpp (51%)
rename extensions/windows-event-log/{ => wel}/Bookmark.cpp (87%)
rename extensions/windows-event-log/{ => wel}/Bookmark.h (85%)
create mode 100644 extensions/windows-event-log/wel/StringSplitter.h
copy extensions/windows-event-log/wel/{LookupCacher.cpp => WindowsError.h}
(63%)
delete mode 100644 libminifi/include/Defaults.h
create mode 100644 libminifi/include/c2/FlowStatusBuilder.h
copy libminifi/include/c2/{ControllerSocketReporter.h => FlowStatusRequest.h}
(56%)
create mode 100644 libminifi/src/c2/FlowStatusBuilder.cpp
create mode 100644 libminifi/src/c2/FlowStatusRequest.cpp
create mode 100644 libminifi/test/unit/FlowStatusBuilderTests.cpp
copy cmake/libssh2/dummy/FindLibSSH2.cmake => packaging/CMakeLists.txt (77%)
rename {msi => packaging/msi}/MergeModulesFeature.xml (100%)
rename {msi => packaging/msi}/VSRedistributablesComponent.xml (100%)
rename {msi => packaging/msi}/VSRedistributablesFeature.xml (100%)
rename {msi => packaging/msi}/WixWin.wsi.in (100%)
rename {msi => packaging/msi}/bgr.png (100%)
rename {msi => packaging/msi}/minifi-logo-ico.ico (100%)
rename {msi => packaging/msi}/minifi-logo-png-banner.png (100%)
rename {msi => packaging/msi}/x64.wsi (100%)
rename {msi => packaging/msi}/x86.wsi (100%)
create mode 100755 packaging/rpm/check_rpm_contents.sh
create mode 100644 packaging/rpm/expected-rpm-contents.in
create mode 100644 packaging/rpm/pre_install.sh
create mode 100644 thirdparty/google-cloud-cpp/remove_installation.patch
create mode 100644 thirdparty/librdkafka/0003-remove_FindLZ4_installation.patch
create mode 100644 thirdparty/opencv/windows-install-path.patch
