fix: custom rules remediation output

snyk · Mar 1, 2023 · e790dfb · e790dfb
1 parent 7c358d6
commit e790dfb
Showing 1 changed file with 12 additions and 9 deletions.
diff --git a/src/lib/formatters/iac-output/text/issues-list/issue.ts b/src/lib/formatters/iac-output/text/issues-list/issue.ts
@@ -52,8 +52,6 @@ function formatProperties(
   result: FormattedOutputResult,
   options?: Options,
 ): string[] {
-  const remediationKey = iacRemediationTypes?.[result.projectType];
-
   const properties = [
     ['Info', formatInfo(result.issue)],
     [
@@ -72,15 +70,10 @@ function formatProperties(
           : ''
       }`,
     ],
-    [
-      'Resolve',
-      remediationKey && result.issue.remediation?.[remediationKey]
-        ? result.issue.remediation[remediationKey]
-        : result.issue.resolve,
-    ],
+    ['Resolve', getRemediationText(result)],
   ];
 
-  const propKeyColWidth = Math.max(...properties.map(([key]) => key.length));
+  const propKeyColWidth = Math.max(...properties.map(([key]) => key!.length));
   const propValColWidth =
     maxLineWidth - contentPadding.length - propKeyColWidth - 2;
   const indentLength = propKeyColWidth + 2;
@@ -104,3 +97,13 @@ function isValidLineNumber(lineNumber: number | undefined): boolean {
     typeof lineNumber === 'number' && lineNumber! > 0 && lineNumber! % 1 === 0
   );
 }
+
+function getRemediationText(result: FormattedOutputResult): string | undefined {
+  const remediationKey = iacRemediationTypes?.[result.projectType];
+
+  if (result.issue.remediation) {
+    return result.issue.remediation[remediationKey] ?? result.issue.remediation;
+  }
+
+  return result.issue.resolve;
+}