Merge branch '321659-handle-discord-errors' into 'master'

Handle RestClient errors in Discord integration

See merge request gitlab-org/gitlab!56112

app/models/project_services/discord_service.rb

@@ -59,6 +59,9 @@ class DiscordService < ChatNotificationService
         embed.description = (message.pretext + "\n" + Array.wrap(message.attachments).join("\n")).gsub(ATTACHMENT_REGEX, " \\k<entry> - \\k<name>\n")
       end
     end
+  rescue RestClient::Exception => error
+    log_error(error.message)
+    false
   end
 
   def custom_data(data)

changelogs/unreleased/321659-handle-discord-errors.yml

+---
+title: Handle RestClient errors in Discord integration
+merge_request: 56112
+author:
+type: fixed

spec/models/project_services/discord_service_spec.rb

@@ -67,5 +67,16 @@ RSpec.describe DiscordService do
         expect { subject.execute(sample_data) }.to raise_error(ArgumentError, /is blocked/)
       end
     end
+
+    context 'when the Discord request fails' do
+      before do
+        WebMock.stub_request(:post, webhook_url).to_return(status: 400)
+      end
+
+      it 'logs an error and returns false' do
+        expect(subject).to receive(:log_error).with('400 Bad Request')
+        expect(subject.execute(sample_data)).to be(false)
+      end
+    end
   end
 end