Merge branch '258658-no-repository-found' into 'master'

Geo - Fix wikis/designs with no repository on the primary trying to sync over and over

See merge request gitlab-org/gitlab!43765

ee/app/services/geo/design_repository_sync_service.rb

@@ -16,7 +16,7 @@ module Geo
     rescue Gitlab::Shell::Error, Gitlab::Git::BaseError => e
       # In some cases repository does not exist, the only way to know about this is to parse the error text.
       # If it does not exist we should consider it as successfully downloaded.
-      if e.message.include? Gitlab::GitAccess::ERROR_MESSAGES[:no_repo] # rubocop:disable Cop/LineBreakAroundConditionalBlock
+      if e.message.include? Gitlab::GitAccessDesign::ERROR_MESSAGES[:no_repo] # rubocop:disable Cop/LineBreakAroundConditionalBlock
         log_info('Design repository is not found, marking it as successfully synced')
         mark_sync_as_successful(missing_on_primary: true)
       else

ee/app/services/geo/wiki_sync_service.rb

@@ -16,7 +16,7 @@ module Geo
     rescue Gitlab::Shell::Error, Gitlab::Git::BaseError, Wiki::CouldNotCreateWikiError => e
       # In some cases repository does not exist, the only way to know about this is to parse the error text.
       # If it does not exist we should consider it as successfully downloaded.
-      if e.message.include? Gitlab::GitAccess::ERROR_MESSAGES[:no_repo] # rubocop:disable Cop/LineBreakAroundConditionalBlock
+      if e.message.include? Gitlab::GitAccessWiki::ERROR_MESSAGES[:no_repo] # rubocop:disable Cop/LineBreakAroundConditionalBlock
         if repository_presumably_exists_on_primary?
           log_info('Wiki is not found, but it seems to exist on the primary')
           fail_registry_sync!('Wiki is not found', e)

ee/changelogs/unreleased/258658-no-repository-found.yml

+---
+title: Geo - Fix wikis with no repository on the primary trying to sync over and over
+merge_request: 43765
+author:
+type: fixed

ee/spec/services/geo/design_repository_sync_service_spec.rb

@@ -111,7 +111,7 @@ RSpec.describe Geo::DesignRepositorySyncService do
 
       allow(repository).to receive(:fetch_as_mirror)
         .with(url_to_repo, remote_name: 'geo', forced: true)
-        .and_raise(Gitlab::Shell::Error.new(Gitlab::GitAccess::ERROR_MESSAGES[:no_repo]))
+        .and_raise(Gitlab::Shell::Error.new(Gitlab::GitAccessDesign::ERROR_MESSAGES[:no_repo]))
 
       subject.execute
 

ee/spec/services/geo/wiki_sync_service_spec.rb

@@ -85,7 +85,7 @@ RSpec.describe Geo::WikiSyncService, :geo do
 
       allow(repository).to receive(:fetch_as_mirror)
         .with(url_to_repo, remote_name: 'geo', forced: true)
-        .and_raise(Gitlab::Shell::Error.new(Gitlab::GitAccess::ERROR_MESSAGES[:no_repo]))
+        .and_raise(Gitlab::Shell::Error.new(Gitlab::GitAccessWiki::ERROR_MESSAGES[:no_repo]))
 
       subject.execute
 
@@ -115,7 +115,7 @@ RSpec.describe Geo::WikiSyncService, :geo do
 
         allow(repository).to receive(:fetch_as_mirror)
           .with(url_to_repo, remote_name: 'geo', forced: true)
-          .and_raise(Gitlab::Shell::Error.new(Gitlab::GitAccess::ERROR_MESSAGES[:no_repo]))
+          .and_raise(Gitlab::Shell::Error.new(Gitlab::GitAccessWiki::ERROR_MESSAGES[:no_repo]))
 
         subject.execute