You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by wk...@apache.org on 2024/04/22 14:21:29 UTC
(trafficserver) branch master updated: CMake: add missing verify_remap_plugin() calls. (#11276)
This is an automated email from the ASF dual-hosted git repository.
wkaras pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/master by this push:
new cb43fc6a8d CMake: add missing verify_remap_plugin() calls. (#11276)
cb43fc6a8d is described below
commit cb43fc6a8da7d4c29fdb19df407698e75f9a7d44
Author: Walt Karas <wk...@yahooinc.com>
AuthorDate: Mon Apr 22 10:21:22 2024 -0400
CMake: add missing verify_remap_plugin() calls. (#11276)
---
cmake/add_atsplugin.cmake | 8 ++++----
plugins/authproxy/CMakeLists.txt | 1 +
plugins/background_fetch/CMakeLists.txt | 1 +
plugins/cache_range_requests/CMakeLists.txt | 1 +
plugins/cachekey/CMakeLists.txt | 1 +
plugins/compress/CMakeLists.txt | 1 +
plugins/conf_remap/CMakeLists.txt | 1 +
plugins/escalate/CMakeLists.txt | 1 +
plugins/esi/CMakeLists.txt | 2 ++
plugins/experimental/access_control/CMakeLists.txt | 2 ++
plugins/experimental/cache_fill/CMakeLists.txt | 2 ++
plugins/experimental/cookie_remap/CMakeLists.txt | 2 ++
plugins/experimental/fq_pacing/CMakeLists.txt | 1 +
plugins/experimental/geoip_acl/CMakeLists.txt | 1 +
plugins/experimental/http_stats/CMakeLists.txt | 1 +
plugins/experimental/maxmind_acl/CMakeLists.txt | 2 ++
plugins/experimental/money_trace/CMakeLists.txt | 1 +
plugins/experimental/mp4/CMakeLists.txt | 1 +
plugins/experimental/rate_limit/CMakeLists.txt | 1 +
plugins/experimental/sslheaders/CMakeLists.txt | 1 +
plugins/experimental/stale_response/CMakeLists.txt | 1 +
plugins/experimental/txn_box/plugin/CMakeLists.txt | 3 +++
plugins/experimental/uri_signing/CMakeLists.txt | 2 ++
plugins/experimental/url_sig/CMakeLists.txt | 1 +
plugins/generator/CMakeLists.txt | 1 +
plugins/header_rewrite/CMakeLists.txt | 1 +
plugins/ja3_fingerprint/CMakeLists.txt | 1 +
plugins/lua/CMakeLists.txt | 1 +
plugins/multiplexer/CMakeLists.txt | 2 ++
plugins/prefetch/CMakeLists.txt | 2 ++
plugins/regex_remap/CMakeLists.txt | 2 ++
plugins/remap_purge/CMakeLists.txt | 2 ++
plugins/s3_auth/CMakeLists.txt | 2 ++
plugins/slice/CMakeLists.txt | 1 +
plugins/statichit/CMakeLists.txt | 1 +
35 files changed, 51 insertions(+), 4 deletions(-)
diff --git a/cmake/add_atsplugin.cmake b/cmake/add_atsplugin.cmake
index 204927f881..e097c4e3b7 100644
--- a/cmake/add_atsplugin.cmake
+++ b/cmake/add_atsplugin.cmake
@@ -38,14 +38,14 @@ function(add_atsplugin name)
endfunction()
function(verify_remap_plugin target)
- add_test(NAME verify_${target} COMMAND $<TARGET_FILE:traffic_server> -C
- "verify_remap_plugin $<TARGET_FILE:${target}>"
+ add_test(NAME verify_remap_${target} COMMAND $<TARGET_FILE:traffic_server> -C
+ "verify_remap_plugin $<TARGET_FILE:${target}>"
)
endfunction()
function(verify_global_plugin target)
- add_test(NAME verify_${target} COMMAND $<TARGET_FILE:traffic_server> -C
- "verify_global_plugin $<TARGET_FILE:${target}>"
+ add_test(NAME verify_global_${target} COMMAND $<TARGET_FILE:traffic_server> -C
+ "verify_global_plugin $<TARGET_FILE:${target}>"
)
endfunction()
diff --git a/plugins/authproxy/CMakeLists.txt b/plugins/authproxy/CMakeLists.txt
index fb22ee2534..50a9a1668c 100644
--- a/plugins/authproxy/CMakeLists.txt
+++ b/plugins/authproxy/CMakeLists.txt
@@ -17,3 +17,4 @@
add_atsplugin(authproxy authproxy.cc utils.cc)
verify_global_plugin(authproxy)
+verify_remap_plugin(authproxy)
diff --git a/plugins/background_fetch/CMakeLists.txt b/plugins/background_fetch/CMakeLists.txt
index abfb728bf6..f95782d1ba 100644
--- a/plugins/background_fetch/CMakeLists.txt
+++ b/plugins/background_fetch/CMakeLists.txt
@@ -18,3 +18,4 @@
add_atsplugin(background_fetch background_fetch.cc configs.cc headers.cc rules.cc)
target_link_libraries(background_fetch PRIVATE libswoc::libswoc)
verify_global_plugin(background_fetch)
+verify_remap_plugin(background_fetch)
diff --git a/plugins/cache_range_requests/CMakeLists.txt b/plugins/cache_range_requests/CMakeLists.txt
index d3185c2014..21c6099211 100644
--- a/plugins/cache_range_requests/CMakeLists.txt
+++ b/plugins/cache_range_requests/CMakeLists.txt
@@ -17,3 +17,4 @@
add_atsplugin(cache_range_requests cache_range_requests.cc)
verify_global_plugin(cache_range_requests)
+verify_remap_plugin(cache_range_requests)
diff --git a/plugins/cachekey/CMakeLists.txt b/plugins/cachekey/CMakeLists.txt
index fbcdd327fb..82f9f67d27 100644
--- a/plugins/cachekey/CMakeLists.txt
+++ b/plugins/cachekey/CMakeLists.txt
@@ -19,3 +19,4 @@ add_atsplugin(cachekey cachekey.cc common.cc configs.cc pattern.cc plugin.cc)
target_link_libraries(cachekey PRIVATE PCRE::PCRE)
verify_global_plugin(cachekey)
+verify_remap_plugin(cachekey)
diff --git a/plugins/compress/CMakeLists.txt b/plugins/compress/CMakeLists.txt
index 910c71648e..f630bf0d1c 100644
--- a/plugins/compress/CMakeLists.txt
+++ b/plugins/compress/CMakeLists.txt
@@ -21,3 +21,4 @@ if(HAVE_BROTLI_ENCODE_H)
target_link_libraries(compress PRIVATE brotli::brotlienc)
endif()
verify_global_plugin(compress)
+verify_remap_plugin(compress)
diff --git a/plugins/conf_remap/CMakeLists.txt b/plugins/conf_remap/CMakeLists.txt
index 37d4dd80e8..e160d2d9a3 100644
--- a/plugins/conf_remap/CMakeLists.txt
+++ b/plugins/conf_remap/CMakeLists.txt
@@ -16,3 +16,4 @@
#######################
add_atsplugin(conf_remap conf_remap.cc)
+verify_remap_plugin(conf_remap)
diff --git a/plugins/escalate/CMakeLists.txt b/plugins/escalate/CMakeLists.txt
index 986006477e..e638b949a1 100644
--- a/plugins/escalate/CMakeLists.txt
+++ b/plugins/escalate/CMakeLists.txt
@@ -16,3 +16,4 @@
#######################
add_atsplugin(escalate escalate.cc)
+verify_remap_plugin(escalate)
diff --git a/plugins/esi/CMakeLists.txt b/plugins/esi/CMakeLists.txt
index b5fea6a89e..f8bc93ef0f 100644
--- a/plugins/esi/CMakeLists.txt
+++ b/plugins/esi/CMakeLists.txt
@@ -23,12 +23,14 @@ add_atsplugin(esi esi.cc serverIntercept.cc)
target_link_libraries(esi PRIVATE esi-common esicore fetcher libswoc::libswoc)
target_include_directories(esi PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}")
verify_global_plugin(esi)
+verify_remap_plugin(esi)
add_atsplugin(combo_handler combo_handler.cc)
target_link_libraries(combo_handler PRIVATE esicore fetcher)
target_include_directories(combo_handler PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}")
verify_global_plugin(combo_handler)
+verify_remap_plugin(combo_handler)
if(BUILD_TESTING)
add_subdirectory(test)
diff --git a/plugins/experimental/access_control/CMakeLists.txt b/plugins/experimental/access_control/CMakeLists.txt
index 515139c7b4..c3e4da04d6 100644
--- a/plugins/experimental/access_control/CMakeLists.txt
+++ b/plugins/experimental/access_control/CMakeLists.txt
@@ -30,6 +30,8 @@ add_atsplugin(
target_link_libraries(access_control PRIVATE PCRE::PCRE OpenSSL::SSL OpenSSL::Crypto ts::tscore)
+verify_remap_plugin(access_control)
+
if(BUILD_TESTING)
add_subdirectory(unit_tests)
endif()
diff --git a/plugins/experimental/cache_fill/CMakeLists.txt b/plugins/experimental/cache_fill/CMakeLists.txt
index b43cf1cf39..5a780a7f60 100644
--- a/plugins/experimental/cache_fill/CMakeLists.txt
+++ b/plugins/experimental/cache_fill/CMakeLists.txt
@@ -16,3 +16,5 @@
#######################
add_atsplugin(cache_fill background_fetch.cc cache_fill.cc)
+
+verify_remap_plugin(cache_fill)
diff --git a/plugins/experimental/cookie_remap/CMakeLists.txt b/plugins/experimental/cookie_remap/CMakeLists.txt
index 117f444c2a..f639c39304 100644
--- a/plugins/experimental/cookie_remap/CMakeLists.txt
+++ b/plugins/experimental/cookie_remap/CMakeLists.txt
@@ -21,6 +21,8 @@ add_atsplugin(cookie_remap cookie_remap.cc cookiejar.cc strip.cc hash.cc)
target_link_libraries(cookie_remap PRIVATE PCRE::PCRE yaml-cpp::yaml-cpp)
+verify_remap_plugin(cookie_remap)
+
if(BUILD_TESTING)
add_executable(test_cookiejar test_cookiejar.cc strip.cc cookiejar.cc)
diff --git a/plugins/experimental/fq_pacing/CMakeLists.txt b/plugins/experimental/fq_pacing/CMakeLists.txt
index 86c360ec39..26b0a191cd 100644
--- a/plugins/experimental/fq_pacing/CMakeLists.txt
+++ b/plugins/experimental/fq_pacing/CMakeLists.txt
@@ -17,3 +17,4 @@
add_atsplugin(fq_pacing fq_pacing.cc)
verify_global_plugin(fq_pacing)
+verify_remap_plugin(fq_pacing)
diff --git a/plugins/experimental/geoip_acl/CMakeLists.txt b/plugins/experimental/geoip_acl/CMakeLists.txt
index 71ca02d562..830e03ada2 100644
--- a/plugins/experimental/geoip_acl/CMakeLists.txt
+++ b/plugins/experimental/geoip_acl/CMakeLists.txt
@@ -17,3 +17,4 @@
add_atsplugin(geoip_acl geoip_acl.cc acl.cc)
target_link_libraries(geoip_acl PRIVATE PCRE::PCRE)
+verify_remap_plugin(geoip_acl)
diff --git a/plugins/experimental/http_stats/CMakeLists.txt b/plugins/experimental/http_stats/CMakeLists.txt
index b310c45bb0..c0596acada 100644
--- a/plugins/experimental/http_stats/CMakeLists.txt
+++ b/plugins/experimental/http_stats/CMakeLists.txt
@@ -16,3 +16,4 @@
#######################
add_atsplugin(http_stats http_stats.cc)
+verify_remap_plugin(http_stats)
diff --git a/plugins/experimental/maxmind_acl/CMakeLists.txt b/plugins/experimental/maxmind_acl/CMakeLists.txt
index 0b736718ed..08afb8c86f 100644
--- a/plugins/experimental/maxmind_acl/CMakeLists.txt
+++ b/plugins/experimental/maxmind_acl/CMakeLists.txt
@@ -23,6 +23,8 @@ if(maxminddb_FOUND)
maxmind_acl PRIVATE libswoc::libswoc ts::tsapi ts::tsutil yaml-cpp::yaml-cpp maxminddb::maxminddb PCRE::PCRE
)
+ verify_remap_plugin(maxmind_acl)
+
else()
message(STATUS "skipping maxmind_acl plugin (missing maxminddb)")
endif()
diff --git a/plugins/experimental/money_trace/CMakeLists.txt b/plugins/experimental/money_trace/CMakeLists.txt
index cdf8a56ba3..f3254a142f 100644
--- a/plugins/experimental/money_trace/CMakeLists.txt
+++ b/plugins/experimental/money_trace/CMakeLists.txt
@@ -18,3 +18,4 @@
add_atsplugin(money_trace money_trace.cc)
target_link_libraries(money_trace PRIVATE libswoc::libswoc)
verify_global_plugin(money_trace)
+verify_remap_plugin(money_trace)
diff --git a/plugins/experimental/mp4/CMakeLists.txt b/plugins/experimental/mp4/CMakeLists.txt
index 4b12940448..ccb6460732 100644
--- a/plugins/experimental/mp4/CMakeLists.txt
+++ b/plugins/experimental/mp4/CMakeLists.txt
@@ -16,3 +16,4 @@
#######################
add_atsplugin(mp4 mp4.cc mp4_meta.cc)
+verify_remap_plugin(mp4)
diff --git a/plugins/experimental/rate_limit/CMakeLists.txt b/plugins/experimental/rate_limit/CMakeLists.txt
index 831e9c5e91..eed36d51d0 100644
--- a/plugins/experimental/rate_limit/CMakeLists.txt
+++ b/plugins/experimental/rate_limit/CMakeLists.txt
@@ -30,3 +30,4 @@ add_atsplugin(
target_link_libraries(rate_limit PRIVATE libswoc::libswoc yaml-cpp::yaml-cpp OpenSSL::SSL)
verify_global_plugin(rate_limit)
+verify_remap_plugin(rate_limit)
diff --git a/plugins/experimental/sslheaders/CMakeLists.txt b/plugins/experimental/sslheaders/CMakeLists.txt
index 5108f6ec19..96d3997513 100644
--- a/plugins/experimental/sslheaders/CMakeLists.txt
+++ b/plugins/experimental/sslheaders/CMakeLists.txt
@@ -28,3 +28,4 @@ endif()
add_atsplugin(sslheaders sslheaders.cc)
target_link_libraries(sslheaders PRIVATE sslhdr OpenSSL::SSL)
verify_global_plugin(sslheaders)
+verify_remap_plugin(sslheaders)
diff --git a/plugins/experimental/stale_response/CMakeLists.txt b/plugins/experimental/stale_response/CMakeLists.txt
index 6013b33010..e7d81cf60b 100644
--- a/plugins/experimental/stale_response/CMakeLists.txt
+++ b/plugins/experimental/stale_response/CMakeLists.txt
@@ -34,3 +34,4 @@ if(BUILD_TESTING)
add_subdirectory(unit_tests)
endif()
verify_global_plugin(stale_response)
+verify_remap_plugin(stale_response)
diff --git a/plugins/experimental/txn_box/plugin/CMakeLists.txt b/plugins/experimental/txn_box/plugin/CMakeLists.txt
index b4d35ae310..ef03cbc586 100644
--- a/plugins/experimental/txn_box/plugin/CMakeLists.txt
+++ b/plugins/experimental/txn_box/plugin/CMakeLists.txt
@@ -47,3 +47,6 @@ add_atsplugin(
target_link_libraries(txn_box PRIVATE libswoc::libswoc PkgConfig::PCRE2 OpenSSL::SSL yaml-cpp::yaml-cpp)
target_include_directories(txn_box PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)
+
+verify_global_plugin(txn_box)
+verify_remap_plugin(txn_box)
diff --git a/plugins/experimental/uri_signing/CMakeLists.txt b/plugins/experimental/uri_signing/CMakeLists.txt
index 0077f8aed9..d4274e9766 100644
--- a/plugins/experimental/uri_signing/CMakeLists.txt
+++ b/plugins/experimental/uri_signing/CMakeLists.txt
@@ -36,6 +36,8 @@ target_link_libraries(
PUBLIC jansson::jansson
)
+verify_remap_plugin(uri_signing)
+
if(BUILD_TESTING)
add_subdirectory(unit_tests)
endif()
diff --git a/plugins/experimental/url_sig/CMakeLists.txt b/plugins/experimental/url_sig/CMakeLists.txt
index e4ac652614..4484684f16 100644
--- a/plugins/experimental/url_sig/CMakeLists.txt
+++ b/plugins/experimental/url_sig/CMakeLists.txt
@@ -17,3 +17,4 @@
add_atsplugin(url_sig url_sig.cc)
target_link_libraries(url_sig PRIVATE OpenSSL::SSL PCRE::PCRE)
+verify_remap_plugin(url_sig)
diff --git a/plugins/generator/CMakeLists.txt b/plugins/generator/CMakeLists.txt
index 7b8a378461..75168675c4 100644
--- a/plugins/generator/CMakeLists.txt
+++ b/plugins/generator/CMakeLists.txt
@@ -17,3 +17,4 @@
add_atsplugin(generator generator.cc)
verify_global_plugin(generator)
+verify_remap_plugin(generator)
diff --git a/plugins/header_rewrite/CMakeLists.txt b/plugins/header_rewrite/CMakeLists.txt
index 0e9f04ab8f..b60db87226 100644
--- a/plugins/header_rewrite/CMakeLists.txt
+++ b/plugins/header_rewrite/CMakeLists.txt
@@ -59,3 +59,4 @@ if(BUILD_TESTING)
endif()
endif()
verify_global_plugin(header_rewrite)
+verify_remap_plugin(header_rewrite)
diff --git a/plugins/ja3_fingerprint/CMakeLists.txt b/plugins/ja3_fingerprint/CMakeLists.txt
index 897c28669b..1daf6175f0 100644
--- a/plugins/ja3_fingerprint/CMakeLists.txt
+++ b/plugins/ja3_fingerprint/CMakeLists.txt
@@ -19,3 +19,4 @@ add_atsplugin(ja3_fingerprint ja3_fingerprint.cc)
target_link_libraries(ja3_fingerprint PRIVATE OpenSSL::SSL)
verify_global_plugin(ja3_fingerprint)
+verify_remap_plugin(ja3_fingerprint)
diff --git a/plugins/lua/CMakeLists.txt b/plugins/lua/CMakeLists.txt
index 4d1a94da91..d9e4419468 100644
--- a/plugins/lua/CMakeLists.txt
+++ b/plugins/lua/CMakeLists.txt
@@ -51,3 +51,4 @@ add_atsplugin(
target_link_libraries(tslua PRIVATE luajit::luajit OpenSSL::Crypto)
verify_global_plugin(tslua)
+verify_remap_plugin(tslua)
diff --git a/plugins/multiplexer/CMakeLists.txt b/plugins/multiplexer/CMakeLists.txt
index d8bf5f9921..e1e7d1c730 100644
--- a/plugins/multiplexer/CMakeLists.txt
+++ b/plugins/multiplexer/CMakeLists.txt
@@ -27,3 +27,5 @@ add_atsplugin(
)
target_compile_definitions(multiplexer PRIVATE PLUGIN_TAG="multiplexer")
+
+verify_remap_plugin(multiplexer)
diff --git a/plugins/prefetch/CMakeLists.txt b/plugins/prefetch/CMakeLists.txt
index aab4bdec8a..432538f74f 100644
--- a/plugins/prefetch/CMakeLists.txt
+++ b/plugins/prefetch/CMakeLists.txt
@@ -33,6 +33,8 @@ add_atsplugin(
target_link_libraries(prefetch PRIVATE OpenSSL::Crypto PCRE::PCRE)
+verify_remap_plugin(prefetch)
+
if(BUILD_TESTING)
add_subdirectory(test)
endif()
diff --git a/plugins/regex_remap/CMakeLists.txt b/plugins/regex_remap/CMakeLists.txt
index 7b454801ae..a69af3590d 100644
--- a/plugins/regex_remap/CMakeLists.txt
+++ b/plugins/regex_remap/CMakeLists.txt
@@ -18,3 +18,5 @@
add_atsplugin(regex_remap regex_remap.cc)
target_link_libraries(regex_remap PRIVATE PCRE::PCRE libswoc::libswoc)
+
+verify_remap_plugin(regex_remap)
diff --git a/plugins/remap_purge/CMakeLists.txt b/plugins/remap_purge/CMakeLists.txt
index a864cd0eb4..5b8d77d030 100644
--- a/plugins/remap_purge/CMakeLists.txt
+++ b/plugins/remap_purge/CMakeLists.txt
@@ -16,3 +16,5 @@
#######################
add_atsplugin(remap_purge remap_purge.cc)
+
+verify_remap_plugin(remap_purge)
diff --git a/plugins/s3_auth/CMakeLists.txt b/plugins/s3_auth/CMakeLists.txt
index 1871c4c364..c7f49335d4 100644
--- a/plugins/s3_auth/CMakeLists.txt
+++ b/plugins/s3_auth/CMakeLists.txt
@@ -21,6 +21,8 @@ add_atsplugin(s3_auth s3_auth.cc aws_auth_v4.cc)
target_link_libraries(s3_auth PRIVATE ts::tscore OpenSSL::Crypto)
+verify_remap_plugin(s3_auth)
+
if(BUILD_TESTING)
add_subdirectory(unit_tests)
endif()
diff --git a/plugins/slice/CMakeLists.txt b/plugins/slice/CMakeLists.txt
index efca6315d8..f63bd2efe4 100644
--- a/plugins/slice/CMakeLists.txt
+++ b/plugins/slice/CMakeLists.txt
@@ -38,3 +38,4 @@ if(BUILD_TESTING)
add_subdirectory(unit-tests)
endif()
verify_global_plugin(slice)
+verify_remap_plugin(slice)
diff --git a/plugins/statichit/CMakeLists.txt b/plugins/statichit/CMakeLists.txt
index c8284ae1f1..910b370714 100644
--- a/plugins/statichit/CMakeLists.txt
+++ b/plugins/statichit/CMakeLists.txt
@@ -16,3 +16,4 @@
#######################
add_atsplugin(statichit statichit.cc)
+verify_remap_plugin(statichit)