Skip to content

Commit 8a01260

Browse files
MirahImageMirahImage
authored
Merge pull request #15828 from rabbitmq/config-to-conf
Convert test configuration from Erlang terms to sysctl format
2 parents 8c0b135 + aa2539b commit 8a01260

File tree

1 file changed

+61
-97
lines changed

1 file changed

+61
-97
lines changed

‎deps/rabbit_common/mk/rabbitmq-run.mk‎

Lines changed: 61 additions & 97 deletions
Original file line numberDiff line numberDiff line change
@@ -167,91 +167,42 @@ endif
167167
# --------------------------------------------------------------------
168168

169169
define test_rabbitmq_config
170-
%% vim:ft=erlang:
171-
172-
[
173-
{rabbit, [
174-
$(if $(RABBITMQ_NODE_PORT), {tcp_listeners$(comma) [$(RABBITMQ_NODE_PORT)]}$(comma),)
175-
{loopback_users, []},
176-
{cluster_name, "localhost"}
177-
]},
178-
{rabbitmq_management, [
179-
$(if $(RABBITMQ_NODE_PORT), {listener$(comma) [{port$(comma) $(shell echo "$$(($(RABBITMQ_NODE_PORT) + 10000))")}]},)
180-
]},
181-
{rabbitmq_web_amqp, [
182-
$(if $(RABBITMQ_NODE_PORT), {tcp_config$(comma) [{port$(comma) $(shell echo "$$((15678 + $(RABBITMQ_NODE_PORT) - 5672))")}]},)
183-
]},
184-
{rabbitmq_mqtt, [
185-
$(if $(RABBITMQ_NODE_PORT), {tcp_listeners$(comma) [$(shell echo "$$((1883 + $(RABBITMQ_NODE_PORT) - 5672))")]},)
186-
]},
187-
{rabbitmq_web_mqtt, [
188-
$(if $(RABBITMQ_NODE_PORT), {tcp_config$(comma) [{port$(comma) $(shell echo "$$((15675 + $(RABBITMQ_NODE_PORT) - 5672))")}]},)
189-
]},
190-
{rabbitmq_web_mqtt_examples, [
191-
$(if $(RABBITMQ_NODE_PORT), {listener$(comma) [{port$(comma) $(shell echo "$$((15670 + $(RABBITMQ_NODE_PORT) - 5672))")}]},)
192-
]},
193-
{rabbitmq_stomp, [
194-
$(if $(RABBITMQ_NODE_PORT), {tcp_listeners$(comma) [$(shell echo "$$((61613 + $(RABBITMQ_NODE_PORT) - 5672))")]},)
195-
]},
196-
{rabbitmq_web_stomp, [
197-
$(if $(RABBITMQ_NODE_PORT), {tcp_config$(comma) [{port$(comma) $(shell echo "$$((15674 + $(RABBITMQ_NODE_PORT) - 5672))")}]},)
198-
]},
199-
{rabbitmq_web_stomp_examples, [
200-
$(if $(RABBITMQ_NODE_PORT), {listener$(comma) [{port$(comma) $(shell echo "$$((15670 + $(RABBITMQ_NODE_PORT) - 5672))")}]},)
201-
]},
202-
{rabbitmq_stream, [
203-
$(if $(RABBITMQ_NODE_PORT), {tcp_listeners$(comma) [$(shell echo "$$((5552 + $(RABBITMQ_NODE_PORT) - 5672))")]},)
204-
]},
205-
{rabbitmq_prometheus, [
206-
$(if $(RABBITMQ_NODE_PORT), {tcp_config$(comma) [{port$(comma) $(shell echo "$$((15692 + $(RABBITMQ_NODE_PORT) - 5672))")}]},)
207-
]},
208-
{ra, [
209-
{data_dir, "$(RABBITMQ_QUORUM_DIR)"}
210-
]},
211-
{osiris, [
212-
{data_dir, "$(RABBITMQ_STREAM_DIR)"}
213-
]}
214-
].
170+
$(if $(RABBITMQ_NODE_PORT),listeners.tcp.default = $(RABBITMQ_NODE_PORT))
171+
loopback_users = none
172+
cluster_name = localhost
173+
$(if $(RABBITMQ_NODE_PORT),management.tcp.port = $(shell echo "$$(($(RABBITMQ_NODE_PORT) + 10000))"))
174+
$(if $(RABBITMQ_NODE_PORT),mqtt.listeners.tcp.default = $(shell echo "$$((1883 + $(RABBITMQ_NODE_PORT) - 5672))"))
175+
$(if $(RABBITMQ_NODE_PORT),web_mqtt.tcp.port = $(shell echo "$$((15675 + $(RABBITMQ_NODE_PORT) - 5672))"))
176+
$(if $(RABBITMQ_NODE_PORT),stomp.listeners.tcp.default = $(shell echo "$$((61613 + $(RABBITMQ_NODE_PORT) - 5672))"))
177+
$(if $(RABBITMQ_NODE_PORT),web_stomp.tcp.port = $(shell echo "$$((15674 + $(RABBITMQ_NODE_PORT) - 5672))"))
178+
$(if $(RABBITMQ_NODE_PORT),stream.listeners.tcp.default = $(shell echo "$$((5552 + $(RABBITMQ_NODE_PORT) - 5672))"))
179+
$(if $(RABBITMQ_NODE_PORT),prometheus.tcp.port = $(shell echo "$$((15692 + $(RABBITMQ_NODE_PORT) - 5672))"))
180+
raft.data_dir = $(RABBITMQ_QUORUM_DIR)
181+
stream.data_dir = $(RABBITMQ_STREAM_DIR)
215182
endef
216183

217184
define test_rabbitmq_config_with_tls
218-
%% vim:ft=erlang:
219-
220-
[
221-
{rabbit, [
222-
{loopback_users, []},
223-
{ssl_listeners, [5671]},
224-
{ssl_options, [
225-
{cacertfile, "$(TEST_TLS_CERTS_DIR_in_config)/testca/cacert.pem"},
226-
{certfile, "$(TEST_TLS_CERTS_DIR_in_config)/server/cert.pem"},
227-
{keyfile, "$(TEST_TLS_CERTS_DIR_in_config)/server/key.pem"},
228-
{verify, verify_peer},
229-
{fail_if_no_peer_cert, false},
230-
{honor_cipher_order, true}]}
231-
]},
232-
{rabbitmq_management, [
233-
{listener, [
234-
{port, 15671},
235-
{ssl, true},
236-
{ssl_opts, [
237-
{cacertfile, "$(TEST_TLS_CERTS_DIR_in_config)/testca/cacert.pem"},
238-
{certfile, "$(TEST_TLS_CERTS_DIR_in_config)/server/cert.pem"},
239-
{keyfile, "$(TEST_TLS_CERTS_DIR_in_config)/server/key.pem"},
240-
{verify, verify_peer},
241-
{fail_if_no_peer_cert, false},
242-
{honor_cipher_order, true}]}
243-
]}
244-
]},
245-
{ra, [
246-
{data_dir, "$(RABBITMQ_QUORUM_DIR)"}
247-
]},
248-
{osiris, [
249-
{data_dir, "$(RABBITMQ_STREAM_DIR)"}
250-
]}
251-
].
185+
loopback_users = none
186+
listeners.ssl.default = 5671
187+
ssl_options.cacertfile = $(TEST_TLS_CERTS_DIR_in_config)/testca/cacert.pem
188+
ssl_options.certfile = $(TEST_TLS_CERTS_DIR_in_config)/server/cert.pem
189+
ssl_options.keyfile = $(TEST_TLS_CERTS_DIR_in_config)/server/key.pem
190+
ssl_options.verify = verify_peer
191+
ssl_options.fail_if_no_peer_cert = false
192+
ssl_options.honor_cipher_order = true
193+
management.listener.port = 15671
194+
management.listener.ssl = true
195+
management.listener.ssl_opts.cacertfile = $(TEST_TLS_CERTS_DIR_in_config)/testca/cacert.pem
196+
management.listener.ssl_opts.certfile = $(TEST_TLS_CERTS_DIR_in_config)/server/cert.pem
197+
management.listener.ssl_opts.keyfile = $(TEST_TLS_CERTS_DIR_in_config)/server/key.pem
198+
management.listener.ssl_opts.verify = verify_peer
199+
management.listener.ssl_opts.fail_if_no_peer_cert = false
200+
management.listener.ssl_opts.honor_cipher_order = true
201+
raft.data_dir = $(RABBITMQ_QUORUM_DIR)
202+
stream.data_dir = $(RABBITMQ_STREAM_DIR)
252203
endef
253204

254-
TEST_CONFIG_FILE ?= $(TEST_TMPDIR)/test.config
205+
TEST_CONFIG_FILE ?= $(TEST_TMPDIR)/test.conf
255206
TEST_TLS_CERTS_DIR := $(TEST_TMPDIR)/tls-certs
256207
ifeq ($(origin TEST_TLS_CERTS_DIR_in_config),undefined)
257208
ifeq ($(PLATFORM),msys2)
@@ -404,22 +355,28 @@ start-brokers start-cluster: $(DIST_TARGET)
404355
fi; \
405356
for n in $$(seq $(NODES)); do \
406357
nodename="rabbit-$$n@$(HOSTNAME)"; \
358+
nodedir="$(TEST_TMPDIR)/$$nodename"; \
359+
mkdir -p "$$nodedir"; \
360+
printf '%s\n' \
361+
"loopback_users = none" \
362+
"cluster_name = localhost" \
363+
"listeners.tcp.default = $$((5672 + $$n - 1))" \
364+
"management.tcp.port = $$((15672 + $$n - 1))" \
365+
"mqtt.listeners.tcp.default = $$((1883 + $$n - 1))" \
366+
"web_mqtt.tcp.port = $$((1893 + $$n - 1))" \
367+
"stomp.listeners.tcp.default = $$((61613 + $$n - 1))" \
368+
"web_stomp.tcp.port = $$((61623 + $$n - 1))" \
369+
"prometheus.tcp.port = $$((15692 + $$n - 1))" \
370+
"stream.listeners.tcp.default = $$((5552 + $$n - 1))" \
371+
> "$$nodedir/rabbitmq.conf"; \
407372
$(MAKE) start-background-broker \
408373
NOBUILD=1 \
409374
RABBITMQ_NODENAME="$$nodename" \
410375
RABBITMQ_NODE_PORT="$$((5672 + $$n - 1))" \
376+
RABBITMQ_CONFIG_FILE="$$nodedir/rabbitmq" \
411377
RABBITMQ_SERVER_START_ARGS=" \
412-
-rabbit loopback_users [] \
413-
-rabbit cluster_name localhost \
414-
-rabbitmq_management listener [{port,$$((15672 + $$n - 1))}] \
415-
-rabbitmq_mqtt tcp_listeners [$$((1883 + $$n - 1))] \
416-
-rabbitmq_web_mqtt tcp_config [{port,$$((1893 + $$n - 1))}] \
417378
-rabbitmq_web_mqtt_examples listener [{port,$$((1903 + $$n - 1))}] \
418-
-rabbitmq_stomp tcp_listeners [$$((61613 + $$n - 1))] \
419-
-rabbitmq_web_stomp tcp_config [{port,$$((61623 + $$n - 1))}] \
420379
-rabbitmq_web_stomp_examples listener [{port,$$((61633 + $$n - 1))}] \
421-
-rabbitmq_prometheus tcp_config [{port,$$((15692 + $$n - 1))}] \
422-
-rabbitmq_stream tcp_listeners [$$((5552 + $$n - 1))] \
423380
$$cluster_nodes_arg \
424381
" & \
425382
done; \
@@ -445,21 +402,28 @@ restart-cluster:
445402
RABBITMQ_NODENAME="$$nodename"; \
446403
echo "Sleeping for $(RESTART_DELAY) seconds..."; \
447404
sleep $(RESTART_DELAY); \
405+
nodedir="$(TEST_TMPDIR)/$$nodename"; \
406+
mkdir -p "$$nodedir"; \
407+
printf '%s\n' \
408+
"loopback_users = none" \
409+
"cluster_name = localhost" \
410+
"listeners.tcp.default = $$((5672 + $$n - 1))" \
411+
"management.tcp.port = $$((15672 + $$n - 1))" \
412+
"mqtt.listeners.tcp.default = $$((1883 + $$n - 1))" \
413+
"web_mqtt.tcp.port = $$((1893 + $$n - 1))" \
414+
"stomp.listeners.tcp.default = $$((61613 + $$n - 1))" \
415+
"web_stomp.tcp.port = $$((61623 + $$n - 1))" \
416+
"prometheus.tcp.port = $$((15692 + $$n - 1))" \
417+
"stream.listeners.tcp.default = $$((5552 + $$n - 1))" \
418+
> "$$nodedir/rabbitmq.conf"; \
448419
$(MAKE) start-background-broker \
449420
NOBUILD=1 \
450421
RABBITMQ_NODENAME="$$nodename" \
451422
RABBITMQ_NODE_PORT="$$((5672 + $$n - 1))" \
423+
RABBITMQ_CONFIG_FILE="$$nodedir/rabbitmq" \
452424
RABBITMQ_SERVER_START_ARGS=" \
453-
-rabbit loopback_users [] \
454-
-rabbitmq_management listener [{port,$$((15672 + $$n - 1))}] \
455-
-rabbitmq_mqtt tcp_listeners [$$((1883 + $$n - 1))] \
456-
-rabbitmq_web_mqtt tcp_config [{port,$$((1893 + $$n - 1))}] \
457425
-rabbitmq_web_mqtt_examples listener [{port,$$((1903 + $$n - 1))}] \
458-
-rabbitmq_stomp tcp_listeners [$$((61613 + $$n - 1))] \
459-
-rabbitmq_web_stomp tcp_config [{port,$$((61623 + $$n - 1))}] \
460426
-rabbitmq_web_stomp_examples listener [{port,$$((61633 + $$n - 1))}] \
461-
-rabbitmq_prometheus tcp_config [{port,$$((15692 + $$n - 1))}] \
462-
-rabbitmq_stream tcp_listeners [$$((5552 + $$n - 1))] \
463427
"; \
464428
$(RABBITMQCTL) -n "$$nodename" await_online_nodes $(NODES) || exit 1; \
465429
done; \

0 commit comments

Comments
 (0)