Commit 23674e05 authored by Grzegorz Bizon's avatar Grzegorz Bizon

Merge branch 'sh-disable-ci-live-trace-ff' into 'master'

Remove ci_live_trace_use_fog_attributes feature flag

See merge request gitlab-org/gitlab!52939
parents a01f3b08 d4d21ef2
......@@ -14,15 +14,7 @@ module Ci
end
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))
else
# TODO: Support AWS S3 server side encryption
files.create({
key: key(model),
body: new_data
})
end
files.create(create_attributes(model, new_data))
end
def append_data(model, new_data, offset)
......
---
title: Remove ci_live_trace_use_fog_attributes feature flag
merge_request: 52939
author:
type: changed
---
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
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
......
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