Merge branch 'handle-config-file-bundler-lock-file-error' into 'master'

Handle Bundler::LockfileError in X-Ray when parsing Gemfile.lock

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/169334



Merged-by: Terri Chu <tchu@gitlab.com>
Approved-by: Tarun Vellishetty <tvellishetty@gitlab.com>
Approved-by: Terri Chu <tchu@gitlab.com>
Reviewed-by: Duo Code Reviewer <duo-code-review-bot@gitlab.com>
Co-authored-by: lma-git <lma@gitlab.com>

ee/lib/ai/context/dependencies/config_files/ruby_gems_lock.rb

@@ -29,6 +29,8 @@ def extract_libs
             parser.specs.map do |spec|
               Lib.new(name: spec.name, version: spec.version.to_s)
             end
+          rescue Bundler::LockfileError => e
+            raise ParsingError, e.message.split("\n").first
           end
         end
       end

ee/spec/lib/ai/context/dependencies/config_files/ruby_gems_lock_spec.rb

@@ -33,6 +33,29 @@
   it_behaves_like 'parsing an invalid dependency config file'
+  context 'when the content contains a merge conflict' do
+    it_behaves_like 'parsing an invalid dependency config file' do
+      let(:invalid_config_file_content) do
+        <<~CONTENT
+          GEM
+            remote: https://rubygems.org/
+            specs:
+              bcrypt (3.1.20)
+              logger (1.5.3)
+          <<<<<<< HEAD
+          =======
+              solargraph (1.2.3)
+          >>>>>>> 83d186c9a3ca327b4c1aea18936043ded82ceb2e
+
+          BUNDLED WITH
+            2.5.16
+        CONTENT
+      end
+
+      let(:expected_parsing_error_message) { 'Your Gemfile.lock contains merge conflicts.' }
+    end
+  end
+
   describe '.matches?' do
     using RSpec::Parameterized::TableSyntax