From c29df0a725dd28cc58d2baf385b3cf002ad175bf Mon Sep 17 00:00:00 2001 From: Justin Bertram Date: Tue, 5 May 2026 21:34:43 -0500 Subject: [PATCH] ARTEMIS-6037 fix CLI defaults --- .../java/org/apache/activemq/artemis/cli/commands/Create.java | 4 ++-- .../brokerConnection/MirrorInfiniteRetryReplicaTest.java | 2 +- .../activemq/artemis/tests/smoke/checkTest/CheckTest.java | 4 ++-- .../soak/brokerConnection/mirror/ClusteredMirrorSoakTest.java | 2 +- .../mirror/ReplicatedBothNodesMirrorTest.java | 4 ++-- .../ClusterNotificationsContinuityTest.java | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java index 1dc72c3b193..01868137b9d 100644 --- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java +++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java @@ -440,7 +440,7 @@ public Create setAutoDelete(boolean autoDelete) { private String getClusterUser() { if (clusterUser == null) { - clusterUser = input("--cluster-user", "What is the cluster user?", "cluster-admin"); + clusterUser = input("--cluster-user", "What is the cluster user?", ActiveMQDefaultConfiguration.getDefaultClusterUser()); } return clusterUser; } @@ -451,7 +451,7 @@ protected void setClusterPassword(String clusterPassword) { protected String getClusterPassword() { if (clusterPassword == null) { - clusterPassword = inputPassword("--cluster-password", "What is the cluster password?", "password-admin"); + clusterPassword = inputPassword("--cluster-password", "What is the cluster password?", ActiveMQDefaultConfiguration.getDefaultClusterPassword()); } if (!PasswordMaskingUtil.isEncMasked(clusterPassword)) { try { diff --git a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/brokerConnection/MirrorInfiniteRetryReplicaTest.java b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/brokerConnection/MirrorInfiniteRetryReplicaTest.java index fd3a3b8558a..8f23fca8ddd 100644 --- a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/brokerConnection/MirrorInfiniteRetryReplicaTest.java +++ b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/brokerConnection/MirrorInfiniteRetryReplicaTest.java @@ -178,7 +178,7 @@ private static void createMirroredBackupServer(String serverName, HelperCreate cliCreateServer = helperCreate(); cliCreateServer.setAllowAnonymous(true).setArtemisInstance(serverLocation); cliCreateServer.setMessageLoadBalancing("ON_DEMAND"); - cliCreateServer.setArgs("--no-stomp-acceptor", "--no-hornetq-acceptor", "--no-mqtt-acceptor", "--no-amqp-acceptor", "--max-hops", "1", "--name", DC1_NODE); + cliCreateServer.setArgs("--no-stomp-acceptor", "--no-hornetq-acceptor", "--no-mqtt-acceptor", "--no-amqp-acceptor", "--max-hops", "1", "--name", DC1_NODE, "--cluster-user", "my-cluster-user", "--cluster-password", "my-cluster-password"); cliCreateServer.setPortOffset(portOffset); cliCreateServer.setClustered(true); cliCreateServer.setReplicated(true); diff --git a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/checkTest/CheckTest.java b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/checkTest/CheckTest.java index ed81e4f16fc..2a11e5a3f64 100644 --- a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/checkTest/CheckTest.java +++ b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/checkTest/CheckTest.java @@ -73,13 +73,13 @@ public static void createServers() throws Exception { { HelperCreate cliCreateServer = helperCreate(); - cliCreateServer.setSharedStore(true).setBackup(false).setSharedStore(true).setDataFolder("./target/check-test/data").setFailoverOnShutdown(true).setStaticCluster("tcp://localhost:61716").setArtemisInstance(server0Location); + cliCreateServer.setSharedStore(true).setBackup(false).setSharedStore(true).setDataFolder("./target/check-test/data").setFailoverOnShutdown(true).setStaticCluster("tcp://localhost:61716").setArtemisInstance(server0Location).setArgs("--cluster-user", "my-cluster-user", "--cluster-password", "my-cluster-password"); cliCreateServer.createServer(); } { HelperCreate cliCreateServer = helperCreate(); - cliCreateServer.setSharedStore(true).setBackup(true).setSharedStore(true).setDataFolder("./target/check-test/data").setFailoverOnShutdown(true).setStaticCluster("tcp://localhost:61616").setPortOffset(100).setArtemisInstance(server1Location); + cliCreateServer.setSharedStore(true).setBackup(true).setSharedStore(true).setDataFolder("./target/check-test/data").setFailoverOnShutdown(true).setStaticCluster("tcp://localhost:61616").setPortOffset(100).setArtemisInstance(server1Location).setArgs("--cluster-user", "my-cluster-user", "--cluster-password", "my-cluster-password"); cliCreateServer.createServer(); } } diff --git a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/ClusteredMirrorSoakTest.java b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/ClusteredMirrorSoakTest.java index a16acbf3284..3cdaef8b311 100644 --- a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/ClusteredMirrorSoakTest.java +++ b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/ClusteredMirrorSoakTest.java @@ -104,7 +104,7 @@ private static void createServer(String serverName, String connectionName, Strin cliCreateServer.setClustered(true); cliCreateServer.setNoWeb(true); cliCreateServer.setStaticCluster(clusterURI); - cliCreateServer.setArgs("--no-stomp-acceptor", "--no-hornetq-acceptor", "--no-mqtt-acceptor", "--no-amqp-acceptor", "--max-hops", "1", "--name", DC1_NODE_A); + cliCreateServer.setArgs("--no-stomp-acceptor", "--no-hornetq-acceptor", "--no-mqtt-acceptor", "--no-amqp-acceptor", "--max-hops", "1", "--name", DC1_NODE_A, "--cluster-user", "my-cluster-user", "--cluster-password", "my-cluster-password"); cliCreateServer.addArgs("--addresses", "order"); cliCreateServer.addArgs("--queues", "myQueue"); cliCreateServer.setPortOffset(portOffset); diff --git a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/ReplicatedBothNodesMirrorTest.java b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/ReplicatedBothNodesMirrorTest.java index 949f84340da..20c653a9f75 100644 --- a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/ReplicatedBothNodesMirrorTest.java +++ b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/ReplicatedBothNodesMirrorTest.java @@ -165,7 +165,7 @@ private static void createMirroredServer(boolean paging, String serverName, HelperCreate cliCreateServer = helperCreate(); cliCreateServer.setAllowAnonymous(true).setArtemisInstance(serverLocation); - cliCreateServer.setArgs("--no-stomp-acceptor", "--no-hornetq-acceptor", "--no-mqtt-acceptor", "--no-amqp-acceptor", "--max-hops", "1", "--name", DC1_NODE); + cliCreateServer.setArgs("--no-stomp-acceptor", "--no-hornetq-acceptor", "--no-mqtt-acceptor", "--no-amqp-acceptor", "--max-hops", "1", "--name", DC1_NODE, "--cluster-user", "my-cluster-user", "--cluster-password", "my-cluster-password"); cliCreateServer.addArgs("--queues", QUEUE_NAME); cliCreateServer.setPortOffset(portOffset); if (replicated) { @@ -234,7 +234,7 @@ private static void createMirroredBackupServer(boolean paging, String serverName HelperCreate cliCreateServer = helperCreate(); cliCreateServer.setAllowAnonymous(true).setArtemisInstance(serverLocation); cliCreateServer.setMessageLoadBalancing("ON_DEMAND"); - cliCreateServer.setArgs("--no-stomp-acceptor", "--no-hornetq-acceptor", "--no-mqtt-acceptor", "--no-amqp-acceptor", "--max-hops", "1", "--name", DC1_NODE); + cliCreateServer.setArgs("--no-stomp-acceptor", "--no-hornetq-acceptor", "--no-mqtt-acceptor", "--no-amqp-acceptor", "--max-hops", "1", "--name", DC1_NODE, "--cluster-user", "my-cluster-user", "--cluster-password", "my-cluster-password"); cliCreateServer.setPortOffset(portOffset); cliCreateServer.setClustered(true); cliCreateServer.setReplicated(true); diff --git a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/clusterNotificationsContinuity/ClusterNotificationsContinuityTest.java b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/clusterNotificationsContinuity/ClusterNotificationsContinuityTest.java index f3afa9e59c8..8e35b56e90b 100644 --- a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/clusterNotificationsContinuity/ClusterNotificationsContinuityTest.java +++ b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/clusterNotificationsContinuity/ClusterNotificationsContinuityTest.java @@ -114,7 +114,7 @@ public static void createServers() throws Exception { cliCreateServer.setMessageLoadBalancing("OFF_WITH_REDISTRIBUTION"); cliCreateServer.setStaticCluster(staticClusterURI); - cliCreateServer.setArgs("--no-stomp-acceptor", "--no-hornetq-acceptor", "--no-mqtt-acceptor", "--no-amqp-acceptor", "--max-hops", "1"); + cliCreateServer.setArgs("--no-stomp-acceptor", "--no-hornetq-acceptor", "--no-mqtt-acceptor", "--no-amqp-acceptor", "--max-hops", "1", "--cluster-user", "my-cluster-user", "--cluster-password", "my-cluster-password"); cliCreateServer.createServer();