Merge pull request #20 from evwilkin/fix/19-gh-403

Author: evwilkin

.github/workflows/daily_run.yml

@@ -39,7 +39,11 @@ jobs:
       # Step 4: Run GitHub-Jira sync
       - name: Execute GitHub-Jira Sync
         env:
+          # PF-org token
           GH_TOKEN: ${{ secrets.GH_TOKEN }}
+          # RH-UXD org token
+          GH_JIRA_SYNC_RHUXD_PAT: ${{ secrets.GH_JIRA_SYNC_RHUXD_PAT }}
+          # Jira token
           JIRA_PAT: ${{ secrets.JIRA_PAT }}
         run: |
           if [[ "${{ github.event.inputs.since_date }}" != "" ]]; then

src/helpers.js

@@ -4,11 +4,49 @@ import { errorCollector } from './index.js';
 import j2m from 'jira2md';
 
 // Initialize Octokit with GraphQL support
+// @deprecated Use getOctokitForOwner() instead for multi-org support
 export const octokit = new Octokit({
   auth: process.env.GH_TOKEN,
   baseUrl: 'https://api.github.com',
 });
 
+// Cache for Octokit instances by owner
+const octokitInstances = new Map();
+
+/**
+ * Get an Octokit instance for the specified owner
+ * @param {string} owner - Repository owner (e.g., 'patternfly', 'rh-uxd')
+ * @returns {Octokit} Cached Octokit instance with appropriate token
+ */
+export function getOctokitForOwner(owner) {
+  // Return cached instance if available
+  if (octokitInstances.has(owner)) {
+    return octokitInstances.get(owner);
+  }
+
+  // Determine which token to use based on owner
+  let token;
+  if (owner === 'rh-uxd') {
+    token = process.env.GH_JIRA_SYNC_RHUXD_PAT;
+  } else {
+    // Default to patternfly token for 'patternfly' and any other owners
+    token = process.env.GH_TOKEN;
+  }
+
+  if (!token) {
+    throw new Error(`Missing GitHub token for owner: ${owner}`);
+  }
+
+  // Create and cache new instance
+  const instance = new Octokit({
+    auth: token,
+    baseUrl: 'https://api.github.com',
+  });
+
+  octokitInstances.set(owner, instance);
+  return instance;
+}
+
 // Initialize Jira client
 export const jiraClient = axios.create({
   baseURL: 'https://issues.redhat.com/',
@@ -283,6 +321,10 @@ export const availableComponents = [
   {
     name: 'github-jira-sync',
     owner: 'rh-uxd'
+  },
+  {
+    name: 'jira-weekly-report',
+    owner: 'rh-uxd'
   }
 ];
 
@@ -354,9 +396,12 @@ export const buildJiraIssueData = (githubIssue, isUpdateIssue = false) => {
 };
 
 // Helper function to execute GraphQL queries
-export async function executeGraphQLQuery(query, variables) {
+export async function executeGraphQLQuery(query, variables, owner = null) {
   try {
-    const response = await octokit.graphql(query, variables);
+    // Extract owner from variables if not provided directly
+    const ownerToUse = owner || variables?.owner || 'patternfly';
+    const octokitInstance = getOctokitForOwner(ownerToUse);
+    const response = await octokitInstance.graphql(query, variables);
     return response;
   } catch (error) {
     errorCollector.addError('HELPERS: GraphQL query execution', error);
@@ -587,7 +632,7 @@ export async function getRepoIssues(repo, ghOwner = 'patternfly', since) {
         repo,
         issuesCursor: cursor,
         since,
-      });
+      }, ghOwner);
 
       // Validate response structure
       if (!response?.repository?.issues) {
@@ -786,7 +831,8 @@ export function shouldSyncFromJira(githubIssue, jiraIssue) {
 export async function updateGitHubIssue(owner, repo, issueNumber, updates) {
   await delay();
   try {
-    const response = await octokit.rest.issues.update({
+    const octokitInstance = getOctokitForOwner(owner);
+    const response = await octokitInstance.rest.issues.update({
       owner,
       repo,
       issue_number: issueNumber,
@@ -805,7 +851,8 @@ export async function updateGitHubIssue(owner, repo, issueNumber, updates) {
 export async function addGitHubIssueComment(owner, repo, issueNumber, body) {
   await delay();
   try {
-    const response = await octokit.rest.issues.createComment({
+    const octokitInstance = getOctokitForOwner(owner);
+    const response = await octokitInstance.rest.issues.createComment({
       owner,
       repo,
       issue_number: issueNumber,
@@ -824,7 +871,8 @@ export async function addGitHubIssueComment(owner, repo, issueNumber, body) {
 export async function createGitHubIssue(owner, repo, issueData) {
   await delay();
   try {
-    const response = await octokit.rest.issues.create({
+    const octokitInstance = getOctokitForOwner(owner);
+    const response = await octokitInstance.rest.issues.create({
       owner,
       repo,
       ...issueData,
@@ -850,7 +898,8 @@ export async function createGitHubIssue(owner, repo, issueData) {
 export async function closeGitHubIssue(owner, repo, issueNumber) {
   await delay();
   try {
-    const response = await octokit.rest.issues.update({
+    const octokitInstance = getOctokitForOwner(owner);
+    const response = await octokitInstance.rest.issues.update({
       owner,
       repo,
       issue_number: issueNumber,

src/syncJiraToGitHub.js

@@ -1,5 +1,5 @@
 import {
-  octokit,
+  getOctokitForOwner,
   delay,
   jiraToGitHubUserMapping,
   extractUpstreamUrl,
@@ -127,19 +127,27 @@ export async function syncAssigneeToGitHub(jiraIssue, githubIssue) {
     }
 
     // Remove existing assignees and add the Jira assignee
-    if (currentAssignees.length > 0) {
-      await octokit.rest.issues.removeAssignees({
-        owner: parseGitHubUrl(githubIssue.url).owner,
-        repo: parseGitHubUrl(githubIssue.url).repo,
-        issue_number: parseGitHubUrl(githubIssue.url).issueNumber,
-        assignees: currentAssignees,
-      });
+    const parsed = parseGitHubUrl(githubIssue.url);
+    if (!parsed) {
+      console.log(`  - Could not parse GitHub URL: ${githubIssue.url}`);
+      return false;
     }
-
-    await octokit.rest.issues.addAssignees({
-      owner: parseGitHubUrl(githubIssue.url).owner,
-      repo: parseGitHubUrl(githubIssue.url).repo,
-      issue_number: parseGitHubUrl(githubIssue.url).issueNumber,
+    const { owner, repo, issueNumber } = parsed;
+    const octokitInstance = getOctokitForOwner(owner);
+
+    // if (currentAssignees.length > 0) {
+    //   await octokitInstance.rest.issues.removeAssignees({
+    //     owner,
+    //     repo,
+    //     issue_number: issueNumber,
+    //     assignees: currentAssignees,
+    //   });
+    // }
+
+    await octokitInstance.rest.issues.addAssignees({
+      owner,
+      repo,
+      issue_number: issueNumber,
       assignees: [githubAssignee],
     });
 
@@ -218,7 +226,8 @@ export async function reopenGitHubIssueIfJiraReopened(jiraIssue, githubIssue) {
     try {
       // Get current GitHub issue state (to verify it's still closed and get updated timestamp)
       await delay();
-      const { data: ghIssue } = await octokit.rest.issues.get({
+      const octokitInstance = getOctokitForOwner(owner);
+      const { data: ghIssue } = await octokitInstance.rest.issues.get({
         owner,
         repo,
         issue_number: issueNumber,
@@ -301,7 +310,8 @@ export async function closeGitHubIssueIfJiraClosed(jiraIssue, githubIssue) {
     try {
       // Get current GitHub issue state (to verify it's still open and get updated timestamp)
       await delay();
-      const { data: ghIssue } = await octokit.rest.issues.get({
+      const octokitInstance = getOctokitForOwner(owner);
+      const { data: ghIssue } = await octokitInstance.rest.issues.get({
         owner,
         repo,
         issue_number: issueNumber,
@@ -396,7 +406,8 @@ export async function checkAndHandleArchivedJiraIssue(githubIssue) {
     try {
       // Get GitHub issue to check if it's already closed
       await delay();
-      const { data: ghIssue } = await octokit.rest.issues.get({
+      const octokitInstance = getOctokitForOwner(owner);
+      const { data: ghIssue } = await octokitInstance.rest.issues.get({
         owner,
         repo,
         issue_number: issueNumber,
@@ -466,7 +477,8 @@ export async function closeGitHubIssuesForClosedJira(closedJiraIssues) {
       try {
         // Get GitHub issue to check if it's already closed
         await delay();
-        const { data: ghIssue } = await octokit.rest.issues.get({
+        const octokitInstance = getOctokitForOwner(owner);
+        const { data: ghIssue } = await octokitInstance.rest.issues.get({
           owner,
           repo,
           issue_number: issueNumber,