feat: Address AI feedback, extract func CF-2412

Author: og-pixel

src/commands/issues.test.ts

@@ -873,6 +873,26 @@ describe("issues command", () => {
   });
 
   describe("--bulk-ignore flag", () => {
+    it("should error when --limit is explicitly combined with --bulk-ignore", async () => {
+      const mockExit = vi.spyOn(process, "exit").mockImplementation(() => {
+        throw new Error("process.exit called");
+      });
+      vi.spyOn(console, "error").mockImplementation(() => {});
+
+      const program = createProgram();
+      await expect(
+        program.parseAsync([
+          "node", "test", "issues", "gh", "test-org", "test-repo",
+          "--bulk-ignore", "--limit", "10",
+        ]),
+      ).rejects.toThrow("process.exit called");
+
+      expect(AnalysisService.bulkIgnoreIssues).not.toHaveBeenCalled();
+      expect(AnalysisService.searchRepositoryIssues).not.toHaveBeenCalled();
+
+      mockExit.mockRestore();
+    });
+
     it("should fetch all FP issues with onlyPotentialFalsePositives: true and call bulkIgnoreIssues", async () => {
       vi.mocked(AnalysisService.searchRepositoryIssues).mockResolvedValue({
         data: mockIssues,
@@ -969,7 +989,7 @@ describe("issues command", () => {
       await program.parseAsync([
         "node", "test", "issues", "gh", "test-org", "test-repo",
         "--bulk-ignore",
-        "--comment", "Verified by security team",
+        "--ignore-comment", "Verified by security team",
       ]);
 
       expect(AnalysisService.bulkIgnoreIssues).toHaveBeenCalledWith(

src/commands/issues.ts

@@ -164,6 +164,106 @@ function parseCommaList(value: string | undefined): string[] | undefined {
     .filter(Boolean);
 }
 
+/**
+ * Build the SearchRepositoryIssuesBody from parsed CLI options.
+ * Resolves tool names/UUIDs via the Codacy API when --tools is provided.
+ */
+async function buildFilterBody(opts: Record<string, any>): Promise<SearchRepositoryIssuesBody> {
+  const body: SearchRepositoryIssuesBody = {};
+
+  if (opts.branch) body.branchName = opts.branch;
+
+  const patterns = parseCommaList(opts.patterns);
+  if (patterns) body.patternIds = patterns;
+
+  const severity = parseCommaList(opts.severities);
+  if (severity) body.levels = severity.map(normalizeSeverity);
+
+  const category = parseCommaList(opts.categories);
+  if (category) body.categories = category.map(normalizeCategory);
+
+  const language = parseCommaList(opts.languages);
+  if (language) body.languages = language;
+
+  const tags = parseCommaList(opts.tags);
+  if (tags) body.tags = tags;
+
+  const author = parseCommaList(opts.authors);
+  if (author) body.authorEmails = author;
+
+  // --false-positives and --bulk-ignore both restrict the API query to FP issues only
+  if (opts.falsePositives || opts.bulkIgnore) body.onlyPotentialFalsePositives = true;
+
+  const toolInputs = parseCommaList(opts.tools);
+  if (toolInputs) {
+    body.toolUuids = await resolveToolUuids(toolInputs, async () => {
+      const tools: Tool[] = [];
+      let cursor: string | undefined;
+      do {
+        const resp = await ToolsService.listTools(cursor, 100);
+        tools.push(...resp.data);
+        cursor = resp.pagination?.cursor;
+      } while (cursor);
+      return tools;
+    });
+  }
+
+  return body;
+}
+
+/**
+ * Fetch every false positive issue (all pages) then ignore them in batches of
+ * BULK_BATCH_SIZE. Prints progress via spinners and exits when done.
+ */
+async function executeBulkIgnore(
+  provider: string,
+  organization: string,
+  repository: string,
+  body: SearchRepositoryIssuesBody,
+  comment: string | undefined,
+): Promise<void> {
+  const fetchSpinner = ora("Fetching false positive issues...").start();
+  const allIssues: CommitIssue[] = [];
+  let cursor: string | undefined;
+
+  do {
+    const resp = await AnalysisService.searchRepositoryIssues(
+      provider,
+      organization,
+      repository,
+      cursor,
+      100,
+      body,
+    );
+    allIssues.push(...resp.data);
+    cursor = resp.pagination?.cursor;
+  } while (cursor);
+
+  fetchSpinner.stop();
+
+  if (allIssues.length === 0) {
+    console.log(ansis.green("No false positive issues found."));
+    return;
+  }
+
+  const count = allIssues.length;
+  const plural = count === 1 ? "" : "s";
+  console.log(`Found ${ansis.bold(String(count))} false positive issue${plural}.`);
+
+  const ignoreSpinner = ora(`Ignoring ${count} issue${plural}...`).start();
+  const issueIds = allIssues.map((i) => i.issueId);
+
+  for (let i = 0; i < issueIds.length; i += BULK_BATCH_SIZE) {
+    await AnalysisService.bulkIgnoreIssues(provider, organization, repository, {
+      issueIds: issueIds.slice(i, i + BULK_BATCH_SIZE),
+      reason: "FalsePositive",
+      comment: comment || undefined,
+    });
+  }
+
+  ignoreSpinner.succeed(`Ignored ${ansis.bold(String(count))} false positive issue${plural}.`);
+}
+
 export function registerIssuesCommand(program: Command) {
   program
     .command("issues")
@@ -190,7 +290,7 @@ export function registerIssuesCommand(program: Command) {
     .option("-O, --overview", "show issue count totals instead of the issues list")
     .option("-F, --false-positives", "only show issues that are potential false positives")
     .option("-I, --bulk-ignore", "ignore all false positive issues matching the current filters")
-    .option("-m, --comment <comment>", "optional comment when using --bulk-ignore")
+    .option("-m, --ignore-comment <comment>", "optional comment when using --bulk-ignore")
     .addHelpText(
       "after",
       `
@@ -202,7 +302,7 @@ Examples:
   $ codacy issues gh my-org my-repo --limit 500
   $ codacy issues gh my-org my-repo --false-positives
   $ codacy issues gh my-org my-repo --bulk-ignore --branch main
-  $ codacy issues gh my-org my-repo --bulk-ignore --patterns security-rule --comment "Confirmed FPs"
+  $ codacy issues gh my-org my-repo --bulk-ignore --patterns security-rule --ignore-comment "Confirmed FPs"
   $ codacy issues gh my-org my-repo --output json`,
     )
     .action(async function (
@@ -216,84 +316,15 @@ Examples:
         const opts = this.opts();
         const format = getOutputFormat(this);
         const isOverview = !!opts.overview;
-        const isBulkIgnore = !!opts.bulkIgnore;
-
-        // Build the shared filter body from CLI options
-        const body: SearchRepositoryIssuesBody = {};
-        if (opts.branch) body.branchName = opts.branch;
-        const patterns = parseCommaList(opts.patterns);
-        if (patterns) body.patternIds = patterns;
-        const severity = parseCommaList(opts.severities);
-        if (severity) body.levels = severity.map(normalizeSeverity);
-        const category = parseCommaList(opts.categories);
-        if (category) body.categories = category.map(normalizeCategory);
-        const language = parseCommaList(opts.languages);
-        if (language) body.languages = language;
-        const tags = parseCommaList(opts.tags);
-        if (tags) body.tags = tags;
-        const author = parseCommaList(opts.authors);
-        if (author) body.authorEmails = author;
-        // --false-positives and --bulk-ignore both restrict the API query to FP issues only
-        if (opts.falsePositives || isBulkIgnore) body.onlyPotentialFalsePositives = true;
-
-        const toolInputs = parseCommaList(opts.tools);
-        if (toolInputs) {
-          body.toolUuids = await resolveToolUuids(toolInputs, async () => {
-            const tools: Tool[] = [];
-            let cursor: string | undefined;
-            do {
-              const resp = await ToolsService.listTools(cursor, 100);
-              tools.push(...resp.data);
-              cursor = resp.pagination?.cursor;
-            } while (cursor);
-            return tools;
-          });
-        }
 
+        const body = await buildFilterBody(opts);
         const limit = Math.min(Math.max(parseInt(opts.limit, 10) || 100, 1), 1000);
 
-        // --bulk-ignore: fetch all FP issues (all pages) then call bulkIgnoreIssues in batches
-        if (isBulkIgnore) {
-          const fetchSpinner = ora("Fetching false positive issues...").start();
-          const allIssues: CommitIssue[] = [];
-          let cursor: string | undefined;
-
-          do {
-            const resp = await AnalysisService.searchRepositoryIssues(
-              provider,
-              organization,
-              repository,
-              cursor,
-              100,
-              body,
-            );
-            allIssues.push(...resp.data);
-            cursor = resp.pagination?.cursor;
-          } while (cursor);
-
-          fetchSpinner.stop();
-
-          if (allIssues.length === 0) {
-            console.log(ansis.green("No false positive issues found."));
-            return;
+        if (opts.bulkIgnore) {
+          if (this.getOptionValueSource("limit") === "cli") {
+            this.error("--limit cannot be used with --bulk-ignore; the bulk-ignore path always processes all matching issues");
           }
-
-          const count = allIssues.length;
-          const plural = count === 1 ? "" : "s";
-          console.log(`Found ${ansis.bold(String(count))} false positive issue${plural}.`);
-
-          const ignoreSpinner = ora(`Ignoring ${count} issue${plural}...`).start();
-          const issueIds = allIssues.map((i) => i.issueId);
-
-          for (let i = 0; i < issueIds.length; i += BULK_BATCH_SIZE) {
-            await AnalysisService.bulkIgnoreIssues(provider, organization, repository, {
-              issueIds: issueIds.slice(i, i + BULK_BATCH_SIZE),
-              reason: "FalsePositive",
-              comment: opts.comment || undefined,
-            });
-          }
-
-          ignoreSpinner.succeed(`Ignored ${ansis.bold(String(count))} false positive issue${plural}.`);
+          await executeBulkIgnore(provider, organization, repository, body, opts.ignoreComment);
           return;
         }