Merge branch '210327-parse-scanner-from-security-report-scan-scanner' into 'master'

Parse scanner from security report scan.scanner

See merge request gitlab-org/gitlab!36865

ee/lib/gitlab/ci/parsers/security/common.rb

@@ -12,6 +12,7 @@ module Gitlab
             raise SecurityReportParserError, "Invalid report format" unless report_data.is_a?(Hash)
 
             report.scanned_resources = report_data.dig('scan', 'scanned_resources') || []
+            create_scanner(report, report_data.dig('scan', 'scanner'))
 
             collate_remediations(report_data).each do |vulnerability|
               create_vulnerability(report, vulnerability, report_data["version"])

ee/spec/lib/gitlab/ci/parsers/security/common_spec.rb

@@ -36,7 +36,7 @@ RSpec.describe Gitlab::Ci::Parsers::Security::Common do
             "cve": "CVE-1020",
             "severity": "High",
             "solution": "Upgrade to latest version.",
-            "scanner": { "id": "gemnasium", "name": "Gemnasium", "vendor": { "name": "GitLab" } },
+            "scanner": { "id": "gemnasium", "name": "Gemnasium" },
             "location": {},
             "identifiers": [],
             "links": [{ "url": "" }]
@@ -52,8 +52,7 @@ RSpec.describe Gitlab::Ci::Parsers::Security::Common do
             "solution": "Upgrade to latest versions.",
             "scanner": {
               "id": "gemnasium",
-              "name": "Gemnasium",
-              "vendor": { "name": "GitLab" }
+              "name": "Gemnasium"
             },
             "location": {},
             "identifiers": [],
@@ -69,8 +68,7 @@ RSpec.describe Gitlab::Ci::Parsers::Security::Common do
             "solution": "Upgrade to fixed version.\r\n",
             "scanner": {
               "id": "gemnasium",
-              "name": "Gemnasium",
-              "vendor": { "name": "GitLab" }
+              "name": "Gemnasium"
             },
             "location": {},
             "identifiers": [],
@@ -78,7 +76,14 @@ RSpec.describe Gitlab::Ci::Parsers::Security::Common do
           }
         ],
         "remediations": [],
-        "dependency_files": []
+        "dependency_files": [],
+        "scan": {
+          "scanner": {
+            "id": "gemnasium",
+            "name": "Gemnasium",
+            "vendor": { "name": "GitLab" }
+          }
+        }
       }
       end