Dont include counts of ignored and excluded advisories in the text re…

…port, only present on stdout
djfdyuruiry · Jul 21, 2023 · e464749 · e464749
1 parent c984d4e
commit e464749
Showing 1 changed file with 15 additions and 37 deletions.
diff --git a/bin/improved-yarn-audit b/bin/improved-yarn-audit
@@ -124,30 +124,24 @@ function checkForMissingExclusions(allAdvisories) {
   }
 }
 
-function buildAdvisoryReport(
+function reportIgnoredAdvisories(
   devDependencyAdvisoryIds,
   severityIgnoredAuditAdvisories,
   excludedAuditAdvisories
 ) {
-  let filteredAdvisoryReport = ""
-
   if (ignoreDevDependencies && devDependencyAdvisoryIds.length > 0) {
-    filteredAdvisoryReport +=
-      `${devDependencyAdvisoryIds.length} ignored because ` +
-      `they are dev dependencies\n`
+    console.warn(`${devDependencyAdvisoryIds.length} ignored because ` +
+      `they are dev dependencies\n`)
   }
 
   if (severityIgnoredAuditAdvisories.length > 0) {
-    filteredAdvisoryReport +=
-      `${severityIgnoredAuditAdvisories.length} ignored because ` +
-      `severity was lower than "${minSeverityName}"\n`
+    console.warn(`${severityIgnoredAuditAdvisories.length} ignored because ` +
+      `severity was lower than "${minSeverityName}"\n`)
   }
 
   if (excludedAuditAdvisories.length > 0) {
-    filteredAdvisoryReport += `${excludedAuditAdvisories.length} ignored because of advisory exclusions\n`
+    console.warn(`${excludedAuditAdvisories.length} ignored because of advisory exclusions\n`)
   }
-
-  return filteredAdvisoryReport
 }
 
 async function createReport(
@@ -169,36 +163,23 @@ async function createReport(
   )
 
   console.log(`Found ${filteredAuditAdvisories.length} vulnerabilities\n`)
+  reportIgnoredAdvisories(
+    devDependencyAdvisoryIds,
+    severityIgnoredAuditAdvisories,
+    excludedAuditAdvisories
+  )
 
   if (outputFormat == "json") {
-    return await createJsonReport(filteredAuditAdvisories,
-      devDependencyAdvisoryIds,
-      severityIgnoredAuditAdvisories,
-      excludedAuditAdvisories)
+    return await createJsonReport(filteredAuditAdvisories)
   } else {
-    return await createTextReport(filteredAuditAdvisories,
-      devDependencyAdvisoryIds,
-      severityIgnoredAuditAdvisories,
-      excludedAuditAdvisories)
+    return await createTextReport(filteredAuditAdvisories)
   }
 }
 
 async function createTextReport(
-  filteredAuditAdvisories,
-  devDependencyAdvisoryIds,
-  severityIgnoredAuditAdvisories,
-  excludedAuditAdvisories) {
+  filteredAuditAdvisories) {
 
-  const filteredAdvisoryReport = buildAdvisoryReport(
-    devDependencyAdvisoryIds,
-    severityIgnoredAuditAdvisories,
-    excludedAuditAdvisories
-  )
-
   const lines = []
-  if (filteredAdvisoryReport.length > 0) {
-    lines.push(filteredAdvisoryReport)
-  }
 
   filteredAuditAdvisories.forEach((a) => {
     const formattedSeverity = a.severity
@@ -229,10 +210,7 @@ async function createTextReport(
 }
 
 async function createJsonReport(
-  filteredAuditAdvisories,
-  devDependencyAdvisoryIds,
-  severityIgnoredAuditAdvisories,
-  excludedAuditAdvisories) {
+  filteredAuditAdvisories) {
 
     const report = []
     filteredAuditAdvisories.forEach((advisory) => {