From 8ea70f707231541f098350412899825f330ce3c6 Mon Sep 17 00:00:00 2001 From: Anton Chuchkalov Date: Fri, 13 Nov 2015 19:44:00 +0300 Subject: [PATCH] #871: ask questions before deleting --- .../lib/devops-client/handler/project.rb | 23 ++++++++++++++++++- .../lib/devops-client/output/project.rb | 9 -------- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/devops-client/lib/devops-client/handler/project.rb b/devops-client/lib/devops-client/handler/project.rb index bf6b7aa..dd261d3 100644 --- a/devops-client/lib/devops-client/handler/project.rb +++ b/devops-client/lib/devops-client/handler/project.rb @@ -451,11 +451,32 @@ protected abort(error) end + ask_for_delete_servers(project, env) body = { deploy_env: env, - dry_run: @options[:dry_run] + dry_run: false } @list = delete("/project/#{project}/servers", body) end + private + + def ask_for_delete_servers(project, env) + body = { + deploy_env: env, + dry_run: true + } + to_delete = delete("/project/#{project}/servers", body)['to_delete'] + if to_delete.empty? + abort "There are no servers to delete." + else + puts "Servers to delete:\n----\n" + puts to_delete.join("\n") + puts '----' + end + if @options[:dry_run] || !question('Are you sure to delete them? ') + abort + end + end + end diff --git a/devops-client/lib/devops-client/output/project.rb b/devops-client/lib/devops-client/output/project.rb index e6151cb..b137aad 100644 --- a/devops-client/lib/devops-client/output/project.rb +++ b/devops-client/lib/devops-client/output/project.rb @@ -153,15 +153,6 @@ module Output def delete_servers_output output = '' - if @options[:dry_run] - if @data['to_delete'].empty? - output << "There are no servers to delete." - else - output << "Servers to delete:\n----\n" - output << @data['to_delete'].join("\n") - end - return output - end if @data['deleted'].empty? output << 'There are no deleted servers.'