Merge branch '218557-geo-design-thumbnails-are-not-replicated' into 'master'

Resolve "Geo: Design thumbnails are not replicated"

Closes #218557

See merge request gitlab-org/gitlab!32703

changelogs/unreleased/218557-geo-design-thumbnails-are-not-replicated.yml

+---
+title: Fix Geo replication for design thumbnails
+merge_request: 32703
+author:
+type: fixed

ee/lib/gitlab/geo/replication.rb

@@ -3,7 +3,7 @@
 module Gitlab
   module Geo
     module Replication
-      USER_UPLOADS_OBJECT_TYPES = %i[attachment avatar file import_export namespace_file personal_file favicon].freeze
+      USER_UPLOADS_OBJECT_TYPES = %i[attachment avatar file import_export namespace_file personal_file favicon design_management/design_v432x230].freeze
       FILE_NOT_FOUND_GEO_CODE = 'FILE_NOT_FOUND'.freeze
 
       def self.object_type_from_user_uploads?(object_type)

ee/lib/gitlab/geo/replication/base_transfer.rb

@@ -46,7 +46,7 @@ module Gitlab
 
         # @return [String] URL to download the resource from
         def resource_url
-          Gitlab::Geo.primary_node.geo_transfers_url(file_type, file_id.to_s)
+          Gitlab::Geo.primary_node.geo_transfers_url(url_encode(file_type), file_id.to_s)
         end
 
         # Returns Result object with success boolean and number of bytes downloaded.

ee/spec/lib/gitlab/geo/replication/base_transfer_spec.rb

@@ -8,6 +8,20 @@ describe Gitlab::Geo::Replication::BaseTransfer do
   let_it_be(:primary_node) { create(:geo_node, :primary) }
   let_it_be(:secondary_node) { create(:geo_node) }
 
+  describe '#resource_url' do
+    subject do
+      described_class.new(file_type: 'design_management/design_v432x230', file_id: 1,
+                          filename: Tempfile.new, expected_checksum: nil, request_data: nil)
+    end
+
+    context 'when file type contains /' do
+      it 'returns escaped url' do
+        url = subject.resource_url
+        expect(url).to include('design_management%2Fdesign_v432x230')
+      end
+    end
+  end
+
   describe '#can_transfer?' do
     subject do
       described_class.new(file_type: :avatar, file_id: 1, filename: Tempfile.new,