feat(pipelinetemplate): Adding group & example to template variables (#…

…1262)

orca-pipelinetemplate/src/main/java/com/netflix/spinnaker/orca/pipelinetemplate/v1schema/model/PipelineTemplate.java

@@ -68,9 +68,11 @@ public void setOwner(String owner) {
 
   public static class Variable implements NamedContent {
     private String name;
+    private String group = "Ungrouped";
     private String description;
     private String type;
     private Object defaultValue;
+    private String example;
 
     @Override
     public String getName() {
@@ -81,6 +83,14 @@ public void setName(String name) {
       this.name = name;
     }
 
+    public String getGroup() {
+      return group;
+    }
+
+    public void setGroup(String group) {
+      this.group = group;
+    }
+
     public String getDescription() {
       return description;
     }
@@ -108,6 +118,14 @@ public void setDefaultValue(Object defaultValue) {
     public boolean hasDefaultValue() {
       return defaultValue != null;
     }
+
+    public String getExample() {
+      return example;
+    }
+
+    public void setExample(String example) {
+      this.example = example;
+    }
   }
 
   public static class Configuration {

orca-pipelinetemplate/src/main/java/com/netflix/spinnaker/orca/pipelinetemplate/v1schema/render/JinjaRenderer.java

@@ -80,7 +80,11 @@ public String render(String template, RenderContext context) {
 
   @Override
   public Object renderGraph(String template, RenderContext context) {
-    return renderedValueConverter.convertRenderedValue(render(template, context));
+    // TODO rz - Need to catch exceptions out of this value converter & give more detailed information if it's a nested
+    // value. For example, if iterating over module output, the line number reported by yamlsnake will be for the final
+    // template, not the input, so it's difficult to correlate what actually is broken.
+    String renderedValue = render(template, context);
+    return renderedValueConverter.convertRenderedValue(renderedValue);
   }
 
   private static class NoopResourceLocator implements ResourceLocator {