fix(web): Include better context in save pipeline template ops (spinn…

…aker#400)
danielpeach · May 24, 2018 · ce710f1 · ce710f1
1 parent a36792c
commit ce710f1
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 16 deletions.
diff --git a/...b/src/main/groovy/com/netflix/spinnaker/gate/controllers/PipelineTemplatesController.java b/...b/src/main/groovy/com/netflix/spinnaker/gate/controllers/PipelineTemplatesController.java
@@ -36,6 +36,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 
 @RestController
 @RequestMapping(value = "/pipelineTemplates")
@@ -65,15 +66,22 @@ public Collection<Map> list(@RequestParam(defaultValue = "global") List<String>
   @RequestMapping(method = RequestMethod.POST)
   @ResponseStatus(value = HttpStatus.ACCEPTED)
   public Map create(@RequestBody Map<String, Object> pipelineTemplate) {
+    PipelineTemplate template;
+    try {
+      template = objectMapper.convertValue(pipelineTemplate, PipelineTemplate.class);
+    } catch (IllegalArgumentException e) {
+      throw new RuntimeException("Pipeline template is invalid", e);
+    }
+
     List<Map<String, Object>> jobs = new ArrayList<>();
     Map<String, Object> job = new HashMap<>();
     job.put("type", "createPipelineTemplate");
     job.put("pipelineTemplate", pipelineTemplate);
     jobs.add(job);
 
     Map<String, Object> operation = new HashMap<>();
-    operation.put("description", "Create pipeline template");
-    operation.put("application", getApplicationFromTemplate(pipelineTemplate));
+    operation.put("description", "Create pipeline template '" + getNameFromTemplate(template) + "'");
+    operation.put("application", getApplicationFromTemplate(template));
     operation.put("job", jobs);
 
     return taskService.create(operation);
@@ -93,6 +101,13 @@ public Map get(@PathVariable String id) {
   @RequestMapping(value = "/{id}", method = RequestMethod.POST)
   @ResponseStatus(value = HttpStatus.ACCEPTED)
   public Map update(@PathVariable String id, @RequestBody Map<String, Object> pipelineTemplate) {
+    PipelineTemplate template;
+    try {
+      template = objectMapper.convertValue(pipelineTemplate, PipelineTemplate.class);
+    } catch (IllegalArgumentException e) {
+      throw new RuntimeException("Pipeline template is invalid", e);
+    }
+
     List<Map<String, Object>> jobs = new ArrayList<>();
     Map<String, Object> job = new HashMap<>();
     job.put("type", "updatePipelineTemplate");
@@ -101,32 +116,36 @@ public Map update(@PathVariable String id, @RequestBody Map<String, Object> pipe
     jobs.add(job);
 
     Map<String, Object> operation = new HashMap<>();
-    operation.put("description", "Update pipeline template '" + id + "'");
-    operation.put("application", getApplicationFromTemplate(pipelineTemplate));
+    operation.put("description", "Update pipeline template '" + getNameFromTemplate(template) + "'");
+    operation.put("application", getApplicationFromTemplate(template));
     operation.put("job", jobs);
 
     return taskService.create(operation);
   }
 
-  private String getApplicationFromTemplate(Map<String, Object> pipelineTemplate) {
-    PipelineTemplate template;
-    try {
-      template = objectMapper.convertValue(pipelineTemplate, PipelineTemplate.class);
-    } catch (IllegalArgumentException e) {
-      return DEFAULT_APPLICATION;
-    }
+  private String getNameFromTemplate(PipelineTemplate template) {
+    return Optional.ofNullable(template.metadata.name).orElse(template.id);
+  }
+
+  private String getApplicationFromTemplate(PipelineTemplate template) {
     List<String> scopes = template.metadata.scopes;
     return (scopes.isEmpty() || scopes.size() > 1) ? DEFAULT_APPLICATION : scopes.get(0);
   }
 
   @JsonIgnoreProperties(ignoreUnknown = true)
-  private static class PipelineTemplate {
+  static class PipelineTemplate {
+    @JsonProperty
+    String id;
+
     @JsonProperty
-    private Metadata metadata = new Metadata();
+    Metadata metadata = new Metadata();
+
+    static class Metadata {
+      @JsonProperty
+      String name;
 
-    private static class Metadata {
       @JsonProperty
-      private List<String> scopes = new ArrayList<>();
+      List<String> scopes = new ArrayList<>();
     }
   }
 }
diff --git a/.../test/groovy/com/netflix/spinnaker/gate/controllers/PipelineTemplateControllerSpec.groovy b/.../test/groovy/com/netflix/spinnaker/gate/controllers/PipelineTemplateControllerSpec.groovy
@@ -53,7 +53,7 @@ class PipelineTemplateControllerSpec extends Specification {
     response.status == 202
     1 * taskService.create([
       application: app,
-      description: "Create pipeline template",
+      description: "Create pipeline template 'foo'",
       job: [
         [
           type: 'createPipelineTemplate',