fixdiscover 1.2.1 → 2.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fixdiscover",
-  "version": "1.2.1",
+  "version": "2.0.0",
   "description": "Small CLI tool to search for Jira issues with linked PRs and Issues that are fixed in an upstream projects.",
   "main": "src/main.ts",
   "type": "commonjs",
@@ -9,14 +9,14 @@
     "test": "tests"
   },
   "scripts": {
-    "build": "esbuild ./src/main.js --bundle --outdir=dist --platform=node --target=node20.0.0 --packages=bundle",
+    "build": "esbuild ./src/main.js --bundle --outdir=dist --platform=node --target=node24.0.0 --packages=bundle",
     "format": "prettier --write '**/*.ts'",
     "format-check": "prettier --check '**/*.ts'",
     "test": "vitest run --coverage",
     "update-snapshots": "vitest run --update",
     "all": "yarn && yarn run build && yarn run format && yarn test"
   },
-  "packageManager": "yarn@4.9.3",
+  "packageManager": "yarn@4.14.1",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/redhat-plumbers-in-action/storypointer.git"
@@ -34,25 +34,25 @@
     "patch"
   ],
   "dependencies": {
-    "@actions/core": "^1.11.1",
-    "@octokit/core": "^7.0.5",
-    "@octokit/plugin-throttling": "^11.0.2",
-    "@octokit/types": "^15.0.0",
+    "@actions/core": "^3.0.1",
+    "@octokit/core": "^7.0.6",
+    "@octokit/plugin-throttling": "^11.0.3",
+    "@octokit/types": "^16.0.0",
     "@total-typescript/ts-reset": "0.6.1",
-    "bugzilla": "^3.1.4",
+    "bugzilla": "^3.1.6",
     "chalk": "5.6.2",
-    "commander": "14.0.1",
-    "dotenv": "17.2.3",
-    "jira.js": "5.2.2",
-    "zod": "4.1.11"
+    "commander": "14.0.3",
+    "dotenv": "17.4.2",
+    "jira.js": "5.3.1",
+    "zod": "4.4.3"
   },
   "devDependencies": {
-    "@types/node": "24.6.1",
-    "@vitest/coverage-v8": "3.2.4",
-    "esbuild": "0.25.10",
-    "prettier": "3.6.2",
+    "@types/node": "25.9.1",
+    "@vitest/coverage-v8": "4.1.7",
+    "esbuild": "0.28.0",
+    "prettier": "3.8.3",
     "ts-node": "10.9.2",
-    "typescript": "5.9.3",
-    "vitest": "3.2.4"
+    "typescript": "6.0.3",
+    "vitest": "4.1.7"
   }
 }

package/src/cli.ts

@@ -1,11 +1,10 @@
 import { Command } from 'commander';
-import { Comment } from 'jira.js/out/version2/models';
 
 import { Bugzilla } from './bugzilla';
 import { Jira } from './jira';
 import { Logger } from './logger';
 import { getOctokit } from './octokit';
-import { getDefaultValue, getOptions, tokenUnavailable } from './util';
+import { getDefaultValue, getOptions, raise, tokenUnavailable } from './util';
 import { LinkFinder } from './linkfinder';
 
 import { IssueLinks, LinkObject } from './schema/link';
@@ -18,7 +17,7 @@ export function cli(): Command {
     .description(
       '🔍 A small CLI tool is used to search for Jira issues with linked PRs and issues that are fixed in upstream projects'
     )
-    .version('1.2.1');
+    .version('2.0.0');
 
   program
     .requiredOption(
@@ -31,6 +30,7 @@ export function cli(): Command {
       'upstream project',
       getDefaultValue('UPSTREAM')
     )
+    .option('-l, --login <email>', 'Jira login email', getDefaultValue('LOGIN'))
     .option('--migrate', 'migrate links from Bugzilla to Jira')
     .option('-n, --nocolor', 'disable color output', getDefaultValue('NOCOLOR'))
     .option('-x, --dry', 'dry run', getDefaultValue('DRY'));
@@ -46,7 +46,18 @@ const runProgram = async () => {
   const logger = new Logger(!!options.nocolor);
 
   const jiraToken = process.env.JIRA_API_TOKEN ?? tokenUnavailable('jira');
-  const jira = new Jira('https://issues.redhat.com', jiraToken, options.dry);
+  const jiraLogin =
+    typeof options.login === 'string' && options.login
+      ? options.login
+      : raise(
+          'Jira login email is required. Use --login <email> or set the LOGIN environment variable.'
+        );
+  const jira = new Jira(
+    'https://redhat.atlassian.net',
+    jiraToken,
+    options.dry,
+    jiraLogin
+  );
 
   const bugzillaToken = options.migrate
     ? (process.env.BUGZILLA_API_TOKEN ?? tokenUnavailable('bugzilla'))
@@ -68,19 +79,19 @@ const runProgram = async () => {
   for (const issue of issues) {
     let links: LinkObject[] = [];
 
-    const bugzillaBug: { bugid: number } | null =
-      issue.fields[jira.fields.bugzillaBug];
-
     const externalLinks = await jira.getLinks(issue.id);
+    const bugzillaBugId = jira.getBugzillaBugId(externalLinks);
+
+    const renderedComments =
+      (issue.renderedFields as Record<string, any>)?.comment?.comments ?? [];
 
-    for (const comment of issue.fields.comment.comments as (Comment & {
-      body?: string;
-    })[]) {
-      if (!comment?.body) {
+    for (const comment of renderedComments) {
+      const body: unknown = comment?.body;
+      if (typeof body !== 'string' || !body) {
         continue;
       }
 
-      const commentLinks = linkFinder.getLinks(comment.body);
+      const commentLinks = linkFinder.getLinks(body);
 
       if (commentLinks) {
         links.push(...(await linkFinder.checkUpstream(commentLinks, octokit)));
@@ -95,8 +106,8 @@ const runProgram = async () => {
       }
     }
 
-    if (options.migrate && bugzillaBug !== null) {
-      const bug = (await bugzilla.getBugs(bugzillaBug.bugid))[0];
+    if (options.migrate && bugzillaBugId !== null) {
+      const bug = (await bugzilla.getBugs(bugzillaBugId))[0];
 
       let linksForMigration: LinkObject[] = [];
 
@@ -138,7 +149,10 @@ const runProgram = async () => {
       await jira.setLabels(issue.key, ['backport']);
       data.push({
         key: jira.getIssueURL(issue.key),
-        bz: bugzillaBug ? bugzilla.getIssueURL(bugzillaBug.bugid) : undefined,
+        bz:
+          bugzillaBugId !== null
+            ? bugzilla.getIssueURL(bugzillaBugId)
+            : undefined,
         links,
       });
     }

package/src/jira.ts

@@ -1,12 +1,9 @@
-import { Version2Client } from 'jira.js';
+import { Version3Client } from 'jira.js';
 
 import { raise } from './util';
 
 export class Jira {
-  readonly api: Version2Client;
-  readonly fields = {
-    bugzillaBug: 'customfield_12316840',
-  };
+  readonly api: Version3Client;
 
   readonly baseJQL = 'Project = RHEL AND statusCategory = "To Do"';
   JQL = '';
@@ -14,12 +11,16 @@ export class Jira {
   constructor(
     readonly instance: string,
     apiToken: string,
-    readonly dry: boolean
+    readonly dry: boolean,
+    email: string
   ) {
-    this.api = new Version2Client({
+    this.api = new Version3Client({
       host: instance,
       authentication: {
-        personalAccessToken: apiToken,
+        basic: {
+          email,
+          apiToken,
+        },
       },
     });
   }
@@ -34,19 +35,14 @@ export class Jira {
     this.JQL += component ? ` AND component = ${component}` : '';
     this.JQL += ' ORDER BY id DESC';
 
-    const response = await this.api.issueSearch.searchForIssuesUsingJqlPost({
-      jql: this.JQL,
-      fields: [
-        'id',
-        'issuetype',
-        'summary',
-        'assignee',
-        'comment',
-        this.fields.bugzillaBug,
-      ],
-      // We should paginate this, let's set 300 for now.
-      maxResults: 300,
-    });
+    const response =
+      await this.api.issueSearch.searchForIssuesUsingJqlEnhancedSearchPost({
+        jql: this.JQL,
+        fields: ['id', 'issuetype', 'summary', 'assignee', 'comment'],
+        expand: 'renderedFields',
+        // We should paginate this, let's set 300 for now.
+        maxResults: 300,
+      });
 
     return response.issues ?? raise('Jira.getIssues(): missing issues.');
   }
@@ -59,6 +55,21 @@ export class Jira {
     return response ?? [];
   }
 
+  static readonly bugzillaUrlRegex =
+    /^https?:\/\/bugzilla\.redhat\.com\/show_bug\.cgi\?id=(\d+)$/;
+
+  getBugzillaBugId(
+    links: Awaited<ReturnType<typeof this.getLinks>>
+  ): number | null {
+    for (const link of links) {
+      const match = link.object?.url?.match(Jira.bugzillaUrlRegex);
+      if (match) {
+        return Number(match[1]);
+      }
+    }
+    return null;
+  }
+
   async setLabels(key: string, labels: string[]) {
     if (this.dry) {
       //console.debug(`DRY: setLabels(${key}, ${labels})`);

package/src/util.ts

@@ -1,4 +1,5 @@
 import { OptionValues } from 'commander';
+import os from 'node:os';
 
 export function raise(error: string): never {
   throw new Error(error);
@@ -23,12 +24,21 @@ export function tokenUnavailable(type: 'jira' | 'bugzilla' | 'github'): never {
   );
 }
 
+export function getUserFromLogin(): string | undefined {
+  try {
+    const login = os.userInfo().username;
+    return `${login}@redhat.com`;
+  } catch {
+    return undefined;
+  }
+}
+
 export function isDefaultValuesDisabled(): boolean {
   return process.env['NODEFAULTS'] ? true : false;
 }
 
 export function getDefaultValue(
-  envName: 'COMPONENT' | 'UPSTREAM' | 'NOCOLOR' | 'DRY'
+  envName: 'COMPONENT' | 'UPSTREAM' | 'NOCOLOR' | 'DRY' | 'LOGIN'
 ) {
   if (isDefaultValuesDisabled()) {
     return undefined;
@@ -36,6 +46,10 @@ export function getDefaultValue(
 
   const value = process.env[envName];
 
+  if (envName === 'LOGIN' && !value) {
+    return getUserFromLogin();
+  }
+
   if ((envName === 'NOCOLOR' || envName === 'DRY') && !value) {
     return false;
   }
@@ -48,6 +62,7 @@ export function getOptions(inputs: OptionValues): OptionValues {
     ...inputs,
     component: inputs.component || getDefaultValue('COMPONENT'),
     upstream: inputs.upstream || getDefaultValue('UPSTREAM'),
+    login: inputs.login || getDefaultValue('LOGIN'),
   };
 }
 

package/vitest.config.ts

@@ -0,0 +1,13 @@
+import { configDefaults, defineConfig } from 'vitest/config';
+
+export default defineConfig({
+  test: {
+    dir: './test',
+
+    exclude: [...configDefaults.exclude],
+
+    coverage: {
+      include: ['src/**/*.ts'],
+    },
+  },
+});