From 117ac4311bde300c9e583e74d6b3462d4a0a2962 Mon Sep 17 00:00:00 2001 From: Marcial Rosales Date: Tue, 15 Apr 2025 07:06:20 +0200 Subject: [PATCH 1/5] Use RABBITMQ_ENABLED_PLUGINS instead of RABBITMQ_ENABLED_PLUGINS_FILE gmake was ignoring the former env var. (cherry picked from commit 6262c849a26faa370e7d304eff7096795645430f) (cherry picked from commit 8abda6ca401ad0c7f94c4d5bac36a0a1beef1270) --- selenium/bin/components/rabbitmq | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/selenium/bin/components/rabbitmq b/selenium/bin/components/rabbitmq index 46cbb1ee2738..d322f61d6154 100644 --- a/selenium/bin/components/rabbitmq +++ b/selenium/bin/components/rabbitmq @@ -66,20 +66,22 @@ start_local_rabbitmq() { RABBITMQ_TEST_DIR="${RABBITMQ_CONFIG_DIR}" ${BIN_DIR}/gen-rabbitmq-conf ${RABBITMQ_CONFIG_DIR} $ENV_FILE /tmp$MOUNT_RABBITMQ_CONF print "> EFFECTIVE RABBITMQ_CONFIG_FILE: /tmp$MOUNT_RABBITMQ_CONF" - ${BIN_DIR}/gen-advanced-config ${RABBITMQ_CONFIG_DIR} $ENV_FILE /tmp$MOUNT_ADVANCED_CONFIG cp ${RABBITMQ_CONFIG_DIR}/enabled_plugins /tmp/etc/rabbitmq/ + RABBITMQ_ENABLED_PLUGINS=`cat /tmp/etc/rabbitmq/enabled_plugins | awk -F'[][]' '{print $2}'` + print "> EFFECTIVE PLUGINS: $RABBITMQ_ENABLED_PLUGINS" + + ${BIN_DIR}/gen-advanced-config ${RABBITMQ_CONFIG_DIR} $ENV_FILE /tmp$MOUNT_ADVANCED_CONFIG RESULT=$? - cp ${RABBITMQ_CONFIG_DIR}/enabled_plugins /tmp/etc/rabbitmq/ if [ $RESULT -eq 0 ]; then - print "> EFFECTIVE RABBITMQ_CONFIG_FILE: /tmp$MOUNT_ADVANCED_CONFIG" - gmake --directory=${RABBITMQ_SERVER_ROOT} run-broker \ - RABBITMQ_ENABLED_PLUGINS_FILE=/tmp/etc/rabbitmq/enabled_plugins \ + print "> EFFECTIVE RABBITMQ_CONFIG_FILE: /tmp$MOUNT_ADVANCED_CONFIG" + gmake --directory=${RABBITMQ_SERVER_ROOT} \ + RABBITMQ_ENABLED_PLUGINS="$RABBITMQ_ENABLED_PLUGINS" \ RABBITMQ_CONFIG_FILE=/tmp$MOUNT_RABBITMQ_CONF \ - RABBITMQ_ADVANCED_CONFIG_FILE=/tmp$MOUNT_ADVANCED_CONFIG + RABBITMQ_ADVANCED_CONFIG_FILE=/tmp$MOUNT_ADVANCED_CONFIG run-broker else - gmake --directory=${RABBITMQ_SERVER_ROOT} run-broker \ - RABBITMQ_ENABLED_PLUGINS_FILE=/tmp/etc/rabbitmq/enabled_plugins \ - RABBITMQ_CONFIG_FILE=/tmp$MOUNT_RABBITMQ_CONF + gmake --directory=${RABBITMQ_SERVER_ROOT} \ + RABBITMQ_ENABLED_PLUGINS="$RABBITMQ_ENABLED_PLUGINS" \ + RABBITMQ_CONFIG_FILE=/tmp$MOUNT_RABBITMQ_CONF run-broker fi print "> RABBITMQ_TEST_DIR: ${RABBITMQ_CONFIG_DIR}" From 7861d58d18de028dd01aea9ed12846b0afd5a8da Mon Sep 17 00:00:00 2001 From: Marcial Rosales Date: Tue, 15 Apr 2025 07:53:50 +0200 Subject: [PATCH 2/5] Convert multiline enabled_plugins to single value (cherry picked from commit ceb7b244f297ba67e1dd1bdc80f535bed4e0bc20) (cherry picked from commit d2337572151bf95f4910526b91fb1946cff31adb) --- selenium/bin/components/rabbitmq | 2 +- selenium/test/basic-auth/enabled_plugins | 16 +--------------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/selenium/bin/components/rabbitmq b/selenium/bin/components/rabbitmq index d322f61d6154..ade6b5a0c2af 100644 --- a/selenium/bin/components/rabbitmq +++ b/selenium/bin/components/rabbitmq @@ -67,7 +67,7 @@ start_local_rabbitmq() { print "> EFFECTIVE RABBITMQ_CONFIG_FILE: /tmp$MOUNT_RABBITMQ_CONF" cp ${RABBITMQ_CONFIG_DIR}/enabled_plugins /tmp/etc/rabbitmq/ - RABBITMQ_ENABLED_PLUGINS=`cat /tmp/etc/rabbitmq/enabled_plugins | awk -F'[][]' '{print $2}'` + RABBITMQ_ENABLED_PLUGINS=`cat /tmp/etc/rabbitmq/enabled_plugins | awk '{printf("\"%s\" ",$0)} END { printf "\n" }' | awk -F'[][]' '{print $2}'` print "> EFFECTIVE PLUGINS: $RABBITMQ_ENABLED_PLUGINS" ${BIN_DIR}/gen-advanced-config ${RABBITMQ_CONFIG_DIR} $ENV_FILE /tmp$MOUNT_ADVANCED_CONFIG diff --git a/selenium/test/basic-auth/enabled_plugins b/selenium/test/basic-auth/enabled_plugins index ea686b9f2b51..352dfc4de16a 100644 --- a/selenium/test/basic-auth/enabled_plugins +++ b/selenium/test/basic-auth/enabled_plugins @@ -1,15 +1 @@ -[accept,amqp10_client,amqp_client,base64url,cowboy,cowlib,eetcd,gun,jose, - oauth2_client,prometheus,rabbitmq_amqp1_0,rabbitmq_auth_backend_cache, - rabbitmq_auth_backend_http,rabbitmq_auth_backend_ldap, - rabbitmq_auth_backend_oauth2,rabbitmq_auth_mechanism_ssl,rabbitmq_aws, - rabbitmq_consistent_hash_exchange,rabbitmq_event_exchange, - rabbitmq_federation,rabbitmq_federation_management, - rabbitmq_jms_topic_exchange,rabbitmq_management,rabbitmq_management_agent, - rabbitmq_mqtt,rabbitmq_peer_discovery_aws,rabbitmq_peer_discovery_common, - rabbitmq_peer_discovery_consul,rabbitmq_peer_discovery_etcd, - rabbitmq_peer_discovery_k8s,rabbitmq_prometheus,rabbitmq_random_exchange, - rabbitmq_recent_history_exchange,rabbitmq_sharding,rabbitmq_shovel, - rabbitmq_shovel_management,rabbitmq_stomp,rabbitmq_stream, - rabbitmq_stream_common,rabbitmq_stream_management,rabbitmq_top, - rabbitmq_tracing,rabbitmq_trust_store,rabbitmq_web_dispatch, - rabbitmq_web_mqtt,rabbitmq_web_stomp]. +[rabbitmq_management]. From c4d06fea1f9386cb5b627495623b4f79f5a27a34 Mon Sep 17 00:00:00 2001 From: Marcial Rosales Date: Tue, 15 Apr 2025 08:23:49 +0200 Subject: [PATCH 3/5] Parse multi-line enabled_plugins Use only needed required plugins for basic auth suite (cherry picked from commit b6d2ff85b264085464b7bea2dda23f4335884960) (cherry picked from commit 3b79aa8f87376230e3bfe06b1d5fea9bd5a74ae9) --- selenium/bin/components/rabbitmq | 2 +- selenium/test/basic-auth/enabled_plugins | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/selenium/bin/components/rabbitmq b/selenium/bin/components/rabbitmq index ade6b5a0c2af..317cebec6398 100644 --- a/selenium/bin/components/rabbitmq +++ b/selenium/bin/components/rabbitmq @@ -67,7 +67,7 @@ start_local_rabbitmq() { print "> EFFECTIVE RABBITMQ_CONFIG_FILE: /tmp$MOUNT_RABBITMQ_CONF" cp ${RABBITMQ_CONFIG_DIR}/enabled_plugins /tmp/etc/rabbitmq/ - RABBITMQ_ENABLED_PLUGINS=`cat /tmp/etc/rabbitmq/enabled_plugins | awk '{printf("\"%s\" ",$0)} END { printf "\n" }' | awk -F'[][]' '{print $2}'` + RABBITMQ_ENABLED_PLUGINS=`cat /tmp/etc/rabbitmq/enabled_plugins | tr -d " \t\n\r" | awk -F'[][]' '{print $2}'` print "> EFFECTIVE PLUGINS: $RABBITMQ_ENABLED_PLUGINS" ${BIN_DIR}/gen-advanced-config ${RABBITMQ_CONFIG_DIR} $ENV_FILE /tmp$MOUNT_ADVANCED_CONFIG diff --git a/selenium/test/basic-auth/enabled_plugins b/selenium/test/basic-auth/enabled_plugins index 352dfc4de16a..0ec08b648cb9 100644 --- a/selenium/test/basic-auth/enabled_plugins +++ b/selenium/test/basic-auth/enabled_plugins @@ -1 +1,2 @@ -[rabbitmq_management]. +[rabbitmq_management,rabbitmq_stream,rabbitmq_stream_common,rabbitmq_stream_management, +rabbitmq_top,rabbitmq_tracing,rabbitmq_federation_management,rabbitmq_shovel_management]. From 2f35c81917d7381b4ad1a055b3a775cf3d351357 Mon Sep 17 00:00:00 2001 From: Marcial Rosales Date: Thu, 24 Apr 2025 13:02:35 +0200 Subject: [PATCH 4/5] Remove event exchange (cherry picked from commit 9e69496c85f9cfe78d65080a089e5d5bc508a43c) (cherry picked from commit aead47d7fa9cd86b5c4e207a12df9a3a81040789) --- selenium/test/exchanges/management.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/selenium/test/exchanges/management.js b/selenium/test/exchanges/management.js index 3e772ad24d21..e84f71f78762 100644 --- a/selenium/test/exchanges/management.js +++ b/selenium/test/exchanges/management.js @@ -32,7 +32,7 @@ describe('Exchange management', function () { }) it('display summary of exchanges', async function () { - assert.equal("All exchanges (15)", await exchanges.getPagingSectionHeaderText()) + assert.equal("All exchanges (14)", await exchanges.getPagingSectionHeaderText()) }) it('list all default exchanges', async function () { @@ -44,7 +44,7 @@ describe('Exchange management', function () { ["/", "amq.fanout", "fanout"], ["/", "amq.headers", "headers"], ["/", "amq.match", "headers"], - ["/", "amq.rabbitmq.event", "topic"], +// ["/", "amq.rabbitmq.event", "topic"], ["/", "amq.rabbitmq.trace", "topic"], ["/", "amq.topic", "topic"], From 13f3968ad210da20d9ea1670cf18ed237092db65 Mon Sep 17 00:00:00 2001 From: Marcial Rosales Date: Fri, 25 Apr 2025 16:34:09 +0200 Subject: [PATCH 5/5] Remove commented out exchange (cherry picked from commit 0b1a4d283b45eabda6a2ce416522218c6fbb1ad0) (cherry picked from commit 55a3ac5598db46d218ae41cdf386a14487a11af2) --- selenium/test/exchanges/management.js | 1 - 1 file changed, 1 deletion(-) diff --git a/selenium/test/exchanges/management.js b/selenium/test/exchanges/management.js index e84f71f78762..01e45fbb983b 100644 --- a/selenium/test/exchanges/management.js +++ b/selenium/test/exchanges/management.js @@ -44,7 +44,6 @@ describe('Exchange management', function () { ["/", "amq.fanout", "fanout"], ["/", "amq.headers", "headers"], ["/", "amq.match", "headers"], -// ["/", "amq.rabbitmq.event", "topic"], ["/", "amq.rabbitmq.trace", "topic"], ["/", "amq.topic", "topic"],