Add latest changes from gitlab-org/gitlab@master

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)

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

config/feature_flags/development/ci_live_trace_use_fog_attributes.yml

@@ -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

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