feat: support multi org #27

Author: coltenkrauter

action.yaml

@@ -27,7 +27,7 @@ inputs:
       - chat:write.customize (to allow the bot to customize the name and avatar)
   channels:
     required: true
-    description: Comma separated list of Slack channel_ids to post to.
+    description: Comma-separated list of Slack channel IDs to post to.
   with-test-data:
     description: Append some test data to the Slack post.
     required: false
@@ -52,7 +52,7 @@ inputs:
     default: true
   repository-filter:
     required: false
-    description: Comma separated list of repositories to scan.
+    description: Comma-separated list of repositories to scan.
   base-url:
     description: Point to different github instance such as https://api.github.com
     required: false
@@ -62,4 +62,4 @@ outputs:
 
 runs:
   using: node20
-  main: dist/index.js
+  main: dist/app.js

dist/index.js

@@ -1,7 +1,7 @@
 {
   "name": "@krauters/github-notifier",
   "description": "GitHub Notifier by Krauters – Post Open Pull Requests to Slack",
-  "version": "0.14.1",
+  "version": "0.15.0",
   "author": "Colten Krauter <coltenkrauter>",
   "type": "module",
   "homepage": "https://buymeacoffee.com/coltenkrauter",
@@ -17,15 +17,15 @@
     "typescript"
   ],
   "exports": {
-    ".": "./dist/index.js"
+    ".": "./dist/app.js"
   },
   "engines": {
     "node": ">=20"
   },
   "scripts": {
     "all": "npm run test && npm run package",
     "bundle:watch": "npm run bundle -- --watch",
-    "bundle": "npx ncc build src/index.ts -o dist --source-map",
+    "bundle": "npx ncc build src/app.ts -o dist --source-map",
     "fix": "npm run lint -- --fix",
     "lint": "npx eslint src/**",
     "prepare": "husky || true",

dist/index.js.map

@@ -3,48 +3,75 @@
 import type { KnownBlock } from '@slack/web-api'
 
 import { context } from '@actions/github'
+import { debug } from '@actions/core'
 import { formatStringList, plural, snapDate, SnapType } from '@krauters/utils'
 
-import type { RunProps } from './structures.js'
+import type { InputProps } from './structures.js'
 
 import pkg from '../package.json' with { type: 'json' }
-import { workflowLogsUrl, workflowUrl } from './defaults.js'
+import { workflowLogsUrl, workflowUrl } from './constants.js'
 import { GitHubClient } from './utils/github/github-client.js'
-import { PullState, RepositoryType } from './utils/github/structures.js'
+import { Pull, PullState, RepositoryType } from './utils/github/structures.js'
 import { getFirstBlocks, getLastBlocks, getPullBlocks } from './utils/slack/blocks.js'
 import { SlackClient } from './utils/slack/slack-client.js'
 import { getApprovedPullRequest } from './utils/test-data.js'
+import { parseInputs } from './input-parser.js'
 
 const { homepage, name, version } = pkg
 
+/**
+ * The main function that gets executed when the action is run.
+ */
+async function main(): Promise<void> {
+	try {
+		debug('Starting main...')
+		await run(parseInputs())
+	} catch (err) {
+		console.error('Fatal error:', err)
+		process.exit(1)
+	}
+}
+
 /**
  * Runs the GitHub Notifier to query GitHub for open pull requests and then post messages to Slack channels.
  *
  * @param props Configurable properties of the GitHub Notifier.
  */
-export async function run({
-	githubProps,
+async function run({
+	githubConfig,
 	repositoryFilter,
-	slackProps,
+	slackConfig,
 	withArchived,
 	withDrafts,
 	withPublic,
 	withPullReport,
 	withTestData,
 	withUserMentions,
-}: RunProps): Promise<void> {
-	const slack = new SlackClient(slackProps)
-	const gh = new GitHubClient(githubProps)
+}: InputProps): Promise<void> {
+	const slack = new SlackClient(slackConfig)
+	const results = await Promise.all(githubConfig.tokens.map(async (token) => {
+		const client = new GitHubClient({
+			options: githubConfig.options,
+			token,
+		})
+
+		const repositories = await client.getRepositories({
+			repositoryFilter,
+			type: RepositoryType.All,
+			withArchived,
+			withPublic,
+		})
+
+		const openPulls = await client.getPulls({ repositories, state: PullState.Open, withDrafts })
+
+		return { client, org: client.getOrg(), openPulls}
+	}))
+
+	console.log(results, 'results')
 
 	await slack.enforceAppNamePattern(/.*github[\s-_]?notifier$/i)
 
-	const repositories = await gh.getRepositories({
-		repositoryFilter,
-		type: RepositoryType.All,
-		withArchived,
-		withPublic,
-	})
-	const openPulls = await gh.getPulls({ repositories, state: PullState.Open, withDrafts })
+	const openPulls: Pull[] = []
 	let blocks: KnownBlock[] = []
 	for (const openPull of openPulls) {
 		console.log(`Building Slack blocks from pull request [${openPull.number}]`)
@@ -74,7 +101,7 @@ export async function run({
 		text = `_<${workflowUrl}|Repository filter>: ${formatStringList(repositoryFilter)}_`
 	}
 
-	blocks = [...getFirstBlocks(gh.cacheOrganization.name, header, text), ...blocks]
+	blocks = [...getFirstBlocks('gh.cacheOrganization.name', header, text), ...blocks]
 
 	blocks = [
 		...blocks,
@@ -87,18 +114,7 @@ export async function run({
 	]
 
 	await slack.postMessage(header, blocks)
-
-	if (withPullReport) {
-		const pulls = await gh.getPulls({
-			oldest: snapDate(new Date(), { months: -12, snap: SnapType.Month }),
-			onlyGhReviews: true,
-			repositories,
-			state: PullState.All,
-			withCommits: false,
-			withDrafts: false,
-			withFilesAndChanges: false,
-			withUser: false,
-		})
-		console.log(gh.getPullReport(pulls).reportString)
-	}
 }
+
+// This is required for the GitHub Action to execute main() when it invokes app.ts as specified in action.yaml
+await main()

package-lock.json

@@ -1,15 +1,16 @@
 import { debug, getBooleanInput, getInput } from '@actions/core'
 import { stringToArray } from '@krauters/utils'
 
-import { run } from './app.js'
+import type { InputProps } from './structures.js'
 
 /**
- * The main function that gets executed when the action is run.
+ * Parses and validates all inputs required for the GitHub Notifier.
+ * 
+ * @returns The parsed and validated inputs for the GitHub Notifier.
  */
-export async function main(): Promise<void> {
-	debug('Starting main...')
+export function parseInputs(): InputProps {
 	debug('Parsing inputs...')
-	const ghToken = getInput('github-token', { required: true })
+	const githubTokens = stringToArray(getInput('github-tokens', { required: true }))
 	const channels = stringToArray(getInput('channels', { required: true }))
 	const slackToken = getInput('slack-token', { required: true })
 	const withTestData = getBooleanInput('with-test-data')
@@ -23,15 +24,15 @@ export async function main(): Promise<void> {
 	// https://github.com/actions/github-script/issues/436
 	const baseUrl = getInput('base-url') || process.env.GITHUB_API_URL
 
-	await run({
-		githubProps: {
+	return {
+		githubConfig: {
 			options: {
 				baseUrl,
 			},
-			token: ghToken,
+			tokens: githubTokens,
 		},
 		repositoryFilter,
-		slackProps: {
+		slackConfig: {
 			channels,
 			token: slackToken,
 		},
@@ -41,5 +42,5 @@ export async function main(): Promise<void> {
 		withPullReport,
 		withTestData,
 		withUserMentions,
-	})
-}
+	}
+} 

package.json

@@ -1,13 +1,13 @@
 import type {
 	ConfigurableGetPullsProps,
 	ConfigurableGetRepositoriesProps,
-	GitHubClientProps,
+	GitHubConfig,
 } from './utils/github/structures.js'
-import type { SlackClientProps } from './utils/slack/structures.js'
+import type { SlackConfig } from './utils/slack/structures.js'
 
-export interface RunProps extends ConfigurableGetPullsProps, ConfigurableGetRepositoriesProps {
-	githubProps: GitHubClientProps
-	slackProps: SlackClientProps
+export interface InputProps extends ConfigurableGetPullsProps, ConfigurableGetRepositoriesProps {
+	githubConfig: GitHubConfig
+	slackConfig: SlackConfig
 	withPullReport: boolean
 	withTestData: boolean
 	withUserMentions: boolean