Merge branch '294155-improve-jira-service-find-issue' into 'master'

Restrict JiraService#find_issue options

See merge request gitlab-org/gitlab!53742

app/models/project_services/jira_service.rb

@@ -159,7 +159,10 @@ class JiraService < IssueTrackerService
     # support any events.
   end
 
-  def find_issue(issue_key, options = {})
+  def find_issue(issue_key, rendered_fields: false)
+    options = {}
+    options = options.merge(expand: 'renderedFields') if rendered_fields
+
     jira_request { client.Issue.find(issue_key, options) }
   end
 

ee/app/controllers/projects/integrations/jira/issues_controller.rb

@@ -66,7 +66,7 @@ module Projects
 
         def issue_json
           ::Integrations::Jira::IssueDetailSerializer.new
-            .represent(project.jira_service.find_issue(params[:id], { expand: 'renderedFields' }), project: project)
+            .represent(project.jira_service.find_issue(params[:id], rendered_fields: true), project: project)
         end
 
         def finder

ee/spec/controllers/projects/integrations/jira/issues_controller_spec.rb

@@ -210,7 +210,7 @@ RSpec.describe Projects::Integrations::Jira::IssuesController do
 
       it 'returns JSON response' do
         expect_next_found_instance_of(JiraService) do |service|
-          expect(service).to receive(:find_issue).with('1', { expand: 'renderedFields' }).and_return(jira_issue)
+          expect(service).to receive(:find_issue).with('1', rendered_fields: true).and_return(jira_issue)
         end
 
         expect_next_instance_of(Integrations::Jira::IssueDetailSerializer) do |serializer|

spec/models/project_services/jira_service_spec.rb

@@ -463,7 +463,7 @@ RSpec.describe JiraService do
       let(:issue_url) { "#{url}/rest/api/2/issue/#{issue_key}?expand=renderedFields" }
 
       it 'calls the Jira API with the options to get the issue' do
-        jira_service.find_issue(issue_key, { expand: 'renderedFields' })
+        jira_service.find_issue(issue_key, rendered_fields: true)
 
         expect(WebMock).to have_requested(:get, issue_url)
       end