Skip to content

IGNITE-19446 Non-REPL connect command should only allow URLs #2049

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

Merged
PakhomovAlexander merged 1 commit into from
May 10, 2023
Merged

IGNITE-19446 Non-REPL connect command should only allow URLs #2049

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
18 changes: 10 additions & 8 deletions ...les/cli/src/main/java/org/apache/ignite/internal/cli/commands/connect/ConnectCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,28 +17,29 @@

package org.apache.ignite.internal.cli.commands.connect;

import static org.apache.ignite.internal.cli.commands.Options.Constants.CLUSTER_URL_KEY;
import static org.apache.ignite.internal.cli.commands.Options.Constants.NODE_URL_OR_NAME_DESC;
import static org.apache.ignite.internal.cli.commands.Options.Constants.NODE_URL_OPTION_DESC;

import jakarta.inject.Inject;
import java.net.URL;
import java.util.concurrent.Callable;
import org.apache.ignite.internal.cli.ReplManager;
import org.apache.ignite.internal.cli.call.connect.ConnectCall;
import org.apache.ignite.internal.cli.commands.BaseCommand;
import org.apache.ignite.internal.cli.commands.node.NodeNameOrUrl;
import org.apache.ignite.internal.cli.core.call.CallExecutionPipeline;
import org.apache.ignite.internal.cli.core.call.UrlCallInput;
import org.apache.ignite.internal.cli.core.converters.UrlConverter;
import picocli.CommandLine.Command;
import picocli.CommandLine.Parameters;

/**
* Connects to the Ignite 3 node.
*/
@Command(name = "connect", description = "Connects to Ignite 3 node")
public class ConnectCommand extends BaseCommand implements Runnable {
public class ConnectCommand extends BaseCommand implements Callable<Integer> {

/** Node URL option. */
@Parameters(description = NODE_URL_OR_NAME_DESC, descriptionKey = CLUSTER_URL_KEY)
private NodeNameOrUrl nodeNameOrUrl;
@Parameters(description = NODE_URL_OPTION_DESC, converter = UrlConverter.class)
private URL nodeUrl;

@Inject
private ConnectCall connectCall;
Expand All @@ -48,9 +49,9 @@ public class ConnectCommand extends BaseCommand implements Runnable {

/** {@inheritDoc} */
@Override
public void run() {
public Integer call() {
int exitCode = CallExecutionPipeline.builder(connectCall)
.inputProvider(() -> new UrlCallInput(nodeNameOrUrl.stringUrl()))
.inputProvider(() -> new UrlCallInput(nodeUrl.toString()))
.output(spec.commandLine().getOut())
.errOutput(spec.commandLine().getErr())
.verbose(verbose)
Expand All @@ -59,5 +60,6 @@ public void run() {
if (exitCode == 0) {
replManager.startReplMode();
}
return exitCode;
}
}
4 changes: 3 additions & 1 deletion ...les/cli/src/test/java/org/apache/ignite/internal/cli/commands/UrlOptionsNegativeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
import org.apache.ignite.internal.cli.commands.cluster.topology.LogicalTopologyReplCommand;
import org.apache.ignite.internal.cli.commands.cluster.topology.PhysicalTopologyCommand;
import org.apache.ignite.internal.cli.commands.cluster.topology.PhysicalTopologyReplCommand;
import org.apache.ignite.internal.cli.commands.connect.ConnectCommand;
import org.apache.ignite.internal.cli.commands.connect.ConnectReplCommand;
import org.apache.ignite.internal.cli.commands.node.NodeNameOrUrl;
import org.apache.ignite.internal.cli.commands.node.config.NodeConfigShowCommand;
Expand Down Expand Up @@ -141,7 +142,8 @@ static List<Arguments> cmdClassAndOptionsProvider() {
arguments(UnitUndeployCommand.class, CLUSTER_URL_OPTION, List.of("id", "--version=1.0.0")),
arguments(UnitStatusCommand.class, CLUSTER_URL_OPTION, List.of("id")),
arguments(UnitListCommand.class, CLUSTER_URL_OPTION, List.of()),
arguments(ClusterInitCommand.class, CLUSTER_URL_OPTION, List.of("--cluster-name=cluster", "--meta-storage-node=test"))
arguments(ClusterInitCommand.class, CLUSTER_URL_OPTION, List.of("--cluster-name=cluster", "--meta-storage-node=test")),
arguments(ConnectCommand.class, "", List.of())
// TODO https://issues.apache.org/jira/browse/IGNITE-18378
// Arguments.arguments(ClusterShowCommand.class, CLUSTER_URL_OPTION, List.of()),
);
Expand Down
2 changes: 1 addition & 1 deletion ...cli/src/test/java/org/apache/ignite/internal/cli/commands/connect/ConnectCommandTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class ConnectCommandTest extends CliCommandTestBase {

@Override
protected Class<?> getCommandClass() {
return ConnectCommand.class;
return ConnectReplCommand.class;
}

@Test
Expand Down