CustomAction#message was never usedashmckenzie/make-console-messages-consistent

3 files changed, 6 insertions, 8 deletions

diff --git a/lib/api/internal/base.rb b/lib/api/internal/base.rb
index 2aaaf06aa94..7daf36384cf 100644
--- a/lib/api/internal/base.rb
+++ b/lib/api/internal/base.rb
@@ -78,7 +78,7 @@ module API
 
             response_with_status(**payload)
           when ::Gitlab::GitAccessResult::CustomAction
-            response_with_status(code: 300, message: check_result.message, payload: check_result.payload, gl_console_messages: check_result.console_messages)
+            response_with_status(code: 300, payload: check_result.payload, gl_console_messages: check_result.console_messages)
           else
             response_with_status(code: 500, success: false, message: UNKNOWN_CHECK_RESULT_ERROR)
           end
diff --git a/lib/gitlab/git_access_result/custom_action.rb b/lib/gitlab/git_access_result/custom_action.rb
index fe5932a3110..336f3405f72 100644
--- a/lib/gitlab/git_access_result/custom_action.rb
+++ b/lib/gitlab/git_access_result/custom_action.rb
@@ -3,7 +3,7 @@
 module Gitlab
   module GitAccessResult
     class CustomAction
-      attr_reader :payload, :message, :console_messages
+      attr_reader :payload, :console_messages
 
       # Example of payload:
       #
@@ -16,9 +16,8 @@ module Gitlab
       #   }
       # }
       #
-      def initialize(payload, message, console_messages)
+      def initialize(payload, console_messages)
         @payload = payload
-        @message = message
         @console_messages = console_messages
       end
     end
diff --git a/spec/requests/api/internal/base_spec.rb b/spec/requests/api/internal/base_spec.rb
index a56527073c7..5c84f729031 100644
--- a/spec/requests/api/internal/base_spec.rb
+++ b/spec/requests/api/internal/base_spec.rb
@@ -452,7 +452,6 @@ describe API::Internal::Base do
 
     context "custom action" do
       let(:access_checker) { double(Gitlab::GitAccess) }
-      let(:message) { 'CustomActionError message' }
       let(:payload) do
         {
           'action' => 'geo_proxy_to_primary',
@@ -463,8 +462,8 @@ describe API::Internal::Base do
           }
         }
       end
-
-      let(:custom_action_result) { Gitlab::GitAccessResult::CustomAction.new(payload, message) }
+      let(:console_messages) { ['informational message'] }
+      let(:custom_action_result) { Gitlab::GitAccessResult::CustomAction.new(payload, console_messages) }
 
       before do
         project.add_guest(user)
@@ -491,8 +490,8 @@ describe API::Internal::Base do
 
           expect(response).to have_gitlab_http_status(300)
           expect(json_response['status']).to be_truthy
-          expect(json_response['message']).to eql(message)
           expect(json_response['payload']).to eql(payload)
+          expect(json_response['gl_console_messages']).to eql(console_messages)
           expect(user.reload.last_activity_on).to be_nil
         end
       end