This is an automated email from the ASF dual-hosted git repository.
fgerlits pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
from 9c3cdeca2 MINIFICPP-2126 reenable Windows CI caching
new f4878bb70 MINIFICPP-1641 Parallelization of docker tests
new 078fd1c87 MINIFICPP-2081 - Make it possible to read Windows events
from a log file
new 66c958632 MINIFICPP-2128 - Verify the hash of a thirdparty dependency
new bbfa1e01b MINIFICPP-2132 improve error messages, refactor EL Value
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/ci.yml | 111 ++-----
.github/workflows/verify-python-compatibility.yml | 128 +++-----
CMakeLists.txt | 2 +-
CMakeSettings.json | 4 +-
PROCESSORS.md | 2 +-
Windows.md | 2 +-
cmake/DockerConfig.cmake | 57 ++--
cmake/MiNiFiOptions.cmake | 3 +-
cmake/VerifyPythonCompatibility.cmake | 29 +-
docker/DockerVerify.sh | 57 ++--
docker/requirements.txt | 4 +-
docker/test/integration/cluster/ContainerStore.py | 224 ++++++++++++--
.../test/integration/cluster/DockerCommunicator.py | 5 +-
.../test/integration/cluster/DockerTestCluster.py | 32 +-
.../cluster/DockerTestDirectoryBindings.py | 93 +++---
.../cluster/{LogSource.py => FeatureContext.py} | 8 +-
docker/test/integration/cluster/ImageStore.py | 41 ---
.../cluster/checkers/ElasticSearchChecker.py | 8 +-
.../containers/AzureStorageServerContainer.py | 4 +-
.../integration/cluster/containers/Container.py | 4 +-
.../cluster/containers/ElasticsearchContainer.py | 68 +++-
.../cluster/containers/FakeGcsServerContainer.py | 7 +-
.../cluster/containers/FlowContainer.py | 10 +-
.../cluster/containers/HttpProxyContainer.py | 5 +-
.../cluster/containers/KafkaBrokerContainer.py | 60 +++-
.../containers/MinifiAsPodInKubernetesCluster.py | 11 +-
.../cluster/containers/MinifiC2ServerContainer.py | 72 ++++-
.../cluster/containers/MinifiContainer.py | 36 ++-
.../cluster/containers/MqttBrokerContainer.py | 5 +-
.../cluster/containers/NifiContainer.py | 4 +-
.../cluster/containers/OPCUAServerContainer.py | 5 +-
.../cluster/containers/OpensearchContainer.py | 50 ++-
.../containers/PostgreSQLServerContainer.py | 6 +-
.../cluster/containers/PrometheusContainer.py | 29 +-
.../cluster/containers/S3ServerContainer.py | 5 +-
.../cluster/containers/SplunkContainer.py | 4 +-
.../cluster/containers/SyslogTcpClientContainer.py | 7 +-
.../cluster/containers/SyslogUdpClientContainer.py | 7 +-
.../cluster/containers/TcpClientContainer.py | 10 +-
.../cluster/containers/ZookeeperContainer.py | 8 +-
docker/test/integration/features/CMakeLists.txt | 117 -------
.../MiNiFi_integration_test_driver.py | 67 ++--
docker/test/integration/{ => features}/README.md | 0
.../features/attributes_to_json.feature | 1 +
.../integration/features/azure_storage.feature | 1 +
.../features/core_functionality.feature | 8 +-
.../features/defragtextflowfiles.feature | 1 +
.../integration/features/elasticsearch.feature | 1 +
.../test/integration/{ => features}/environment.py | 61 ++--
.../features/file_system_operations.feature | 16 +
.../features/google_cloud_storage.feature | 1 +
.../test/integration/features/hashcontent.feature | 1 +
docker/test/integration/features/http.feature | 25 +-
docker/test/integration/features/https.feature | 3 +-
docker/test/integration/features/kafka.feature | 97 +++---
.../features/kubernetes_logging.feature | 1 +
.../features/kubernetes_metrics.feature | 1 +
.../test/integration/features/lua_script.feature | 1 +
.../integration/features/minifi_c2_server.feature | 1 +
.../integration/features/minifi_controller.feature | 1 +
docker/test/integration/features/mqtt.feature | 1 +
.../integration/features/network_listener.feature | 1 +
docker/test/integration/features/opcua.feature | 133 ++++----
.../test/integration/features/opensearch.feature | 7 +-
.../test/integration/features/prometheus.feature | 1 +
docker/test/integration/features/python.feature | 1 +
.../integration/features/python_script.feature | 1 +
.../features/python_with_modules.feature | 2 +
.../test/integration/features/replace_text.feature | 1 +
docker/test/integration/features/routetext.feature | 1 +
docker/test/integration/features/s2s.feature | 7 +-
docker/test/integration/features/s3.feature | 49 +--
docker/test/integration/features/splunk.feature | 9 +-
docker/test/integration/features/sql.feature | 1 +
.../test/integration/{ => features}/steps/steps.py | 193 ++++++------
.../integration/features/syslog_listener.feature | 1 +
docker/test/integration/{ => features}/utils.py | 0
docker/test/integration/minifi/core/Processor.py | 4 +
.../minifi/processors/AddPythonAttribute.py | 4 +-
.../minifi/processors/AttributesToJSON.py | 4 +-
.../processors/AzureBlobStorageProcessorBase.py | 8 +-
.../processors/CollectKubernetesPodMetrics.py | 5 +-
.../integration/minifi/processors/ConsumeKafka.py | 7 +-
.../integration/minifi/processors/ConsumeMQTT.py | 7 +-
.../minifi/processors/CountingProcessor.py | 6 +-
.../minifi/processors/DefragmentText.py | 5 +-
.../minifi/processors/DeleteAzureBlobStorage.py | 5 +-
.../minifi/processors/DeleteGCSObject.py | 8 +-
.../minifi/processors/DeleteS3Object.py | 6 +-
.../minifi/processors/ExecutePythonProcessor.py | 5 +-
.../integration/minifi/processors/ExecuteSQL.py | 5 +-
.../integration/minifi/processors/ExecuteScript.py | 5 +-
.../minifi/processors/FetchAzureBlobStorage.py | 5 +-
.../integration/minifi/processors/FetchFile.py | 5 +-
.../minifi/processors/FetchGCSObject.py | 8 +-
.../minifi/processors/FetchOPCProcessor.py | 5 +-
.../integration/minifi/processors/FetchS3Object.py | 6 +-
.../processors/GaussianDistributionWithNumpy.py | 6 +-
.../minifi/processors/GenerateFlowFile.py | 5 +-
.../test/integration/minifi/processors/GetFile.py | 5 +-
.../integration/minifi/processors/HashContent.py | 5 +-
.../integration/minifi/processors/InvokeHTTP.py | 4 +-
.../minifi/processors/ListAzureBlobStorage.py | 9 +-
.../test/integration/minifi/processors/ListFile.py | 5 +-
.../integration/minifi/processors/ListGCSBucket.py | 8 +-
.../test/integration/minifi/processors/ListS3.py | 29 +-
.../integration/minifi/processors/ListenHTTP.py | 5 +-
.../integration/minifi/processors/ListenSyslog.py | 5 +-
.../integration/minifi/processors/ListenTCP.py | 5 +-
.../integration/minifi/processors/LogAttribute.py | 5 +-
.../minifi/processors/LogOnDestructionProcessor.py | 5 +-
.../minifi/processors/MoveContentToJson.py | 6 +-
.../minifi/processors/PostElasticsearch.py | 7 +-
.../integration/minifi/processors/PublishKafka.py | 7 +-
.../integration/minifi/processors/PublishMQTT.py | 7 +-
.../minifi/processors/PutAzureBlobStorage.py | 7 +-
.../test/integration/minifi/processors/PutFile.py | 5 +-
.../integration/minifi/processors/PutGCSObject.py | 8 +-
.../minifi/processors/PutOPCProcessor.py | 5 +-
.../integration/minifi/processors/PutS3Object.py | 6 +-
.../test/integration/minifi/processors/PutSQL.py | 5 +-
.../integration/minifi/processors/PutSplunkHTTP.py | 5 +-
.../minifi/processors/QueryDatabaseTable.py | 5 +-
.../minifi/processors/QuerySplunkIndexingStatus.py | 6 +-
.../minifi/processors/RemoveFlowFile.py | 6 +-
.../integration/minifi/processors/ReplaceText.py | 5 +-
.../minifi/processors/RouteOnAttribute.py | 5 +-
.../integration/minifi/processors/RouteText.py | 5 +-
.../test/integration/minifi/processors/TailFile.py | 5 +-
.../minifi/processors/UpdateAttribute.py | 5 +-
.../integration/resources/elasticsearch/Dockerfile | 7 -
.../resources/elasticsearch/certs/elastic_http.crt | 19 --
.../resources/elasticsearch/certs/elastic_http.key | 28 --
.../elasticsearch/certs/elastic_transport.crt | 19 --
.../elasticsearch/certs/elastic_transport.key | 28 --
.../elasticsearch/certs/minifi_client.crt | 19 --
.../elasticsearch/certs/minifi_client.key | 28 --
.../resources/elasticsearch/certs/root_ca.crt | 19 --
.../resources/kafka_broker/conf/certs/ca-cert | 21 --
.../resources/kafka_broker/conf/certs/ca-cert.key | 30 --
.../resources/kafka_broker/conf/certs/ca-cert.srl | 1 -
.../kafka_broker/conf/certs/client_cert.key | 28 --
.../kafka_broker/conf/certs/client_cert.pem | 19 --
.../kafka_broker/conf/certs/server_cert.key | 28 --
.../kafka_broker/conf/certs/server_cert.pem | 19 --
.../kafka_broker/conf/certs/server_keystore.jks | Bin 2643 -> 0 bytes
.../kafka_broker/conf/certs/server_truststore.jks | Bin 2135 -> 0 bytes
.../resources/kafka_broker/conf/server.properties | 5 +-
.../resources/minifi-c2-server-ssl/Dockerfile | 7 -
.../minifi-c2-server-ssl/authorities.yaml | 2 -
.../resources/minifi-c2-server-ssl/c2.properties | 10 -
.../certs/minifi-c2-server-keystore.p12 | Bin 2544 -> 0 bytes
.../certs/minifi-c2-server-truststore.p12 | Bin 2978 -> 0 bytes
.../certs/minifi-c2-server.crt | 20 --
.../certs/minifi-c2-server.key | 28 --
.../minifi-c2-server-ssl/certs/minifi-cpp-flow.crt | 20 --
.../minifi-c2-server-ssl/certs/minifi-cpp-flow.key | 28 --
.../minifi-c2-server-ssl/certs/root-ca.key | 30 --
.../minifi-c2-server-ssl/certs/root-ca.pem | 19 --
.../resources/minifi-c2-server/Dockerfile | 2 -
.../authorizations.yaml | 0
.../resources/minifi-c2-server/c2.properties | 10 +
.../config.yml => minifi-c2-server/config-ssl.yml} | 6 +-
.../integration/resources/opensearch/Dockerfile | 5 -
.../resources/opensearch/certs/admin-key.pem | 28 --
.../resources/opensearch/certs/admin.pem | 19 --
.../resources/opensearch/certs/root-ca.pem | 21 --
.../integration/resources/prometheus/Dockerfile | 2 -
.../resources/prometheus/conf/prometheus.yml | 7 -
.../test/integration/ssl_utils/SSL_cert_utils.py | 27 +-
extensions/expression-language/common/Value.h | 342 +++++++--------------
.../tests/ExpressionLanguageTests.cpp | 38 +++
.../processors/RouteOnAttribute.cpp | 14 +-
extensions/windows-event-log/Bookmark.cpp | 4 +-
extensions/windows-event-log/Bookmark.h | 3 +-
.../windows-event-log/ConsumeWindowsEventLog.cpp | 22 +-
.../windows-event-log/ConsumeWindowsEventLog.h | 6 +-
.../windows-event-log/tests/BookmarkTests.cpp | 30 +-
extensions/windows-event-log/tests/CWELTestUtils.h | 10 +
.../tests/ConsumeWindowsEventLogTests.cpp | 41 +++
.../wel/{LookupCacher.cpp => EventPath.cpp} | 30 +-
.../wel/{LookupCacher.h => EventPath.h} | 52 ++--
libminifi/include/utils/GeneralUtils.h | 8 +
win_build_vs.bat | 2 +-
184 files changed, 1689 insertions(+), 1887 deletions(-)
copy docker/test/integration/cluster/{LogSource.py => FeatureContext.py} (80%)
delete mode 100644 docker/test/integration/features/CMakeLists.txt
rename docker/test/integration/{ =>
features}/MiNiFi_integration_test_driver.py (86%)
rename docker/test/integration/{ => features}/README.md (100%)
rename docker/test/integration/{ => features}/environment.py (63%)
rename docker/test/integration/{ => features}/steps/steps.py (84%)
rename docker/test/integration/{ => features}/utils.py (100%)
delete mode 100644 docker/test/integration/resources/elasticsearch/Dockerfile
delete mode 100644
docker/test/integration/resources/elasticsearch/certs/elastic_http.crt
delete mode 100644
docker/test/integration/resources/elasticsearch/certs/elastic_http.key
delete mode 100644
docker/test/integration/resources/elasticsearch/certs/elastic_transport.crt
delete mode 100644
docker/test/integration/resources/elasticsearch/certs/elastic_transport.key
delete mode 100644
docker/test/integration/resources/elasticsearch/certs/minifi_client.crt
delete mode 100644
docker/test/integration/resources/elasticsearch/certs/minifi_client.key
delete mode 100644
docker/test/integration/resources/elasticsearch/certs/root_ca.crt
delete mode 100644
docker/test/integration/resources/kafka_broker/conf/certs/ca-cert
delete mode 100644
docker/test/integration/resources/kafka_broker/conf/certs/ca-cert.key
delete mode 100644
docker/test/integration/resources/kafka_broker/conf/certs/ca-cert.srl
delete mode 100644
docker/test/integration/resources/kafka_broker/conf/certs/client_cert.key
delete mode 100644
docker/test/integration/resources/kafka_broker/conf/certs/client_cert.pem
delete mode 100644
docker/test/integration/resources/kafka_broker/conf/certs/server_cert.key
delete mode 100644
docker/test/integration/resources/kafka_broker/conf/certs/server_cert.pem
delete mode 100644
docker/test/integration/resources/kafka_broker/conf/certs/server_keystore.jks
delete mode 100644
docker/test/integration/resources/kafka_broker/conf/certs/server_truststore.jks
delete mode 100644
docker/test/integration/resources/minifi-c2-server-ssl/Dockerfile
delete mode 100644
docker/test/integration/resources/minifi-c2-server-ssl/authorities.yaml
delete mode 100644
docker/test/integration/resources/minifi-c2-server-ssl/c2.properties
delete mode 100644
docker/test/integration/resources/minifi-c2-server-ssl/certs/minifi-c2-server-keystore.p12
delete mode 100644
docker/test/integration/resources/minifi-c2-server-ssl/certs/minifi-c2-server-truststore.p12
delete mode 100644
docker/test/integration/resources/minifi-c2-server-ssl/certs/minifi-c2-server.crt
delete mode 100644
docker/test/integration/resources/minifi-c2-server-ssl/certs/minifi-c2-server.key
delete mode 100644
docker/test/integration/resources/minifi-c2-server-ssl/certs/minifi-cpp-flow.crt
delete mode 100644
docker/test/integration/resources/minifi-c2-server-ssl/certs/minifi-cpp-flow.key
delete mode 100644
docker/test/integration/resources/minifi-c2-server-ssl/certs/root-ca.key
delete mode 100644
docker/test/integration/resources/minifi-c2-server-ssl/certs/root-ca.pem
delete mode 100644
docker/test/integration/resources/minifi-c2-server/Dockerfile
rename docker/test/integration/resources/{minifi-c2-server-ssl =>
minifi-c2-server}/authorizations.yaml (100%)
create mode 100644
docker/test/integration/resources/minifi-c2-server/c2.properties
rename docker/test/integration/resources/{minifi-c2-server-ssl/config.yml =>
minifi-c2-server/config-ssl.yml} (84%)
delete mode 100644 docker/test/integration/resources/opensearch/Dockerfile
delete mode 100644
docker/test/integration/resources/opensearch/certs/admin-key.pem
delete mode 100644 docker/test/integration/resources/opensearch/certs/admin.pem
delete mode 100644
docker/test/integration/resources/opensearch/certs/root-ca.pem
delete mode 100644 docker/test/integration/resources/prometheus/Dockerfile
delete mode 100644
docker/test/integration/resources/prometheus/conf/prometheus.yml
copy extensions/windows-event-log/wel/{LookupCacher.cpp => EventPath.cpp} (63%)
copy extensions/windows-event-log/wel/{LookupCacher.h => EventPath.h} (57%)
