This is an automated email from the ASF dual-hosted git repository. fgerlits pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
commit 0ed0524e798fd6bd1695386c86ab5a4869d03cb8 Author: Martin Zink <[email protected]> AuthorDate: Thu Aug 14 18:17:22 2025 +0200 MINIFICPP-2608 Refresh outdated linter cmake target Signed-off-by: Ferenc Gerlits <[email protected]> Closes #2010 --- .github/workflows/ci.yml | 42 +++++++++--------- CMakeLists.txt | 26 +---------- CONTRIBUTING.md | 3 -- cmake/Extensions.cmake | 8 ---- extension-framework/include/ResourceClaim.h | 2 +- .../include/controllers/SSLContextService.h | 2 +- .../controllers/SSLContextServiceInterface.h | 2 +- extension-framework/include/core/StateManager.h | 3 +- extension-framework/include/core/StateStorage.h | 6 +-- .../include/utils/ProcessorConfigUtils.h | 51 +++++++++++++++------- extensions/aws/CMakeLists.txt | 2 - extensions/azure/CMakeLists.txt | 2 - extensions/bustache/CMakeLists.txt | 1 - extensions/civetweb/CMakeLists.txt | 1 - extensions/couchbase/CMakeLists.txt | 1 - extensions/elasticsearch/CMakeLists.txt | 1 - extensions/execute-process/CMakeLists.txt | 1 - extensions/expression-language/CMakeLists.txt | 1 - extensions/gcp/CMakeLists.txt | 1 - extensions/grafana-loki/CMakeLists.txt | 1 - extensions/kafka/CMakeLists.txt | 1 - extensions/kubernetes/CMakeLists.txt | 1 - extensions/libarchive/CMakeLists.txt | 1 - extensions/llamacpp/CMakeLists.txt | 1 - extensions/lua/CMakeLists.txt | 1 - extensions/mqtt/CMakeLists.txt | 1 - extensions/opc/CMakeLists.txt | 1 - extensions/opencv/CMakeLists.txt | 1 - extensions/pdh/CMakeLists.txt | 1 - extensions/procfs/CMakeLists.txt | 1 - extensions/prometheus/CMakeLists.txt | 1 - extensions/python/CMakeLists.txt | 1 - extensions/rocksdb-repos/CMakeLists.txt | 1 - extensions/script/CMakeLists.txt | 1 - extensions/sftp/CMakeLists.txt | 1 - extensions/smb/CMakeLists.txt | 1 - extensions/splunk/CMakeLists.txt | 1 - extensions/sql/CMakeLists.txt | 1 - extensions/standard-processors/CMakeLists.txt | 1 - extensions/systemd/CMakeLists.txt | 1 - extensions/test-processors/CMakeLists.txt | 1 - extensions/windows-event-log/CMakeLists.txt | 1 - 42 files changed, 68 insertions(+), 111 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c7bfa1785..321eb0e4e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -535,32 +535,34 @@ jobs: with: name: behavex_output path: build/behavex_output - cpplint: - name: "cpplint" + linters: + name: "C++ lint + Shellcheck + Flake8" runs-on: ubuntu-22.04-arm timeout-minutes: 15 - steps: - - id: checkout - uses: actions/checkout@v4 - - name: linter - run: python3 thirdparty/google-styleguide/run_linter.py -q -i libminifi/ extensions/ controller/ encrypt-config/ minifi_main/ minifi-api/ utils/ - shellcheck: - name: "Shellcheck" - runs-on: ubuntu-22.04-arm - timeout-minutes: 10 - steps: - - id: checkout - uses: actions/checkout@v4 - - name: shellcheck - run: ./run_shellcheck.sh . - Flake8: - name: "Flake8" - runs-on: ubuntu-22.04-arm - timeout-minutes: 10 steps: - id: checkout uses: actions/checkout@v4 + - id: install_deps run: sudo apt update && sudo apt install -y flake8 + + - id: cpp_lint + name: C++ linter + continue-on-error: true + run: python3 thirdparty/google-styleguide/run_linter.py -q -i controller/ core-framework/ encrypt-config/ extension-framework/ extensions/ libminifi/ minifi-api/ minifi_main/ + + - id: shellcheck + name: Shellcheck + continue-on-error: true + run: ./run_shellcheck.sh . + - id: flake8_check + name: Flake8 check + continue-on-error: true run: ./run_flake8.sh . + + - name: Check Linter Statuses + if: steps.cpp_lint.outcome == 'failure' || steps.shellcheck.outcome == 'failure' || steps.flake8_check.outcome == 'failure' + run: | + echo "One or more linters failed. Failing the workflow." + exit 1 diff --git a/CMakeLists.txt b/CMakeLists.txt index b2ecde8c6..70de14896 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -770,32 +770,10 @@ endif() include(BuildDocs) - -# Create a custom build target that will run the linter. -# Directories have their separate linter targets to be able to use better parallelization -get_property(extensions GLOBAL PROPERTY EXTENSION-LINTERS) -set(root_linted_dirs libminifi/include libminifi/src libminifi/test encrypt-config controller) -list(TRANSFORM root_linted_dirs PREPEND ${CMAKE_SOURCE_DIR}/) - -set(linted_dir_counter 1) -set(root_linter_target_names "") - -foreach(linted_dir ${root_linted_dirs}) - set(linter_target_name "root-linter-${linted_dir_counter}") - list(APPEND root_linter_target_names ${linter_target_name}) - add_custom_target("${linter_target_name}" - COMMAND python3 ${CMAKE_SOURCE_DIR}/thirdparty/google-styleguide/run_linter.py -q -i ${linted_dir} - ) - set_target_properties(${linter_target_name} PROPERTIES EXCLUDE_FROM_DEFAULT_BUILD TRUE) - math(EXPR linted_dir_counter "${linted_dir_counter}+1") -endforeach() - -# Main linter target that depends on every other -add_custom_target(linter) -add_dependencies(linter ${root_linter_target_names} ${extensions}) +add_custom_target(linter COMMAND + python3 ${CMAKE_SOURCE_DIR}/thirdparty/google-styleguide/run_linter.py -q -i ${CMAKE_SOURCE_DIR}/controller/ ${CMAKE_SOURCE_DIR}/core-framework/ ${CMAKE_SOURCE_DIR}/encrypt-config/ ${CMAKE_SOURCE_DIR}/extension-framework/ ${CMAKE_SOURCE_DIR}/extensions/ ${CMAKE_SOURCE_DIR}/libminifi/ ${CMAKE_SOURCE_DIR}/minifi-api/ ${CMAKE_SOURCE_DIR}/minifi_main/) set_target_properties(linter PROPERTIES EXCLUDE_FROM_DEFAULT_BUILD TRUE) - if(NOT WIN32) add_custom_target(shellcheck COMMAND ${CMAKE_SOURCE_DIR}/run_shellcheck.sh ${CMAKE_SOURCE_DIR}) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 694901a26..a1d25c6ca 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -126,8 +126,5 @@ register_extension(minifi-kubernetes-extensions "KUBERNETES EXTENSIONS" KUBERNET # the first argument should be the extension target # the next three arguments are used for documentation purposes # the fifth optional argument designates the directory of the extension's tests - -# we could optionally enforce a coding style by registering a linter target -register_extension_linter(minifi-kubernetes-extensions-linter) ``` diff --git a/cmake/Extensions.cmake b/cmake/Extensions.cmake index c497ec525..3dda3982a 100644 --- a/cmake/Extensions.cmake +++ b/cmake/Extensions.cmake @@ -105,14 +105,6 @@ macro(register_extension_test extension-dir) endif() endmacro() -macro(register_extension_linter target-name) - get_property(extensions GLOBAL PROPERTY EXTENSION-LINTERS) - set_property(GLOBAL APPEND PROPERTY EXTENSION-LINTERS "${target-name}") - add_custom_target(${target-name} - COMMAND python3 ${CMAKE_SOURCE_DIR}/thirdparty/google-styleguide/run_linter.py -q -i ${CMAKE_CURRENT_LIST_DIR}/) - set_target_properties(${target-name} PROPERTIES EXCLUDE_FROM_DEFAULT_BUILD TRUE) -endmacro() - function(get_component_name extension-name output) # component names can only contain [a-zA-Z_] string(REPLACE "-" "_" result ${extension-name}) diff --git a/extension-framework/include/ResourceClaim.h b/extension-framework/include/ResourceClaim.h index ff9ada8cc..c9948ea60 100644 --- a/extension-framework/include/ResourceClaim.h +++ b/extension-framework/include/ResourceClaim.h @@ -18,4 +18,4 @@ #pragma once -#include "minifi-cpp/ResourceClaim.h" \ No newline at end of file +#include "minifi-cpp/ResourceClaim.h" diff --git a/extension-framework/include/controllers/SSLContextService.h b/extension-framework/include/controllers/SSLContextService.h index 0c9c535c2..58dabc724 100644 --- a/extension-framework/include/controllers/SSLContextService.h +++ b/extension-framework/include/controllers/SSLContextService.h @@ -16,4 +16,4 @@ */ #pragma once -#include "minifi-cpp/controllers/SSLContextServiceInterface.h" \ No newline at end of file +#include "minifi-cpp/controllers/SSLContextServiceInterface.h" diff --git a/extension-framework/include/controllers/SSLContextServiceInterface.h b/extension-framework/include/controllers/SSLContextServiceInterface.h index 0c9c535c2..58dabc724 100644 --- a/extension-framework/include/controllers/SSLContextServiceInterface.h +++ b/extension-framework/include/controllers/SSLContextServiceInterface.h @@ -16,4 +16,4 @@ */ #pragma once -#include "minifi-cpp/controllers/SSLContextServiceInterface.h" \ No newline at end of file +#include "minifi-cpp/controllers/SSLContextServiceInterface.h" diff --git a/extension-framework/include/core/StateManager.h b/extension-framework/include/core/StateManager.h index bf5a30e66..ef1b3ff0c 100644 --- a/extension-framework/include/core/StateManager.h +++ b/extension-framework/include/core/StateManager.h @@ -17,12 +17,13 @@ #pragma once -#include "core/Core.h" #include <memory> #include <optional> #include <string> #include <unordered_map> + +#include "core/Core.h" #include "minifi-cpp/core/StateManager.h" namespace org::apache::nifi::minifi::core { diff --git a/extension-framework/include/core/StateStorage.h b/extension-framework/include/core/StateStorage.h index 89822310f..ed431bb72 100644 --- a/extension-framework/include/core/StateStorage.h +++ b/extension-framework/include/core/StateStorage.h @@ -17,12 +17,12 @@ #pragma once -#include "core/Core.h" -#include "StateManager.h" - #include <memory> #include <string> #include <unordered_map> + +#include "core/Core.h" +#include "StateManager.h" #include "minifi-cpp/core/StateStorage.h" namespace org::apache::nifi::minifi::core { diff --git a/extension-framework/include/utils/ProcessorConfigUtils.h b/extension-framework/include/utils/ProcessorConfigUtils.h index 5f0ca845f..f18febf78 100644 --- a/extension-framework/include/utils/ProcessorConfigUtils.h +++ b/extension-framework/include/utils/ProcessorConfigUtils.h @@ -32,36 +32,49 @@ namespace org::apache::nifi::minifi::utils { inline std::string parseProperty(const core::ProcessContext& ctx, const core::PropertyReference& property, const core::FlowFile* flow_file = nullptr) { - return ctx.getProperty(property.name, flow_file) | orThrow(fmt::format("Expected valid value from \"{}::{}\"", ctx.getProcessorInfo().getName(), property.name)); + return ctx.getProperty(property.name, flow_file) + | orThrow(fmt::format("Expected valid value from \"{}::{}\"", ctx.getProcessorInfo().getName(), property.name)); } inline bool parseBoolProperty(const core::ProcessContext& ctx, const core::PropertyReference& property, const core::FlowFile* flow_file = nullptr) { - return ctx.getProperty(property.name, flow_file) | andThen(parsing::parseBool) | orThrow(fmt::format("Expected parsable bool from \"{}::{}\"", ctx.getProcessorInfo().getName(), property.name)); + return ctx.getProperty(property.name, flow_file) + | andThen(parsing::parseBool) + | orThrow(fmt::format("Expected parsable bool from \"{}::{}\"", ctx.getProcessorInfo().getName(), property.name)); } inline uint64_t parseU64Property(const core::ProcessContext& ctx, const core::PropertyReference& property, const core::FlowFile* flow_file = nullptr) { - return ctx.getProperty(property.name, flow_file) | andThen(parsing::parseIntegral<uint64_t>) | orThrow(fmt::format("Expected parsable uint64_t from \"{}::{}\"", ctx.getProcessorInfo().getName(), property.name)); + return ctx.getProperty(property.name, flow_file) + | andThen(parsing::parseIntegral<uint64_t>) + | orThrow(fmt::format("Expected parsable uint64_t from \"{}::{}\"", ctx.getProcessorInfo().getName(), property.name)); } inline int64_t parseI64Property(const core::ProcessContext& ctx, const core::PropertyReference& property, const core::FlowFile* flow_file = nullptr) { - return ctx.getProperty(property.name, flow_file) | andThen(parsing::parseIntegral<int64_t>) | orThrow(fmt::format("Expected parsable int64_t from \"{}::{}\"", ctx.getProcessorInfo().getName(), property.name)); + return ctx.getProperty(property.name, flow_file) + | andThen(parsing::parseIntegral<int64_t>) + | orThrow(fmt::format("Expected parsable int64_t from \"{}::{}\"", ctx.getProcessorInfo().getName(), property.name)); } inline std::chrono::milliseconds parseDurationProperty(const core::ProcessContext& ctx, const core::PropertyReference& property, const core::FlowFile* flow_file = nullptr) { - return ctx.getProperty(property.name, flow_file) | andThen(parsing::parseDuration<std::chrono::milliseconds>) | orThrow(fmt::format("Expected parsable duration from \"{}::{}\"", ctx.getProcessorInfo().getName(), property.name)); + return ctx.getProperty(property.name, flow_file) + | andThen(parsing::parseDuration<std::chrono::milliseconds>) + | orThrow(fmt::format("Expected parsable duration from \"{}::{}\"", ctx.getProcessorInfo().getName(), property.name)); } inline uint64_t parseDataSizeProperty(const core::ProcessContext& ctx, const core::PropertyReference& property, const core::FlowFile* flow_file = nullptr) { - return ctx.getProperty(property.name, flow_file) | andThen(parsing::parseDataSize) | orThrow(fmt::format("Expected parsable data size from \"{}::{}\"", ctx.getProcessorInfo().getName(), property.name)); + return ctx.getProperty(property.name, flow_file) + | andThen(parsing::parseDataSize) + | orThrow(fmt::format("Expected parsable data size from \"{}::{}\"", ctx.getProcessorInfo().getName(), property.name)); } inline std::optional<std::string> parseOptionalProperty(const core::ProcessContext& ctx, const core::PropertyReference& property, const core::FlowFile* flow_file = nullptr) { - return ctx.getProperty(property.name, flow_file) | utils::toOptional(); + return ctx.getProperty(property.name, flow_file) + | utils::toOptional(); } inline std::optional<bool> parseOptionalBoolProperty(const core::ProcessContext& ctx, const core::PropertyReference& property, const core::FlowFile* flow_file = nullptr) { if (const auto property_str = ctx.getProperty(property.name, flow_file)) { - return parsing::parseBool(*property_str) | utils::orThrow(fmt::format("Expected parsable bool from \"{}::{}\"", ctx.getProcessorInfo().getName(), property.name)); + return parsing::parseBool(*property_str) + | utils::orThrow(fmt::format("Expected parsable bool from \"{}::{}\"", ctx.getProcessorInfo().getName(), property.name)); } return std::nullopt; } @@ -71,7 +84,8 @@ inline std::optional<uint64_t> parseOptionalU64Property(const core::ProcessConte if (property_str->empty()) { return std::nullopt; } - return parsing::parseIntegral<uint64_t>(*property_str) | utils::orThrow(fmt::format("Expected parsable uint64_t from \"{}::{}\"", ctx.getProcessorInfo().getName(), property.name)); + return parsing::parseIntegral<uint64_t>(*property_str) + | utils::orThrow(fmt::format("Expected parsable uint64_t from \"{}::{}\"", ctx.getProcessorInfo().getName(), property.name)); } return std::nullopt; @@ -82,7 +96,8 @@ inline std::optional<int64_t> parseOptionalI64Property(const core::ProcessContex if (property_str->empty()) { return std::nullopt; } - return parsing::parseIntegral<int64_t>(*property_str) | utils::orThrow(fmt::format("Expected parsable int64_t from \"{}::{}\"", ctx.getProcessorInfo().getName(), property.name)); + return parsing::parseIntegral<int64_t>(*property_str) + | utils::orThrow(fmt::format("Expected parsable int64_t from \"{}::{}\"", ctx.getProcessorInfo().getName(), property.name)); } return std::nullopt; @@ -93,7 +108,8 @@ inline std::optional<std::chrono::milliseconds> parseOptionalDurationProperty(co if (property_str->empty()) { return std::nullopt; } - return parsing::parseDuration(*property_str) | utils::orThrow(fmt::format("Expected parsable duration from \"{}::{}\"", ctx.getProcessorInfo().getName(), property.name)); + return parsing::parseDuration(*property_str) + | utils::orThrow(fmt::format("Expected parsable duration from \"{}::{}\"", ctx.getProcessorInfo().getName(), property.name)); } return std::nullopt; @@ -104,7 +120,8 @@ inline std::optional<uint64_t> parseOptionalDataSizeProperty(const core::Process if (property_str->empty()) { return std::nullopt; } - return parsing::parseDataSize(*property_str) | utils::orThrow(fmt::format("Expected parsable data size from \"{}::{}\"", ctx.getProcessorInfo().getName(), property.name)); + return parsing::parseDataSize(*property_str) + | utils::orThrow(fmt::format("Expected parsable data size from \"{}::{}\"", ctx.getProcessorInfo().getName(), property.name)); } return std::nullopt; @@ -115,7 +132,8 @@ inline std::optional<float> parseOptionalFloatProperty(const core::ProcessContex if (property_str->empty()) { return std::nullopt; } - return parsing::parseFloat(*property_str) | utils::orThrow(fmt::format("Expected parsable float from {}::{}", ctx.getProcessorInfo().getName(), property.name)); + return parsing::parseFloat(*property_str) + | utils::orThrow(fmt::format("Expected parsable float from {}::{}", ctx.getProcessorInfo().getName(), property.name)); } return std::nullopt; } @@ -148,7 +166,9 @@ std::optional<T> parseOptionalEnumProperty(const core::ProcessContext& context, } template<typename ControllerServiceType> -std::optional<std::shared_ptr<ControllerServiceType>> parseOptionalControllerService(const core::ProcessContext& context, const core::PropertyReference& prop, const utils::Identifier& processor_uuid) { +std::optional<std::shared_ptr<ControllerServiceType>> parseOptionalControllerService(const core::ProcessContext& context, + const core::PropertyReference& prop, + const utils::Identifier& processor_uuid) { const auto controller_service_name = context.getProperty(prop.name); if (!controller_service_name) { return std::nullopt; @@ -169,6 +189,7 @@ std::optional<std::shared_ptr<ControllerServiceType>> parseOptionalControllerSer template<typename ControllerServiceType> std::shared_ptr<ControllerServiceType> parseControllerService(const core::ProcessContext& context, const core::PropertyReference& prop, const utils::Identifier& processor_uuid) { - return parseOptionalControllerService<ControllerServiceType>(context, prop, processor_uuid) | utils::orThrow("Required Controller Service"); + return parseOptionalControllerService<ControllerServiceType>(context, prop, processor_uuid) + | utils::orThrow("Required Controller Service"); } } // namespace org::apache::nifi::minifi::utils diff --git a/extensions/aws/CMakeLists.txt b/extensions/aws/CMakeLists.txt index a2bc0cd44..55e65fec6 100644 --- a/extensions/aws/CMakeLists.txt +++ b/extensions/aws/CMakeLists.txt @@ -50,5 +50,3 @@ if(WIN32) endif() register_extension(minifi-aws "AWS EXTENSIONS" AWS-EXTENSIONS "This enables AWS support" "extensions/aws/tests") - -register_extension_linter(minifi-aws-extensions-linter) diff --git a/extensions/azure/CMakeLists.txt b/extensions/azure/CMakeLists.txt index b6014ddf2..dffcf59a4 100644 --- a/extensions/azure/CMakeLists.txt +++ b/extensions/azure/CMakeLists.txt @@ -45,5 +45,3 @@ if (WIN32) endif() register_extension(minifi-azure "AZURE EXTENSIONS" AZURE-EXTENSIONS "This enables Azure support" "extensions/azure/tests") - -register_extension_linter(minifi-azure-extensions-linter) diff --git a/extensions/bustache/CMakeLists.txt b/extensions/bustache/CMakeLists.txt index b5e76956c..1a771b0ae 100644 --- a/extensions/bustache/CMakeLists.txt +++ b/extensions/bustache/CMakeLists.txt @@ -33,4 +33,3 @@ target_link_libraries(minifi-bustache-extensions ${LIBMINIFI}) target_link_libraries(minifi-bustache-extensions bustache) register_extension(minifi-bustache-extensions "BUSTACHE EXTENSIONS" BUSTACHE-EXTENSIONS "This enables bustache functionality including ApplyTemplate." "extensions/bustache/tests") -register_extension_linter(minifi-bustache-extensions-linter) diff --git a/extensions/civetweb/CMakeLists.txt b/extensions/civetweb/CMakeLists.txt index eb7e5f30d..d299bc6e7 100644 --- a/extensions/civetweb/CMakeLists.txt +++ b/extensions/civetweb/CMakeLists.txt @@ -35,4 +35,3 @@ target_include_directories(minifi-civet-extensions BEFORE PUBLIC target_link_libraries(minifi-civet-extensions ${LIBMINIFI} Threads::Threads civetweb::civetweb-cpp) register_extension(minifi-civet-extensions CIVETWEB CIVETWEB "This enables ListenHTTP" "extensions/civetweb/tests") -register_extension_linter(minifi-civet-extensions-linter) diff --git a/extensions/couchbase/CMakeLists.txt b/extensions/couchbase/CMakeLists.txt index 92d4617e6..3c7ac35e1 100644 --- a/extensions/couchbase/CMakeLists.txt +++ b/extensions/couchbase/CMakeLists.txt @@ -38,4 +38,3 @@ target_link_libraries(minifi-couchbase ${LIBMINIFI} couchbase_cxx_client_static register_extension(minifi-couchbase "COUCHBASE EXTENSIONS" COUCHBASE-EXTENSIONS "This enables Couchbase support" "extensions/couchbase/tests") -register_extension_linter(minifi-couchbase-extensions-linter) diff --git a/extensions/elasticsearch/CMakeLists.txt b/extensions/elasticsearch/CMakeLists.txt index 7231c4afb..163be34ed 100644 --- a/extensions/elasticsearch/CMakeLists.txt +++ b/extensions/elasticsearch/CMakeLists.txt @@ -31,4 +31,3 @@ target_link_libraries(minifi-elasticsearch ${LIBMINIFI}) register_extension(minifi-elasticsearch "ELASTICSEARCH EXTENSIONS" ELASTICSEARCH-EXTENSIONS "This enables elasticsearch support" "extensions/elasticsearch/tests") -register_extension_linter(minifi-elasticsearch-extensions-linter) diff --git a/extensions/execute-process/CMakeLists.txt b/extensions/execute-process/CMakeLists.txt index db798cc00..b467fc853 100644 --- a/extensions/execute-process/CMakeLists.txt +++ b/extensions/execute-process/CMakeLists.txt @@ -35,4 +35,3 @@ target_link_libraries(minifi-execute-process ${LIBMINIFI}) register_extension(minifi-execute-process "EXECUTE PROCESS EXTENSION" EXECUTE-PROCESS-EXTENSION "This enables execute process support" "extensions/execute-process/test") -register_extension_linter(minifi-execute-process-extensions-linter) diff --git a/extensions/expression-language/CMakeLists.txt b/extensions/expression-language/CMakeLists.txt index 3183d97ca..9a28e0395 100644 --- a/extensions/expression-language/CMakeLists.txt +++ b/extensions/expression-language/CMakeLists.txt @@ -146,4 +146,3 @@ if (BREW_FLEX_INCLUDE) endif() register_extension(minifi-expression-language-extensions "EXPRESSION LANGUAGE EXTENSIONS" EXPRESSION-LANGUAGE-EXTENSIONS "This enables NiFi expression language" "extensions/expression-language/tests") -register_extension_linter(minifi-expression-language-extensions-linter) diff --git a/extensions/gcp/CMakeLists.txt b/extensions/gcp/CMakeLists.txt index cf8dc9a47..654209d08 100644 --- a/extensions/gcp/CMakeLists.txt +++ b/extensions/gcp/CMakeLists.txt @@ -35,4 +35,3 @@ target_include_directories(minifi-gcp SYSTEM PUBLIC ${google-cloud-cpp_INCLUDE_D register_extension(minifi-gcp "GCP EXTENSIONS" GCP-EXTENSIONS "This enables Google Cloud Platform support" "extensions/gcp/tests") -register_extension_linter(minifi-gcp-extensions-linter) diff --git a/extensions/grafana-loki/CMakeLists.txt b/extensions/grafana-loki/CMakeLists.txt index e1278595d..04a068fc9 100644 --- a/extensions/grafana-loki/CMakeLists.txt +++ b/extensions/grafana-loki/CMakeLists.txt @@ -61,4 +61,3 @@ endif() register_extension(minifi-grafana-loki "GRAFANA LOKI EXTENSIONS" GRAFANA-LOKI-EXTENSIONS "This enables Grafana Loki support" "extensions/grafana-loki/tests") -register_extension_linter(minifi-grafana-loki-extensions-linter) diff --git a/extensions/kafka/CMakeLists.txt b/extensions/kafka/CMakeLists.txt index 08f400e2c..13f4b3a38 100644 --- a/extensions/kafka/CMakeLists.txt +++ b/extensions/kafka/CMakeLists.txt @@ -37,4 +37,3 @@ target_link_libraries(minifi-rdkafka-extensions rdkafka) register_extension(minifi-rdkafka-extensions "RDKAFKA EXTENSIONS" RDKAFKA-EXTENSIONS "This Enables librdkafka functionality including PublishKafka" "extensions/kafka/tests") -register_extension_linter(minifi-rdkafka-extensions-linter) diff --git a/extensions/kubernetes/CMakeLists.txt b/extensions/kubernetes/CMakeLists.txt index 4ac885c99..fcaf72166 100644 --- a/extensions/kubernetes/CMakeLists.txt +++ b/extensions/kubernetes/CMakeLists.txt @@ -27,4 +27,3 @@ add_minifi_library(minifi-kubernetes-extensions SHARED ${SOURCES}) target_link_libraries(minifi-kubernetes-extensions ${LIBMINIFI} kubernetes) register_extension(minifi-kubernetes-extensions "KUBERNETES EXTENSIONS" KUBERNETES-EXTENSIONS "This enables Kubernetes support" "extensions/kubernetes/tests") -register_extension_linter(minifi-kubernetes-extensions-linter) diff --git a/extensions/libarchive/CMakeLists.txt b/extensions/libarchive/CMakeLists.txt index bf7b2a7f5..14b75dcc2 100644 --- a/extensions/libarchive/CMakeLists.txt +++ b/extensions/libarchive/CMakeLists.txt @@ -39,4 +39,3 @@ target_link_libraries(minifi-archive-extensions ${LIBMINIFI} Threads::Threads) target_link_libraries(minifi-archive-extensions LibArchive::LibArchive) register_extension(minifi-archive-extensions "ARCHIVE EXTENSIONS" ARCHIVE-EXTENSIONS "This Enables libarchive functionality including MergeContent, CompressContent, (Un)FocusArchiveEntry and ManipulateArchive." "extensions/libarchive/tests") -register_extension_linter(minifi-archive-extensions-linter) diff --git a/extensions/llamacpp/CMakeLists.txt b/extensions/llamacpp/CMakeLists.txt index 5a25cbc05..e10bea82b 100644 --- a/extensions/llamacpp/CMakeLists.txt +++ b/extensions/llamacpp/CMakeLists.txt @@ -35,4 +35,3 @@ target_link_libraries(minifi-llamacpp ${LIBMINIFI} llama) register_extension(minifi-llamacpp "LLAMACPP EXTENSION" LLAMACPP-EXTENSION "Provides llama.cpp support" "extensions/llamacpp/tests") -register_extension_linter(minifi-llamacpp-linter) diff --git a/extensions/lua/CMakeLists.txt b/extensions/lua/CMakeLists.txt index ed0766e9b..3a8ca0301 100644 --- a/extensions/lua/CMakeLists.txt +++ b/extensions/lua/CMakeLists.txt @@ -42,4 +42,3 @@ target_link_libraries(minifi-lua-script-extension PUBLIC lua sol2) target_compile_features(minifi-lua-script-extension PUBLIC cxx_std_14) register_extension(minifi-lua-script-extension "LUA SCRIPTING EXTENSIONS" LUA-SCRIPTING-EXTENSIONS "This enables LUA scripting" "extensions/lua/tests") -register_extension_linter(minifi-lua-script-extension-linter) diff --git a/extensions/mqtt/CMakeLists.txt b/extensions/mqtt/CMakeLists.txt index d6d2817ea..322623664 100644 --- a/extensions/mqtt/CMakeLists.txt +++ b/extensions/mqtt/CMakeLists.txt @@ -34,4 +34,3 @@ include(PahoMqttC) target_link_libraries(minifi-mqtt-extensions paho.mqtt.c) register_extension(minifi-mqtt-extensions "MQTT EXTENSIONS" MQTT-EXTENSIONS "This Enables MQTT functionality including PublishMQTT/ConsumeMQTT" "${CMAKE_CURRENT_SOURCE_DIR}/tests") -register_extension_linter(minifi-mqtt-extensions-linter) diff --git a/extensions/opc/CMakeLists.txt b/extensions/opc/CMakeLists.txt index 567799bb5..a19db6df8 100644 --- a/extensions/opc/CMakeLists.txt +++ b/extensions/opc/CMakeLists.txt @@ -41,4 +41,3 @@ target_link_libraries(minifi-opc-extensions ${LIBMINIFI} Threads::Threads) target_link_libraries(minifi-opc-extensions ${CMAKE_DL_LIBS} spdlog::spdlog open62541::open62541) register_extension(minifi-opc-extensions "OPC EXTENSIONS" OPC-EXTENSIONS "This enables OPC-UA support" "extensions/opc/tests") -register_extension_linter(minifi-opc-extensions-linter) diff --git a/extensions/opencv/CMakeLists.txt b/extensions/opencv/CMakeLists.txt index a3b45a70c..ed812c1a6 100644 --- a/extensions/opencv/CMakeLists.txt +++ b/extensions/opencv/CMakeLists.txt @@ -34,4 +34,3 @@ target_link_libraries(minifi-opencv ${LIBMINIFI}) target_link_libraries(minifi-opencv OPENCV::libopencv) register_extension(minifi-opencv "OPENCV EXTENSIONS" OPENCV-EXTENSIONS "This enables OpenCV support" "extensions/opencv/tests") -register_extension_linter(minifi-opencv-linter) diff --git a/extensions/pdh/CMakeLists.txt b/extensions/pdh/CMakeLists.txt index 627562a2a..153bc65f1 100644 --- a/extensions/pdh/CMakeLists.txt +++ b/extensions/pdh/CMakeLists.txt @@ -31,4 +31,3 @@ target_link_libraries(minifi-pdh ${LIBMINIFI} pdh) register_extension(minifi-pdh "PDH EXTENSIONS" PDH-EXTENSIONS "This enables PDH support" "extensions/pdh/tests") -register_extension_linter(minifi-pdh-extensions-linter) diff --git a/extensions/procfs/CMakeLists.txt b/extensions/procfs/CMakeLists.txt index ff97d9385..f36959441 100644 --- a/extensions/procfs/CMakeLists.txt +++ b/extensions/procfs/CMakeLists.txt @@ -30,4 +30,3 @@ target_link_libraries(minifi-procfs ${LIBMINIFI}) register_extension(minifi-procfs "PROCFS EXTENSIONS" PROCFS-EXTENSIONS "Enabled metrics collection from procfs" "extensions/procfs/tests") -register_extension_linter(minifi-procfs-extensions-linter) diff --git a/extensions/prometheus/CMakeLists.txt b/extensions/prometheus/CMakeLists.txt index d7f5af46b..047ce4420 100644 --- a/extensions/prometheus/CMakeLists.txt +++ b/extensions/prometheus/CMakeLists.txt @@ -32,4 +32,3 @@ target_link_libraries(minifi-prometheus ${LIBMINIFI} prometheus-cpp::core prome target_include_directories(minifi-prometheus PUBLIC ${prometheus-cpp_INCLUDE_DIRS}) register_extension(minifi-prometheus "PROMETHEUS EXTENSIONS" PROMETHEUS-EXTENSIONS "This enables Prometheus support" "extensions/prometheus/tests") -register_extension_linter(minifi-prometheus-linter) diff --git a/extensions/python/CMakeLists.txt b/extensions/python/CMakeLists.txt index 6eb2b0003..d1ebd6b0c 100644 --- a/extensions/python/CMakeLists.txt +++ b/extensions/python/CMakeLists.txt @@ -95,4 +95,3 @@ if (NOT WIN32) register_extension(minifi-python-lib-loader-extension "PYTHON LIB LOADER" PYTHON-LIB-LOADER-EXTENSIONS "This enables library that loads python library for python symbols") endif() register_extension(minifi-python-script-extension "PYTHON SCRIPTING ENGINE" PYTHON-SCRIPTING-EXTENSIONS "This enables python script engine" "extensions/python/tests") -register_extension_linter(minifi-python-script-extension-linter) diff --git a/extensions/rocksdb-repos/CMakeLists.txt b/extensions/rocksdb-repos/CMakeLists.txt index f4d535208..db6beeed4 100644 --- a/extensions/rocksdb-repos/CMakeLists.txt +++ b/extensions/rocksdb-repos/CMakeLists.txt @@ -35,4 +35,3 @@ target_link_libraries(minifi-rocksdb-repos PUBLIC minifi-api minifi-extension-fr target_link_libraries(minifi-rocksdb-repos PRIVATE $<LINK_ONLY:core-minifi>) register_extension(minifi-rocksdb-repos "ROCKSDB REPOS" ROCKSDB-REPOS "This Enables persistent provenance, flowfile, and content repositories using RocksDB" "extensions/rocksdb-repos/tests") -register_extension_linter(minifi-rocksdb-repos-linter) diff --git a/extensions/script/CMakeLists.txt b/extensions/script/CMakeLists.txt index 12f47a59c..24403caf5 100644 --- a/extensions/script/CMakeLists.txt +++ b/extensions/script/CMakeLists.txt @@ -31,4 +31,3 @@ target_link_libraries(minifi-script-extension PRIVATE ${LIBMINIFI} Threads::Thre target_include_directories(minifi-script-extension PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/extensions/python") register_extension(minifi-script-extension "SCRIPTING EXTENSIONS" SCRIPTING-EXTENSIONS "This enables scripting" "extensions/script/tests") -register_extension_linter(minifi-script-extension-linter) diff --git a/extensions/sftp/CMakeLists.txt b/extensions/sftp/CMakeLists.txt index 2cea03f2b..c5c1cb6a7 100644 --- a/extensions/sftp/CMakeLists.txt +++ b/extensions/sftp/CMakeLists.txt @@ -36,4 +36,3 @@ target_link_libraries(minifi-sftp ${LIBMINIFI} Threads::Threads) target_link_libraries(minifi-sftp libssh2 RapidJSON) register_extension(minifi-sftp "SFTP EXTENSIONS" SFTP "This enables SFTP support" "extensions/sftp/tests") -register_extension_linter(minifi-sftp-linter) diff --git a/extensions/smb/CMakeLists.txt b/extensions/smb/CMakeLists.txt index 205580aa0..a51fe63cf 100644 --- a/extensions/smb/CMakeLists.txt +++ b/extensions/smb/CMakeLists.txt @@ -31,4 +31,3 @@ target_include_directories(minifi-smb PRIVATE BEFORE "${CMAKE_SOURCE_DIR}/extens register_extension(minifi-smb "SMB EXTENSIONS" SMB-EXTENSIONS "This enables SMB support" "extensions/smb/tests") -register_extension_linter(minifi-smb-extensions-linter) diff --git a/extensions/splunk/CMakeLists.txt b/extensions/splunk/CMakeLists.txt index ff18d2d9a..1ab016a6a 100644 --- a/extensions/splunk/CMakeLists.txt +++ b/extensions/splunk/CMakeLists.txt @@ -31,4 +31,3 @@ target_link_libraries(minifi-splunk ${LIBMINIFI}) register_extension(minifi-splunk "SPLUNK EXTENSIONS" SPLUNK-EXTENSIONS "This enables Splunk support" "extensions/splunk/tests") -register_extension_linter(minifi-splunk-extensions-linter) diff --git a/extensions/sql/CMakeLists.txt b/extensions/sql/CMakeLists.txt index 39f9ce82b..3982458a4 100644 --- a/extensions/sql/CMakeLists.txt +++ b/extensions/sql/CMakeLists.txt @@ -179,4 +179,3 @@ target_link_libraries(minifi-sql SOCI::libsoci_odbc SOCI::libsoci_core) target_link_libraries(minifi-sql ${LIBMINIFI} Threads::Threads) register_extension(minifi-sql "SQL EXTENSIONS" SQL-EXTENSIONS "Enables the SQL Suite of Tools" "extensions/sql/tests") -register_extension_linter(minifi-sql-extensions-linter) diff --git a/extensions/standard-processors/CMakeLists.txt b/extensions/standard-processors/CMakeLists.txt index f62003e75..7c643c087 100644 --- a/extensions/standard-processors/CMakeLists.txt +++ b/extensions/standard-processors/CMakeLists.txt @@ -34,4 +34,3 @@ enable_coroutines() register_extension(minifi-standard-processors "STANDARD PROCESSORS" STANDARD-PROCESSORS "Provides standard processors" "extensions/standard-processors/tests/") -register_extension_linter(minifi-standard-processors-linter) diff --git a/extensions/systemd/CMakeLists.txt b/extensions/systemd/CMakeLists.txt index 87f49cafb..560ed283e 100644 --- a/extensions/systemd/CMakeLists.txt +++ b/extensions/systemd/CMakeLists.txt @@ -28,4 +28,3 @@ add_minifi_library(minifi-systemd SHARED "ConsumeJournald.cpp" "libwrapper/LibWr target_link_libraries(minifi-systemd ${LIBMINIFI} Threads::Threads) register_extension(minifi-systemd "SYSTEMD EXTENSIONS" SYSTEMD-EXTENSIONS "Enabled log collection from journald" "extensions/systemd/tests") -register_extension_linter(minifi-systemd-extension-linter) diff --git a/extensions/test-processors/CMakeLists.txt b/extensions/test-processors/CMakeLists.txt index 4953f31ea..056687d0a 100644 --- a/extensions/test-processors/CMakeLists.txt +++ b/extensions/test-processors/CMakeLists.txt @@ -31,4 +31,3 @@ target_link_libraries(minifi-test-processors ${LIBMINIFI}) register_extension(minifi-test-processors "TEST-PROCESSORS EXTENSION" TEST-PROCESSORS-EXTENSION "This enables processors purely for testing purposes" "" "CI_ONLY_INSTALL") -register_extension_linter(minifi-test-processors-extensions-linter) diff --git a/extensions/windows-event-log/CMakeLists.txt b/extensions/windows-event-log/CMakeLists.txt index 6adb1220a..38bd6ff9c 100644 --- a/extensions/windows-event-log/CMakeLists.txt +++ b/extensions/windows-event-log/CMakeLists.txt @@ -34,4 +34,3 @@ target_link_libraries(minifi-wel ${LIBMINIFI} Threads::Threads) target_link_libraries(minifi-wel PUGI::libpugixml ZLIB::ZLIB Wevtapi.lib) register_extension(minifi-wel "WEL EXTENSIONS" WEL-EXTENSION "Enables the suite of Windows Event Log extensions." "extensions/windows-event-log/tests") -register_extension_linter(minifi-wel-extension-linter)
