Improve deploy environment chatops slash command

We now match deployment actions better. If there is more than one
deployment action matched, we check if there is an action which name
equals to environment name, instead of raising an error about too many
actions defined.

2 files changed, 23 insertions, 21 deletions

diff --git a/lib/gitlab/slash_commands/deploy.rb b/lib/gitlab/slash_commands/deploy.rb
index e71eb15d604..93e00ab75a1 100644
--- a/lib/gitlab/slash_commands/deploy.rb
+++ b/lib/gitlab/slash_commands/deploy.rb
@@ -21,29 +21,34 @@ module Gitlab
         from = match[:from]
         to = match[:to]
 
-        actions = find_actions(from, to)
+        action = find_action(from, to)
 
-        if actions.none?
-          Gitlab::SlashCommands::Presenters::Deploy.new(nil).no_actions
-        elsif actions.one?
-          action = play!(from, to, actions.first)
-          Gitlab::SlashCommands::Presenters::Deploy.new(action).present(from, to)
+        if action.nil?
+          Gitlab::SlashCommands::Presenters::Deploy
+            .new(action).action_not_found
         else
-          Gitlab::SlashCommands::Presenters::Deploy.new(actions).too_many_actions
+          deployment = action.play(current_user)
+
+          Gitlab::SlashCommands::Presenters::Deploy
+            .new(deployment).present(from, to)
         end
       end
 
       private
 
-      def play!(from, to, action)
-        action.play(current_user)
-      end
-
-      def find_actions(from, to)
+      def find_action(from, to)
         environment = project.environments.find_by(name: from)
-        return [] unless environment
+        return unless environment
 
-        environment.actions_for(to).select(&:starts_environment?)
+        actions = environment.actions_for(to).select do |action|
+          action.starts_environment?
+        end
+
+        if actions.many?
+          actions.find { |action| action.name == to.to_s }
+        else
+          actions.first
+        end
       end
     end
   end
diff --git a/lib/gitlab/slash_commands/presenters/deploy.rb b/lib/gitlab/slash_commands/presenters/deploy.rb
index b8dc77bd37b..b72586394bc 100644
--- a/lib/gitlab/slash_commands/presenters/deploy.rb
+++ b/lib/gitlab/slash_commands/presenters/deploy.rb
@@ -3,17 +3,14 @@ module Gitlab
     module Presenters
       class Deploy < Presenters::Base
         def present(from, to)
-          message = "Deployment started from #{from} to #{to}. [Follow its progress](#{resource_url})."
+          message = "Deployment started from #{from} to #{to}. " \
+                    "[Follow its progress](#{resource_url})."
 
           in_channel_response(text: message)
         end
 
-        def no_actions
-          ephemeral_response(text: "No action found to be executed")
-        end
-
-        def too_many_actions
-          ephemeral_response(text: "Too many actions defined")
+        def action_not_found
+          ephemeral_response(text: "Couldn't find a deployment action.")
         end
       end
     end