fix(cli): replace artifacts commands (#1645)

(cherry picked from commit 1caf20d)
spinnaker · Apr 27, 2020 · 60698a1 · 60698a1
1 parent a959bf7
commit 60698a1
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 0 deletions.
diff --git a/docs/commands.md b/docs/commands.md
@@ -6354,6 +6354,8 @@ hal config features edit [parameters]
 ```
 
 #### Parameters
+ * `--artifacts`: Enable artifact support. Read more at [https://spinnaker.io/reference/artifacts/](https://spinnaker.io/reference/artifacts/)
+ * `--artifacts-rewrite`: Enable new artifact support. Read more at [https://www.spinnaker.io/reference/artifacts-with-artifactsrewrite/](https://www.spinnaker.io/reference/artifacts-with-artifactsrewrite/)
  * `--chaos`: Enable Chaos Monkey support. For this to work, you'll need a running Chaos Monkey deployment. Currently, Halyard doesn't configure Chaos Monkey for you; read more instructions here [https://github.com/Netflix/chaosmonkey/wiki](https://github.com/Netflix/chaosmonkey/wiki).
  * `--deployment`: If supplied, use this Halyard deployment. This will _not_ create a new deployment.
  * `--managed-pipeline-templates-v2-ui`: Enable managed pipeline templates v2 UI support.

diff --git a/...rc/main/java/com/netflix/spinnaker/halyard/cli/command/v1/config/EditFeaturesCommand.java b/...rc/main/java/com/netflix/spinnaker/halyard/cli/command/v1/config/EditFeaturesCommand.java
@@ -49,6 +49,20 @@ public class EditFeaturesCommand extends AbstractConfigCommand {
       arity = 1)
   private Boolean pipelineTemplates = null;
 
+  @Parameter(
+      names = "--artifacts",
+      description =
+          "Enable artifact support. Read more at https://spinnaker.io/reference/artifacts/",
+      arity = 1)
+  private Boolean artifacts = null;
+
+  @Parameter(
+      names = "--artifacts-rewrite",
+      description =
+          "Enable new artifact support. Read more at https://www.spinnaker.io/reference/artifacts-with-artifactsrewrite/",
+      arity = 1)
+  private Boolean artifactsRewrite = null;
+
   @Parameter(
       names = "--mine-canary",
       description =
@@ -78,6 +92,9 @@ protected void executeThis() {
     features.setChaos(chaos != null ? chaos : features.isChaos());
     features.setPipelineTemplates(
         pipelineTemplates != null ? pipelineTemplates : features.getPipelineTemplates());
+    features.setArtifacts(artifacts != null ? artifacts : features.getArtifacts());
+    features.setArtifactsRewrite(
+        artifactsRewrite != null ? artifactsRewrite : features.getArtifactsRewrite());
     features.setMineCanary(mineCanary != null ? mineCanary : features.getMineCanary());
     features.setManagedPipelineTemplatesV2UI(
         managedPipelineTemplatesV2UI != null

diff --git a/...va/com/netflix/spinnaker/halyard/deploy/spinnaker/v1/profile/deck/DeckProfileFactory.java b/...va/com/netflix/spinnaker/halyard/deploy/spinnaker/v1/profile/deck/DeckProfileFactory.java
@@ -117,6 +117,13 @@ protected void setProfile(
         "features.pipelineTemplates",
         Boolean.toString(
             features.getPipelineTemplates() != null ? features.getPipelineTemplates() : false));
+    bindings.put(
+        "features.artifacts",
+        Boolean.toString(features.getArtifacts() != null ? features.getArtifacts() : false));
+    bindings.put(
+        "features.artifactsRewrite",
+        Boolean.toString(
+            features.getArtifactsRewrite() != null ? features.getArtifactsRewrite() : false));
     bindings.put(
         "features.mineCanary",
         Boolean.toString(features.getMineCanary() != null ? features.getMineCanary() : false));