#871: ask questions before deleting

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

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.'