Avoid pkg with cves override in Docker image scanner lib
Change-Id: I55d3c232e41d63b6f12035c684df0c4163a4a6aa
Related-PROD: https://mirantis.jira.com/browse/PRODX-4050
diff --git a/src/com/mirantis/mk/DockerImageScanner.groovy b/src/com/mirantis/mk/DockerImageScanner.groovy
index c17bb15..ec449f9 100644
--- a/src/com/mirantis/mk/DockerImageScanner.groovy
+++ b/src/com/mirantis/mk/DockerImageScanner.groovy
@@ -160,30 +160,23 @@
def reportJSON = new JsonSlurper().parseText(reportFileContents)
def imageDict = [:]
- def cves = []
reportJSON.each{
image ->
if ("${image.value}".contains('issues')) { return }
image.value.each{
pkg ->
- cves = []
pkg.value.each{
cve ->
if (cve[2] && (cve[1].contains('High') || cve[1].contains('Critical'))) {
- if (!imageDict.containsKey("${image.key}")) {
+ if (!imageDict.containsKey(image.key)) {
imageDict.put(image.key, [:])
}
if (!imageDict[image.key].containsKey(pkg.key)) {
imageDict[image.key].put(pkg.key, [])
}
- cves.add("${cve[0]} (${cve[2]})")
+ imageDict[image.key][pkg.key].add("${cve[0]} (${cve[2]})")
}
}
- if (cves) {
- imageDict[image.key] = [
- "${pkg.key}": cves
- ]
- }
}
}