Merge branch '282413-remove-safe-operator-from-issue-description' into 'master'

Remove safe navigation operator from Vulnerability description

See merge request gitlab-org/gitlab!47768

ee/app/presenters/vulnerability_presenter.rb

@@ -36,6 +36,14 @@ class VulnerabilityPresenter < Gitlab::View::Presenter::Delegated
     add_line_numbers(path, finding.location['start_line'], finding.location['end_line'])
   end
 
+  def scanner
+    finding.scanner || {}
+  end
+
+  def scan
+    finding.scan || {}
+  end
+
   private
 
   def root_url

ee/app/views/vulnerabilities/issue_description.md.erb

@@ -61,22 +61,22 @@
 <% end %>
 <% end %>
 
-<% if vulnerability.try(:scan).present? && vulnerability.try(:scanner).present? %>
+<% if vulnerability.scanner.present? || vulnerability.scan.present? %>
 ### <%= _("Scanner") %>:
 
-<% if vulnerability&.scanner[:name].present? %>
+<% if vulnerability.scanner.present? %>
 * <%= _("Name") %>: <%= vulnerability.scanner[:name] %>
 <% end %>
-<% if vulnerability&.scan[:type].present? %>
+<% if vulnerability.scan[:type].present? %>
 * <%= _("Type") %>: <%= vulnerability.scan[:type] %>
 <% end %>
-<% if vulnerability&.scan[:status].present? %>
+<% if vulnerability.scan[:status].present? %>
 * <%= _("Status") %>: <%= vulnerability.scan[:status] %>
 <% end %>
-<% if vulnerability&.scan[:start_time].present? %>
+<% if vulnerability.scan[:start_time].present? %>
 * <%= _("Start Time") %>: <%= vulnerability.scan[:start_time] %>
 <% end %>
-<% if vulnerability&.scan[:end_time].present? %>
+<% if vulnerability.scan[:end_time].present? %>
 * <%= _("End Time") %>: <%= vulnerability.scan[:end_time] %>
 <% end %>
 <% end %>

ee/app/views/vulnerabilities/jira_issue_description.md.erb

@@ -52,22 +52,22 @@ h3. <%= _("Links") %>:
 <%= _("See vulnerability %{vulnerability_link} for any Remediation details.".html_safe) % { vulnerability_link: "[#{vulnerability.id}|#{vulnerability_url(vulnerability)}]" } %>
 <% end %>
 
-<% if vulnerability.try(:scan).present? && vulnerability.try(:scanner).present? %>
+<% if vulnerability.scanner.present? || vulnerability.scan.present? %>
 h3. <%= _("Scanner") %>:
 
-<% if vulnerability&.scanner[:name].present? %>
+<% if vulnerability.scanner.present? %>
 * <%= _("Name") %>: <%= vulnerability.scanner[:name] %>
 <% end %>
-<% if vulnerability&.scan[:type].present? %>
+<% if vulnerability.scan[:type].present? %>
 * <%= _("Type") %>: <%= vulnerability.scan[:type] %>
 <% end %>
-<% if vulnerability&.scan[:status].present? %>
+<% if vulnerability.scan[:status].present? %>
 * <%= _("Status") %>: <%= vulnerability.scan[:status] %>
 <% end %>
-<% if vulnerability&.scan[:start_time].present? %>
+<% if vulnerability.scan[:start_time].present? %>
 * <%= _("Start Time") %>: <%= vulnerability.scan[:start_time] %>
 <% end %>
-<% if vulnerability&.scan[:end_time].present? %>
+<% if vulnerability.scan[:end_time].present? %>
 * <%= _("End Time") %>: <%= vulnerability.scan[:end_time] %>
 <% end %>
 <% end %>

ee/spec/helpers/vulnerabilities_helper_spec.rb

@@ -181,6 +181,9 @@ RSpec.describe VulnerabilitiesHelper do
           * [Cipher does not check for integrity first?|https://crypto.stackexchange.com/questions/31428/pbewithmd5anddes-cipher-does-not-check-for-integrity-first]
 
 
+          h3. Scanner:
+
+          * Name: Find Security Bugs
         JIRA
       end
 

ee/spec/services/ee/issues/create_from_vulnerability_service_spec.rb

@@ -118,6 +118,11 @@ RSpec.describe Issues::CreateFromVulnerabilityService, '#execute' do
           ### Links:
 
           * [Cipher does not check for integrity first?](https://crypto.stackexchange.com/questions/31428/pbewithmd5anddes-cipher-does-not-check-for-integrity-first)
+
+
+          ### Scanner:
+
+          * Name: Find Security Bugs
         DESC
       end