🐛 Fix multiple google cloud artifact scan bugs (#14052)

* 🐛 Fix multiple google cloud artifact scan bugs

* udpate

Author: manuel-sommer

dojo/tools/gcloud_artifact_scan/parser.py

@@ -35,7 +35,6 @@ def get_findings(self, json_output, test):
                 for vuln in tree["package_vulnerability_summary"]["vulnerabilities"][severity]:
                     description = "name: " + str(vuln["name"]) + "\n\n"
                     description += "resourceUri: " + str(vuln["resourceUri"]) + "\n"
-                    description += "fixAvailable: " + str(vuln["vulnerability"]["fixAvailable"]) + "\n"
                     description += "packageIssue: " + str(vuln["vulnerability"]["packageIssue"]) + "\n"
                     description += "CVE: " + str(vuln["vulnerability"]["shortDescription"]) + "\n"
                     reference = ""
@@ -45,13 +44,23 @@ def get_findings(self, json_output, test):
                         title=vuln["noteName"],
                         test=test,
                         description=description,
-                        severity=severity.lower().capitalize(),
+                        severity=self.severity_mapper(severity),
                         references=reference,
                         component_name="affectedCPEUri: " + vuln["vulnerability"]["packageIssue"][0]["affectedCpeUri"] + " affectedPackage: " + vuln["vulnerability"]["packageIssue"][0]["affectedPackage"],
                         component_version=vuln["vulnerability"]["packageIssue"][0]["affectedVersion"]["fullName"],
                         static_finding=True,
                         dynamic_finding=False,
-                        cvssv3_score=vuln["vulnerability"]["cvssScore"],
                     )
+                    if vuln["vulnerability"].get("fixAvailable"):
+                        finding.fix_available = vuln["vulnerability"].get("fixAvailable")
+                    if vuln["vulnerability"].get("cvssScore"):
+                        finding.cvssv3_score = vuln["vulnerability"].get("cvssScore")
                     findings.append(finding)
         return findings
+
+    def severity_mapper(self, severity):
+        if severity.lower().capitalize() in {"Critical", "High", "Medium", "Low", "Info"}:
+            return severity.lower().capitalize()
+        if severity == "Minimal":
+            return "Low"
+        return "Info"