MINOR: spoe: Add SPOE filters in the exposed deprecated directives

It is the first deprecated directive exposed via the
'expose-deprecated-directives' global option. This way, it is possible to
silent the warning about the SPOE uses.
This commit is contained in:
Christopher Faulet 2024-03-15 09:08:08 +01:00
parent 189f74d4ff
commit 885e40494c
3 changed files with 10 additions and 2 deletions

View File

@ -26625,7 +26625,8 @@ the Stream Processing Offload Protocol (SPOP).
For all information about the SPOE configuration and the SPOP specification, see For all information about the SPOE configuration and the SPOP specification, see
"doc/SPOE.txt". "doc/SPOE.txt".
WARNING: The SPOE filter is now deprecated. WARNING: The SPOE filter is now deprecated. Use 'expose-deprecated-directives'
to silent warnings if you must use it.
9.4. Cache 9.4. Cache
---------- ----------

View File

@ -12,6 +12,11 @@ varnishtest "SPOE bug: missing configuration file"
feature ignore_unknown_macro feature ignore_unknown_macro
haproxy h1 -conf-BAD {} { haproxy h1 -conf-BAD {} {
global
.if version_atleast(3.0-dev6)
expose-deprecated-directives
.endif
defaults defaults
timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
timeout client "${HAPROXY_TEST_TIMEOUT-5s}" timeout client "${HAPROXY_TEST_TIMEOUT-5s}"

View File

@ -4106,7 +4106,9 @@ parse_spoe_flt(char **args, int *cur_arg, struct proxy *px,
curpxopts2 = 0; curpxopts2 = 0;
ha_warning("Proxy %s: SPOE filter is deprecated and will be removed in future version.\n", px->id); if (!deprecated_directives_allowed)
ha_warning("Proxy %s: SPOE filter is deprecated and will be removed in future version. "
"Use 'expose-deprecated-directives' in global section to silent this warning\n", px->id);
conf = calloc(1, sizeof(*conf)); conf = calloc(1, sizeof(*conf));
if (conf == NULL) { if (conf == NULL) {