bosh-director-core 1.3202.0 → 1.3213.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb842b11e8c46b11cb2d49b58dd34c6714e471f6
-  data.tar.gz: e66c1c493c6f4783480f228cabaa22ed3401c5e0
+  metadata.gz: d8ddd09c19af85516dfc14db1177d92f41409417
+  data.tar.gz: 14d761f6bd1b68ab2b68506e7cf8c9151b2a28be
 SHA512:
-  metadata.gz: 20b4320641f249a0647afd1a98f6701a0fb615b822cbbcbf93b11a054e4a6959ac39b4650fb4511caf46d91b9b81c6bbec129f6449bcd212d381277d4c600584
-  data.tar.gz: 5b7d7b27d93162c93e00682e29ac7e7a923b5530097d40777fb9cb8b84f4804555a6ef6d5e56ebedbd7e18408d0a394cd4b749a14096564c7ec302892c6abce4
+  metadata.gz: 5985cf33c89328de20ed3102745b890d851721345e3ac5bb7aff4a3e75cf82f2aa31a948895332a86045de2d160c31322aea1f495a6f74b7dd600d241a9bd86f
+  data.tar.gz: 576571f5435a45f8d8595f7b20f1030e745cf7fd01f0f8418f75b8e07d80745bb561aebca559f97dddddd8775ed50e368a8242f6fef9d84e5de86c0a8647d5a6

data/lib/bosh/director/core/templates/job_instance_renderer.rb

@@ -9,9 +9,26 @@ module Bosh::Director::Core::Templates
     end
 
     def render(spec)
+      errors = []
+
       rendered_templates = @templates.map do |template|
         job_template_renderer = job_template_renderers[template.name]
-        job_template_renderer.render(spec)
+
+        begin
+          job_template_renderer.render(spec)
+        rescue Exception => e
+          errors.push e
+        end
+      end
+
+      if errors.length > 0
+        message = "Unable to render jobs for instance group '#{spec['job']['name']}'. Errors are:"
+
+        errors.each do |e|
+          message = "#{message}\n   - #{e.message.gsub(/\n/, "\n  ")}"
+        end
+
+        raise message
       end
 
       RenderedJobInstance.new(rendered_templates)

data/lib/bosh/director/core/templates/job_template_renderer.rb

@@ -2,6 +2,7 @@ require 'bosh/director/core/templates'
 require 'bosh/director/core/templates/rendered_job_template'
 require 'bosh/director/core/templates/rendered_file_template'
 require 'bosh/template/evaluation_context'
+require 'common/deep_copy'
 
 module Bosh::Director::Core::Templates
   class JobTemplateRenderer
@@ -15,18 +16,60 @@ module Bosh::Director::Core::Templates
     end
 
     def render(spec)
-      template_context = Bosh::Template::EvaluationContext.new(spec)
-      job_name = spec['job']['name']
-      index = spec['index']
+      template_context = Bosh::Template::EvaluationContext.new(adjust_template_properties(spec,@name))
 
-      monit = monit_erb.render(template_context, job_name, index, @logger)
+      monit = monit_erb.render(template_context, @logger)
+
+      errors = []
 
       rendered_files = source_erbs.map do |source_erb|
-        file_contents = source_erb.render(template_context, job_name, index, @logger)
+        begin
+          file_contents = source_erb.render(template_context, @logger)
+        rescue Exception => e
+          errors.push e
+        end
+
         RenderedFileTemplate.new(source_erb.src_name, source_erb.dest_name, file_contents)
       end
 
+      if errors.length > 0
+        message = "Unable to render templates for job '#{@name}'. Errors are:"
+
+        errors.each do |e|
+          message = "#{message}\n   - #{e.message.gsub(/\n/, "\n  ")}"
+        end
+
+        raise message
+      end
+
       RenderedJobTemplate.new(@name, monit, rendered_files)
     end
+
+    private
+
+    # This method will check if the current template has any properties that were
+    # defined at the template level in the deployment manifest; if yes, it will make
+    # a deep copy of the spec and change the spec.properties to <current-template>.template_scoped_properties.
+    # This is due to the requirement that limits the available properties for a template
+    # by the properties defined in the template scope in the deployment manifest, if they exist.
+    # We make a deep copy of the spec to be safe, as we are modifying it.
+    def adjust_template_properties(spec, current_template_name)
+      result = spec
+      if spec['job'].is_a?(Hash) && !spec['job']['templates'].nil?
+        current_template = spec['job']['templates'].find {|template| template['name'] == current_template_name }
+
+        if !current_template['template_scoped_properties'].nil?
+          # Make a deep copy of the spec and replace the properties with
+          # the specific template properties.
+          altered_spec = Bosh::Common::DeepCopy.copy(spec)
+          altered_spec['properties'] = Bosh::Common::DeepCopy.copy(
+              current_template['template_scoped_properties']
+          )
+          result = altered_spec
+        end
+      end
+      result
+    end
+
   end
 end

data/lib/bosh/director/core/templates/source_erb.rb

@@ -13,20 +13,18 @@ module Bosh::Director::Core::Templates
       @erb = erb
     end
 
-    def render(context, job_name, index, logger)
+    def render(context, logger)
       erb.result(context.get_binding)
       # rubocop:disable RescueException
     rescue Exception => e
       # rubocop:enable RescueException
 
       logger.debug(e.inspect)
-      job_desc = "#{job_name}/#{index}"
       line_index = e.backtrace.index { |l| l.include?(erb.filename) }
       line = line_index ? e.backtrace[line_index] : '(unknown):(unknown)'
       template_name, line = line.split(':')
 
-      message = "Error filling in template `#{File.basename(template_name)}' " +
-        "for `#{job_desc}' (line #{line}: #{e})"
+      message = "Error filling in template '#{File.basename(template_name)}' (line #{line}: #{e})"
 
       logger.debug("#{message}\n#{e.backtrace.join("\n")}")
       raise message

data/lib/bosh/director/core/version.rb

@@ -1,7 +1,7 @@
 module Bosh
   module Director
     module Core
-      VERSION = '1.3202.0'
+      VERSION = '1.3213.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh-director-core
 version: !ruby/object:Gem::Version
-  version: 1.3202.0
+  version: 1.3213.0
 platform: ruby
 authors:
 - Pivotal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-23 00:00:00.000000000 Z
+date: 2016-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_common
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3202.0
+        version: 1.3213.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3202.0
+        version: 1.3213.0
 - !ruby/object:Gem::Dependency
   name: bosh-template
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3202.0
+        version: 1.3213.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3202.0
+        version: 1.3213.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement