feat(MPTv2): Support artifacts when executing v2 templated pipelines. (…

…spinnaker#2710)
armory-io · Mar 7, 2019 · 2f766c8 · 2f766c8
1 parent 6eafe07
commit 2f766c8
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 5 deletions.
diff --git a/...java/com/netflix/spinnaker/orca/pipelinetemplate/v2schema/V2SchemaExecutionGenerator.java b/...java/com/netflix/spinnaker/orca/pipelinetemplate/v2schema/V2SchemaExecutionGenerator.java
@@ -45,6 +45,7 @@ public Map<String, Object> generate(V2PipelineTemplate template, V2TemplateConfi
 
     addNotifications(pipeline, template, configuration);
     addParameters(pipeline, template, configuration);
+    addExpectedArtifacts(pipeline, template, configuration);
     addTriggers(pipeline, template, configuration);
     pipeline.put("templateVariables", configuration.getVariables());
 
@@ -89,6 +90,23 @@ private void addParameters(Map<String, Object> pipeline, V2PipelineTemplate temp
     }
   }
 
+  private void addExpectedArtifacts(Map<String, Object> pipeline, V2PipelineTemplate template, V2TemplateConfiguration configuration) {
+    if (configuration.getInherit().contains("expectedArtifacts")) {
+      pipeline.put(
+        "expectedArtifacts",
+        TemplateMerge.mergeDistinct(
+          (List<HashMap<String, Object>>) template.getPipeline().get("expectedArtifacts"),
+          configuration.getExpectedArtifacts()
+        )
+      );
+    } else {
+      pipeline.put(
+        "expectedArtifacts",
+        Optional.ofNullable(configuration.getExpectedArtifacts()).orElse(Collections.emptyList())
+      );
+    }
+  }
+
   private void addTriggers(Map<String, Object> pipeline,
                            V2PipelineTemplate template,
                            V2TemplateConfiguration configuration) {

diff --git a/orca-web/src/main/groovy/com/netflix/spinnaker/orca/controllers/OperationsController.groovy b/orca-web/src/main/groovy/com/netflix/spinnaker/orca/controllers/OperationsController.groovy
@@ -41,11 +41,7 @@ import com.netflix.spinnaker.security.AuthenticatedRequest
 import groovy.util.logging.Slf4j
 import javassist.NotFoundException
 import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.web.bind.annotation.PathVariable
-import org.springframework.web.bind.annotation.RequestBody
-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.*
 import retrofit.RetrofitError
 import retrofit.http.Query
 
@@ -189,6 +185,9 @@ class OperationsController {
       pipeline = preprocessor.process(pipeline)
     }
 
+    // Explicitly resolve artifacts after preprocessing to support artifacts in templated pipelines.
+    artifactResolver?.resolveArtifacts(pipeline)
+
     if (pipeline.disabled) {
       throw new InvalidRequestException("Pipeline is disabled and cannot be started.")
     }