fix(pipelines): Pass resolveArtifacts = true to plan endpoint (#427) (#…

…428) Orca now requires callers to explicitly request artifact resolution when calling '/plan' on a templated pipeline. We do want this behavior when triggering from echo, so pass the flag.
spinnaker · Jan 4, 2019 · 22a704d · 22a704d
1 parent 05db3d9
commit 22a704d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/...etriggers/src/main/java/com/netflix/spinnaker/echo/pipelinetriggers/orca/OrcaService.java b/...etriggers/src/main/java/com/netflix/spinnaker/echo/pipelinetriggers/orca/OrcaService.java
@@ -32,8 +32,8 @@ public interface OrcaService {
   @POST("/orchestrate")
   Observable<TriggerResponse> trigger(@Body Pipeline pipeline);
 
-  @POST("/orchestrate")
-  Map plan(@Body Map pipelineConfig);
+  @POST("/plan")
+  Map plan(@Body Map pipelineConfig, @Query("resolveArtifacts") boolean resolveArtifacts);
 
   @POST("/orchestrate")
   Observable<TriggerResponse> trigger(@Body Pipeline pipeline, @Header(AuthenticatedRequest.SPINNAKER_USER) String runAsUser);

diff --git a/...ers/src/main/java/com/netflix/spinnaker/echo/pipelinetriggers/orca/PipelineInitiator.java b/...ers/src/main/java/com/netflix/spinnaker/echo/pipelinetriggers/orca/PipelineInitiator.java
@@ -98,7 +98,7 @@ public void startPipeline(Pipeline pipeline) {
           boolean propagateAuth = pipeline.getTrigger() != null && pipeline.getTrigger().isPropagateAuth();
           log.debug("Planning templated pipeline {} before triggering", pipeline.getId());
           pipeline = pipeline.withPlan(true);
-          Map resolvedPipelineMap = orca.plan(objectMapper.convertValue(pipeline, Map.class));
+          Map resolvedPipelineMap = orca.plan(objectMapper.convertValue(pipeline, Map.class), true);
           pipeline = objectMapper.convertValue(resolvedPipelineMap, Pipeline.class);
           if (propagateAuth) {
             pipeline = pipeline.withTrigger(pipeline.getTrigger().atPropagateAuth(true));

diff --git a/...test/groovy/com/netflix/spinnaker/echo/pipelinetriggers/orca/PipelineInitiatorSpec.groovy b/...test/groovy/com/netflix/spinnaker/echo/pipelinetriggers/orca/PipelineInitiatorSpec.groovy
@@ -53,7 +53,7 @@ class PipelineInitiatorSpec extends Specification {
 
     then:
     1 * fiatStatus.isEnabled() >> { return true }
-    orcaCalls * orca.plan(_) >> pipelineMap
+    orcaCalls * orca.plan(_, true) >> pipelineMap
     objectMapper.convertValue(pipelineMap, Pipeline.class) >> pipeline
     1 * orca.trigger(_) >> empty()