bosh-director 1.5.0.pre.1226 → 1.5.0.pre.1244

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

@@ -1,30 +1,47 @@
+require 'json'
 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'
 
 module Bosh::Director
   module Api::Controllers
     class CompiledPackagesController < BaseController
-      get '/stemcells/:stemcell_name/:stemcell_version/releases/:release_name/:release_version/compiled_packages' do
-        stemcell_manager = Api::StemcellManager.new
-        stemcell = stemcell_manager.find_by_name_and_version(params[:stemcell_name], params[:stemcell_version])
-
-        release_manager = Api::ReleaseManager.new
-        release = release_manager.find_by_name(params[:release_name])
-        release_version = release_manager.find_version(release, params[:release_version])
+      post '/compiled_package_groups/export', consumes: [:json] do
+        stemcell = find_stemcell_by_name_and_version
+        release_version = find_release_version_by_name_and_version
 
-        compiled_packages = CompiledPackageGroup.new(release_version, stemcell)
         output_dir = File.join(Dir.tmpdir, 'compiled_packages')
         FileUtils.mkdir_p(output_dir)
+
         killer = StaleFileKiller.new(output_dir)
         killer.kill
-        exporter = CompiledPackagesExporter.new(compiled_packages, App.instance.blobstores.blobstore)
+
+        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
+        send_file(output_path, type: :tgz)
+      end
+
+      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

data/lib/bosh/director/compiled_package_downloader.rb

@@ -1,9 +1,7 @@
-require 'bosh/director'
-require 'bosh/director/compiled_package_yaml_writer'
-
 require 'fileutils'
 require 'tmpdir'
-require 'pathname'
+require 'bosh/director'
+require 'bosh/director/compiled_package_manifest'
 
 module Bosh::Director
   class CompiledPackageDownloader
@@ -13,25 +11,23 @@ module Bosh::Director
     end
 
     def download
-      @download_dir = Pathname.new(Dir.mktmpdir)
+      @download_dir = Dir.mktmpdir
 
-      blobs_path = @download_dir.join('compiled_packages', 'blobs')
-      blobs_path.mkpath
+      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
-
-        compiled_package_blob = blobs_path.join(blobstore_id).open('w')
-        @blobstore_client.get(blobstore_id, compiled_package_blob)
-        compiled_package_blob.close
+        File.open(File.join(blobs_path, blobstore_id), 'w') do |f|
+          @blobstore_client.get(blobstore_id, f, sha1: compiled_package.sha1)
+        end
       end
 
-      CompiledPackageYamlWriter.new(@compiled_package_group, @download_dir.join('compiled_packages')).write
       @download_dir
     end
 
     def cleanup
-      @download_dir.rmtree
+      FileUtils.rm_rf(@download_dir)
     end
   end
 end

data/lib/bosh/director/compiled_package_manifest.rb

@@ -0,0 +1,27 @@
+require 'yaml'
+require 'bosh/director'
+
+module Bosh::Director
+  class CompiledPackageManifest
+    def initialize(group)
+      @compiled_package_group = group
+    end
+
+    def to_h
+      {
+        'compiled_packages' => @compiled_package_group.compiled_packages.map do |compiled_package|
+          {
+            'package_name' => compiled_package.package.name,
+            'package_fingerprint' => compiled_package.package.fingerprint,
+            '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

@@ -12,11 +12,13 @@ module Bosh::Director
       downloader = CompiledPackageDownloader.new(@compiled_package_group, @blobstore_client)
       download_dir = downloader.download
 
-      TarGzipper.new.compress(download_dir, 'compiled_packages', output_path)
+      manifest = CompiledPackageManifest.new(@compiled_package_group)
+      manifest.write(File.join(download_dir, 'compiled_packages.MF'))
 
+      archiver = TarGzipper.new
+      archiver.compress(download_dir, ['compiled_packages', 'compiled_packages.MF'], output_path)
+    ensure
       downloader.cleanup
-
-      nil
     end
   end
 end

data/lib/bosh/director/tar_gzipper.rb

@@ -38,6 +38,7 @@ module Bosh::Director
     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?

data/lib/bosh/director/version.rb

@@ -2,6 +2,6 @@
 
 module Bosh
   module Director
-    VERSION = '1.5.0.pre.1226'
+    VERSION = '1.5.0.pre.1244'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh-director
 version: !ruby/object:Gem::Version
-  version: 1.5.0.pre.1226
+  version: 1.5.0.pre.1244
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-01 00:00:00.000000000 Z
+date: 2013-11-04 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.5.0.pre.1226
+        version: 1.5.0.pre.1244
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1226
+        version: 1.5.0.pre.1244
 - !ruby/object:Gem::Dependency
   name: bosh-core
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1226
+        version: 1.5.0.pre.1244
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1226
+        version: 1.5.0.pre.1244
 - !ruby/object:Gem::Dependency
   name: bosh_common
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1226
+        version: 1.5.0.pre.1244
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1226
+        version: 1.5.0.pre.1244
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +82,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1226
+        version: 1.5.0.pre.1244
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1226
+        version: 1.5.0.pre.1244
 - !ruby/object:Gem::Dependency
   name: bosh_openstack_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -98,7 +98,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1226
+        version: 1.5.0.pre.1244
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1226
+        version: 1.5.0.pre.1244
 - !ruby/object:Gem::Dependency
   name: bosh_aws_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +114,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1226
+        version: 1.5.0.pre.1244
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1226
+        version: 1.5.0.pre.1244
 - !ruby/object:Gem::Dependency
   name: bosh_vsphere_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -130,7 +130,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1226
+        version: 1.5.0.pre.1244
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -138,7 +138,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1226
+        version: 1.5.0.pre.1244
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
@@ -445,7 +445,7 @@ dependencies:
         version: '1.0'
 description: ! 'BOSH Director
 
-  21ba44'
+  1e7603'
 email: support@cloudfoundry.com
 executables:
 - bosh-director
@@ -527,7 +527,7 @@ files:
 - lib/bosh/director/compile_task.rb
 - lib/bosh/director/compiled_package_downloader.rb
 - lib/bosh/director/compiled_package_group.rb
-- lib/bosh/director/compiled_package_yaml_writer.rb
+- lib/bosh/director/compiled_package_manifest.rb
 - lib/bosh/director/compiled_packages_exporter.rb
 - lib/bosh/director/config.rb
 - lib/bosh/director/configuration_hasher.rb

data/lib/bosh/director/compiled_package_yaml_writer.rb

@@ -1,24 +0,0 @@
-require 'bosh/director'
-
-module Bosh::Director
-  class CompiledPackageYamlWriter
-    def initialize(group, dir)
-      @compiled_package_group = group
-      @dir = dir
-    end
-
-    def write
-      hashes = @compiled_package_group.compiled_packages.map do |compiled_package|
-        {
-          'package_name' => compiled_package.package.name,
-          'package_fingerprint' => compiled_package.package.fingerprint,
-          'stemcell_sha1' => @compiled_package_group.stemcell_sha1,
-          'blobstore_id' => compiled_package.blobstore_id,
-        }
-      end
-      File.open(File.join(@dir, 'compiled_packages.yml'), 'w') do |f|
-        f.write(YAML.dump('compiled_packages' => hashes))
-      end
-    end
-  end
-end