bosh-director 1.1858.0 → 1.1868.0

data/lib/bosh/director.rb

@@ -73,7 +73,6 @@ require 'bosh/director/instance_updater'
 require 'bosh/director/job_runner'
 require 'bosh/director/job_updater'
 require 'bosh/director/job_queue'
-require 'bosh/director/tar_gzipper'
 require 'bosh/director/lock'
 require 'bosh/director/nats_rpc'
 require 'bosh/director/network_reservation'

data/lib/bosh/director/compiled_packages_exporter.rb

@@ -1,4 +1,4 @@
-require 'bosh/director/tar_gzipper'
+require 'bosh/director/core/tar_gzipper'
 require 'bosh/director/compiled_package_downloader'
 
 module Bosh::Director
@@ -15,7 +15,7 @@ module Bosh::Director
       manifest = CompiledPackageManifest.new(@compiled_package_group)
       manifest.write(File.join(download_dir, 'compiled_packages.MF'))
 
-      archiver = TarGzipper.new
+      archiver = Core::TarGzipper.new
       archiver.compress(download_dir, ['compiled_packages', 'compiled_packages.MF'], output_path)
     ensure
       downloader.cleanup

data/lib/bosh/director/deployment_plan.rb

@@ -10,7 +10,6 @@ require 'bosh/director/deployment_plan/job'
 require 'bosh/director/deployment_plan/network'
 require 'bosh/director/deployment_plan/network_subnet'
 require 'bosh/director/deployment_plan/compiled_package'
-require 'bosh/director/deployment_plan/rendered_templates_archive'
 require 'bosh/director/deployment_plan/preparer'
 require 'bosh/director/deployment_plan/resource_pools'
 require 'bosh/director/deployment_plan/multi_job_updater'

data/lib/bosh/director/deployment_plan/instance.rb

@@ -19,7 +19,7 @@ module Bosh::Director
       # @return [Hash] A hash of template SHA1 hashes
       attr_accessor :template_hashes
 
-      # @return [DeploymentPlan::RenderedTemplatesArchive]
+      # @return [Bosh::Director::Core::Templates::RenderedTemplatesArchive]
       attr_accessor :rendered_templates_archive
 
       # @return [Hash<String, NetworkReservation>] network reservations

data/lib/bosh/director/deployment_plan/job.rb

@@ -215,9 +215,15 @@ module Bosh::Director
 
         releases_by_package_names.each do |package_name, releases|
           if releases.size > 1
+            release1, release2 = releases.to_a[0..1]
+            offending_template1 = templates.find { |t| t.release == release1 }
+            offending_template2 = templates.find { |t| t.release == release2 }
+
             raise JobPackageCollision,
-                  "Colocated package `#{package_name}' has the same name in multiple releases. " +
-                  'BOSH cannot currently colocate two packages with identical names from separate releases.'
+                  "Package name collision detected in job `#{@name}': "\
+                  "template `#{release1.name}/#{offending_template1.name}' depends on package `#{release1.name}/#{package_name}', "\
+                  "template `#{release2.name}/#{offending_template2.name}' depends on `#{release2.name}/#{package_name}'. " +
+                  'BOSH cannot currently collocate two packages with identical names from separate releases.'
           end
         end
       end

data/lib/bosh/director/job_renderer.rb

@@ -1,13 +1,13 @@
-require 'bosh/director/job_template_loader'
-require 'bosh/director/job_instance_renderer'
+require 'bosh/director/core/templates/job_template_loader'
+require 'bosh/director/core/templates/job_instance_renderer'
 
 module Bosh::Director
   class JobRenderer
     # @param [DeploymentPlan::Job]
     def initialize(job)
       @job = job
-      job_template_loader = JobTemplateLoader.new(Config.logger)
-      @instance_renderer = JobInstanceRenderer.new(@job, job_template_loader)
+      job_template_loader = Core::Templates::JobTemplateLoader.new(Config.logger)
+      @instance_renderer = Core::Templates::JobInstanceRenderer.new(@job, job_template_loader)
     end
 
     def render_job_instances(blobstore)
@@ -18,7 +18,7 @@ module Bosh::Director
 
         archive_model = instance.model.latest_rendered_templates_archive
         if archive_model && archive_model.content_sha1 == configuration_hash
-          rendered_templates_archive = DeploymentPlan::RenderedTemplatesArchive.new(archive_model.blobstore_id, archive_model.sha1)
+          rendered_templates_archive = Core::Templates::RenderedTemplatesArchive.new(archive_model.blobstore_id, archive_model.sha1)
         else
           rendered_templates_archive = rendered_job_instance.persist(blobstore)
           instance.model.add_rendered_templates_archive(

data/lib/bosh/director/jobs/backup.rb

@@ -1,3 +1,5 @@
+require 'bosh/director/core/tar_gzipper'
+
 module Bosh::Director
   module Jobs
     class Backup < BaseJob
@@ -11,7 +13,7 @@ module Bosh::Director
 
       def initialize(dest, options={})
         @backup_file = dest
-        @tar_gzipper = options.fetch(:tar_gzipper) { TarGzipper.new }
+        @tar_gzipper = options.fetch(:tar_gzipper) { Core::TarGzipper.new }
         @blobstore_client = options.fetch(:blobstore) { App.instance.blobstores.blobstore }
         @db_adapter = options.fetch(:db_adapter) { Bosh::Director::DbBackup.create(Config.db_config) }
         @base_dir = options.fetch(:base_dir) { Config.base_dir }

data/lib/bosh/director/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Director
-    VERSION = '1.1858.0'
+    VERSION = '1.1868.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh-director
 version: !ruby/object:Gem::Version
-  version: 1.1858.0
+  version: 1.1868.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-27 00:00:00.000000000 Z
+date: 2014-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1858.0
+        version: 1.1868.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1858.0
+        version: 1.1868.0
 - !ruby/object:Gem::Dependency
   name: bosh-core
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1858.0
+        version: 1.1868.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,23 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1858.0
+        version: 1.1868.0
+- !ruby/object:Gem::Dependency
+  name: bosh-director-core
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1868.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1868.0
 - !ruby/object:Gem::Dependency
   name: bosh_common
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +82,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1858.0
+        version: 1.1868.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +90,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1858.0
+        version: 1.1868.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +98,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1858.0
+        version: 1.1868.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +106,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1858.0
+        version: 1.1868.0
 - !ruby/object:Gem::Dependency
   name: bosh_openstack_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -98,7 +114,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1858.0
+        version: 1.1868.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +122,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1858.0
+        version: 1.1868.0
 - !ruby/object:Gem::Dependency
   name: bosh_aws_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +130,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1858.0
+        version: 1.1868.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +138,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1858.0
+        version: 1.1868.0
 - !ruby/object:Gem::Dependency
   name: bosh_vsphere_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -130,7 +146,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1858.0
+        version: 1.1868.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -138,7 +154,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1858.0
+        version: 1.1868.0
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
@@ -461,7 +477,7 @@ dependencies:
         version: '1.0'
 description: ! 'BOSH Director
 
-  570d8c'
+  f69423'
 email: support@cloudfoundry.com
 executables:
 - bosh-director
@@ -556,7 +572,6 @@ files:
 - lib/bosh/director/compiled_package_group.rb
 - lib/bosh/director/compiled_package_manifest.rb
 - lib/bosh/director/compiled_packages_exporter.rb
-- lib/bosh/director/compressed_rendered_job_templates.rb
 - lib/bosh/director/config.rb
 - lib/bosh/director/cycle_helper.rb
 - lib/bosh/director/db_backup.rb
@@ -581,7 +596,6 @@ files:
 - lib/bosh/director/deployment_plan/planner.rb
 - lib/bosh/director/deployment_plan/preparer.rb
 - lib/bosh/director/deployment_plan/release_version.rb
-- lib/bosh/director/deployment_plan/rendered_templates_archive.rb
 - lib/bosh/director/deployment_plan/resource_pool.rb
 - lib/bosh/director/deployment_plan/resource_pools.rb
 - lib/bosh/director/deployment_plan/stemcell.rb
@@ -601,12 +615,9 @@ files:
 - lib/bosh/director/instance_preparer.rb
 - lib/bosh/director/instance_updater.rb
 - lib/bosh/director/ip_util.rb
-- lib/bosh/director/job_instance_renderer.rb
 - lib/bosh/director/job_queue.rb
 - lib/bosh/director/job_renderer.rb
 - lib/bosh/director/job_runner.rb
-- lib/bosh/director/job_template_loader.rb
-- lib/bosh/director/job_template_renderer.rb
 - lib/bosh/director/job_updater.rb
 - lib/bosh/director/jobs/backup.rb
 - lib/bosh/director/jobs/base_job.rb
@@ -669,15 +680,11 @@ files:
 - lib/bosh/director/problem_handlers/unresponsive_agent.rb
 - lib/bosh/director/problem_resolver.rb
 - lib/bosh/director/problem_scanner.rb
-- lib/bosh/director/rendered_job_instance.rb
-- lib/bosh/director/rendered_job_template.rb
 - lib/bosh/director/rendered_job_templates_cleaner.rb
-- lib/bosh/director/rendered_templates_writer.rb
 - lib/bosh/director/resource_pool_updater.rb
 - lib/bosh/director/scheduler.rb
 - lib/bosh/director/sequel.rb
 - lib/bosh/director/stale_file_killer.rb
-- lib/bosh/director/tar_gzipper.rb
 - lib/bosh/director/task_result_file.rb
 - lib/bosh/director/thread_pool.rb
 - lib/bosh/director/validation_helper.rb
@@ -715,7 +722,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1775214425609302363
+      hash: -2788441104523827358
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23

data/lib/bosh/director/compressed_rendered_job_templates.rb

@@ -1,30 +0,0 @@
-require 'tmpdir'
-require 'digest/sha1'
-require 'bosh/director/tar_gzipper'
-require 'bosh/director/rendered_templates_writer'
-
-module Bosh::Director
-  class CompressedRenderedJobTemplates
-    def initialize(path)
-      @path = path
-    end
-
-    def write(rendered_templates)
-      Dir.mktmpdir do |dir|
-        writer = RenderedTemplatesWriter.new
-        writer.write(rendered_templates, dir)
-
-        tar_gzipper = TarGzipper.new
-        tar_gzipper.compress(dir, %w(.), @path)
-      end
-    end
-
-    def contents
-      File.open(@path, 'r')
-    end
-
-    def sha1
-      Digest::SHA1.file(@path).hexdigest
-    end
-  end
-end

data/lib/bosh/director/deployment_plan/rendered_templates_archive.rb

@@ -1,14 +0,0 @@
-module Bosh::Director::DeploymentPlan
-  class RenderedTemplatesArchive
-    attr_reader :blobstore_id, :sha1
-
-    def initialize(blobstore_id, sha1)
-      @blobstore_id = blobstore_id
-      @sha1 = sha1
-    end
-
-    def spec
-      { 'blobstore_id' => @blobstore_id, 'sha1' => @sha1 }
-    end
-  end
-end

data/lib/bosh/director/job_instance_renderer.rb

@@ -1,30 +0,0 @@
-require 'bosh/director/rendered_job_instance'
-
-module Bosh::Director
-  class JobInstanceRenderer
-    def initialize(job, job_template_loader)
-      @job = job
-      @job_template_loader = job_template_loader
-    end
-
-    def render(instance)
-      rendered_templates = job.templates.map do |template|
-        job_template_renderer = job_template_renderers[template.name]
-        job_template_renderer.render(job.name, instance)
-      end
-
-      RenderedJobInstance.new(rendered_templates)
-    end
-
-    private
-
-    def job_template_renderers
-      @job_template_renderers ||= job.templates.reduce({}) do |hash, template|
-        hash[template.name] = job_template_loader.process(template)
-        hash
-      end
-    end
-
-    attr_reader :job_template_loader, :job
-  end
-end

data/lib/bosh/director/job_template_loader.rb

@@ -1,56 +0,0 @@
-require 'bosh/director/job_template_renderer'
-
-module Bosh::Director
-  SrcFileTemplate = Struct.new(:src_name, :dest_name, :erb_file)
-
-  class JobTemplateLoader
-    def initialize(logger)
-      @logger = logger
-    end
-
-    def process(job_template)
-      template_dir = extract_template(job_template)
-      manifest = Psych.load_file(File.join(template_dir, 'job.MF'))
-
-      monit_template = erb(File.join(template_dir, 'monit'))
-      monit_template.filename = File.join(job_template.name, 'monit')
-
-      templates = []
-
-      manifest.fetch('templates', {}).each_pair do |src_name, dest_name|
-        erb_file = erb(File.join(template_dir, 'templates', src_name))
-        erb_file.filename = File.join(job_template.name, src_name)
-        templates << SrcFileTemplate.new(src_name, dest_name, erb_file)
-      end
-
-      JobTemplateRenderer.new(job_template.name, monit_template, templates, logger)
-    ensure
-      FileUtils.rm_rf(template_dir) if template_dir
-    end
-
-    private
-
-    attr_reader :logger
-
-    def extract_template(job_template)
-      temp_path = job_template.download_blob
-      template_dir = Dir.mktmpdir('template_dir')
-
-      output = `tar -C #{template_dir} -xzf #{temp_path} 2>&1`
-      if $?.exitstatus != 0
-        raise JobTemplateUnpackFailed,
-              "Cannot unpack `#{job_template.name}' job template, " +
-                "tar returned #{$?.exitstatus}, " +
-                "tar output: #{output}"
-      end
-
-      template_dir
-    ensure
-      FileUtils.rm_f(temp_path) if temp_path
-    end
-
-    def erb(path)
-      ERB.new(File.read(path))
-    end
-  end
-end

data/lib/bosh/director/job_template_renderer.rb

@@ -1,50 +0,0 @@
-require 'bosh/director/rendered_job_template'
-
-module Bosh::Director
-  RenderedFileTemplate = Struct.new(:src_name, :dest_name, :contents)
-  class JobTemplateRenderer
-
-    attr_reader :monit_template, :templates
-
-    def initialize(name, monit_template, templates, logger)
-      @name = name
-      @monit_template = monit_template
-      @templates = templates
-      @logger = logger
-    end
-
-    def render(job_name, instance)
-      template_context = Bosh::Common::TemplateEvaluationContext.new(instance.spec)
-
-      monit = render_erb(job_name, monit_template, template_context, instance.index)
-
-      rendered_templates = templates.map do |template_file|
-        file_contents = render_erb(job_name, template_file.erb_file, template_context, instance.index)
-        RenderedFileTemplate.new(template_file.src_name, template_file.dest_name, file_contents)
-      end
-
-      RenderedJobTemplate.new(name, monit, rendered_templates)
-    end
-
-    private
-
-    attr_reader :name, :logger
-
-    def render_erb(job_name, template, template_context, index)
-      template.result(template_context.get_binding)
-    rescue Exception => e
-      logger.debug(e.inspect)
-      job_desc = "#{job_name}/#{index}"
-      line_index = e.backtrace.index { |l| l.include?(template.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})"
-
-      logger.debug("#{message}\n#{e.backtrace.join("\n")}")
-
-      raise JobTemplateBindingFailed, "#{message}"
-    end
-  end
-end

data/lib/bosh/director/rendered_job_instance.rb

@@ -1,48 +0,0 @@
-require 'bosh/director/deployment_plan/rendered_templates_archive'
-require 'bosh/director/compressed_rendered_job_templates'
-require 'digest/sha1'
-require 'tempfile'
-
-module Bosh::Director
-  class RenderedJobInstance
-    def initialize(job_templates)
-      @job_templates = job_templates
-    end
-
-    def configuration_hash
-      instance_digest = Digest::SHA1.new
-      job_templates.sort { |x, y| x.name <=> y.name }.each do |rendered_job_template|
-        bound_templates = ''
-        bound_templates << rendered_job_template.monit
-
-        rendered_job_template.templates.sort { |x, y| x.src_name <=> y.src_name }.each do |template_file|
-          bound_templates << template_file.contents
-          instance_digest << bound_templates
-        end
-      end
-
-      instance_digest.hexdigest
-    end
-
-    def template_hashes
-      job_templates.reduce({}) do |h, rendered_job_template|
-        h.merge(rendered_job_template.name => rendered_job_template.template_hash)
-      end
-    end
-
-    def persist(blobstore)
-      file = Tempfile.new('compressed-rendered-job-templates')
-
-      compressed_archive = CompressedRenderedJobTemplates.new(file.path)
-      compressed_archive.write(job_templates)
-
-      blobstore_id = blobstore.create(compressed_archive.contents)
-      DeploymentPlan::RenderedTemplatesArchive.new(blobstore_id, compressed_archive.sha1)
-    ensure
-      file.close!
-    end
-
-    private
-    attr_reader :job_templates
-  end
-end

data/lib/bosh/director/rendered_job_template.rb

@@ -1,21 +0,0 @@
-module Bosh::Director
-  class RenderedJobTemplate
-    attr_reader :name, :monit, :templates
-
-    def initialize(name, monit, templates)
-      @name = name
-      @monit = monit
-      @templates = templates
-    end
-
-    def template_hash
-      template_digest = Digest::SHA1.new
-      template_digest << monit
-      templates.sort { |x, y| x.src_name <=> y.src_name }.each do |template_file|
-        template_digest << template_file.contents
-      end
-
-      template_digest.hexdigest
-    end
-  end
-end

data/lib/bosh/director/rendered_templates_writer.rb

@@ -1,24 +0,0 @@
-require 'fileutils'
-
-module Bosh::Director
-  class RenderedTemplatesWriter
-    def write(rendered_templates, output_dir)
-      rendered_templates.each do |job_template|
-        job_template_dir = File.join(output_dir, job_template.name)
-        Dir.mkdir(job_template_dir)
-
-        File.open(File.join(job_template_dir, 'monit'), 'w') do |f|
-          f.write(job_template.monit)
-        end
-
-        job_template.templates.each do |file_template|
-          file_template_dest = File.join(job_template_dir, file_template.dest_name)
-          FileUtils.mkdir_p(File.dirname(file_template_dest))
-          File.open(file_template_dest, 'w') do |f|
-            f.write(file_template.contents)
-          end
-        end
-      end
-    end
-  end
-end

data/lib/bosh/director/tar_gzipper.rb

@@ -1,46 +0,0 @@
-require 'tmpdir'
-require 'open3'
-
-module Bosh::Director
-  class TarGzipper
-    # @param [String] base_dir the directory from which the tar command is run
-    # @param [String, Array] sources the relative paths to include
-    # @param [String] dest the destination filename for the tgz output
-    # @param [Hash] options the options for compress
-    # @option options [Boolean] :copy_first copy the source to a temp dir before archiving
-    def compress(base_dir, sources, dest, options={})
-      sources = [*sources]
-
-      sources.each do |source|
-        raise "Sources must have a path depth of 1 and contain no '#{File::SEPARATOR}'" if source.include?(File::SEPARATOR)
-      end
-
-      base_dir_path = Pathname.new(base_dir)
-
-      unless base_dir_path.exist?
-        raise "The base directory #{base_dir} could not be found."
-      end
-
-      unless base_dir_path.absolute?
-        raise "The base directory #{base_dir} is not an absolute path."
-      end
-
-      if options[:copy_first]
-        Dir.mktmpdir do |tmpdir|
-          FileUtils.cp_r(sources.map { |s| File.join(base_dir, s) }, "#{tmpdir}/")
-          tar(tmpdir, dest, sources)
-        end
-      else
-        tar(base_dir, dest, sources)
-      end
-    end
-
-    private
-
-    def tar(base_dir, dest, sources)
-      out, err, status = Open3.capture3('tar', '-C', base_dir, '-czf', dest, *sources)
-      raise("tar exited #{status.exitstatus}, output: '#{out}', error: '#{err}'") unless status.success?
-      out
-    end
-  end
-end