Add latest changes from gitlab-org/gitlab@master

2 files changed, 24 insertions, 5 deletions

diff --git a/lib/gitlab/ci/ansi2json/converter.rb b/lib/gitlab/ci/ansi2json/converter.rb
index cbda3808b86..0373a12ab69 100644
--- a/lib/gitlab/ci/ansi2json/converter.rb
+++ b/lib/gitlab/ci/ansi2json/converter.rb
@@ -37,16 +37,13 @@ module Gitlab
 
           flush_current_line
 
-          # TODO: replace OpenStruct with a better type
-          # https://gitlab.com/gitlab-org/gitlab/issues/34305
-          OpenStruct.new(
+          Gitlab::Ci::Ansi2json::Result.new(
             lines: @lines,
             state: @state.encode,
             append: append,
             truncated: truncated,
             offset: start_offset,
-            size: stream.tell - start_offset,
-            total: stream.size
+            stream: stream
           )
         end
 
diff --git a/lib/gitlab/ci/ansi2json/result.rb b/lib/gitlab/ci/ansi2json/result.rb
new file mode 100644
index 00000000000..9b573882a52
--- /dev/null
+++ b/lib/gitlab/ci/ansi2json/result.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+# Convertion result object class
+module Gitlab
+  module Ci
+    module Ansi2json
+      class Result
+        attr_reader :lines, :state, :append, :truncated, :offset, :size, :total
+
+        def initialize(lines:, state:, append:, truncated:, offset:, stream:)
+          @lines = lines
+          @state = state
+          @append = append
+          @truncated = truncated
+          @offset = offset
+          @size = stream.tell - offset
+          @total = stream.size
+        end
+      end
+    end
+  end
+end