Requested PR changes

Author: aramprice

src/bosh-director/lib/bosh/director/api/controllers/deployments_controller.rb

@@ -490,7 +490,11 @@ def initialize(config)
           manifest_text = request.body.read
           manifest_hash = validate_manifest_yml(manifest_text)
 
-          manifest_hash['name'] = deployment.name if deployment
+          if deployment
+            manifest_hash['name'] = deployment.name
+            # ensure diff will show `name` from `deployment.name` and not manifest YAML
+            manifest_text = YAML.dump(manifest_hash)
+          end
 
           if deployment
             before_manifest = Manifest.load_from_model(deployment, resolve_interpolation: false)

src/bosh-director/lib/bosh/director/deployment_plan/stages/package_compile_stage.rb

@@ -162,7 +162,7 @@ def prepare_vm(...)
         private
 
         def validate_compiled_package_blobstore_id!(task_result)
-          bid = task_result['blobstore_id']
+          bid = task_result.is_a?(Hash) ? task_result['blobstore_id'] : nil
           return if Blobstore::UuidValidation.valid_uuid?(bid)
 
           raise PackageCompilationInvalidTaskBlobstoreId,

src/bosh-director/lib/bosh/director/jobs/update_release.rb

@@ -75,7 +75,7 @@ def extract_release
         out, err, status = Open3.capture3('tar', '-C', release_dir, '-xf', release_path)
         combined = [out, err].map(&:to_s).join
         if status.exitstatus != 0
-          logger.error("Failed to extract release archive '#{release_path}' into dir '#{release_dir}', tar returned #{status.exitstatus}, output: #{combined})")
+          logger.error("Failed to extract release archive '#{release_path}' into dir '#{release_dir}', tar returned #{status.exitstatus}, output: #{combined}")
           FileUtils.rm_rf(release_dir)
           raise ReleaseInvalidArchive, 'Extracting release archive failed. Check task debug log for details.'
         end

src/bosh-director/spec/unit/bosh/director/api/controllers/deployments_controller_spec.rb

@@ -2737,10 +2737,14 @@ def perform
 
             it 'uses the deployment from the URL when the YAML manifest names a different deployment' do
               manifest = YAML.dump('name' => 'other_deployment', 'releases' => [], 'instance_groups' => [])
+              expect_any_instance_of(DeploymentManager)
+                .to receive(:create_deployment) do |_, _, rewritten_manifest, *_|
+                expect(YAML.load(rewritten_manifest)).to include('name' => 'owned_deployment')
+                OpenStruct.new(id: 1)
+              end
               put '/owned_deployment/jobs/dea?state=recreate', manifest, { 'CONTENT_TYPE' => 'text/yaml' }
               expect(last_response.status).to eq(302)
             end
-
           end
 
           context 'PUT /:deployment/jobs/:job/:index_or_id' do

src/bosh-director/spec/unit/bosh/director/jobs/fetch_logs_spec.rb

@@ -41,7 +41,8 @@ module Bosh::Director
           let(:agent) { instance_double('Bosh::Director::AgentClient', fetch_logs: {'blobstore_id' => 'aaaaaaaa-aaaa-4aaa-8aaa-aaaaaaaa0001'}) }
 
           it 'cleans old log bundles' do
-            old_log_bundle = FactoryBot.create(:models_log_bundle, timestamp: Time.now - 12*24*60*60, blobstore_id: 'bbbbbbbb-bbbb-4bbb-8bbb-bbbbbbbbb001') # 12 days
+            old_log_bundle = FactoryBot.create(:models_log_bundle, timestamp: Time.now - (12*24*60*60), blobstore_id: 'bbbbbbbb-bbbb-4bbb-8bbb-bbbbbbbbb001') # 12 days
+
             expect(blobstore).to receive(:delete).with('bbbbbbbb-bbbb-4bbb-8bbb-bbbbbbbbb001')
 
             fetch_logs.perform
@@ -51,7 +52,7 @@ module Bosh::Director
 
           context 'when deleting blob from blobstore fails' do
             it 'cleans the old log bundle if it was not found in the blobstore' do
-              old_log_bundle = FactoryBot.create(:models_log_bundle, timestamp: Time.now - 12*24*60*60, blobstore_id: 'bbbbbbbb-bbbb-4bbb-8bbb-bbbbbbbbb001') # 12 days
+              old_log_bundle = FactoryBot.create(:models_log_bundle, timestamp: Time.now - (12*24*60*60), blobstore_id: 'bbbbbbbb-bbbb-4bbb-8bbb-bbbbbbbbb001') # 12 days
               expect(blobstore).to receive(:delete).with('bbbbbbbb-bbbb-4bbb-8bbb-bbbbbbbbb001').and_raise(Bosh::Director::Blobstore::NotFound)
 
               fetch_logs.perform
@@ -60,7 +61,7 @@ module Bosh::Director
             end
 
             it 'does not clean the old log bundle if any other error is returned' do
-              old_log_bundle = FactoryBot.create(:models_log_bundle, timestamp: Time.now - 12*24*60*60, blobstore_id: 'bbbbbbbb-bbbb-4bbb-8bbb-bbbbbbbbb001') # 12 days
+              old_log_bundle = FactoryBot.create(:models_log_bundle, timestamp: Time.now - (12*24*60*60), blobstore_id: 'bbbbbbbb-bbbb-4bbb-8bbb-bbbbbbbbb001') # 12 days
               expect(blobstore).to receive(:delete).with('bbbbbbbb-bbbb-4bbb-8bbb-bbbbbbbbb001').and_raise(Bosh::Director::Blobstore::NotImplemented)
 
               fetch_logs.perform