Merge branch '247870-nomethoderror-saving-jira-integration-with-invalid-credentials' into 'master'

NoMethodError - Saving Jira integration with invalid credentials

See merge request gitlab-org/gitlab!45718

app/models/concerns/project_services_loggable.rb

@@ -16,8 +16,8 @@ module ProjectServicesLoggable
   def build_message(message, params = {})
     {
       service_class: self.class.name,
-      project_id: project.id,
-      project_path: project.full_path,
+      project_id: project&.id,
+      project_path: project&.full_path,
       message: message
     }.merge(params)
   end

changelogs/unreleased/247870-nomethoderror-saving-jira-integration-with-invalid-credentials.yml

+---
+title: Fix exception when saving Jira integration info for an instance
+merge_request: 45718
+author:
+type: fixed

spec/models/service_spec.rb

@@ -843,5 +843,24 @@ RSpec.describe Service do
 
       service.log_error(test_message, additional_argument: 'some argument')
     end
+
+    context 'when project is nil' do
+      let(:project) { nil }
+      let(:arguments) do
+        {
+          service_class: service.class.name,
+          project_path: nil,
+          project_id: nil,
+          message: test_message,
+          additional_argument: 'some argument'
+        }
+      end
+
+      it 'logs info messages using json logger' do
+        expect(Gitlab::JsonLogger).to receive(:info).with(arguments)
+
+        service.log_info(test_message, additional_argument: 'some argument')
+      end
+    end
   end
 end