Skip to content

Commit 7172807

Browse files
rcjsuenrcjsuen
authored
Merge pull request #473 from docker/update-scout-cve-tests
Update expected CVEs for Scout tests
2 parents ce6160e + 7ddd645 commit 7172807

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

‎internal/scout/service_test.go‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,8 @@ func TestCalculateDiagnostics(t *testing.T) {
105105
Experimental: configuration.Experimental{
106106
VulnerabilityScanning: true,
107107
Scout: configuration.Get("/tmp/non-existent-file-to-get-default-config").Experimental.Scout,
108-
}},
108+
},
109+
},
109110
)
110111
},
111112
},
@@ -342,7 +343,7 @@ func TestGetHovers_IgnoresSpecifics(t *testing.T) {
342343
result: &protocol.Hover{
343344
Contents: protocol.MarkupContent{
344345
Kind: protocol.MarkupKindMarkdown,
345-
Value: "Current image vulnerabilities: 1C 3H 9M 0L \r\n\r\nRecommended tags:\n\n<table>\n<tr><td><code>3.21.4</code></td><td align=\"right\"> 0C</td><td align=\"right\"> 0H</td><td align=\"right\"> 0M</td><td align=\"right\"> 2L</td><td align=\"right\"></td></tr>\n<tr><td><code>3.20.7</code></td><td align=\"right\"> 0C</td><td align=\"right\"> 0H</td><td align=\"right\"> 0M</td><td align=\"right\"> 2L</td><td align=\"right\"></td></tr>\n<tr><td><code>3.19.8</code></td><td align=\"right\"> 0C</td><td align=\"right\"> 0H</td><td align=\"right\"> 0M</td><td align=\"right\"> 2L</td><td align=\"right\"></td></tr>\n<tr><td><code>3.22.1</code></td><td align=\"right\"> 0C</td><td align=\"right\"> 0H</td><td align=\"right\"> 0M</td><td align=\"right\"> 2L</td><td align=\"right\"></td></tr>\n</table>\n",
346+
Value: "Current image vulnerabilities: 1C 3H 9M 0L \r\n\r\nRecommended tags:\n\n<table>\n<tr><td><code>3.21.4</code></td><td align=\"right\"> 0C</td><td align=\"right\"> 1H</td><td align=\"right\"> 2M</td><td align=\"right\"> 2L</td><td align=\"right\"></td></tr>\n<tr><td><code>3.20.7</code></td><td align=\"right\"> 0C</td><td align=\"right\"> 1H</td><td align=\"right\"> 2M</td><td align=\"right\"> 2L</td><td align=\"right\"></td></tr>\n<tr><td><code>3.19.8</code></td><td align=\"right\"> 0C</td><td align=\"right\"> 1H</td><td align=\"right\"> 1M</td><td align=\"right\"> 2L</td><td align=\"right\"></td></tr>\n<tr><td><code>3.22.1</code></td><td align=\"right\"> 0C</td><td align=\"right\"> 1H</td><td align=\"right\"> 2M</td><td align=\"right\"> 2L</td><td align=\"right\"></td></tr>\n</table>\n",
346347
},
347348
},
348349
},
@@ -358,7 +359,7 @@ func TestGetHovers_IgnoresSpecifics(t *testing.T) {
358359
result: &protocol.Hover{
359360
Contents: protocol.MarkupContent{
360361
Kind: protocol.MarkupKindMarkdown,
361-
Value: "Recommended tags:\n\n<table>\n<tr><td><code>3.21.4</code></td><td align=\"right\"> 0C</td><td align=\"right\"> 0H</td><td align=\"right\"> 0M</td><td align=\"right\"> 2L</td><td align=\"right\"></td></tr>\n<tr><td><code>3.20.7</code></td><td align=\"right\"> 0C</td><td align=\"right\"> 0H</td><td align=\"right\"> 0M</td><td align=\"right\"> 2L</td><td align=\"right\"></td></tr>\n<tr><td><code>3.19.8</code></td><td align=\"right\"> 0C</td><td align=\"right\"> 0H</td><td align=\"right\"> 0M</td><td align=\"right\"> 2L</td><td align=\"right\"></td></tr>\n<tr><td><code>3.22.1</code></td><td align=\"right\"> 0C</td><td align=\"right\"> 0H</td><td align=\"right\"> 0M</td><td align=\"right\"> 2L</td><td align=\"right\"></td></tr>\n</table>\n",
362+
Value: "Recommended tags:\n\n<table>\n<tr><td><code>3.21.4</code></td><td align=\"right\"> 0C</td><td align=\"right\"> 1H</td><td align=\"right\"> 2M</td><td align=\"right\"> 2L</td><td align=\"right\"></td></tr>\n<tr><td><code>3.20.7</code></td><td align=\"right\"> 0C</td><td align=\"right\"> 1H</td><td align=\"right\"> 2M</td><td align=\"right\"> 2L</td><td align=\"right\"></td></tr>\n<tr><td><code>3.19.8</code></td><td align=\"right\"> 0C</td><td align=\"right\"> 1H</td><td align=\"right\"> 1M</td><td align=\"right\"> 2L</td><td align=\"right\"></td></tr>\n<tr><td><code>3.22.1</code></td><td align=\"right\"> 0C</td><td align=\"right\"> 1H</td><td align=\"right\"> 2M</td><td align=\"right\"> 2L</td><td align=\"right\"></td></tr>\n</table>\n",
362363
},
363364
},
364365
},
@@ -390,7 +391,7 @@ func TestGetHovers_IgnoresSpecifics(t *testing.T) {
390391
result: &protocol.Hover{
391392
Contents: protocol.MarkupContent{
392393
Kind: protocol.MarkupKindMarkdown,
393-
Value: "Image vulnerabilities: 0C 0H 5M 5L \r\n\r\nRecommended tags:\n\n<table>\n<tr><td><code>25.04</code></td><td align=\"right\"> 0C</td><td align=\"right\"> 0H</td><td align=\"right\"> 5M</td><td align=\"right\"> 4L</td><td align=\"right\"></td></tr>\n<tr><td><code>25.10</code></td><td align=\"right\"> 0C</td><td align=\"right\"> 0H</td><td align=\"right\"> 0M</td><td align=\"right\"> 0L</td><td align=\"right\"></td></tr>\n</table>\n",
394+
Value: "Image vulnerabilities: 0C 0H 5M 6L \r\n\r\nRecommended tags:\n\n<table>\n<tr><td><code>25.10</code></td><td align=\"right\"> 0C</td><td align=\"right\"> 0H</td><td align=\"right\"> 0M</td><td align=\"right\"> 0L</td><td align=\"right\"></td></tr>\n<tr><td><code>25.04</code></td><td align=\"right\"> 0C</td><td align=\"right\"> 0H</td><td align=\"right\"> 7M</td><td align=\"right\"> 6L</td><td align=\"right\"></td></tr>\n</table>\n",
394395
},
395396
},
396397
},
@@ -406,7 +407,7 @@ func TestGetHovers_IgnoresSpecifics(t *testing.T) {
406407
result: &protocol.Hover{
407408
Contents: protocol.MarkupContent{
408409
Kind: protocol.MarkupKindMarkdown,
409-
Value: "Recommended tags:\n\n<table>\n<tr><td><code>25.04</code></td><td align=\"right\"> 0C</td><td align=\"right\"> 0H</td><td align=\"right\"> 5M</td><td align=\"right\"> 4L</td><td align=\"right\"></td></tr>\n<tr><td><code>25.10</code></td><td align=\"right\"> 0C</td><td align=\"right\"> 0H</td><td align=\"right\"> 0M</td><td align=\"right\"> 0L</td><td align=\"right\"></td></tr>\n</table>\n",
410+
Value: "Recommended tags:\n\n<table>\n<tr><td><code>25.10</code></td><td align=\"right\"> 0C</td><td align=\"right\"> 0H</td><td align=\"right\"> 0M</td><td align=\"right\"> 0L</td><td align=\"right\"></td></tr>\n<tr><td><code>25.04</code></td><td align=\"right\"> 0C</td><td align=\"right\"> 0H</td><td align=\"right\"> 7M</td><td align=\"right\"> 6L</td><td align=\"right\"></td></tr>\n</table>\n",
410411
},
411412
},
412413
},
@@ -422,7 +423,7 @@ func TestGetHovers_IgnoresSpecifics(t *testing.T) {
422423
result: &protocol.Hover{
423424
Contents: protocol.MarkupContent{
424425
Kind: protocol.MarkupKindMarkdown,
425-
Value: "Image vulnerabilities: 0C 0H 5M 5L ",
426+
Value: "Image vulnerabilities: 0C 0H 5M 6L ",
426427
},
427428
},
428429
},

0 commit comments

Comments
 (0)