Merge branch '300624-don-t-move-pages-on-disk-if-feature-flag-is-disabled' into 'master'

Don't move pages on disk if feature flag is disabled

See merge request gitlab-org/gitlab!53363

app/workers/pages_transfer_worker.rb

@@ -9,7 +9,7 @@ class PagesTransferWorker # rubocop:disable Scalability/IdempotentWorker
   loggable_arguments 0, 1
 
   def perform(method, args)
-    return unless Gitlab::PagesTransfer::Async::METHODS.include?(method)
+    return unless Gitlab::PagesTransfer::METHODS.include?(method)
 
     result = Gitlab::PagesTransfer.new.public_send(method, *args) # rubocop:disable GitlabSecurity/PublicSend
 

lib/gitlab/pages_transfer.rb

@@ -7,16 +7,26 @@
 #
 module Gitlab
   class PagesTransfer < ProjectTransfer
-    class Async
-      METHODS = %w[move_namespace move_project rename_project rename_namespace].freeze
+    METHODS = %w[move_namespace move_project rename_project rename_namespace].freeze
 
+    class Async
       METHODS.each do |meth|
         define_method meth do |*args|
+          next unless Feature.enabled?(:pages_update_legacy_storage, default_enabled: true)
+
           PagesTransferWorker.perform_async(meth, args)
         end
       end
     end
 
+    METHODS.each do |meth|
+      define_method meth do |*args|
+        next unless Feature.enabled?(:pages_update_legacy_storage, default_enabled: true)
+
+        super(*args)
+      end
+    end
+
     def async
       @async ||= Async.new
     end

spec/lib/gitlab/pages_transfer_spec.rb

@@ -8,13 +8,24 @@ RSpec.describe Gitlab::PagesTransfer do
 
     context 'when receiving an allowed method' do
       it 'schedules a PagesTransferWorker', :aggregate_failures do
-        described_class::Async::METHODS.each do |meth|
+        described_class::METHODS.each do |meth|
           expect(PagesTransferWorker)
             .to receive(:perform_async).with(meth, %w[foo bar])
 
           async.public_send(meth, 'foo', 'bar')
         end
       end
+
+      it 'does nothing if legacy storage is disabled' do
+        stub_feature_flags(pages_update_legacy_storage: false)
+
+        described_class::METHODS.each do |meth|
+          expect(PagesTransferWorker)
+            .not_to receive(:perform_async)
+
+          async.public_send(meth, 'foo', 'bar')
+        end
+      end
     end
 
     context 'when receiving a private method' do
@@ -59,6 +70,15 @@ RSpec.describe Gitlab::PagesTransfer do
 
       expect(subject.public_send(meth, *args)).to be(false)
     end
+
+    it 'does nothing if legacy storage is disabled' do
+      stub_feature_flags(pages_update_legacy_storage: false)
+
+      subject.public_send(meth, *args)
+
+      expect(File.exist?(config_path_before)).to be(true)
+      expect(File.exist?(config_path_after)).to be(false)
+    end
   end
 
   describe '#move_namespace' do

spec/workers/pages_transfer_worker_spec.rb

@@ -4,7 +4,7 @@ require 'spec_helper'
 
 RSpec.describe PagesTransferWorker do
   describe '#perform' do
-    Gitlab::PagesTransfer::Async::METHODS.each do |meth|
+    Gitlab::PagesTransfer::METHODS.each do |meth|
       context "when method is #{meth}" do
         let(:args) { [1, 2, 3] }