fix: move owner/repo to top level index.js to avoid issues with context

gitevents · Sep 22, 2022 · abc6660 · abc6660
1 parent 41d8b48
commit abc6660
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -26083,9 +26083,8 @@ var __webpack_exports__ = {}
     }
   } // CONCATENATED MODULE: ./src/lib/gh-query.js
 
-  async function query(octokit, context, core) {
+  async function query(octokit, owner, repo, core) {
     core.info('Querying for reactions')
-    const [owner, repo] = context.actor.split('/')
 
     const query = `
     query reactions($owner: String!, $repo: String!, $size: Int!) {
@@ -26196,13 +26195,14 @@ var __webpack_exports__ = {}
     context.botUser = botUser
 
     const owner = process.env.GITHUB_REPOSITORY_OWNER
+    const repo = process.env.GITHUB_REPOSITORY_NAME
     if (context.eventName === 'workflow_dispatch') {
-      const users = await query(octokit, context, core)
+      const users = await query(octokit, owner, repo, core)
       for (const user of users) {
         await gh_invite(octokit, owner, user, core)
       }
     } else if (context.eventName === 'schedule') {
-      const users = await query(octokit, context, core)
+      const users = await query(octokit, owner, repo, core)
       for (const user of users) {
         await gh_invite(octokit, owner, user, core)
       }

diff --git a/src/index.js b/src/index.js
@@ -41,13 +41,14 @@ async function run() {
   context.botUser = botUser
 
   const owner = process.env.GITHUB_REPOSITORY_OWNER
+  const repo = process.env.GITHUB_REPOSITORY_NAME
   if (context.eventName === 'workflow_dispatch') {
-    const users = await query(octokit, context, core)
+    const users = await query(octokit, owner, repo, core)
     for (const user of users) {
       await invite(octokit, owner, user, core)
     }
   } else if (context.eventName === 'schedule') {
-    const users = await query(octokit, context, core)
+    const users = await query(octokit, owner, repo, core)
     for (const user of users) {
       await invite(octokit, owner, user, core)
     }

diff --git a/src/lib/gh-query.js b/src/lib/gh-query.js
@@ -1,6 +1,5 @@
-export default async function query(octokit, context, core) {
+export default async function query(octokit, owner, repo, core) {
   core.info('Querying for reactions')
-  const [owner, repo] = context.actor.split('/')
 
   const query = `
     query reactions($owner: String!, $repo: String!, $size: Int!) {

diff --git a/test/query.test.js b/test/query.test.js
@@ -24,7 +24,8 @@ tap.test('query() should return a list of users', async (t) => {
         return Promise.resolve(emptyResult)
       }
     },
-    { actor: 'hello/world' },
+    'hello',
+    'world',
     core
   )
   t.same(actual, [])