[NO-ISSUE] update federation security test config with federation pre…

…fix in 2.37.0
rh-messaging · Sep 23, 2024 · c1d96e1 · c1d96e1
1 parent 1657f19
commit c1d96e1
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 21 deletions.
diff --git a/controllers/activemqartemis_pub_sub_scale_test.go b/controllers/activemqartemis_pub_sub_scale_test.go
@@ -163,16 +163,11 @@ var _ = Describe("pub sub scale", func() {
 					"securityRoles.COMMANDS.control-plane.consume=true",
 					"securityRoles.COMMANDS.control-plane.send=true",
 
-					"securityRoles.$ACTIVEMQ_ARTEMIS_FEDERATION.control-plane.createNonDurableQueue=true",
-					"securityRoles.$ACTIVEMQ_ARTEMIS_FEDERATION.control-plane.consume=true",
-					"securityRoles.$ACTIVEMQ_ARTEMIS_FEDERATION.control-plane.send=true",
-
-					// federation uses a dynamic event address that needs a prefix as it has a uuid at the end
-					// to cover that permission, we need the wildcard permisison set for control-plane
-					"securityRoles.#.control-plane.createNonDurableQueue=true",
-					"securityRoles.#.control-plane.createAddress=true",
-					"securityRoles.#.control-plane.consume=true",
-					"securityRoles.#.control-plane.send=true",
+					"# federation internal links etc use the ACTIVEMQ_ARTEMIS_FEDERATION prefix",
+					"securityRoles.\"$ACTIVEMQ_ARTEMIS_FEDERATION.#\".control-plane.createNonDurableQueue=true",
+					"securityRoles.\"$ACTIVEMQ_ARTEMIS_FEDERATION.#\".control-plane.createAddress=true",
+					"securityRoles.\"$ACTIVEMQ_ARTEMIS_FEDERATION.#\".control-plane.consume=true",
+					"securityRoles.\"$ACTIVEMQ_ARTEMIS_FEDERATION.#\".control-plane.send=true",
 
 					// with properties update - can have this static with dns
 					"# federate the address, publish on N goes to [0..N]",

diff --git a/controllers/activemqartemis_work_queue_test.go b/controllers/activemqartemis_work_queue_test.go
@@ -159,16 +159,11 @@ var _ = Describe("work queue", func() {
 					"securityRoles.JOBS.control-plane.consume=true",
 					"securityRoles.JOBS.control-plane.send=true",
 
-					"securityRoles.$ACTIVEMQ_ARTEMIS_FEDERATION.control-plane.createNonDurableQueue=true",
-					"securityRoles.$ACTIVEMQ_ARTEMIS_FEDERATION.control-plane.consume=true",
-					"securityRoles.$ACTIVEMQ_ARTEMIS_FEDERATION.control-plane.send=true",
-
-					// federation uses a dynamic event address that needs a prefix as it has a uuid at the end
-					// to cover that permission, we need the wildcard permisison set for control-plane
-					"securityRoles.#.control-plane.createNonDurableQueue=true",
-					"securityRoles.#.control-plane.createAddress=true",
-					"securityRoles.#.control-plane.consume=true",
-					"securityRoles.#.control-plane.send=true",
+					"# federation internal links etc use the ACTIVEMQ_ARTEMIS_FEDERATION prefix",
+					"securityRoles.\"$ACTIVEMQ_ARTEMIS_FEDERATION.#\".control-plane.createNonDurableQueue=true",
+					"securityRoles.\"$ACTIVEMQ_ARTEMIS_FEDERATION.#\".control-plane.createAddress=true",
+					"securityRoles.\"$ACTIVEMQ_ARTEMIS_FEDERATION.#\".control-plane.consume=true",
+					"securityRoles.\"$ACTIVEMQ_ARTEMIS_FEDERATION.#\".control-plane.send=true",
 
 					"# federate the queue in both directions",
 					"broker-0.AMQPConnections.target.uri=tcp://${CR_NAME}-ss-1.${CR_NAME}-hdls-svc:61616",
@@ -181,8 +176,10 @@ var _ = Describe("work queue", func() {
 					"AMQPConnections.target.password=passwd",
 					"AMQPConnections.target.autostart=true",
 
-					"# in pull mode",
+					"# in pull mode, batch=100",
 					"AMQPConnections.target.federations.peerN.properties.amqpCredit=0",
+					"AMQPConnections.target.federations.peerN.properties.amqpPullConsumerCredits=100",
+
 					"AMQPConnections.target.federations.peerN.localQueuePolicies.forJobs.includes.justJobs.queueMatch=JOBS",
 
 					// brokerCrd.Spec.DeploymentPlan.EnableMetricsPlugin