diff --git a/app/models/ci/build_trace_chunks/fog.rb b/app/models/ci/build_trace_chunks/fog.rb index 27b579bf428..cbf0c0a1696 100644 --- a/app/models/ci/build_trace_chunks/fog.rb +++ b/app/models/ci/build_trace_chunks/fog.rb @@ -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) diff --git a/changelogs/unreleased/sh-disable-ci-live-trace-ff.yml b/changelogs/unreleased/sh-disable-ci-live-trace-ff.yml new file mode 100644 index 00000000000..ac2858260e8 --- /dev/null +++ b/changelogs/unreleased/sh-disable-ci-live-trace-ff.yml @@ -0,0 +1,5 @@ +--- +title: Remove ci_live_trace_use_fog_attributes feature flag +merge_request: 52939 +author: +type: changed diff --git a/config/feature_flags/development/ci_live_trace_use_fog_attributes.yml b/config/feature_flags/development/ci_live_trace_use_fog_attributes.yml deleted file mode 100644 index 20a38d77407..00000000000 --- a/config/feature_flags/development/ci_live_trace_use_fog_attributes.yml +++ /dev/null @@ -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 diff --git a/spec/models/ci/build_trace_chunks/fog_spec.rb b/spec/models/ci/build_trace_chunks/fog_spec.rb index bc96e2584cf..d9e9533fb26 100644 --- a/spec/models/ci/build_trace_chunks/fog_spec.rb +++ b/spec/models/ci/build_trace_chunks/fog_spec.rb @@ -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