Skip to content

ARTEMIS-6037 fix CLI defaults #6436

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jbertram wants to merge 1 commit into from
Closed

ARTEMIS-6037 fix CLI defaults #6436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand All @@ -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());
Copy link
Copy Markdown
Contributor

@clebertsuconic clebertsuconic May 12, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would remove the default argument on inputPassword, and throw an exception if not passed, and while in silent..

I have a branch with this suggestion:

https://github.com/clebertsuconic/artemis/tree/ARTEMIS-6037

Copy link
Copy Markdown
Contributor Author

@jbertram jbertram May 12, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I actually already implemented that on my branch for ARTEMIS-6055. I'll close this PR and handle this as part of the general case for all passwords.

}
if (!PasswordMaskingUtil.isEncMasked(clusterPassword)) {
try {
Expand Down
2 changes: 1 addition & 1 deletion .../apache/activemq/artemis/tests/smoke/brokerConnection/MirrorInfiniteRetryReplicaTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions ...moke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/checkTest/CheckTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...g/apache/activemq/artemis/tests/soak/brokerConnection/mirror/ClusteredMirrorSoakTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions ...he/activemq/artemis/tests/soak/brokerConnection/mirror/ReplicatedBothNodesMirrorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion ...artemis/tests/soak/clusterNotificationsContinuity/ClusterNotificationsContinuityTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down