Merge pull request #706 from cloudfoundry/erb-renderer-update-embedded-ruby-code

ERB renderer: update embedded ruby code

Author: aramprice

templatescompiler/erbrenderer/erb_renderer.go

@@ -1,6 +1,7 @@
 package erbrenderer
 
 import (
+	_ "embed"
 	"encoding/json"
 	"path/filepath"
 
@@ -9,10 +10,18 @@ import (
 	boshsys "github.com/cloudfoundry/bosh-utils/system"
 )
 
+//go:embed erb_renderer.rb
+var templateEvaluationContextRb string
+
 type ERBRenderer interface {
 	Render(srcPath, dstPath string, context TemplateEvaluationContext) error
 }
 
+// You only need **one** of these per package!
+//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 -generate
+//counterfeiter:generate github.com/cloudfoundry/bosh-utils/system.CmdRunner
+//counterfeiter:generate github.com/cloudfoundry/bosh-utils/system.FileSystem
+
 type erbRenderer struct {
 	fs     boshsys.FileSystem
 	runner boshsys.CmdRunner
@@ -50,7 +59,7 @@ func (r erbRenderer) Render(srcPath, dstPath string, context TemplateEvaluationC
 		}
 	}()
 
-	rendererScriptPath := filepath.Join(tmpDir, "erb-render.rb")
+	rendererScriptPath := filepath.Join(tmpDir, "erb_renderer.rb")
 	err = r.writeRendererScript(rendererScriptPath)
 	if err != nil {
 		return err

…nderer/template_evaluation_context_rb.go …atescompiler/erbrenderer/erb_renderer.rbtemplatescompiler/erbrenderer/template_evaluation_context_rb.go renamed to templatescompiler/erbrenderer/erb_renderer.rb templatescompiler/erbrenderer/template_evaluation_context_rb.go renamed to templatescompiler/erbrenderer/erb_renderer.rb

@@ -1,6 +1,3 @@
-package erbrenderer
-
-const templateEvaluationContextRb = `
 # Based on common/properties/template_evaluation_context.rb
 require "rubygems"
 require "ostruct"
@@ -169,22 +166,25 @@ def dump(*args)
 end
 
 class ERBRenderer
-  def initialize(context)
-    @context = context
+  def initialize(json_context_path)
+    @json_context_path = json_context_path
   end
 
   def render(src_path, dst_path)
-    erb = ERB.new(File.read(src_path), safe_level = nil, trim_mode = "-")
+    erb = ERB.new(File.read(src_path), trim_mode: "-")
     erb.filename = src_path
 
+    context_hash = JSON.load(File.read(@json_context_path))
+    template_evaluation_context = TemplateEvaluationContext.new(context_hash)
+
     File.open(dst_path, "w") do |f|
-      f.write(erb.result(@context.get_binding))
+      f.write(erb.result(template_evaluation_context.get_binding))
     end
 
   rescue Exception => e
-    name = "#{@context.name}/#{@context.index}"
+    name = "#{template_evaluation_context&.name}/#{template_evaluation_context&.index}"
 
-    line_i = e.backtrace.index { |l| l.include?(erb.filename) }
+    line_i = e.backtrace.index { |l| l.include?("#{erb&.filename}") }
     line_num = line_i ? e.backtrace[line_i].split(':')[1] : "unknown"
     location = "(line #{line_num}: #{e.inspect})"
 
@@ -193,12 +193,8 @@ def render(src_path, dst_path)
 end
 
 if $0 == __FILE__
-  context_path, src_path, dst_path = *ARGV
-
-  context_hash = JSON.load(File.read(context_path))
-  context = TemplateEvaluationContext.new(context_hash)
+  json_context_path, erb_template_path, rendered_template_path = *ARGV
 
-  renderer = ERBRenderer.new(context)
-  renderer.render(src_path, dst_path)
+  renderer = ERBRenderer.new(json_context_path)
+  renderer.render(erb_template_path, rendered_template_path)
 end
-`