Commit d69e7b44 authored by Nick Thomas's avatar Nick Thomas

Don't verify the integrity of uploads and LFS objects in object storage

parent 231e3e3b
module EE
module Gitlab
module Verify
module LfsObjects
extend ::Gitlab::Utils::Override
private
override :relation
def relation
super.with_files_stored_locally
end
end
end
end
end
module EE
module Gitlab
module Verify
module Uploads
extend ::Gitlab::Utils::Override
private
override :relation
def relation
super.with_files_stored_locally
end
end
end
end
end
require 'spec_helper'
describe Gitlab::Verify::LfsObjects do
before do
stub_lfs_object_storage
end
it 'skips LFS objects in object storage' do
local_failure = create(:lfs_object)
create(:lfs_object, :object_storage)
failures = {}
described_class.new(batch_size: 10).run_batches { |_, failed| failures.merge!(failed) }
expect(failures.keys).to contain_exactly(local_failure)
end
end
require 'spec_helper'
describe Gitlab::Verify::Uploads do
before do
stub_uploads_object_storage(AvatarUploader)
end
it 'skips uploads in object storage' do
local_failure = create(:upload)
create(:upload, :object_storage)
failures = {}
described_class.new(batch_size: 10).run_batches { |_, failed| failures.merge!(failed) }
expect(failures.keys).to contain_exactly(local_failure)
end
end
module Gitlab
module Verify
class LfsObjects < BatchVerifier
prepend ::EE::Gitlab::Verify::LfsObjects
def name
'LFS objects'
end
......
module Gitlab
module Verify
class Uploads < BatchVerifier
prepend ::EE::Gitlab::Verify::Uploads
def name
'Uploads'
end
......
......@@ -15,4 +15,8 @@ FactoryBot.define do
trait :correct_oid do
oid 'b804383982bb89b00e828e3f44c038cc991d3d1768009fc39ba8e2c081b9fb75'
end
trait :object_storage do
file_store { LfsObjectUploader::Store::REMOTE }
end
end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment