Merge pull request #1098 from 20minutes/fix/artifacts-deps-only

Do not check the whole `package.json` for artifacts

Author: j0k3r

functions/classes/ArtifactsHandler.js

@@ -40,13 +40,17 @@ export class ArtifactsHandler extends Handler {
     const file = files.data.find(({ filename }) => filename.includes('package.json'))
 
     if (!file) {
+      console.log('No package.json found in PR')
+
       response = await this.updateStatus(body, payload.success)
 
       return callback(null, response)
     }
 
     const refMatch = file.contents_url.match(/ref=([a-z0-9]+)/)
     if (!refMatch?.[1]) {
+      console.log('no ref in package.json diff url?')
+
       response = await this.updateStatus(body, payload.success)
 
       return callback(null, response)
@@ -59,13 +63,32 @@ export class ArtifactsHandler extends Handler {
       ref: refMatch[1],
     })
 
-    const match = Buffer.from(content.data.content.toString('utf8'), 'base64')
-      .toString('ascii')
-      .match(this.artifactsRegex)
+    let packageJson = ''
+    try {
+      packageJson = JSON.parse(
+        Buffer.from(content.data.content.toString('utf8'), 'base64').toString('ascii')
+      )
+    } catch (e) {
+      response = await this.updateStatus(body, payload.success)
+      console.log('Parsing package.json failed:', e)
+
+      return callback(null, response)
+    }
+
+    const deps = {
+      dependencies: packageJson.dependencies || {},
+      devDependencies: packageJson.devDependencies || {},
+    }
+
+    const match = JSON.stringify(deps).match(this.artifactsRegex)
 
     if (match === null) {
+      console.log('No match, success.')
+
       response = await this.updateStatus(body, payload.success)
     } else {
+      console.log('Match found, failure.')
+
       response = await this.updateStatus(body, payload.failure)
     }
 

tests/artifcats.spec.js

@@ -349,7 +349,7 @@ describe('Artifacts check', () => {
             'https://raw.githubusercontent.com/20minutes/thundra/d85673bd0d81b4ecdc3c4c52936cbcdb778b7751/package.json?token=AAUILIMSMV5HAKKH4FRRQH3JBX7YI',
           type: 'file',
           content:
-            'ewogICJuYW1lIjogIm15X3BhY2thZ2UiLAogICJkZXNjcmlwdGlvbiI6ICJtYWtlIHlvdXIgcGFja2FnZSBlYXNpZXIgdG8gZmluZCBvbiB0aGUgbnBtIHdlYnNpdGUiLAogICJ2ZXJzaW9uIjogIjEuMC4wIiwKICAic2NyaXB0cyI6IHsKICAgICJ0ZXN0IjogImVjaG8gXCJFcnJvcjogbm8gdGVzdCBzcGVjaWZpZWRcIiAmJiBleGl0IDEiCiAgfSwKICAicmVwb3NpdG9yeSI6IHsKICAgICJ0eXBlIjogImdpdCIsCiAgICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tb25hdGhlb2N0b2NhdC9teV9wYWNrYWdlLmdpdCIKICB9LAogICJrZXl3b3JkcyI6IFtdLAogICJhdXRob3IiOiAiIiwKICAibGljZW5zZSI6ICJJU0MiLAogICJidWdzIjogewogICAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbW9uYXRoZW9jdG9jYXQvbXlfcGFja2FnZS9pc3N1ZXMiCiAgfSwKICAiaG9tZXBhZ2UiOiAiaHR0cHM6Ly9naXRodWIuY29tL21vbmF0aGVvY3RvY2F0L215X3BhY2thZ2UiCn0=',
+            'ewogICJuYW1lIjogIm15X3BhY2thZ2UiLAogICJkZXNjcmlwdGlvbiI6ICJtYWtlIHlvdXIgcGFja2FnZSBlYXNpZXIgdG8gZmluZCBvbiB0aGUgbnBtIHdlYnNpdGUiLAogICJ2ZXJzaW9uIjogIjEuMC4wIiwKICAic2NyaXB0cyI6IHsKICAgICJ0ZXN0IjogImVjaG8gXCJFcnJvcjogbm8gdGVzdCBzcGVjaWZpZWRcIiAmJiBleGl0IDEiCiAgfSwKICAicmVwb3NpdG9yeSI6IHsKICAgICJ0eXBlIjogImdpdCIsCiAgICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tb25hdGhlb2N0b2NhdC9teV9wYWNrYWdlLmdpdCIKICB9LAogICJrZXl3b3JkcyI6IFtdLAogICJhdXRob3IiOiAiIiwKICAibGljZW5zZSI6ICJJU0MiLAogICJidWdzIjogewogICAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbW9uYXRoZW9jdG9jYXQvbXlfcGFja2FnZS9pc3N1ZXMiCiAgfSwKICAiaG9tZXBhZ2UiOiAiaHR0cHM6Ly9naXRodWIuY29tL21vbmF0aGVvY3RvY2F0L215X3BhY2thZ2UiLAogICJkZXBlbmRlbmNpZXMiOiB7CiAgICAic3VwZXIiOiAiaHR0cDovL2xvY2FsaG9zdDoxMjM0L3BhY2thZ2UuemlwIgogIH0KfQ==',
           encoding: 'base64',
           _links: {
             self: 'https://api.github.com/repos/20minutes/thundra/contents/package.json?ref=d85673bd0d81b4ecdc3c4c52936cbcdb778b7751',
@@ -385,7 +385,7 @@ describe('Artifacts check', () => {
       },
     }
 
-    const fixup = new ArtifactsHandler('GH_TOKEN', 'THE BRAND', '(monatheoctocat|super)')
+    const fixup = new ArtifactsHandler('GH_TOKEN', 'THE BRAND', '(localhost:)')
     await fixup.handle(githubEvent, callback)
 
     expect(callback).toHaveBeenCalledTimes(1)