Fix GeoNode#name backward compatibility

For backwards compatibility, ensures name ends with
a trailing forward slash when it looks like the url
field missing slash

ee/app/models/geo_node.rb

@@ -126,6 +126,24 @@ class GeoNode < ApplicationRecord
     secondary? && clone_protocol == 'ssh'
   end
 
+  def name
+    value = read_attribute(:name)
+
+    if looks_like_url_field_missing_slash?(value)
+      add_ending_slash(value)
+    else
+      value
+    end
+  end
+
+  def name=(value)
+    if looks_like_url_field_missing_slash?(value)
+      write_with_ending_slash(:name, value)
+    else
+      write_attribute(:name, value)
+    end
+  end
+
   def url
     read_with_ending_slash(:url)
   end
@@ -317,6 +335,14 @@ class GeoNode < ApplicationRecord
     Gitlab::Geo.expire_cache!
   end
 
+  # This method is required for backward compatibility. If it
+  # returns true,  then we can be fairly confident they did not
+  # set gitlab_rails['geo_node_name']. But if it returns false,
+  # then we aren't sure, so we shouldn't touch the name value.
+  def looks_like_url_field_missing_slash?(value)
+    add_ending_slash(value) == url
+  end
+
   def read_with_ending_slash(attribute)
     value = read_attribute(attribute)
 

ee/spec/models/geo_node_spec.rb

@@ -379,6 +379,46 @@ describe GeoNode, :geo, type: :model do
     end
   end
 
+  describe '#name' do
+    it 'adds a trailing forward slash when name looks like url field missing slash' do
+      subject = build(:geo_node, url: 'https://foo.com', name: 'https://foo.com')
+
+      expect(subject.name).to eq('https://foo.com/')
+    end
+
+    it 'does not add a trailing forward slash when name does not looks like url field' do
+      subject = build(:geo_node, url: 'https://foo.com', name: 'https://bar.com')
+
+      expect(subject.name).to eq('https://bar.com')
+    end
+
+    it 'does not add a trailing forward slash when name is nil' do
+      subject = build(:geo_node, name: nil)
+
+      expect(subject.name).to be_nil
+    end
+
+    it 'does not add a trailing forward slash when name is an empty string' do
+      subject = build(:geo_node, name: '')
+
+      expect(subject.name).to be_empty
+    end
+  end
+
+  describe '#name=' do
+    it 'adds a trailing forward slash when name looks like url field missing slash' do
+      subject = create(:geo_node, url: 'https://foo.com', name: 'https://foo.com')
+
+      expect(subject.read_attribute(:name)).to eq('https://foo.com/')
+    end
+
+    it 'does not add a trailing forward slash when name does not looks like url field' do
+      subject = create(:geo_node, url: 'https://foo.com', name: 'https://bar.com')
+
+      expect(subject.read_attribute(:name)).to eq('https://bar.com')
+    end
+  end
+
   describe '#url' do
     it 'returns a string' do
       expect(new_node.url).to be_a String