Merge pull request #51 from lwander/validate-help

Correct help-text behavior
spinnaker · Dec 22, 2016 · a523cf5 · a523cf5
2 parents 17ff603 + be8b7cd
commit a523cf5
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 2 deletions.
diff --git a/halyard-cli/src/main/java/com/netflix/spinnaker/halyard/cli/command/v1/NestableCommand.java b/halyard-cli/src/main/java/com/netflix/spinnaker/halyard/cli/command/v1/NestableCommand.java
@@ -41,7 +41,7 @@ public abstract class NestableCommand {
   @Getter(AccessLevel.PROTECTED)
   private JCommander commander;
 
-  @Parameter(names = { "-h", "--help" }, description = "Display help text about this command.")
+  @Parameter(names = { "-h", "--help" }, help = true, description = "Display help text about this command.")
   public boolean help;
 
   @Parameter(names = {"-d", "--debug"}, description = "Show detailed network traffic with halyard daemon.")

diff --git a/...ava/com/netflix/spinnaker/halyard/cli/command/v1/providers/AbstractAddAccountCommand.java b/...ava/com/netflix/spinnaker/halyard/cli/command/v1/providers/AbstractAddAccountCommand.java
@@ -20,7 +20,6 @@
 import com.beust.jcommander.Parameters;
 import com.netflix.spinnaker.halyard.cli.command.v1.NestableCommand;
 import com.netflix.spinnaker.halyard.cli.services.v1.Daemon;
-import com.netflix.spinnaker.halyard.cli.ui.v1.AnsiParagraphBuilder;
 import com.netflix.spinnaker.halyard.cli.ui.v1.AnsiUi;
 import com.netflix.spinnaker.halyard.config.model.v1.node.Account;
 import java.util.HashMap;
@@ -38,6 +37,7 @@ public abstract class AbstractAddAccountCommand extends AbstractProviderCommand
 
   @Parameter(
       names = "--account-name",
+      required = true,
       description = "The name of the account to create."
   )
   private String accountName;

diff --git a/...ix/spinnaker/halyard/cli/command/v1/providers/dockerRegistry/DockerAddAccountCommand.java b/...ix/spinnaker/halyard/cli/command/v1/providers/dockerRegistry/DockerAddAccountCommand.java
@@ -32,6 +32,7 @@ protected String getProviderName() {
 
   @Parameter(
       names = "--address",
+      required = true,
       description = "The registry address you want to pull and deploy images from. For example:\n\n"
           + "  index.docker.io     - DockerHub\n"
           + "  quay.io             - Quay\n"

diff --git a/...om/netflix/spinnaker/halyard/cli/command/v1/providers/google/GoogleAddAccountCommand.java b/...om/netflix/spinnaker/halyard/cli/command/v1/providers/google/GoogleAddAccountCommand.java
@@ -32,6 +32,7 @@ protected String getProviderName() {
 
   @Parameter(
       names = "--project",
+      required = true,
       description = "The Google Cloud Platform project this Spinnaker account will manage."
   )
   private String project;

diff --git a/...ix/spinnaker/halyard/cli/command/v1/providers/kubernetes/KubernetesAddAccountCommand.java b/...ix/spinnaker/halyard/cli/command/v1/providers/kubernetes/KubernetesAddAccountCommand.java
@@ -48,6 +48,7 @@ protected String getProviderName() {
 
   @Parameter(
       names = "--docker-registries",
+      required = true,
       variableArity = true,
       description = "A list of the Spinnaker docker registry account names this Spinnaker account can use as image sources. "
           + "These docker registry accounts must be registered in your halconfig before you can add them here."