update conditionals

AikidoSec · Apr 19, 2024 · 10bfec7 · 10bfec7
1 parent 6af1f4e
commit 10bfec7
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 5 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -231,7 +231,10 @@ async function run() {
             if (result.diff_url) {
                 moreDetailsText = ` More details at ${result.diff_url}`;
             }
-            const shouldPostComment = !isMergeGroupAction && (postScanStatusAsComment === 'on' || postScanStatusAsComment === 'only_if_new_findings');
+            let shouldPostComment = (postScanStatusAsComment === 'on' || postScanStatusAsComment === 'only_if_new_findings');
+            if (isMergeGroupAction) {
+                shouldPostComment = false; // no review comments in merge queue
+            }
             if (shouldPostComment && !!((_9 = result.outcome) === null || _9 === void 0 ? void 0 : _9.human_readable_message)) {
                 try {
                     const options = { onlyIfNewFindings: postScanStatusAsComment === 'only_if_new_findings', hasNewFindings: !!result.gate_passed };
@@ -246,7 +249,10 @@ async function run() {
                     }
                 }
             }
-            const shouldPostReviewComments = !isMergeGroupAction && (postReviewComments === 'on');
+            let shouldPostReviewComments = (postReviewComments === 'on');
+            if (isMergeGroupAction) {
+                shouldPostReviewComments = false; // no review comments in merge queue
+            }
             if (shouldPostReviewComments) {
                 await createReviewComments(secretKey, scanId);
             }

diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/src/main.ts b/src/main.ts
@@ -135,7 +135,11 @@ async function run(): Promise<void> {
 				moreDetailsText = ` More details at ${result.diff_url}`;
 			}
 
-			const shouldPostComment = !isMergeGroupAction && (postScanStatusAsComment === 'on' || postScanStatusAsComment === 'only_if_new_findings');
+			let shouldPostComment = (postScanStatusAsComment === 'on' || postScanStatusAsComment === 'only_if_new_findings');
+			if (isMergeGroupAction) {
+				shouldPostComment = false; // no review comments in merge queue
+			}
+
 			if (shouldPostComment && !!result.outcome?.human_readable_message) {
 				try {
 					const options = { onlyIfNewFindings: postScanStatusAsComment === 'only_if_new_findings', hasNewFindings: !!result.gate_passed };
@@ -149,7 +153,11 @@ async function run(): Promise<void> {
 				}
 			}
 
-			const shouldPostReviewComments = !isMergeGroupAction && (postReviewComments === 'on');
+			let shouldPostReviewComments = (postReviewComments === 'on');
+			if (isMergeGroupAction) {
+				shouldPostReviewComments = false; // no review comments in merge queue
+			}
+
 			if (shouldPostReviewComments) {
 				await createReviewComments(secretKey, scanId)
 			}