Remove feature flag from design registry finder

ee/app/finders/geo/design_registry_finder.rb

@@ -3,15 +3,15 @@
 module Geo
   class DesignRegistryFinder < RegistryFinder
     def count_syncable
-      current_node(fdw: false).designs.count
+      designs.count
     end
 
     def count_synced
-      registries.merge(Geo::DesignRegistry.synced).count
+      registries.synced.count
     end
 
     def count_failed
-      registries.merge(Geo::DesignRegistry.failed).count
+      registries.failed.count
     end
 
     def count_registry
@@ -19,8 +19,8 @@ module Geo
     end
 
     def find_registry_differences(range)
-      source_ids = Gitlab::Geo.current_node.designs.id_in(range).pluck_primary_key
-      tracked_ids = Geo::DesignRegistry.pluck_model_ids_in_range(range)
+      source_ids = designs.id_in(range).pluck_primary_key
+      tracked_ids = registries.pluck_model_ids_in_range(range)
 
       untracked_ids = source_ids - tracked_ids
       unused_tracked_ids = tracked_ids - source_ids
@@ -46,7 +46,7 @@ module Geo
     # @param [Array<Integer>] except_ids ids that will be ignored from the query
     # rubocop:disable CodeReuse/ActiveRecord
     def find_never_synced_registries(batch_size:, except_ids: [])
-      Geo::DesignRegistry
+      registries
         .never_synced
         .model_id_not_in(except_ids)
         .limit(batch_size)
@@ -55,7 +55,7 @@ module Geo
 
     # rubocop:disable CodeReuse/ActiveRecord
     def find_retryable_dirty_registries(batch_size:, except_ids: [])
-      Geo::DesignRegistry
+      registries
         .updated_recently
         .model_id_not_in(except_ids)
         .order(Gitlab::Database.nulls_first_order(:last_synced_at))
@@ -65,15 +65,12 @@ module Geo
 
     private
 
+    def designs
+      current_node_non_fdw.designs
+    end
+
     def registries
-      if Geo::DesignRegistry.registry_consistency_worker_enabled?
-        Geo::DesignRegistry.all
-      else
-        current_node(fdw: true)
-          .projects
-          .with_designs
-          .inner_join_design_registry
-      end
+      Geo::DesignRegistry
     end
   end
 end

ee/spec/finders/geo/design_registry_finder_spec.rb

@@ -4,158 +4,63 @@ require 'spec_helper'
 RSpec.describe Geo::DesignRegistryFinder, :geo do
   include ::EE::GeoHelpers
 
-  let(:secondary) { create(:geo_node) }
-  let(:project_1) { create(:project) }
-  let(:project_2) { create(:project) }
-  let(:project_3) { create(:project) }
-  let(:project_4) { create(:project) }
-  let(:project_5) { create(:project) }
-  let(:project_6) { create(:project) }
+  let_it_be(:secondary) { create(:geo_node) }
+  let_it_be(:synced_group) { create(:group) }
+  let_it_be(:nested_group) { create(:group, parent: synced_group) }
+  let_it_be(:project_1) { create(:project, group: synced_group) }
+  let_it_be(:project_2) { create(:project, group: nested_group) }
+  let_it_be(:project_3) { create(:project) }
+  let_it_be(:project_4) { create(:project) }
+  let_it_be(:project_5) { create(:project, :broken_storage) }
+  let_it_be(:project_6) { create(:project, :broken_storage) }
+  let_it_be(:project_7) { create(:project) }
 
   subject { described_class.new(current_node_id: secondary.id) }
 
-  context 'when geo_design_registry_ssot_sync is disabled', :geo_fdw do
-    let!(:failed_registry) { create(:geo_design_registry, :sync_failed) }
-    let!(:synced_registry) { create(:geo_design_registry, :synced) }
-
-    before do
-      stub_feature_flags(geo_design_registry_ssot_sync: false)
-    end
-
-    describe '#count_syncable' do
-      it 'returns number of design repositories' do
-        # One more design for the same project to assert absence of duplicates
-        create(:design, project: synced_registry.project)
-
-        expect(subject.count_syncable).to eq(2)
-      end
-    end
-
-    describe '#count_synced' do
-      it 'returns only synced registry' do
-        expect(subject.count_synced).to eq(1)
-      end
-    end
-
-    describe '#count_failed' do
-      it 'returns only failed registry' do
-        expect(subject.count_failed).to eq(1)
-      end
-    end
-
-    describe '#count_registry' do
-      it 'returns number of all registries' do
-        expect(subject.count_registry).to eq(2)
-      end
-    end
-
-    context 'selective sync' do
-      let(:synced_group) { create(:group) }
-      let(:unsynced_group) { create(:group) }
-      let(:synced_project) { create(:project, group: synced_group) }
-      let(:unsynced_project) { create(:project, :broken_storage, group: unsynced_group) }
-      let(:unsynced_project2) { create(:project, group: unsynced_group) }
-      let(:synced_project2) { create(:project, group: synced_group) }
-
-      before do
-        create(:geo_design_registry, :synced, project: synced_project)
-        create(:geo_design_registry, :sync_failed, project: synced_project2)
-        create(:geo_design_registry, :synced, project: unsynced_project)
-        create(:geo_design_registry, :sync_failed, project: unsynced_project2)
-
-        secondary.update!(selective_sync_type: 'namespaces', namespaces: [synced_group])
-      end
-
-      context 'count all the things' do
-        describe '#count_syncable' do
-          it 'returns number of design repositories' do
-            result = subject.count_syncable
-
-            expect(result).to eq(2)
-          end
-        end
-
-        describe '#count_synced' do
-          it 'returns only synced registry' do
-            result = subject.count_synced
-
-            expect(result).to eq(1)
-          end
-        end
-
-        describe '#count_failed' do
-          it 'returns only failed registry' do
-            result = subject.count_failed
+  before do
+    stub_current_geo_node(secondary)
+  end
 
-            expect(result).to eq(1)
-          end
-        end
+  describe '#count_syncable' do
+    it 'returns number of designs' do
+      # Two designs for the same project to assert absence of duplicates
+      create_list(:design, 2, project: project_1)
+      create(:design, project: project_2)
 
-        describe '#count_registry' do
-          it 'returns number of all registries' do
-            result = subject.count_registry
+      result = subject.count_syncable
 
-            expect(result).to eq(2)
-          end
-        end
-      end
+      expect(result).to eq(2)
     end
   end
 
-  context 'when geo_design_registry_ssot_sync is enabled' do
-    let!(:registry_project_1) { create(:geo_design_registry, :synced, project_id: project_1.id) }
-    let!(:registry_project_2) { create(:geo_design_registry, :sync_failed, project_id: project_2.id) }
-    let!(:registry_project_3) { create(:geo_design_registry, project_id: project_3.id, last_synced_at: nil) }
-    let!(:registry_project_4) { create(:geo_design_registry, project_id: project_4.id, last_synced_at: 3.days.ago, retry_at: 2.days.ago) }
-    let!(:registry_project_5) { create(:geo_design_registry, project_id: project_5.id, last_synced_at: 6.days.ago) }
-    let!(:registry_project_6) { create(:geo_design_registry, project_id: project_6.id, last_synced_at: nil) }
+  describe '#count_synced' do
+    it 'returns number of synced registries' do
+      create(:geo_design_registry, :synced, project_id: project_1.id)
+      create(:geo_design_registry, :sync_failed, project_id: project_2.id)
 
-    before do
-      stub_feature_flags(geo_design_registry_ssot_sync: true)
+      expect(subject.count_synced).to eq(1)
     end
+  end
 
-    describe '#count_syncable' do
-      it 'returns number of design repositories' do
-        # One more design for the same project to assert absence of duplicates
-        create(:design, project: project_1)
-
-        result = subject.count_syncable
+  describe '#count_failed' do
+    it 'returns number of failed registries' do
+      create(:geo_design_registry, :synced, project_id: project_1.id)
+      create(:geo_design_registry, :sync_failed, project_id: project_2.id)
 
-        expect(result).to eq(6)
-      end
+      expect(subject.count_failed).to eq(1)
     end
+  end
 
-    describe '#count_synced' do
-      it 'returns only synced registry' do
-        expect(subject.count_synced).to eq(1)
-      end
-    end
+  describe '#count_registry' do
+    it 'returns number of all registries' do
+      create(:geo_design_registry, :synced, project_id: project_1.id)
+      create(:geo_design_registry, :sync_failed, project_id: project_2.id)
 
-    describe '#count_failed' do
-      it 'returns only failed registry' do
-        expect(subject.count_failed).to eq(1)
-      end
-    end
-
-    describe '#count_registry' do
-      it 'returns number of all registries' do
-        expect(subject.count_registry).to eq(6)
-      end
+      expect(subject.count_registry).to eq(2)
     end
   end
 
   describe '#find_registry_differences' do
-    let_it_be(:secondary) { create(:geo_node) }
-    let_it_be(:synced_group) { create(:group) }
-    let_it_be(:nested_group) { create(:group, parent: synced_group) }
-    let_it_be(:project_1) { create(:project, group: synced_group) }
-    let_it_be(:project_2) { create(:project, group: nested_group) }
-    let_it_be(:project_3) { create(:project) }
-    let_it_be(:project_4) { create(:project) }
-    let_it_be(:project_5) { create(:project, :broken_storage) }
-    let_it_be(:project_6) { create(:project, :broken_storage) }
-    let_it_be(:project_7) { create(:project) }
-
     before_all do
       create(:design, project: project_1)
       create(:design, project: project_2)
@@ -165,10 +70,6 @@ RSpec.describe Geo::DesignRegistryFinder, :geo do
       create(:design, project: project_6)
     end
 
-    before do
-      stub_current_geo_node(secondary)
-    end
-
     context 'untracked IDs' do
       before do
         create(:geo_design_registry, project_id: project_1.id)