bosh-director 1.1840.0 → 1.1858.0

data/db/migrations/director/20140124225348_proper_pk_for_attributes.rb

@@ -0,0 +1,15 @@
+Sequel.migration do
+  change do
+    add_column :director_attributes, :temp_name, String, null: true
+    self[:director_attributes].update(temp_name: :name)
+
+    alter_table :director_attributes do
+      drop_column :name
+      rename_column :temp_name, :name
+      add_index [:name], unique:true, name: 'unique_attribute_name'
+      set_column_not_null :name
+
+      add_primary_key :id
+    end
+  end
+end

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

@@ -53,16 +53,16 @@ module Bosh::Director
     def bind_existing_vm(vm, lock)
       state = get_state(vm)
       lock.synchronize do
-        @logger.debug("Processing network reservations")
+        @logger.debug('Processing network reservations')
         reservations = get_network_reservations(state)
 
         instance = vm.instance
         if instance
           bind_instance(instance, state, reservations)
         else
-          @logger.debug("Binding resource pool VM")
+          @logger.debug('Binding resource pool VM')
           resource_pool = @deployment_plan.resource_pool(
-              state["resource_pool"]["name"])
+              state['resource_pool']['name'])
           if resource_pool
             bind_idle_vm(vm, resource_pool, state, reservations)
           else
@@ -70,7 +70,7 @@ module Bosh::Director
             @deployment_plan.delete_vm(vm)
           end
         end
-        @logger.debug("Finished binding VM")
+        @logger.debug('Finished binding VM')
       end
     end
 
@@ -80,7 +80,7 @@ module Bosh::Director
     # @param [Hash] state VM state according to its agent
     # @param [Hash] reservations Network reservations
     def bind_idle_vm(vm, resource_pool, state, reservations)
-      @logger.debug("Adding to resource pool")
+      @logger.debug('Adding to resource pool')
       idle_vm = resource_pool.add_idle_vm
       idle_vm.vm = vm
       idle_vm.current_state = state
@@ -88,7 +88,7 @@ module Bosh::Director
       reservation = reservations[resource_pool.network.name]
       if reservation
         if reservation.static?
-          @logger.debug("Releasing static network reservation for " +
+          @logger.debug('Releasing static network reservation for ' +
                         "resource pool VM `#{vm.cid}'")
           resource_pool.network.release(reservation)
         else
@@ -103,12 +103,12 @@ module Bosh::Director
     # @param [Hash] state Instance state according to agent
     # @param [Hash] reservations Instance network reservations
     def bind_instance(instance_model, state, reservations)
-      @logger.debug("Binding instance VM")
+      @logger.debug('Binding instance VM')
 
       # Update instance, if we are renaming a job.
       if @deployment_plan.rename_in_progress?
-        old_name = @deployment_plan.job_rename["old_name"]
-        new_name = @deployment_plan.job_rename["new_name"]
+        old_name = @deployment_plan.job_rename['old_name']
+        new_name = @deployment_plan.job_rename['new_name']
 
         if instance_model.job == old_name
           @logger.info("Renaming `#{old_name}' to `#{new_name}'")
@@ -120,27 +120,27 @@ module Bosh::Director
       if (job = @deployment_plan.job(instance_model.job)) &&
          (instance = job.instance(instance_model.index))
 
-        @logger.debug("Found job and instance spec")
+        @logger.debug('Found job and instance spec')
         instance.use_model(instance_model)
         instance.current_state = state
 
-        @logger.debug("Copying network reservations")
+        @logger.debug('Copying network reservations')
         instance.take_network_reservations(reservations)
 
-        @logger.debug("Copying resource pool reservation")
+        @logger.debug('Copying resource pool reservation')
         job.resource_pool.mark_active_vm
       else
-        @logger.debug("Job/instance not found, marking for deletion")
+        @logger.debug('Job/instance not found, marking for deletion')
         @deployment_plan.delete_instance(instance_model)
       end
     end
 
     def get_network_reservations(state)
       reservations = {}
-      state["networks"].each do |name, network_config|
+      state['networks'].each do |name, network_config|
         network = @deployment_plan.network(name)
         if network
-          reservation = NetworkReservation.new(:ip => network_config["ip"])
+          reservation = NetworkReservation.new(:ip => network_config['ip'])
           network.reserve(reservation)
           reservations[name] = reservation if reservation.reserved?
         end
@@ -155,9 +155,13 @@ module Bosh::Director
 
       @logger.debug("Received VM state: #{state.pretty_inspect}")
       verify_state(vm, state)
-      @logger.debug("Verified VM state")
+      @logger.debug('Verified VM state')
 
       migrate_legacy_state(vm, state)
+      state.delete('release')
+      if state.include?('job')
+        state['job'].delete('release')
+      end
       state
     end
 
@@ -179,38 +183,38 @@ module Bosh::Director
               "expected Hash, got #{state.class}"
       end
 
-      actual_deployment_name = state["deployment"]
+      actual_deployment_name = state['deployment']
       expected_deployment_name = @deployment_plan.name
 
       if actual_deployment_name != expected_deployment_name
         raise AgentWrongDeployment,
               "VM `#{vm.cid}' is out of sync: " +
-              "expected to be a part of deployment " +
+                'expected to be a part of deployment ' +
               "`#{expected_deployment_name}' " +
-              "but is actually a part of deployment " +
+                'but is actually a part of deployment ' +
               "`#{actual_deployment_name}'"
       end
 
-      actual_job = state["job"].is_a?(Hash) ? state["job"]["name"] : nil
-      actual_index = state["index"]
+      actual_job = state['job'].is_a?(Hash) ? state['job']['name'] : nil
+      actual_index = state['index']
 
       if instance.nil? && !actual_job.nil?
         raise AgentUnexpectedJob,
               "VM `#{vm.cid}' is out of sync: " +
               "it reports itself as `#{actual_job}/#{actual_index}' but " +
-              "there is no instance reference in DB"
+                'there is no instance reference in DB'
       end
 
       if instance &&
         (instance.job != actual_job || instance.index != actual_index)
         # Check if we are resuming a previously unfinished rename
-        if actual_job == @deployment_plan.job_rename["old_name"] &&
-           instance.job == @deployment_plan.job_rename["new_name"] &&
+        if actual_job == @deployment_plan.job_rename['old_name'] &&
+           instance.job == @deployment_plan.job_rename['new_name'] &&
            instance.index == actual_index
 
           # Rename already happened in the DB but then something happened
           # and agent has never been updated.
-          unless @deployment_plan.job_rename["force"]
+          unless @deployment_plan.job_rename['force']
             raise AgentRenameInProgress,
                   "Found a job `#{actual_job}' that seems to be " +
                   "in the middle of a rename to `#{instance.job}'. " +
@@ -235,7 +239,7 @@ module Bosh::Director
 
       instance = vm.instance
       if instance
-        disk_size = state["persistent_disk"].to_i
+        disk_size = state['persistent_disk'].to_i
         persistent_disk = instance.persistent_disk
 
         # This is to support legacy deployments where we did not have
@@ -331,12 +335,12 @@ module Bosh::Director
 
     def bind_dns
       domain = Models::Dns::Domain.find_or_create(:name => dns_domain_name,
-                                                  :type => "NATIVE")
+                                                  :type => 'NATIVE')
       @deployment_plan.dns_domain = domain
 
       soa_record = Models::Dns::Record.find_or_create(:domain_id => domain.id,
                                                       :name => dns_domain_name,
-                                                      :type => "SOA")
+                                                      :type => 'SOA')
       soa_record.content = SOA
       soa_record.ttl = 300
       soa_record.save
@@ -350,7 +354,7 @@ module Bosh::Director
       Models::Dns::Record.find_or_create(:domain_id => domain.id,
                                          :name => dns_ns_record,
                                          :type =>'A', :ttl => TTL_4H,
-                                         :content => Config.dns["address"])
+                                         :content => Config.dns['address'])
     end
 
     def bind_instance_vms
@@ -359,7 +363,7 @@ module Bosh::Director
       @deployment_plan.jobs.each do |job|
         job.instances.each do |instance|
           # Don't allocate resource pool VMs to instances in detached state
-          next if instance.state == "detached"
+          next if instance.state == 'detached'
           # Skip bound instances
           next if instance.model.vm
           unbound_instances << instance
@@ -368,7 +372,7 @@ module Bosh::Director
 
       return if unbound_instances.empty?
 
-      @event_log.begin_stage("Binding instance VMs", unbound_instances.size)
+      @event_log.begin_stage('Binding instance VMs', unbound_instances.size)
 
       ThreadPool.new(:max_threads => Config.max_threads).wrap do |pool|
         unbound_instances.each do |instance|
@@ -407,11 +411,11 @@ module Bosh::Director
     def delete_unneeded_vms
       unneeded_vms = @deployment_plan.unneeded_vms
       if unneeded_vms.empty?
-        @logger.info("No unneeded vms to delete")
+        @logger.info('No unneeded vms to delete')
         return
       end
 
-      @event_log.begin_stage("Deleting unneeded VMs", unneeded_vms.size)
+      @event_log.begin_stage('Deleting unneeded VMs', unneeded_vms.size)
       ThreadPool.new(:max_threads => Config.max_threads).wrap do |pool|
         unneeded_vms.each do |vm|
           pool.process do
@@ -428,14 +432,14 @@ module Bosh::Director
     def delete_unneeded_instances
       unneeded_instances = @deployment_plan.unneeded_instances
       if unneeded_instances.empty?
-        @logger.info("No unneeded instances to delete")
+        @logger.info('No unneeded instances to delete')
         return
       end
 
-      event_log_stage = @event_log.begin_stage("Deleting unneeded instances", unneeded_instances.size)
+      event_log_stage = @event_log.begin_stage('Deleting unneeded instances', unneeded_instances.size)
       instance_deleter = InstanceDeleter.new(@deployment_plan)
       instance_deleter.delete_instances(unneeded_instances, event_log_stage)
-      @logger.info("Deleted no longer needed instances")
+      @logger.info('Deleted no longer needed instances')
     end
   end
 end

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

@@ -1,5 +1,3 @@
-# Copyright (c) 2009-2012 VMware, Inc.
-
 module Bosh::Director
   module DeploymentPlan
     ##
@@ -27,7 +25,7 @@ module Bosh::Director
 
       def current_state
         if @current_state
-          @current_state.delete("release")
+          @current_state.delete('release')
         end
         @current_state
       end
@@ -76,7 +74,7 @@ module Bosh::Director
         else
           unless @network_reservation
             raise NetworkReservationMissing,
-                  "Missing network reservation for resource pool VM"
+                  'Missing network reservation for resource pool VM'
           end
 
           network_settings = {}
@@ -91,14 +89,14 @@ module Bosh::Director
       # @return [Boolean] returns true if the expected network configuration
       #   differs from the one provided by the VM
       def networks_changed?
-        network_settings != @current_state["networks"]
+        network_settings != @current_state['networks']
       end
 
       ##
       # @return [Boolean] returns true if the expected resource pool
       #   specification differs from the one provided by the VM
       def resource_pool_changed?
-        return true if resource_pool.spec != @current_state["resource_pool"]
+        return true if resource_pool.spec != @current_state['resource_pool']
         return true if resource_pool.deployment_plan.recreate
         return true if @vm && @vm.env != resource_pool.env
 

data/lib/bosh/director/job_instance_renderer.rb

@@ -1,3 +1,5 @@
+require 'bosh/director/rendered_job_instance'
+
 module Bosh::Director
   class JobInstanceRenderer
     def initialize(job, job_template_loader)
@@ -6,10 +8,12 @@ module Bosh::Director
     end
 
     def render(instance)
-      job.templates.map do |template|
+      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

data/lib/bosh/director/job_renderer.rb

@@ -1,27 +1,37 @@
 require 'bosh/director/job_template_loader'
 require 'bosh/director/job_instance_renderer'
-require 'bosh/director/rendered_job_instance_hasher'
-require 'bosh/director/rendered_job_templates_persister'
 
 module Bosh::Director
   class JobRenderer
     # @param [DeploymentPlan::Job]
     def initialize(job)
       @job = job
-      job_template_loader = JobTemplateLoader.new
+      job_template_loader = JobTemplateLoader.new(Config.logger)
       @instance_renderer = JobInstanceRenderer.new(@job, job_template_loader)
     end
 
     def render_job_instances(blobstore)
       @job.instances.each do |instance|
-        rendered_templates = @instance_renderer.render(instance)
+        rendered_job_instance = @instance_renderer.render(instance)
 
-        hasher = RenderedJobInstanceHasher.new(rendered_templates)
-        instance.configuration_hash = hasher.configuration_hash
-        instance.template_hashes = hasher.template_hashes
+        configuration_hash = rendered_job_instance.configuration_hash
 
-        persister = RenderedJobTemplatesPersister.new(blobstore)
-        persister.persist(instance, rendered_templates)
+        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)
+        else
+          rendered_templates_archive = rendered_job_instance.persist(blobstore)
+          instance.model.add_rendered_templates_archive(
+            blobstore_id: rendered_templates_archive.blobstore_id,
+            sha1: rendered_templates_archive.sha1,
+            content_sha1: configuration_hash,
+            created_at: Time.now,
+          )
+        end
+
+        instance.configuration_hash = configuration_hash
+        instance.template_hashes    = rendered_job_instance.template_hashes
+        instance.rendered_templates_archive = rendered_templates_archive
       end
     end
   end

data/lib/bosh/director/job_template_loader.rb

@@ -4,6 +4,10 @@ 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'))
@@ -19,13 +23,15 @@ module Bosh::Director
         templates << SrcFileTemplate.new(src_name, dest_name, erb_file)
       end
 
-      JobTemplateRenderer.new(job_template.name, monit_template, templates)
+      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')

data/lib/bosh/director/job_template_renderer.rb

@@ -6,11 +6,11 @@ module Bosh::Director
 
     attr_reader :monit_template, :templates
 
-    def initialize(name, monit_template, templates)
+    def initialize(name, monit_template, templates, logger)
       @name = name
       @monit_template = monit_template
       @templates = templates
-      @logger = Config.logger
+      @logger = logger
     end
 
     def render(job_name, instance)
@@ -28,14 +28,12 @@ module Bosh::Director
 
     private
 
-    private
-
-    attr_reader :name
+    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)
+      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)'
@@ -44,7 +42,7 @@ module Bosh::Director
       message = "Error filling in template `#{File.basename(template_name)}' " +
         "for `#{job_desc}' (line #{line}: #{e})"
 
-      @logger.debug("#{message}\n#{e.backtrace.join("\n")}")
+      logger.debug("#{message}\n#{e.backtrace.join("\n")}")
 
       raise JobTemplateBindingFailed, "#{message}"
     end

data/lib/bosh/director/{rendered_job_instance_hasher.rb → rendered_job_instance.rb}

@@ -1,5 +1,10 @@
+require 'bosh/director/deployment_plan/rendered_templates_archive'
+require 'bosh/director/compressed_rendered_job_templates'
+require 'digest/sha1'
+require 'tempfile'
+
 module Bosh::Director
-  class RenderedJobInstanceHasher
+  class RenderedJobInstance
     def initialize(job_templates)
       @job_templates = job_templates
     end
@@ -25,6 +30,18 @@ module Bosh::Director
       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

data/lib/bosh/director/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh-director
 version: !ruby/object:Gem::Version
-  version: 1.1840.0
+  version: 1.1858.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-24 00:00:00.000000000 Z
+date: 2014-01-27 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.1840.0
+        version: 1.1858.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1840.0
+        version: 1.1858.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.1840.0
+        version: 1.1858.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1840.0
+        version: 1.1858.0
 - !ruby/object:Gem::Dependency
   name: bosh_common
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1840.0
+        version: 1.1858.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1840.0
+        version: 1.1858.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +82,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1840.0
+        version: 1.1858.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1840.0
+        version: 1.1858.0
 - !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.1840.0
+        version: 1.1858.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1840.0
+        version: 1.1858.0
 - !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.1840.0
+        version: 1.1858.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1840.0
+        version: 1.1858.0
 - !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.1840.0
+        version: 1.1858.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -138,7 +138,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1840.0
+        version: 1.1858.0
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
@@ -461,7 +461,7 @@ dependencies:
         version: '1.0'
 description: ! 'BOSH Director
 
-  a98c30'
+  570d8c'
 email: support@cloudfoundry.com
 executables:
 - bosh-director
@@ -502,6 +502,7 @@ files:
 - db/migrations/director/20131121182231_add_rendered_templates_archives.rb
 - db/migrations/director/20131125232201_rename_rendered_templates_archives_blob_id_and_checksum_columns.rb
 - db/migrations/director/20140116002324_pivot_director_attributes.rb
+- db/migrations/director/20140124225348_proper_pk_for_attributes.rb
 - db/migrations/dns/20120123234908_initial.rb
 - lib/bosh/director.rb
 - lib/bosh/director/agent_client.rb
@@ -668,10 +669,9 @@ 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_hasher.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_job_templates_persister.rb
 - lib/bosh/director/rendered_templates_writer.rb
 - lib/bosh/director/resource_pool_updater.rb
 - lib/bosh/director/scheduler.rb
@@ -715,7 +715,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1800556756686427460
+      hash: 1775214425609302363
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23

data/lib/bosh/director/rendered_job_templates_persister.rb

@@ -1,41 +0,0 @@
-require 'tempfile'
-require 'bosh/director/compressed_rendered_job_templates'
-require 'bosh/director/deployment_plan/rendered_templates_archive'
-
-module Bosh::Director
-  class RenderedJobTemplatesPersister
-    def initialize(blobstore)
-      @blobstore = blobstore
-    end
-
-    def persist(instance, rendered_job_templates)
-      archive_model = instance.model.latest_rendered_templates_archive
-
-      if !archive_model || archive_model.content_sha1 != instance.configuration_hash
-        archive_model = persist_without_checking(instance, rendered_job_templates)
-      end
-
-      instance.rendered_templates_archive =
-        DeploymentPlan::RenderedTemplatesArchive.new(
-          archive_model.blobstore_id, archive_model.sha1)
-    end
-
-    def persist_without_checking(instance, rendered_job_templates)
-      file = Tempfile.new('compressed-rendered-job-templates')
-
-      compressed_archive = CompressedRenderedJobTemplates.new(file.path)
-      compressed_archive.write(rendered_job_templates)
-
-      blobstore_id = @blobstore.create(compressed_archive.contents)
-
-      instance.model.add_rendered_templates_archive(
-        blobstore_id: blobstore_id,
-        sha1: compressed_archive.sha1,
-        content_sha1: instance.configuration_hash,
-        created_at: Time.now,
-      )
-    ensure
-      file.close!
-    end
-  end
-end