Merge pull request #4110 from snyk/fix/undefined-ignored-issues-count

fix: Ignored issues count displays "undefined"
snyk · Oct 6, 2022 · 61c983d · 61c983d
2 parents b0c0789 + 962df51
commit 61c983d
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/src/lib/formatters/iac-output/text/formatters.ts b/src/lib/formatters/iac-output/text/formatters.ts
@@ -106,7 +106,7 @@ export function formatSnykIacTestTestData(
   const filesWithIssuesCount = countFilesWithIssues(snykIacTestScanResult);
   const filesWithoutIssuesCount = allFilesCount - filesWithIssuesCount;
   const ignores = snykIacTestScanResult
-    ? snykIacTestScanResult.scanAnalytics.ignoredCount
+    ? snykIacTestScanResult.metadata.ignoredCount
     : 0;
 
   let contextSuppressedIssueCount: number | undefined;

diff --git a/src/lib/iac/test/v2/analytics/index.ts b/src/lib/iac/test/v2/analytics/index.ts
@@ -35,7 +35,7 @@ function computeIacAnalytics(testOutput: TestOutput): IacAnalytics {
     iacType,
     packageManager: Object.keys(iacType) as ResourceKind[],
     iacIssuesCount: testOutput.results?.vulnerabilities?.length || 0,
-    iacIgnoredIssuesCount: testOutput.results?.scanAnalytics.ignoredCount || 0,
+    iacIgnoredIssuesCount: testOutput.results?.metadata.ignoredCount || 0,
     iacFilesCount: Object.values(iacType).reduce(
       (acc, packageManagerAnalytics) => acc + packageManagerAnalytics!.count,
       0,

diff --git a/src/lib/iac/test/v2/scan/results.ts b/src/lib/iac/test/v2/scan/results.ts
@@ -39,6 +39,7 @@ export interface Results {
 
 export interface Metadata {
   projectName: string;
+  ignoredCount: number;
 }
 
 export interface ScanAnalytics {

diff --git a/test/jest/unit/iac/process-results/fixtures/snyk-iac-test-results-with-suppressions.json b/test/jest/unit/iac/process-results/fixtures/snyk-iac-test-results-with-suppressions.json
@@ -147,7 +147,8 @@
       }
     ],
     "metadata": {
-      "projectName": "input-files-for-json-v2"
+      "projectName": "input-files-for-json-v2",
+      "ignoredCount": 3
     },
     "scanAnalytics": {
       "suppressedResults": {

diff --git a/test/jest/unit/iac/process-results/fixtures/snyk-iac-test-results.json b/test/jest/unit/iac/process-results/fixtures/snyk-iac-test-results.json
@@ -147,9 +147,7 @@
       }
     ],
     "metadata": {
-      "projectName": "input-files-for-json-v2"
-    },
-    "scanAnalytics": {
+      "projectName": "input-files-for-json-v2",
       "ignoredCount": 3
     }
   },