feat(cli): Print artifact-specific version (#349)

spinnaker · Apr 13, 2017 · 7dca740 · 7dca740
1 parent 1c57084
commit 7dca740
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 9 deletions.
diff --git a/docs/commands.md b/docs/commands.md
@@ -2412,6 +2412,7 @@ hal version bom VERSION [parameters]
 ```
 #### Parameters
 `VERSION`: The version whose Bill of Materials (BOM) to lookup.
+ * `--artifact-name`: When supplied, print the version of this artifact only.
  * `--no-validate`: (*Default*: `false`) Skip validation.
 
 ---

diff --git a/...rc/main/java/com/netflix/spinnaker/halyard/cli/command/v1/versions/BomVersionCommand.java b/...rc/main/java/com/netflix/spinnaker/halyard/cli/command/v1/versions/BomVersionCommand.java
@@ -19,14 +19,12 @@
 
 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.config.AbstractConfigCommand;
 import com.netflix.spinnaker.halyard.cli.services.v1.Daemon;
 import com.netflix.spinnaker.halyard.cli.services.v1.OperationHandler;
 import com.netflix.spinnaker.halyard.cli.ui.v1.AnsiFormatUtils;
-import com.netflix.spinnaker.halyard.config.model.v1.node.DeploymentConfiguration;
+import com.netflix.spinnaker.halyard.cli.ui.v1.AnsiPrinter;
 import com.netflix.spinnaker.halyard.core.registry.v1.BillOfMaterials;
-import com.netflix.spinnaker.halyard.core.registry.v1.Versions;
 import lombok.AccessLevel;
 import lombok.Getter;
 
@@ -53,6 +51,12 @@ public class BomVersionCommand extends AbstractConfigCommand {
       "get the BOM for whatever version of Spinnaker you are currently configuring."
   );
 
+  @Parameter(
+      names = "--artifact-name",
+      description = "When supplied, print the version of this artifact only."
+  )
+  String artifactName;
+
   @Override
   public String getMainParameter() {
     return "VERSION";
@@ -74,10 +78,18 @@ public String getVersion() {
 
   @Override
   protected void executeThis() {
-    new OperationHandler<BillOfMaterials>()
-        .setFormat(AnsiFormatUtils.Format.YAML)
+    BillOfMaterials bom = new OperationHandler<BillOfMaterials>()
         .setOperation(Daemon.getBillOfMaterials(getVersion()))
         .setFailureMesssage("Failed to get Bill of Materials for version " + getVersion())
         .get();
+
+    String result;
+    if (artifactName == null) {
+      result = AnsiFormatUtils.format(AnsiFormatUtils.Format.YAML, bom);
+    } else {
+      result = bom.getArtifactVersion(artifactName);
+    }
+
+    AnsiPrinter.println(result);
   }
 }
diff --git a/...rd-web/src/main/java/com/netflix/spinnaker/halyard/controllers/v1/VersionsController.java b/...rd-web/src/main/java/com/netflix/spinnaker/halyard/controllers/v1/VersionsController.java
@@ -24,10 +24,7 @@
 import com.netflix.spinnaker.halyard.core.tasks.v1.DaemonTask;
 import com.netflix.spinnaker.halyard.core.tasks.v1.DaemonTaskHandler;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @RestController
 @RequestMapping("/v1/versions")