Merge branch 'jej/object-storage-uploader-migrate-with-license-callback' into 'master'

ObjectStoreUploader#migrate! uses with_callbacks to trigger verify_license!

Closes #3370

See merge request !2863

app/uploaders/object_store_uploader.rb

@@ -94,6 +94,7 @@ class ObjectStoreUploader < GitlabUploader
     # change storage
     self.object_store = new_store
 
+    with_callbacks(:store, file) do
       storage.store!(file).tap do |new_file|
         # since we change storage store the new storage
         # in case of failure delete new file
@@ -108,6 +109,7 @@ class ObjectStoreUploader < GitlabUploader
         old_file.delete
       end
     end
+  end
 
   def schedule_migration_to_object_storage(new_file)
     if self.class.object_store_enabled? && licensed? && file_storage?

spec/uploaders/object_store_uploader_spec.rb

@@ -111,6 +111,16 @@ describe ObjectStoreUploader do
           end
         end
 
+        context 'when storage is unlicensed' do
+          before do
+            stub_artifacts_object_storage(licensed: false)
+          end
+
+          it "raises an error" do
+            expect { subject }.to raise_error(/Object Storage feature is missing/)
+          end
+        end
+
         context 'when credentials are set' do
           before do
             stub_artifacts_object_storage