feat: remove PR on test success

change the pullRequest to be per dependent object
pkgjs · Apr 15, 2021 · 562ace0 · 562ace0
1 parent a9f028d
commit 562ace0
Show file tree

Hide file tree

Showing 9 changed files with 35 additions and 32 deletions.
diff --git a/.wiby.json b/.wiby.json
@@ -1,14 +1,16 @@
 {
   "dependents": [
     {
-      "repository": "https://github.com/wiby-test/partial"
+      "repository": "https://github.com/wiby-test/partial",
+      "pullRequest": false
     },
     {
-      "repository": "git://github.com/wiby-test/fail"
+      "repository": "git://github.com/wiby-test/fail",
+      "pullRequest": false
     },
     {
-      "repository": "git+https://github.com/wiby-test/pass"
+      "repository": "git+https://github.com/wiby-test/pass",
+      "pullRequest": true
     }
-  ],
-  "pullRequest": false
+  ]
 }
diff --git a/bin/commands/result.js b/bin/commands/result.js
@@ -24,8 +24,7 @@ exports.builder = (yargs) => yargs
 exports.handler = async (params) => {
   const config = params.dependent
     ? {
-        dependents: [{ repository: params.dependent }],
-        pullRequest: !!params['pull-request']
+        dependents: [{ repository: params.dependent, pullRequest: !!params['pull-request'] }]
       }
     : wiby.validate({ config: params.config })
 

diff --git a/bin/commands/test.js b/bin/commands/test.js
@@ -24,8 +24,7 @@ exports.builder = (yargs) => yargs
 exports.handler = (params) => {
   const config = params.dependent
     ? {
-        dependents: [{ repository: params.dependent }],
-        pullRequest: !!params['pull-request']
+        dependents: [{ repository: params.dependent, pullRequest: !!params['pull-request'] }]
       }
     : wiby.validate({ config: params.config })
 

diff --git a/lib/config.js b/lib/config.js
@@ -13,13 +13,12 @@ const dependentSchema = joi.object({
       'git',
       'git+https'
     ]
-  })
+  }),
+  pullRequest: joi.boolean().optional()
 }).unknown(false)
 
 exports.schema = joi.object({
-  dependents: joi.array().items(dependentSchema),
-  pullRequest: joi.boolean().optional()
-
+  dependents: joi.array().items(dependentSchema)
 }).unknown(false)
 
 exports.validate = ({ config: configFilePath }) => {

diff --git a/lib/github.js b/lib/github.js
@@ -149,7 +149,7 @@ module.exports.createPR = async function createPR (owner, repo, title, head, bas
   })
 }
 
-module.exports.updatePRStatus = async function updatePRStatus (owner, repo, pullNumber) {
+module.exports.closePR = async function closePR (owner, repo, pullNumber) {
   return octokit.rest.pulls.update({
     owner,
     repo,

diff --git a/lib/result.js b/lib/result.js
@@ -17,15 +17,15 @@ const pipelineStatusesEnum = module.exports.pipelineStatusesEnum = Object.freeze
 
 const PENDING_RESULT_EXIT_CODE = 64
 
-module.exports = async function ({ dependents, pullRequest }) {
+module.exports = async function ({ dependents }) {
   const parentPkgJSON = await context.getLocalPackageJSON()
   const parentPkgInfo = gitURLParse(parentPkgJSON.repository.url)
   const output = { status: pipelineStatusesEnum.PENDING, results: [] }
   const allDependentsChecks = []
 
   debug(`Parent module: ${parentPkgInfo.owner}/${parentPkgJSON.name}`)
 
-  for (const { repository: url } of dependents) {
+  for (const { repository: url, pullRequest } of dependents) {
     const dependentPkgInfo = gitURLParse(url)
     const dependentPkgJSON = await github.getPackageJson(dependentPkgInfo.owner, dependentPkgInfo.name)
     debug(`Dependent module: ${dependentPkgInfo.owner}/${dependentPkgInfo.name}`)
@@ -37,7 +37,9 @@ module.exports = async function ({ dependents, pullRequest }) {
     const parentBranchName = await context.getParentBranchName()
     const branch = await context.getTestingBranchName(parentBranchName)
     let resp = await github.getChecks(dependentPkgInfo.owner, dependentPkgInfo.name, branch)
-    await updatePRStatus(dependentPkgInfo.owner, dependentPkgInfo.name, branch, resp.data.check_runs)
+    if (pullRequest) {
+      await closePR(dependentPkgInfo.owner, dependentPkgInfo.name, branch, resp.data.check_runs)
+    }
     if (resp.data.check_runs.length === 0) {
       resp = await github.getCommitStatusesForRef(dependentPkgInfo.owner, dependentPkgInfo.name, branch)
     }
@@ -164,7 +166,7 @@ function resolveCodeAndExit (overallStatus) {
   }
 }
 
-const updatePRStatus = module.exports.updatePRStatus = async function updatePRStatus (owner, repo, branch, checkRuns) {
+const closePR = module.exports.closePR = async function closePR (owner, repo, branch, checkRuns) {
   if (!checkRuns || checkRuns.length === 0) {
     return
   }
@@ -184,6 +186,6 @@ const updatePRStatus = module.exports.updatePRStatus = async function updatePRSt
     return acc
   }, [])
   debug(`Dependent module: ${JSON.stringify(prsToClose, null, 2)}`)
-  const result = await prsToClose.map((pr) => github.updatePRStatus(owner, repo, pr.number))
+  const result = await prsToClose.map((pr) => github.closePR(owner, repo, pr.number))
   return result
 }
diff --git a/lib/test.js b/lib/test.js
@@ -9,7 +9,7 @@ const logger = require('./logger')
 const testCommandNamespace = 'wiby:test'
 const debug = logger(testCommandNamespace)
 
-module.exports = async function ({ dependents, pullRequest }) {
+module.exports = async function ({ dependents }) {
   // enable log output for test command without DEBUG env
   logger.enableLogs(testCommandNamespace)
 
@@ -21,7 +21,7 @@ module.exports = async function ({ dependents, pullRequest }) {
   const parentDependencyLink = await context.getDependencyLink(parentRepositoryInfo.owner, parentRepositoryInfo.name, parentBranchName)
   debug('Commit URL to test:', parentDependencyLink)
 
-  for (const { repository: url } of dependents) {
+  for (const { repository: url, pullRequest } of dependents) {
     const dependentRepositoryInfo = gitURLParse(url)
     const dependentPkgJson = await github.getPackageJson(dependentRepositoryInfo.owner, dependentRepositoryInfo.name)
     debug(`Dependent module: ${dependentRepositoryInfo.owner}/${dependentRepositoryInfo.name}`)

diff --git a/test/config.js b/test/config.js
@@ -30,16 +30,18 @@ tap.test('config validation', async (tap) => {
     tap.strictSame(normalizedConfig, {
       dependents: [
         {
-          repository: 'https://github.com/wiby-test/partial'
+          repository: 'https://github.com/wiby-test/partial',
+          pullRequest: false
         },
         {
-          repository: 'git://github.com/wiby-test/fail'
+          repository: 'git://github.com/wiby-test/fail',
+          pullRequest: false
         },
         {
-          repository: 'git+https://github.com/wiby-test/pass'
+          repository: 'git+https://github.com/wiby-test/pass',
+          pullRequest: true
         }
-      ],
-      pullRequest: false
+      ]
     })
     tap.end()
   })

diff --git a/test/result.js b/test/result.js
@@ -126,26 +126,26 @@ tap.test('wiby.result()', async (tap) => {
     const branch = 'wiby-main'
     t.plan(6)
     t.test('no checkruns returns', async (t) => {
-      const result = await wiby.result.updatePRStatus(owner, repo, branch, null)
+      const result = await wiby.result.closePR(owner, repo, branch, null)
       t.equal(result, undefined)
     })
     t.test('status not completed returns empty array', async (t) => {
-      const result = await wiby.result.updatePRStatus(owner, repo, branch, [{ status: 'queued' }])
+      const result = await wiby.result.closePR(owner, repo, branch, [{ status: 'queued' }])
       t.equal(result.length, 0)
     })
     t.test('conclusion not a success returns empty array', async (t) => {
-      const result = await wiby.result.updatePRStatus(owner, repo, branch, [{ status: 'queued', conclusion: 'failure' }])
+      const result = await wiby.result.closePR(owner, repo, branch, [{ status: 'queued', conclusion: 'failure' }])
       t.equal(result.length, 0)
     })
     t.test('no pull requests returns empty array', async (t) => {
-      const result = await wiby.result.updatePRStatus(owner, repo, branch, [{
+      const result = await wiby.result.closePR(owner, repo, branch, [{
         status: 'completed',
         conclusion: 'success'
       }])
       t.equal(result.length, 0)
     })
     t.test('empty pull requests returns empty array', async (t) => {
-      const result = await wiby.result.updatePRStatus(owner, repo, branch, [{
+      const result = await wiby.result.closePR(owner, repo, branch, [{
         status: 'completed',
         conclusion: 'success',
         pull_requests: []
@@ -159,7 +159,7 @@ tap.test('wiby.result()', async (tap) => {
         .reply(200, {
           data: {}
         })
-      const result = await wiby.result.updatePRStatus(owner, repo, branch, [{
+      const result = await wiby.result.closePR(owner, repo, branch, [{
         status: 'completed',
         conclusion: 'success',
         pull_requests: [{