Move Geo redirect/proxy messages into Gitlab::Geo

ee/lib/ee/gitlab/geo_git_access.rb

@@ -40,7 +40,7 @@ module EE
       end
 
       def messages
-        messages = proxying_to_primary_message
+        messages = ::Gitlab::Geo.proxying_push_to_primary_message(primary_ssh_url_to_repo).split("\n")
         lag_message = current_replication_lag_message
 
         return messages unless lag_message
@@ -75,23 +75,6 @@ module EE
         geo_primary_ssh_url_to_repo(project_or_wiki)
       end
 
-      def proxying_to_primary_message
-        # This is formatted like this to fit into the console 'box', e.g.
-        #
-        # remote:
-        # remote: You're pushing to a Geo secondary! We'll help you by proxying this
-        # remote: request to the primary:
-        # remote:
-        # remote:   ssh://<user>@<host>:<port>/<group>/<repo>.git
-        # remote:
-        <<~STR.split("\n")
-          You're pushing to a Geo secondary! We'll help you by proxying this
-          request to the primary:
-
-            #{primary_ssh_url_to_repo}
-        STR
-      end
-
       def current_replication_lag_message
         return if ::Gitlab::Database.read_write? || current_replication_lag.zero?
 

ee/lib/gitlab/geo.rb

@@ -136,5 +136,34 @@ module Gitlab
 
       Gitlab::CIDR.new(allowed_ips).match?(ip)
     end
+
+    def self.proxying_push_to_primary_message(url)
+      push_to_primary_message(url, 'proxying')
+    end
+
+    def self.redirecting_push_to_primary_message(url)
+      push_to_primary_message(url, 'redirecting')
+    end
+
+    def self.push_to_primary_message(url, action)
+      return unless url && action
+
+      # This is formatted like this to fit into the console 'box', e.g.
+      #
+      # remote:
+      # remote: You're pushing to a Geo secondary! We'll help you by <action> this
+      # remote: request to the primary:
+      # remote:
+      # remote:   <url>
+      # remote:
+      template = <<~STR
+        You're pushing to a Geo secondary! We'll help you by %{action} this
+        request to the primary:
+
+          %{url}
+      STR
+
+      _(template) % { action: _(action), url: url }
+    end
   end
 end

ee/spec/lib/gitlab/geo_spec.rb

@@ -307,4 +307,32 @@ describe Gitlab::Geo, :geo, :request_store do
       end
     end
   end
+
+  describe '.proxying_to_primary_message' do
+    it 'returns a message as a string' do
+      url = 'ssh://git@primary.com/namespace/repo.git'
+      message = <<~STR
+      You're pushing to a Geo secondary! We'll help you by proxying this
+      request to the primary:
+
+        #{url}
+      STR
+
+      expect(described_class.proxying_push_to_primary_message(url)).to eq(message)
+    end
+  end
+
+  describe '.redirecting_to_primary_message' do
+    it 'returns a message as a string' do
+      url = 'http://primary.com/namespace/repo.git'
+      message = <<~STR
+      You're pushing to a Geo secondary! We'll help you by redirecting this
+      request to the primary:
+
+        #{url}
+      STR
+
+      expect(described_class.redirecting_push_to_primary_message(url)).to eq(message)
+    end
+  end
 end