fix: add unique id for all PolicyReport report

devopstales · Jun 30, 2022 · 569e0cd · 569e0cd
1 parent b2c7a94
commit 569e0cd
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/trivy-operator.py b/trivy-operator.py
@@ -17,6 +17,7 @@
 from OpenSSL import crypto
 from datetime import datetime, timezone
 import logging
+import uuid
 
 #############################################################################
 # Logging
@@ -443,6 +444,7 @@ def delete_policyreports(namespace, name):
                         "properties": {
                             "artifact.repository": image_name.split(':')[0],
                             "artifact.tag": image_name.split(':')[1],
+                            "resultID": str(uuid.uuid4()),
                         },
                         "resources": [],
                         "result": "error",
@@ -524,12 +526,14 @@ def delete_policyreports(namespace, name):
                                 "policy": "Image Vulnerability",
                                 "rule": item["VulnerabilityID"],
                                 "properties": {
-                                    "artifact.repository": image_name.split(':')[0],
-                                    "artifact.tag": image_name.split(':')[1],
+                                    "registry.server": image_name.split('/')[0],
+                                    "artifact.repository": image_name.split('/')[1] + "/" + image_name.split('/')[2].split(':')[0],
+                                    "artifact.tag": image_name.split(':')[-1],
                                     "resource": item["PkgName"],
                                     "score": str(score),
                                     "primaryLink": item["PrimaryURL"],
                                     "installedVersion": item["InstalledVersion"],
+                                    "resultID": str(uuid.uuid4()),
                                 },
                                 "resources": [],
                                 "severity": item["Severity"].lower(),
@@ -574,8 +578,10 @@ def delete_policyreports(namespace, name):
                             "policy": "Image Vulnerability",
                             "rule": item["VulnerabilityID"],
                             "properties": {
-                                "artifact.repository": image_name.split(':')[0],
+                                "registry.server": image_name.split('/')[0],
+                                "artifact.repository": image_name.split('/')[1] + "/" + image_name.split('/')[2].split(':')[0],
                                 "artifact.tag": image_name.split(':')[1],
+                                "resultID": str(uuid.uuid4()),
                             },
                             "resources": [],
                             "result": "pass",
@@ -1038,7 +1044,7 @@ def validate1(logger, namespace, name, annotations, spec, **_):
                 elif b"unsupported MediaType" in error.strip():
                     logger.error(
                         "Unsupported MediaType: see https://github.com/google/go-containerregistry/issues/377")
-                elif b"MANIFEST_UNKNOWN: manifest unknown; map[Tag:latest]" in error.strip():
+                elif b"MANIFEST_UNKNOWN: manifest unknown" in error.strip():
                     logger.error("No tag in registry")
                 else:
                     logger.error("%s" % (error.strip()))