feat(pipelinetemplate): Removing handlebars rendering option (#1272)

orca-pipelinetemplate/src/main/java/com/netflix/spinnaker/orca/config/PipelineTemplateConfiguration.java

@@ -20,12 +20,10 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.netflix.spinnaker.orca.pipelinetemplate.PipelineTemplateModule;
-import com.netflix.spinnaker.orca.pipelinetemplate.v1schema.render.HandlebarsRenderer;
 import com.netflix.spinnaker.orca.pipelinetemplate.v1schema.render.JinjaRenderer;
 import com.netflix.spinnaker.orca.pipelinetemplate.v1schema.render.RenderedValueConverter;
 import com.netflix.spinnaker.orca.pipelinetemplate.v1schema.render.Renderer;
 import com.netflix.spinnaker.orca.pipelinetemplate.v1schema.render.YamlRenderedValueConverter;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
@@ -48,13 +46,6 @@ RenderedValueConverter yamlRenderedValueConverter() {
   }
 
   @Bean
-  @ConditionalOnExpression("!${pipelineTemplate.jinja.enabled:false}")
-  Renderer handlebarsRenderer(RenderedValueConverter renderedValueConverter, ObjectMapper pipelineTemplateObjectMapper) {
-    return new HandlebarsRenderer(renderedValueConverter, pipelineTemplateObjectMapper);
-  }
-
-  @Bean
-  @ConditionalOnExpression("${pipelineTemplate.jinja.enabled:false}")
   Renderer jinjaRenderer(RenderedValueConverter renderedValueConverter, ObjectMapper pipelineTemplateObjectMapper) {
     return new JinjaRenderer(renderedValueConverter, pipelineTemplateObjectMapper);
   }

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

@@ -29,6 +29,7 @@
 import com.hubspot.jinjava.loader.ResourceLocator;
 import com.netflix.spinnaker.orca.pipelinetemplate.exceptions.TemplateRenderException;
 import com.netflix.spinnaker.orca.pipelinetemplate.v1schema.render.filters.FriggaFilter;
+import com.netflix.spinnaker.orca.pipelinetemplate.v1schema.render.filters.JsonFilter;
 import com.netflix.spinnaker.orca.pipelinetemplate.v1schema.render.tags.ModuleTag;
 import com.netflix.spinnaker.orca.pipelinetemplate.validator.Errors;
 import com.netflix.spinnaker.orca.pipelinetemplate.validator.Errors.Error;
@@ -60,6 +61,7 @@ public JinjaRenderer(RenderedValueConverter renderedValueConverter, ObjectMapper
     jinja.setResourceLocator(new NoopResourceLocator());
     jinja.getGlobalContext().registerTag(new ModuleTag(this, pipelineTemplateObjectMapper));
     jinja.getGlobalContext().registerFilter(new FriggaFilter());
+    jinja.getGlobalContext().registerFilter(new JsonFilter(pipelineTemplateObjectMapper));
 
     log.info("PipelineTemplates: Using JinjaRenderer");
   }

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

@@ -0,0 +1,56 @@
+/*
+ * Copyright 2017 Netflix, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.netflix.spinnaker.orca.pipelinetemplate.v1schema.render.filters;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.hubspot.jinjava.interpret.InterpretException;
+import com.hubspot.jinjava.interpret.JinjavaInterpreter;
+import com.hubspot.jinjava.lib.filter.Filter;
+import com.netflix.spinnaker.orca.pipelinetemplate.exceptions.TemplateRenderException;
+import com.netflix.spinnaker.orca.pipelinetemplate.validator.Errors.Error;
+
+public class JsonFilter implements Filter {
+
+  private ObjectMapper objectMapper;
+
+  public JsonFilter(ObjectMapper objectMapper) {
+    this.objectMapper = objectMapper;
+  }
+
+  @Override
+  public Object filter(Object var, JinjavaInterpreter interpreter, String... args) {
+    if (args.length != 0) {
+      throw new InterpretException("json filter does accept any arguments");
+    }
+
+    try {
+      return objectMapper.writeValueAsString(var);
+    } catch (JsonProcessingException e) {
+      throw TemplateRenderException.fromError(
+        new Error()
+          .withMessage("failed converting object to json")
+          .withDetail("object", (String) var),
+        e
+      );
+    }
+  }
+
+  @Override
+  public String getName() {
+    return "json";
+  }
+}