Merge branch 'remove-use_cte_for_any_project_with_shared_runners_enabled' into 'master'

Remove shared runners CTE FF

See merge request gitlab-org/gitlab!72370

config/feature_flags/development/use_cte_for_any_project_with_shared_runners_enabled.yml

----
-name: use_cte_for_any_project_with_shared_runners_enabled
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/71452
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/342024
-milestone: '14.4'
-type: development
-group: group::optimize
-default_enabled: true

ee/app/models/ee/namespace.rb

@@ -430,22 +430,18 @@ module EE
     private
 
     def any_project_with_shared_runners_enabled_with_cte?
-      if ::Feature.enabled?(:use_cte_for_any_project_with_shared_runners_enabled, self, default_enabled: :yaml)
-        projects_query = if user_namespace?
-                           projects
-                         else
-                           cte = ::Gitlab::SQL::CTE.new(:namespace_self_and_descendants_cte, self_and_descendant_ids)
-
-                           ::Project
-                             .with(cte.to_arel)
-                             .from([::Project.table_name, cte.table.name].join(', '))
-                             .where(::Project.arel_table[:namespace_id].eq(cte.table[:id]))
-                         end
-
-        projects_query.with_shared_runners.any?
-      else
-        all_projects.with_shared_runners.any?
-      end
+      projects_query = if user_namespace?
+                         projects
+                       else
+                         cte = ::Gitlab::SQL::CTE.new(:namespace_self_and_descendants_cte, self_and_descendant_ids)
+
+                         ::Project
+                           .with(cte.to_arel)
+                           .from([::Project.table_name, cte.table.name].join(', '))
+                           .where(::Project.arel_table[:namespace_id].eq(cte.table[:id]))
+                       end
+
+      projects_query.with_shared_runners.any?
     end
 
     def fallback_plan

ee/spec/models/ee/namespace_spec.rb

@@ -627,58 +627,32 @@ RSpec.describe Namespace do
   describe '#any_project_with_shared_runners_enabled?' do
     subject { namespace.any_project_with_shared_runners_enabled? }
 
-    shared_examples '#any_project_with_shared_runners_enabled? examples' do
-      context 'without projects' do
-        it { is_expected.to be_falsey }
-      end
-
-      context 'group with shared runners enabled project' do
-        let!(:project) { create(:project, namespace: namespace, shared_runners_enabled: true) }
-
-        it { is_expected.to be_truthy }
-      end
-
-      context 'subgroup with shared runners enabled project' do
-        let(:namespace) { create(:group) }
-        let(:subgroup) { create(:group, parent: namespace) }
-        let!(:subproject) { create(:project, namespace: subgroup, shared_runners_enabled: true) }
-
-        it { is_expected.to be_truthy }
-      end
-
-      context 'with project and disabled shared runners' do
-        let!(:project) do
-          create(:project,
-                 namespace: namespace,
-                 shared_runners_enabled: false)
-        end
-
-        it { is_expected.to be_falsey }
-      end
+    context 'without projects' do
+      it { is_expected.to be_falsey }
     end
 
-    context 'when use_cte_for_any_project_with_shared_runners_enabled is enabled' do
-      before do
-        stub_feature_flags(use_cte_for_any_project_with_shared_runners_enabled: true)
-      end
+    context 'group with shared runners enabled project' do
+      let!(:project) { create(:project, namespace: namespace, shared_runners_enabled: true) }
 
-      it_behaves_like '#any_project_with_shared_runners_enabled? examples' do
-        it 'creates a CTE' do
-          group = create(:group)
+      it { is_expected.to be_truthy }
+    end
 
-          expect(Gitlab::SQL::CTE).to receive(:new).and_call_original
+    context 'subgroup with shared runners enabled project' do
+      let(:namespace) { create(:group) }
+      let(:subgroup) { create(:group, parent: namespace) }
+      let!(:subproject) { create(:project, namespace: subgroup, shared_runners_enabled: true) }
 
-          group.any_project_with_shared_runners_enabled?
-        end
-      end
+      it { is_expected.to be_truthy }
     end
 
-    context 'when use_cte_for_any_project_with_shared_runners_enabled is disabled' do
-      before do
-        stub_feature_flags(use_cte_for_any_project_with_shared_runners_enabled: false)
+    context 'with project and disabled shared runners' do
+      let!(:project) do
+        create(:project,
+               namespace: namespace,
+               shared_runners_enabled: false)
       end
 
-      it_behaves_like '#any_project_with_shared_runners_enabled? examples'
+      it { is_expected.to be_falsey }
     end
   end