Skip to content

Commit

Permalink
chore: remove the hostname question in the task setup (#1451)
Browse files Browse the repository at this point in the history
### Motivation
The question leads to setting the hostname in all tasks created using
the setup even if the task could just use the hostname of the node.

### Modification
Removed the hostname question. Most users do not need it at all, so
there is no real loss here.

### Result
The hostname can be set explicitly using a command but not in setup
anymore
  • Loading branch information
0utplay authored Jul 14, 2024
1 parent 1ab0a72 commit d1b4f62
Showing 1 changed file with 0 additions and 23 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -25,38 +25,30 @@
import eu.cloudnetservice.driver.service.ServiceEnvironmentType;
import eu.cloudnetservice.driver.service.ServiceTask;
import eu.cloudnetservice.driver.service.ServiceTemplate;
import eu.cloudnetservice.node.config.Configuration;
import eu.cloudnetservice.node.console.animation.setup.ConsoleSetupAnimation;
import eu.cloudnetservice.node.console.animation.setup.answer.Parsers;
import eu.cloudnetservice.node.console.animation.setup.answer.QuestionAnswerType;
import eu.cloudnetservice.node.console.animation.setup.answer.QuestionListEntry;
import eu.cloudnetservice.node.template.TemplateStorageUtil;
import eu.cloudnetservice.node.util.NetworkUtil;
import eu.cloudnetservice.node.version.ServiceVersion;
import eu.cloudnetservice.node.version.ServiceVersionProvider;
import eu.cloudnetservice.node.version.ServiceVersionType;
import eu.cloudnetservice.node.version.information.TemplateVersionInstaller;
import jakarta.inject.Inject;
import java.util.Set;
import java.util.stream.Collectors;
import lombok.NonNull;

public class SpecificTaskSetup extends DefaultTaskSetup implements DefaultSetup {

private final Configuration nodeConfig;

@Inject
public SpecificTaskSetup(
@NonNull Parsers parsers,
@NonNull Configuration nodeConfig,
@NonNull TemplateStorageUtil storageUtil,
@NonNull ServiceTaskProvider taskProvider,
@NonNull GroupConfigurationProvider groupProvider,
@NonNull ServiceVersionProvider serviceVersionProvider
) {
super(parsers, storageUtil, taskProvider, groupProvider, serviceVersionProvider);

this.nodeConfig = nodeConfig;
}

@Override
Expand Down Expand Up @@ -113,19 +105,6 @@ public void applyQuestions(@NonNull ConsoleSetupAnimation animation) {
.possibleResults("[0, 65535]")
.recommendation(44955))
.build(),
QuestionListEntry.<String>builder()
.key("taskHostAddress")
.translatedQuestion("command-tasks-setup-question-host-address")
.answerType(QuestionAnswerType.<String>builder()
.recommendation(this.nodeConfig.hostAddress())
.parser(this.parsers.assignableHostAndPortOrAlias())
.possibleResults(() -> NetworkUtil.availableIPAddresses()
.stream()
.collect(Collectors.collectingAndThen(Collectors.toSet(), ips -> {
ips.addAll(this.nodeConfig.ipAliases().keySet());
return ips;
}))))
.build(),
QuestionListEntry.<Tuple2<String, JavaVersion>>builder()
.key("taskJavaCommand")
.translatedQuestion("command-tasks-setup-question-javacommand")
Expand Down Expand Up @@ -160,7 +139,6 @@ public void handleResults(@NonNull ConsoleSetupAnimation animation) {
Tuple2<ServiceVersionType, ServiceVersion> version = animation.result("taskServiceVersion");
Tuple2<String, ?> javaVersion = animation.result("taskJavaCommand");
var defaultTemplate = ServiceTemplate.builder().prefix(name).name("default").build();
String hostAddress = animation.result("taskHostAddress");

var task = ServiceTask.builder()
.name(name)
Expand All @@ -171,7 +149,6 @@ public void handleResults(@NonNull ConsoleSetupAnimation animation) {
.minServiceCount(animation.result("taskMinServices"))
.serviceEnvironmentType(environment)
.startPort(animation.result("taskStartPort"))
.hostAddress(hostAddress)
.javaCommand(javaVersion.first())
.templates(Set.of(defaultTemplate))
.nameSplitter(animation.result("taskNameSplitter"))
Expand Down

0 comments on commit d1b4f62

Please sign in to comment.