Expand relative paths passed to CLI (#188)

spinnaker · Mar 1, 2017 · 8d86543 · 8d86543
1 parent 0e68888
commit 8d86543
Show file tree

Hide file tree

Showing 9 changed files with 48 additions and 0 deletions.
diff --git a/...i/src/main/java/com/netflix/spinnaker/halyard/cli/command/v1/admin/PublishBomCommand.java b/...i/src/main/java/com/netflix/spinnaker/halyard/cli/command/v1/admin/PublishBomCommand.java
@@ -20,6 +20,7 @@
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 import com.netflix.spinnaker.halyard.cli.command.v1.NestableCommand;
+import com.netflix.spinnaker.halyard.cli.command.v1.converter.PathExpandingConverter;
 import com.netflix.spinnaker.halyard.cli.services.v1.Daemon;
 import com.netflix.spinnaker.halyard.cli.ui.v1.AnsiUi;
 import lombok.AccessLevel;
@@ -38,6 +39,7 @@ public class PublishBomCommand extends NestableCommand {
 
   @Parameter(
       names = "--bom-path",
+      converter = PathExpandingConverter.class,
       required = true,
       description = "The path to the BOM owning the artifact to publish."
   )

diff --git a/...c/main/java/com/netflix/spinnaker/halyard/cli/command/v1/admin/PublishProfileCommand.java b/...c/main/java/com/netflix/spinnaker/halyard/cli/command/v1/admin/PublishProfileCommand.java
@@ -20,6 +20,7 @@
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 import com.netflix.spinnaker.halyard.cli.command.v1.NestableCommand;
+import com.netflix.spinnaker.halyard.cli.command.v1.converter.PathExpandingConverter;
 import com.netflix.spinnaker.halyard.cli.services.v1.Daemon;
 import com.netflix.spinnaker.halyard.cli.ui.v1.AnsiUi;
 import lombok.AccessLevel;
@@ -38,13 +39,15 @@ public class PublishProfileCommand extends NestableCommand {
 
   @Parameter(
       names = "--bom-path",
+      converter = PathExpandingConverter.class,
       required = true,
       description = "The path to the BOM owning the artifact to publish."
   )
   private String bomPath;
 
   @Parameter(
       names = "--profile-path",
+      converter = PathExpandingConverter.class,
       required = true,
       description = "The path to the artifact profile to publish."
   )

diff --git a/...innaker/halyard/cli/command/v1/config/providers/appengine/AppengineAddAccountCommand.java b/...innaker/halyard/cli/command/v1/config/providers/appengine/AppengineAddAccountCommand.java
@@ -20,6 +20,7 @@
 import com.beust.jcommander.Parameters;
 import com.netflix.spinnaker.halyard.cli.command.v1.config.providers.account.AbstractAddAccountCommand;
 import com.netflix.spinnaker.halyard.cli.command.v1.config.providers.google.CommonGoogleCommandProperties;
+import com.netflix.spinnaker.halyard.cli.command.v1.converter.PathExpandingConverter;
 import com.netflix.spinnaker.halyard.config.model.v1.node.Account;
 import com.netflix.spinnaker.halyard.config.model.v1.providers.appengine.AppengineAccount;
 
@@ -38,6 +39,7 @@ protected String getProviderName() {
 
   @Parameter(
       names = "--json-path",
+      converter = PathExpandingConverter.class,
       description = CommonGoogleCommandProperties.JSON_PATH_DESCRIPTION
   )
   private String jsonPath;
@@ -70,6 +72,7 @@ protected String getProviderName() {
 
   @Parameter(
       names = "--ssh-private-key-file-path",
+      converter = PathExpandingConverter.class,
       description = AppengineCommandProperties.SSH_PRIVATE_KEY_FILE_PATH
   )
   private String sshPrivateKeyFilePath;

diff --git a/...nnaker/halyard/cli/command/v1/config/providers/appengine/AppengineEditAccountCommand.java b/...nnaker/halyard/cli/command/v1/config/providers/appengine/AppengineEditAccountCommand.java
@@ -19,6 +19,7 @@
 import com.beust.jcommander.Parameter;
 import com.netflix.spinnaker.halyard.cli.command.v1.config.providers.account.AbstractEditAccountCommand;
 import com.netflix.spinnaker.halyard.cli.command.v1.config.providers.google.CommonGoogleCommandProperties;
+import com.netflix.spinnaker.halyard.cli.command.v1.converter.PathExpandingConverter;
 import com.netflix.spinnaker.halyard.config.model.v1.node.Account;
 import com.netflix.spinnaker.halyard.config.model.v1.providers.appengine.AppengineAccount;
 
@@ -36,6 +37,7 @@ protected String getProviderName() {
 
   @Parameter(
       names = "--json-path",
+      converter = PathExpandingConverter.class,
       description = CommonGoogleCommandProperties.JSON_PATH_DESCRIPTION
   )
   private String jsonPath;
@@ -68,6 +70,7 @@ protected String getProviderName() {
 
   @Parameter(
       names = "--ssh-private-key-file-path",
+      converter = PathExpandingConverter.class,
       description = AppengineCommandProperties.SSH_PRIVATE_KEY_FILE_PATH
   )
   private String sshPrivateKeyFilePath;

diff --git a/...lyard/cli/command/v1/config/providers/dockerRegistry/DockerRegistryAddAccountCommand.java b/...lyard/cli/command/v1/config/providers/dockerRegistry/DockerRegistryAddAccountCommand.java
@@ -19,6 +19,7 @@
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 import com.netflix.spinnaker.halyard.cli.command.v1.config.providers.account.AbstractAddAccountCommand;
+import com.netflix.spinnaker.halyard.cli.command.v1.converter.PathExpandingConverter;
 import com.netflix.spinnaker.halyard.config.model.v1.node.Account;
 import com.netflix.spinnaker.halyard.config.model.v1.providers.dockerRegistry.DockerRegistryAccount;
 import java.util.ArrayList;
@@ -53,6 +54,7 @@ protected String getProviderName() {
 
   @Parameter(
       names = "--password-file",
+      converter = PathExpandingConverter.class,
       description = DockerRegistryCommandProperties.PASSWORD_FILE_DESCRIPTION
   )
   private String passwordFile;

diff --git a/...yard/cli/command/v1/config/providers/dockerRegistry/DockerRegistryEditAccountCommand.java b/...yard/cli/command/v1/config/providers/dockerRegistry/DockerRegistryEditAccountCommand.java
@@ -18,6 +18,7 @@
 
 import com.beust.jcommander.Parameter;
 import com.netflix.spinnaker.halyard.cli.command.v1.config.providers.account.AbstractEditAccountCommand;
+import com.netflix.spinnaker.halyard.cli.command.v1.converter.PathExpandingConverter;
 import com.netflix.spinnaker.halyard.config.model.v1.node.Account;
 import com.netflix.spinnaker.halyard.config.model.v1.providers.dockerRegistry.DockerRegistryAccount;
 import java.util.ArrayList;
@@ -62,6 +63,7 @@ protected String getProviderName() {
 
   @Parameter(
       names = "--password-file",
+      converter = PathExpandingConverter.class,
       description = DockerRegistryCommandProperties.PASSWORD_FILE_DESCRIPTION
   )
   private String passwordFile;

diff --git a/...lix/spinnaker/halyard/cli/command/v1/config/providers/google/GoogleAddAccountCommand.java b/...lix/spinnaker/halyard/cli/command/v1/config/providers/google/GoogleAddAccountCommand.java
@@ -19,6 +19,7 @@
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 import com.netflix.spinnaker.halyard.cli.command.v1.config.providers.account.AbstractAddAccountCommand;
+import com.netflix.spinnaker.halyard.cli.command.v1.converter.PathExpandingConverter;
 import com.netflix.spinnaker.halyard.config.model.v1.node.Account;
 import com.netflix.spinnaker.halyard.config.model.v1.providers.google.GoogleAccount;
 import java.util.ArrayList;
@@ -39,6 +40,7 @@ protected String getProviderName() {
 
   @Parameter(
       names = "--json-path",
+      converter = PathExpandingConverter.class,
       description = CommonGoogleCommandProperties.JSON_PATH_DESCRIPTION
   )
   private String jsonPath;

diff --git a/...ix/spinnaker/halyard/cli/command/v1/config/providers/google/GoogleEditAccountCommand.java b/...ix/spinnaker/halyard/cli/command/v1/config/providers/google/GoogleEditAccountCommand.java
@@ -18,6 +18,7 @@
 
 import com.beust.jcommander.Parameter;
 import com.netflix.spinnaker.halyard.cli.command.v1.config.providers.account.AbstractEditAccountCommand;
+import com.netflix.spinnaker.halyard.cli.command.v1.converter.PathExpandingConverter;
 import com.netflix.spinnaker.halyard.config.model.v1.node.Account;
 import com.netflix.spinnaker.halyard.config.model.v1.providers.google.GoogleAccount;
 import java.util.ArrayList;
@@ -37,6 +38,7 @@ protected String getProviderName() {
 
   @Parameter(
       names = "--json-path",
+      converter = PathExpandingConverter.class,
       description = CommonGoogleCommandProperties.JSON_PATH_DESCRIPTION
   )
   private String jsonPath;

diff --git a/...n/java/com/netflix/spinnaker/halyard/cli/command/v1/converter/PathExpandingConverter.java b/...n/java/com/netflix/spinnaker/halyard/cli/command/v1/converter/PathExpandingConverter.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2017 Google, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License")
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package com.netflix.spinnaker.halyard.cli.command.v1.converter;
+
+import com.beust.jcommander.IStringConverter;
+
+import java.io.File;
+
+public class PathExpandingConverter implements IStringConverter<String> {
+  @Override
+  public String convert(String value) {
+    return new File(value).getAbsolutePath();
+  }
+}