start moving to Netlify functions due to Azure issues

mongoosejs · Dec 18, 2024 · f89d29a · f89d29a
1 parent 576475a
commit f89d29a
Show file tree

Hide file tree

Showing 6 changed files with 86 additions and 139 deletions.
diff --git a/api_status/function.json b/api_status/function.json
diff --git a/api_status/index.js → netlify/functions/status.js b/api_status/index.js → netlify/functions/status.js
@@ -1,8 +1,8 @@
 'use strict'
 
-const azureWrapper = require('../util/azureWrapper');
+const extrovert = require('extrovert');
 const pkg = require('../package.json');
 
-module.exports = azureWrapper(async function status() {
+module.exports = extrovert.toNetlifyFunction(async function status() {
   return { ok: 1, version: pkg.version, nodeVersion: process.version };
 });
diff --git a/webhookGitHubComment/index.js → netlify/functions/webhookGitHubComment.js b/webhookGitHubComment/index.js → netlify/functions/webhookGitHubComment.js
@@ -1,93 +1,81 @@
-'use strict';
-
-const axios = require('axios');
-const azureWrapper = require('../util/azureWrapper');
-const createReleaseFromChangelog = require('../src/actions/createReleaseFromChangelog');
-const { createTokenAuth } = require('@octokit/auth-token');
-const config = require('../.config');
-const connect = require('../src/db');
-
-const ignoreUsers = new Set(config.ignoreUsers);
-
-module.exports = azureWrapper(async function webhookGitHubComment(context, req) {
-  const conn = await connect();
-  const Subscriber = conn.model('Subscriber');
-  const Task = conn.model('Task');
-
-  const task = await Task.create({
-    method: req.method,
-    url: req.url,
-    params: req.body
-  });
-
-  const { token } = await createTokenAuth(config.githubAccessTokenForMongoose)();
-
-  const { action, issue, sender, ref, ref_type } = req.body;
-
-  await task.log(`Action: ${action}`);
-
-  if (action === 'opened' && issue != null) {
-    // Opened new issue
-    await task.log('Opened new issue');
-    const orgs = await axios.get(sender['organizations_url']).then(res => res.data);
-    const orgNames = orgs.map(org => org.login);
-    const orgIds = orgs.map(org => org.id);
-
-    if (ignoreUsers.has(sender.login)) {
-      return { ok: 1 };
-    }
-
-    const subscriber = await Subscriber.findOne({
-      $or: [
-        { githubUsername: sender.login },
-        { githubUserId: sender.id },
-        { githubOrganization: { $in: orgNames } },
-        { githubOrganizationId: { $in: orgIds } },
-        { 'githubOrganizationMembers.login': sender.login },
-        { 'githubOrganizationMembers.id': sender.id }
-      ]
-    });
-
-    if (subscriber == null) {
-      return { ok: 1 };
-    }
-
-    // Is a subscriber, add priority label
-    await axios.post(`${issue.url}/labels`, { labels: ['priority'] }, {
-      headers: {
-        authorization: `bearer ${token}`
-      }
-    });
-
-    // Send to Slack
-    const url = 'https://slack.com/api/chat.postMessage';
-    await axios.post(url, {
-      channel: '#pro-notifications',
-      blocks: [
-        {type: 'divider'},
-        {
-          type: 'section',
-          text: {
-            type: 'mrkdwn',
-            text: `*NEW ISSUE CREATED!* \n\n ${issue.user.login} has posted an issue titled: ${issue.title}`
-          }
-        },
-        {type: 'divider'},
-        {
-          type: 'section',
-          text: {
-            type: 'mrkdwn',
-            text: `*DESCRIPTION* \n\n ${issue.body}`
-          }
-        }, 
-      ]
-    }, { headers: { authorization: `Bearer ${config.slackToken}` } });
-  } else if (ref != null && ref_type === 'tag') {
-    // Assume tag was created, so create a release
-    await createReleaseFromChangelog(task)(ref);
-  } else {
-    await task.log('Skipped');
-  }
-
-  return { ok: 1 };
+'use strict';
+
+const axios = require('axios');
+const createReleaseFromChangelog = require('../../src/actions/createReleaseFromChangelog');
+const { createTokenAuth } = require('@octokit/auth-token');
+const config = require('../../.config');
+const connect = require('../../src/db');
+const extrovert = require('extrovert');
+
+const ignoreUsers = new Set(config.ignoreUsers);
+
+module.exports = extrovert.toNetlifyFunction(async function webhookGitHubComment(params) {
+  const conn = await connect();
+  const Subscriber = conn.model('Subscriber');
+
+  const { token } = await createTokenAuth(config.githubAccessTokenForMongoose)();
+
+  const { action, issue, sender, ref, ref_type } = req.body;
+
+  if (action === 'opened' && issue != null) {
+    // Opened new issue
+    const orgs = await axios.get(sender['organizations_url']).then(res => res.data);
+    const orgNames = orgs.map(org => org.login);
+    const orgIds = orgs.map(org => org.id);
+
+    if (ignoreUsers.has(sender.login)) {
+      return { ok: 1 };
+    }
+
+    const subscriber = await Subscriber.findOne({
+      $or: [
+        { githubUsername: sender.login },
+        { githubUserId: sender.id },
+        { githubOrganization: { $in: orgNames } },
+        { githubOrganizationId: { $in: orgIds } },
+        { 'githubOrganizationMembers.login': sender.login },
+        { 'githubOrganizationMembers.id': sender.id }
+      ]
+    });
+
+    if (subscriber == null) {
+      return { ok: 1 };
+    }
+
+    // Is a subscriber, add priority label
+    await axios.post(`${issue.url}/labels`, { labels: ['priority'] }, {
+      headers: {
+        authorization: `bearer ${token}`
+      }
+    });
+
+    // Send to Slack
+    const url = 'https://slack.com/api/chat.postMessage';
+    await axios.post(url, {
+      channel: '#pro-notifications',
+      blocks: [
+        {type: 'divider'},
+        {
+          type: 'section',
+          text: {
+            type: 'mrkdwn',
+            text: `*NEW ISSUE CREATED!* \n\n ${issue.user.login} has posted an issue titled: ${issue.title}`
+          }
+        },
+        {type: 'divider'},
+        {
+          type: 'section',
+          text: {
+            type: 'mrkdwn',
+            text: `*DESCRIPTION* \n\n ${issue.body}`
+          }
+        }, 
+      ]
+    }, { headers: { authorization: `Bearer ${config.slackToken}` } });
+  } else if (ref != null && ref_type === 'tag') {
+    // Assume tag was created, so create a release
+    await createReleaseFromChangelog(ref);
+  }
+
+  return { ok: 1 };
 });
diff --git a/package.json b/package.json
@@ -9,6 +9,7 @@
     "archetype": "0.13.0",
     "axios": "0.21.4",
     "cheerio": "1.0.0-rc.2",
+    "extrovert": "0.0.24",
     "mongoose": "8.x",
     "ramda": "0.28.0"
   },

diff --git a/src/actions/createReleaseFromChangelog.js b/src/actions/createReleaseFromChangelog.js
@@ -2,7 +2,7 @@
 
 const githubOAuth = require('../integrations/githubOAuth');
 
-module.exports = task => async function createReleaseFromChangelog(ref) {
+module.exports = async function createReleaseFromChangelog(ref) {
   if (ref == null) {
     return;
   }
@@ -15,7 +15,7 @@ module.exports = task => async function createReleaseFromChangelog(ref) {
     }
     return 'master';
   })();
-  const changelog = await task.sideEffect(githubOAuth.getChangelog, {
+  const changelog = await githubOAuth.getChangelog({
     branch
   });
   const lines = changelog.split('\n');
@@ -38,7 +38,5 @@ module.exports = task => async function createReleaseFromChangelog(ref) {
   let body = changelogLines;
   const tagAndName = body[0].slice(0, body[0].indexOf(' '));
   body = body.join('\n');
-  await task.sideEffect(function createRelease({ tagAndName, body }) {
-    return githubOAuth.createRelease(tagAndName, body);
-  }, { tagAndName, body });
+  return await githubOAuth.createRelease(tagAndName, body);
 };
diff --git a/webhookGitHubComment/function.json b/webhookGitHubComment/function.json