bosh-director-core 1.3215.4.0 → 1.3232.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 565b5125d4c1c6a2f3c86213f28979c7270412da
-  data.tar.gz: 158a463e928c8b226edd5bb79cb7e53b11917891
+  metadata.gz: 1996df7fb224c82448f175a7b9d9b859d2081278
+  data.tar.gz: 795f351ee1b4758e994f044eb5de6adeb693fa07
 SHA512:
-  metadata.gz: a5186af8d2981d2058224c7486e88c7f8daca3bf4b14fa591a3d754e034f93bffc1096c0c5700c0ce223dfd49e155eacdb7884db51510ad2faf57cd099120536
-  data.tar.gz: 63ef899969cdbe4f7f52c03d5ccb07f4926b51f065fa2c51e07dc46c769ae2fbc3f5bf20dd2d3d144053c75e6def3876ba6e6edcbade164b55c1828b30d11060
+  metadata.gz: c958b8c45dd45848042c7a43f4f58a1f581a33fba9ad43a527e8f9eca88b0dccb610e352630f36dc6207d0ba97c16fb447c60d99734d16d5b06fcd9e221f9ee7
+  data.tar.gz: 41c34f916330350978f039691d7984258cbde2da5f9db066e7861c3ef6952c88ef35bea8b50a207a41dd09a4ed2e29a73d3f490aae6f19396aafe3bdc90247d1

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

@@ -11,6 +11,7 @@ module Bosh::Director::Core
     def compress(base_dir, sources, dest, options = {})
       sources = [*sources]
       sources.each do |source|
+        source = source.gsub(%r(^\./), '')
         if source.include?(File::SEPARATOR)
           raise "Sources must have a path depth of 1 and contain no '#{File::SEPARATOR}'"
         end

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

@@ -17,12 +17,14 @@ module Bosh::Director::Core::Templates
 
       source_erbs = []
 
+      template_name = manifest.fetch('name', {})
+
       manifest.fetch('templates', {}).each_pair do |src_name, dest_name|
         erb_file = File.read(File.join(template_dir, 'templates', src_name))
         source_erbs << SourceErb.new(src_name, dest_name, erb_file, job_template.name)
       end
 
-      JobTemplateRenderer.new(job_template.name, monit_source_erb, source_erbs, @logger)
+      JobTemplateRenderer.new(job_template.name, template_name, monit_source_erb, source_erbs, @logger)
     ensure
       FileUtils.rm_rf(template_dir) if template_dir
     end
@@ -36,7 +38,7 @@ module Bosh::Director::Core::Templates
       output = `tar -C #{template_dir} -xzf #{temp_path} 2>&1`
       if $?.exitstatus != 0
         raise JobTemplateUnpackFailed,
-              "Cannot unpack `#{job_template.name}' job template, " +
+              "Cannot unpack '#{job_template.name}' job template, " +
                 "tar returned #{$?.exitstatus}, " +
                 "tar output: #{output}"
       end

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

@@ -8,21 +8,27 @@ module Bosh::Director::Core::Templates
   class JobTemplateRenderer
     attr_reader :monit_erb, :source_erbs
 
-    def initialize(name, monit_erb, source_erbs, logger)
+    def initialize(name, template_name, monit_erb, source_erbs, logger)
       @name = name
+      @template_name = template_name
       @monit_erb = monit_erb
       @source_erbs = source_erbs
       @logger = logger
     end
 
     def render(spec)
-      template_context = Bosh::Template::EvaluationContext.new(adjust_template_properties(spec,@name))
+      if spec['properties_need_filtering']
+        spec = remove_unused_properties(spec)
+      end
 
+      template_context = Bosh::Template::EvaluationContext.new(Bosh::Common::DeepCopy.copy(spec))
       monit = monit_erb.render(template_context, @logger)
 
       errors = []
 
       rendered_files = source_erbs.map do |source_erb|
+        template_context = Bosh::Template::EvaluationContext.new(Bosh::Common::DeepCopy.copy(spec))
+
         begin
           file_contents = source_erb.render(template_context, @logger)
         rescue Exception => e
@@ -47,29 +53,22 @@ module Bosh::Director::Core::Templates
 
     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
+    def remove_unused_properties(spec)
+      if spec.nil?
+        return nil
+      end
+
+      modified_spec = Bosh::Common::DeepCopy.copy(spec)
+
+      if modified_spec.has_key?('properties')
+        if modified_spec['properties'][@template_name]
+          properties_template = modified_spec['properties'][@template_name]
+          modified_spec['properties'] = properties_template
         end
       end
-      result
+
+      modified_spec
     end
 
   end
-end
+end

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

@@ -1,7 +1,7 @@
 module Bosh
   module Director
     module Core
-      VERSION = '1.3215.4.0'
+      VERSION = '1.3232.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh-director-core
 version: !ruby/object:Gem::Version
-  version: 1.3215.4.0
+  version: 1.3232.0
 platform: ruby
 authors:
 - Pivotal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-14 00:00:00.000000000 Z
+date: 2016-04-25 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.3215.4.0
+        version: 1.3232.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3215.4.0
+        version: 1.3232.0
 - !ruby/object:Gem::Dependency
   name: bosh-template
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3215.4.0
+        version: 1.3232.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3215.4.0
+        version: 1.3232.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement