Commit 47a1593d authored by Jacob Vosmaer's avatar Jacob Vosmaer

Remove support for legacy tar.gz pages artifacts

parent 1e4b9310
...@@ -74,25 +74,13 @@ module Projects ...@@ -74,25 +74,13 @@ module Projects
end end
def extract_archive!(temp_path) def extract_archive!(temp_path)
if artifacts_filename.ends_with?('.tar.gz') || artifacts_filename.ends_with?('.tgz') if artifacts_filename.ends_with?('.zip')
extract_tar_archive!(temp_path)
elsif artifacts_filename.ends_with?('.zip')
extract_zip_archive!(temp_path) extract_zip_archive!(temp_path)
else else
raise InvaildStateError, 'unsupported artifacts format' raise InvaildStateError, 'unsupported artifacts format'
end end
end end
def extract_tar_archive!(temp_path)
build.artifacts_file.use_file do |artifacts_path|
results = Open3.pipeline(%W(gunzip -c #{artifacts_path}),
%W(dd bs=#{BLOCK_SIZE} count=#{blocks}),
%W(tar -x -C #{temp_path} #{SITE_PATH}),
err: '/dev/null')
raise FailedToExtractError, 'pages failed to extract' unless results.compact.all?(&:success?)
end
end
def extract_zip_archive!(temp_path) def extract_zip_archive!(temp_path)
raise InvaildStateError, 'missing artifacts metadata' unless build.artifacts_metadata? raise InvaildStateError, 'missing artifacts metadata' unless build.artifacts_metadata?
......
...@@ -21,76 +21,72 @@ describe Projects::UpdatePagesService do ...@@ -21,76 +21,72 @@ describe Projects::UpdatePagesService do
end end
context 'legacy artifacts' do context 'legacy artifacts' do
%w(tar.gz zip).each do |format| let(:extension) { 'zip' }
let(:extension) { format }
context "for valid #{format}" do before do
build.update_attributes(legacy_artifacts_file: file)
build.update_attributes(legacy_artifacts_metadata: metadata)
end
describe 'pages artifacts' do
context 'with expiry date' do
before do before do
build.update_attributes(legacy_artifacts_file: file) build.artifacts_expire_in = "2 days"
build.update_attributes(legacy_artifacts_metadata: metadata) build.save!
end end
describe 'pages artifacts' do it "doesn't delete artifacts" do
context 'with expiry date' do expect(execute).to eq(:success)
before do
build.artifacts_expire_in = "2 days"
build.save!
end
it "doesn't delete artifacts" do
expect(execute).to eq(:success)
expect(build.reload.artifacts?).to eq(true)
end
end
context 'without expiry date' do
it "does delete artifacts" do
expect(execute).to eq(:success)
expect(build.reload.artifacts?).to eq(false) expect(build.reload.artifacts?).to eq(true)
end
end
end end
end
it 'succeeds' do context 'without expiry date' do
expect(project.pages_deployed?).to be_falsey it "does delete artifacts" do
expect(execute).to eq(:success) expect(execute).to eq(:success)
expect(project.pages_deployed?).to be_truthy
# Check that all expected files are extracted expect(build.reload.artifacts?).to eq(false)
%w[index.html zero .hidden/file].each do |filename|
expect(File.exist?(File.join(project.public_pages_path, filename))).to be_truthy
end
end end
end
end
it 'limits pages size' do it 'succeeds' do
stub_application_setting(max_pages_size: 1) expect(project.pages_deployed?).to be_falsey
expect(execute).not_to eq(:success) expect(execute).to eq(:success)
end expect(project.pages_deployed?).to be_truthy
it 'removes pages after destroy' do # Check that all expected files are extracted
expect(PagesWorker).to receive(:perform_in) %w[index.html zero .hidden/file].each do |filename|
expect(project.pages_deployed?).to be_falsey expect(File.exist?(File.join(project.public_pages_path, filename))).to be_truthy
expect(execute).to eq(:success) end
expect(project.pages_deployed?).to be_truthy end
project.destroy
expect(project.pages_deployed?).to be_falsey
end
it 'fails if sha on branch is not latest' do it 'limits pages size' do
build.update_attributes(ref: 'feature') stub_application_setting(max_pages_size: 1)
expect(execute).not_to eq(:success)
end
expect(execute).not_to eq(:success) it 'removes pages after destroy' do
end expect(PagesWorker).to receive(:perform_in)
expect(project.pages_deployed?).to be_falsey
expect(execute).to eq(:success)
expect(project.pages_deployed?).to be_truthy
project.destroy
expect(project.pages_deployed?).to be_falsey
end
it 'fails for empty file fails' do it 'fails if sha on branch is not latest' do
build.update_attributes(legacy_artifacts_file: empty_file) build.update_attributes(ref: 'feature')
expect { execute } expect(execute).not_to eq(:success)
.to raise_error(Projects::UpdatePagesService::FailedToExtractError) end
end
end it 'fails for empty file fails' do
build.update_attributes(legacy_artifacts_file: empty_file)
expect { execute }
.to raise_error(Projects::UpdatePagesService::FailedToExtractError)
end end
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