bosh-director 1.3048.0 → 1.3050.0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh-director
 version: !ruby/object:Gem::Version
-  version: 1.3048.0
+  version: 1.3050.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-18 00:00:00.000000000 Z
+date: 2015-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
@@ -30,126 +30,126 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3048.0
+        version: 1.3050.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3048.0
+        version: 1.3050.0
 - !ruby/object:Gem::Dependency
   name: bosh-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3048.0
+        version: 1.3050.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3048.0
+        version: 1.3050.0
 - !ruby/object:Gem::Dependency
   name: bosh-director-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3048.0
+        version: 1.3050.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3048.0
+        version: 1.3050.0
 - !ruby/object:Gem::Dependency
   name: bosh_common
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3048.0
+        version: 1.3050.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3048.0
+        version: 1.3050.0
 - !ruby/object:Gem::Dependency
   name: bosh-template
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3048.0
+        version: 1.3050.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3048.0
+        version: 1.3050.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3048.0
+        version: 1.3050.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3048.0
+        version: 1.3050.0
 - !ruby/object:Gem::Dependency
   name: bosh_openstack_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3048.0
+        version: 1.3050.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3048.0
+        version: 1.3050.0
 - !ruby/object:Gem::Dependency
   name: bosh_aws_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3048.0
+        version: 1.3050.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3048.0
+        version: 1.3050.0
 - !ruby/object:Gem::Dependency
   name: bosh_vsphere_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3048.0
+        version: 1.3050.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3048.0
+        version: 1.3050.0
 - !ruby/object:Gem::Dependency
   name: bosh_vcloud_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -198,14 +198,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.27.0
+        version: 1.31.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.27.0
+        version: 1.31.0
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
@@ -572,7 +572,7 @@ dependencies:
         version: '0'
 description: |-
   BOSH Director
-  e2c11a
+  b92cdc
 email: support@cloudfoundry.com
 executables:
 - bosh-director
@@ -638,11 +638,9 @@ files:
 - lib/bosh/director/api/api_helper.rb
 - lib/bosh/director/api/backup_manager.rb
 - lib/bosh/director/api/cloud_config_manager.rb
-- lib/bosh/director/api/compiled_package_group_manager.rb
 - lib/bosh/director/api/controllers/backups_controller.rb
 - lib/bosh/director/api/controllers/base_controller.rb
 - lib/bosh/director/api/controllers/cloud_configs_controller.rb
-- lib/bosh/director/api/controllers/compiled_packages_controller.rb
 - lib/bosh/director/api/controllers/deployments_controller.rb
 - lib/bosh/director/api/controllers/info_controller.rb
 - lib/bosh/director/api/controllers/locks_controller.rb
@@ -687,12 +685,7 @@ files:
 - lib/bosh/director/compiled_package.rb
 - lib/bosh/director/compiled_package/blob_sha_mismatch_error.rb
 - lib/bosh/director/compiled_package/compiled_package.rb
-- lib/bosh/director/compiled_package/compiled_package_inserter.rb
-- lib/bosh/director/compiled_package/compiled_packages_export.rb
-- lib/bosh/director/compiled_package_downloader.rb
 - lib/bosh/director/compiled_package_group.rb
-- lib/bosh/director/compiled_package_manifest.rb
-- lib/bosh/director/compiled_packages_exporter.rb
 - lib/bosh/director/compiled_release_downloader.rb
 - lib/bosh/director/compiled_release_manifest.rb
 - lib/bosh/director/config.rb
@@ -773,7 +766,6 @@ files:
 - lib/bosh/director/jobs/delete_stemcell.rb
 - lib/bosh/director/jobs/export_release.rb
 - lib/bosh/director/jobs/fetch_logs.rb
-- lib/bosh/director/jobs/import_compiled_packages.rb
 - lib/bosh/director/jobs/release/release_job.rb
 - lib/bosh/director/jobs/run_errand.rb
 - lib/bosh/director/jobs/scheduled_backup.rb

data/lib/bosh/director/api/compiled_package_group_manager.rb

@@ -1,17 +0,0 @@
-require 'securerandom'
-
-module Bosh::Director
-  module Api
-    class CompiledPackageGroupManager
-      include ApiHelper
-
-      def create_from_file_path(username, path)
-        unless File.exists?(path)
-          raise DirectorError, "Failed to import compiled packages: file not found - #{path}"
-        end
-
-        JobQueue.new.enqueue(username, Jobs::ImportCompiledPackages, 'import compiled packages', [path])
-      end
-    end
-  end
-end

data/lib/bosh/director/api/controllers/compiled_packages_controller.rb

@@ -1,63 +0,0 @@
-require 'json'
-require 'tempfile'
-require 'bosh/director/api/compiled_package_group_manager'
-require 'bosh/director/api/controllers/base_controller'
-require 'bosh/director/api/stemcell_manager'
-require 'bosh/director/compiled_package_group'
-require 'bosh/director/compiled_packages_exporter'
-require 'bosh/director/stale_file_killer'
-require 'bosh/director/jobs/import_compiled_packages'
-
-module Bosh::Director
-  module Api::Controllers
-    class CompiledPackagesController < BaseController
-      def initialize(config, compiled_package_group_manager)
-        super(config)
-        @compiled_package_group_manager = compiled_package_group_manager
-      end
-
-      post '/export', consumes: :json do
-        stemcell = find_stemcell_by_name_and_version
-        release_version = find_release_version_by_name_and_version
-
-        output_dir = File.join(Dir.tmpdir, 'compiled_packages')
-        FileUtils.mkdir_p(output_dir)
-
-        killer = StaleFileKiller.new(output_dir)
-        killer.kill
-
-        compiled_packages = CompiledPackageGroup.new(release_version, stemcell)
-        blobstore_client = App.instance.blobstores.blobstore
-        exporter = CompiledPackagesExporter.new(compiled_packages, blobstore_client)
-
-        output_path = File.join(output_dir, "compiled_packages_#{Time.now.to_f}.tar.gz")
-        exporter.export(output_path)
-
-        send_file(output_path, type: :tgz)
-      end
-
-      post '/import', consumes: :multipart do
-        task = @compiled_package_group_manager.create_from_file_path(current_user, params[:nginx_upload_path])
-        redirect "/tasks/#{task.id}"
-      end
-
-      private
-
-      def find_stemcell_by_name_and_version
-        stemcell_manager = Api::StemcellManager.new
-        stemcell_manager.find_by_name_and_version(
-          body_params['stemcell_name'], body_params['stemcell_version'])
-      end
-
-      def find_release_version_by_name_and_version
-        release_manager = Api::ReleaseManager.new
-        release = release_manager.find_by_name(body_params['release_name'])
-        release_manager.find_version(release, body_params['release_version'])
-      end
-
-      def body_params
-        @body_params ||= JSON.load(request.body)
-      end
-    end
-  end
-end

data/lib/bosh/director/compiled_package/compiled_package_inserter.rb

@@ -1,45 +0,0 @@
-require 'bosh/director/compiled_package'
-
-module Bosh::Director::CompiledPackage
-  class CompiledPackageInserter
-    def initialize(blobstore_client)
-      @blobstore_client = blobstore_client
-    end
-
-    def insert(compiled_package, release_version)
-      package = Bosh::Director::Models::Package[fingerprint: compiled_package.package_fingerprint]
-      raise ArgumentError, [compiled_package.inspect, release_version.inspect].inspect unless package
-
-      stemcell = Bosh::Director::Models::Stemcell[sha1: compiled_package.stemcell_sha1]
-
-      transitive_dependencies = release_version.transitive_dependencies(package)
-      package_dependency_key = Bosh::Director::Models::CompiledPackage.create_dependency_key(transitive_dependencies)
-
-      compiled_package_model = Bosh::Director::Models::CompiledPackage[
-        package: package,
-        stemcell: stemcell,
-        dependency_key: package_dependency_key,
-      ]
-
-      return if compiled_package_model
-
-      oid = File.open(compiled_package.blob_path) do |f|
-        @blobstore_client.create(f)
-      end
-
-      begin
-        Bosh::Director::Models::CompiledPackage.create(
-          blobstore_id: oid,
-          package: package,
-          stemcell: stemcell,
-          sha1: compiled_package.sha1,
-          dependency_key: package_dependency_key,
-          build: Bosh::Director::Models::CompiledPackage.generate_build_number(package, stemcell),
-        )
-      rescue
-        @blobstore_client.delete(oid)
-        raise
-      end
-    end
-  end
-end

data/lib/bosh/director/compiled_package/compiled_packages_export.rb

@@ -1,35 +0,0 @@
-require 'bosh/director/compiled_package'
-require 'bosh/director/compiled_package/compiled_package'
-
-module Bosh::Director::CompiledPackage
-  class CompiledPackagesExport
-    def initialize(options={})
-      @file = options.fetch(:file)
-      @exec = options.fetch(:exec, Bosh::Exec)
-    end
-
-    def extract
-      tmp_dir = Dir.mktmpdir
-      
-      @exec.sh("tar -C #{tmp_dir} -xf #{@file}")
-      
-      manifest = YAML.load_file("#{tmp_dir}/compiled_packages.MF")
-      packages = []
-      
-      manifest['compiled_packages'].each do |p|
-        packages << CompiledPackage.new(
-          package_name: p['package_name'],
-          package_fingerprint: p['package_fingerprint'],
-          sha1: p['compiled_package_sha1'],
-          stemcell_sha1: p['stemcell_sha1'],
-          blobstore_id: p['blobstore_id'],
-          blob_path: File.join(tmp_dir, 'compiled_packages', 'blobs', p['blobstore_id']),
-        )
-      end
-
-      yield manifest, packages
-
-      FileUtils.rm_rf(tmp_dir)
-    end
-  end
-end

data/lib/bosh/director/compiled_package_downloader.rb

@@ -1,33 +0,0 @@
-require 'fileutils'
-require 'tmpdir'
-require 'bosh/director'
-require 'bosh/director/compiled_package_manifest'
-
-module Bosh::Director
-  class CompiledPackageDownloader
-    def initialize(compiled_package_group, blobstore_client)
-      @compiled_package_group = compiled_package_group
-      @blobstore_client = blobstore_client
-    end
-
-    def download
-      @download_dir = Dir.mktmpdir
-
-      blobs_path = File.join(@download_dir, 'compiled_packages', 'blobs')
-      FileUtils.mkpath(blobs_path)
-
-      @compiled_package_group.compiled_packages.each do |compiled_package|
-        blobstore_id = compiled_package.blobstore_id
-        File.open(File.join(blobs_path, blobstore_id), 'w') do |f|
-          @blobstore_client.get(blobstore_id, f, sha1: compiled_package.sha1)
-        end
-      end
-
-      @download_dir
-    end
-
-    def cleanup
-      FileUtils.rm_rf(@download_dir)
-    end
-  end
-end

data/lib/bosh/director/compiled_package_manifest.rb

@@ -1,31 +0,0 @@
-require 'yaml'
-require 'bosh/director'
-
-module Bosh::Director
-  class CompiledPackageManifest
-    def initialize(group)
-      @compiled_package_group = group
-    end
-
-    def to_h
-      {
-        'release_name' => @compiled_package_group.release_version.release.name,
-        'release_version' => @compiled_package_group.release_version.version,
-        'release_commit_hash' => @compiled_package_group.release_version.commit_hash,
-        'compiled_packages' => @compiled_package_group.compiled_packages.map do |compiled_package|
-          {
-            'package_name' => compiled_package.package.name,
-            'package_fingerprint' => compiled_package.package.fingerprint,
-            'compiled_package_sha1' => compiled_package.sha1,
-            'stemcell_sha1' => @compiled_package_group.stemcell_sha1,
-            'blobstore_id' => compiled_package.blobstore_id,
-          }
-        end
-      }
-    end
-
-    def write(dest_path)
-      File.open(dest_path, 'w') { |f| f.write(YAML.dump(to_h)) }
-    end
-  end
-end

data/lib/bosh/director/compiled_packages_exporter.rb

@@ -1,24 +0,0 @@
-require 'bosh/director/core/tar_gzipper'
-require 'bosh/director/compiled_package_downloader'
-
-module Bosh::Director
-  class CompiledPackagesExporter
-    def initialize(compiled_package_group, blobstore_client)
-      @compiled_package_group = compiled_package_group
-      @blobstore_client = blobstore_client
-    end
-
-    def export(output_path)
-      downloader = CompiledPackageDownloader.new(@compiled_package_group, @blobstore_client)
-      download_dir = downloader.download
-
-      manifest = CompiledPackageManifest.new(@compiled_package_group)
-      manifest.write(File.join(download_dir, 'compiled_packages.MF'))
-
-      archiver = Core::TarGzipper.new
-      archiver.compress(download_dir, ['compiled_packages', 'compiled_packages.MF'], output_path)
-    ensure
-      downloader.cleanup
-    end
-  end
-end

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

@@ -1,44 +0,0 @@
-require 'bosh/director/compiled_package/compiled_packages_export'
-require 'bosh/director/compiled_package/compiled_package_inserter'
-
-module Bosh::Director
-  module Jobs
-    class ImportCompiledPackages < BaseJob
-      @queue = :normal
-
-      def self.job_type
-        :import_compiled_packages
-      end
-
-      def initialize(compiled_packages_path)
-        @compiled_packages_path = compiled_packages_path
-        @blobstore_client = Bosh::Director::App.instance.blobstores.blobstore
-      end
-
-      def perform
-        export = Bosh::Director::CompiledPackage::CompiledPackagesExport.new(file: @compiled_packages_path)
-
-        export.extract do |manifest, packages|
-          release_name = manifest.fetch('release_name')
-          release_version_version = manifest.fetch('release_version')
-
-          release = Bosh::Director::Models::Release[name: release_name]
-          if release.nil?
-            raise ReleaseNotFound, "Release version `#{release}/#{release_version_version}' doesn't exist"
-          end
-
-          release_version = Bosh::Director::Api::ReleaseManager.new.find_version(release, release_version_version)
-          inserter = Bosh::Director::CompiledPackage::CompiledPackageInserter.new(@blobstore_client)
-
-          packages.each { |p| p.check_blob_sha }
-
-          packages.each do |package|
-            inserter.insert(package, release_version)
-          end
-        end
-      ensure
-        FileUtils.rm_rf(@compiled_packages_path)
-      end
-    end
-  end
-end