tim/fluke
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'CID-470-fix_output_on_server_with_empty_name_deleting' into qa

Browse Source
This commit is contained in:
Anton Chuchkalov 2016-03-17 18:32:53 +02:00
commit 48333a9097
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
devops-service/lib/executors/server_executor.rb
View File

@ -436,7 +436,7 @@ module Devops
end end
def delete_from_chef_server node_name def delete_from_chef_server node_name
return if node_name.blank? return {chef_node: nil, chef_client: nil} if node_name.blank?
{ {
:chef_node => knife_instance.chef_node_delete(node_name), :chef_node => knife_instance.chef_node_delete(node_name),
:chef_client => knife_instance.chef_client_delete(node_name) :chef_client => knife_instance.chef_client_delete(node_name)
@ -454,9 +454,13 @@ module Devops
return 0 return 0
end end
puts_and_flush "Deleting from chef server:" if @server.chef_node_name.present?
delete_from_chef_server(@server.chef_node_name).each do |key, result| puts_and_flush "Deleting from chef server:"
@out.puts "#{key} - #{result}" delete_from_chef_server(@server.chef_node_name).each do |key, result|
@out.puts "#{key} - #{result}"
end
else
puts_and_flush "Chef node name is empty, skipping deleting from chef server."
end end
puts_and_flush "Deleting from cloud:" puts_and_flush "Deleting from cloud:"

4
devops-service/spec/executors/server_executor_spec.rb
View File

@ -667,7 +667,9 @@ RSpec.describe Devops::Executor::ServerExecutor, type: :executor, stubbed_connec
it "doesn't call knife if chef node name is empty" do it "doesn't call knife if chef node name is empty" do
expect(stubbed_knife).not_to receive(:chef_client_delete) expect(stubbed_knife).not_to receive(:chef_client_delete)
expect(stubbed_knife).not_to receive(:chef_node_delete) expect(stubbed_knife).not_to receive(:chef_node_delete)
executor.delete_from_chef_server('') expect(
executor.delete_from_chef_server('')
).to be_a(Hash).and include(:chef_node, :chef_client)
end end
end end