Add latest changes from gitlab-org/gitlab@master
This commit is contained in:
parent
bf41398e5d
commit
1d004494bb
|
@ -14,15 +14,7 @@ module Ci
|
||||||
end
|
end
|
||||||
|
|
||||||
def set_data(model, new_data)
|
def set_data(model, new_data)
|
||||||
if Feature.enabled?(:ci_live_trace_use_fog_attributes, default_enabled: true)
|
|
||||||
files.create(create_attributes(model, new_data))
|
files.create(create_attributes(model, new_data))
|
||||||
else
|
|
||||||
# TODO: Support AWS S3 server side encryption
|
|
||||||
files.create({
|
|
||||||
key: key(model),
|
|
||||||
body: new_data
|
|
||||||
})
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def append_data(model, new_data, offset)
|
def append_data(model, new_data, offset)
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
---
|
||||||
|
title: Remove ci_live_trace_use_fog_attributes feature flag
|
||||||
|
merge_request: 52939
|
||||||
|
author:
|
||||||
|
type: changed
|
|
@ -1,8 +0,0 @@
|
||||||
---
|
|
||||||
name: ci_live_trace_use_fog_attributes
|
|
||||||
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/47536
|
|
||||||
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/285079
|
|
||||||
milestone: '13.6'
|
|
||||||
type: development
|
|
||||||
group: group::testing
|
|
||||||
default_enabled: true
|
|
|
@ -98,27 +98,6 @@ RSpec.describe Ci::BuildTraceChunks::Fog do
|
||||||
|
|
||||||
expect(data_store.data(model)).to eq new_data
|
expect(data_store.data(model)).to eq new_data
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'when ci_live_trace_use_fog_attributes flag is disabled' do
|
|
||||||
before do
|
|
||||||
stub_feature_flags(ci_live_trace_use_fog_attributes: false)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'does not pass along Fog attributes' do
|
|
||||||
expect_next_instance_of(Fog::AWS::Storage::Files) do |files|
|
|
||||||
expect(files).to receive(:create).with(
|
|
||||||
key: anything,
|
|
||||||
body: new_data
|
|
||||||
).and_call_original
|
|
||||||
end
|
|
||||||
|
|
||||||
expect(data_store.data(model)).to be_nil
|
|
||||||
|
|
||||||
data_store.set_data(model, new_data)
|
|
||||||
|
|
||||||
expect(data_store.data(model)).to eq new_data
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue