feat(github-action): Should only fail when there are results on PR

aws-cloudformation · May 23, 2024 · f2b989d · f2b989d
1 parent 799aea3
commit f2b989d
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 9 deletions.
diff --git a/action/__tests__/main.test.ts b/action/__tests__/main.test.ts
@@ -27,7 +27,11 @@ jest.mock('../src/checkoutRepository', () => ({
 }))
 jest.mock('../src/handlePushRun', () => ({
   __esModule: true,
-  handlePushRun: jest.fn(),
+  handlePushRun: jest.fn().mockReturnValue([
+      ['file1.ts', 'Violation message 1', 'rule-id-1'],
+      ['file2.ts', 'Violation message 2', 'rule-id-2']
+    ]
+  ),
   default: jest.fn()
 }))
 jest.mock('../src/handleValidate', () => {
@@ -57,6 +61,10 @@ jest.mock('../src/handlePullRequestRun', () => {
       if (config.createReview) {
         handleCreateReviewSpy(...args)
       }
+      return [
+        ['file1.ts', 'Violation message 1', 'rule-id-1'],
+        ['file2.ts', 'Violation message 2', 'rule-id-2']
+      ]
     }),
     handleCreateReview: handleCreateReviewSpy,
     default: jest.fn()

diff --git a/action/src/main.ts b/action/src/main.ts
@@ -30,17 +30,20 @@ export async function run(): Promise<void> {
     } = result
 
     if (sarifRun.results.length) {
-      core.setFailed(RunStrings.ValidationFailed)
-
       if (analyze) {
+        core.setFailed(RunStrings.ValidationFailed)
         await uploadCodeScan({ result })
       } else {
-        await handleWriteActionSummary({
-          results:
-            eventName === 'pull_request'
-              ? await handlePullRequestRun({ run: sarifRun })
-              : await handlePushRun({ run: sarifRun })
-        })
+        const results =
+          eventName === 'pull_request'
+            ? await handlePullRequestRun({ run: sarifRun })
+            : await handlePushRun({ run: sarifRun })
+        if (results.length) {
+          core.setFailed(RunStrings.ValidationFailed)
+          await handleWriteActionSummary({
+            results
+          })
+        }
       }
     }
   } catch (error) {