diff --git a/.gitignore b/.gitignore index 8cf1b15..1407f2e 100644 --- a/.gitignore +++ b/.gitignore @@ -69,3 +69,6 @@ package-lock.json bin data + +# Local Netlify folder +.netlify diff --git a/netlify/functions/webhookGitHubComment.js b/netlify/functions/webhookGitHubComment.js index 8149f41..4244ce6 100644 --- a/netlify/functions/webhookGitHubComment.js +++ b/netlify/functions/webhookGitHubComment.js @@ -3,19 +3,20 @@ 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); +const ignoreUsers = new Set((process.env.IGNORE_GITHUB_USERS || '').split(',')); +const githubAccessTokenForMongoose = process.env.GITHUB_ACCESS_TOKEN_FOR_MONGOOSE; +const slackToken = process.env.SLACK_TOKEN; module.exports = extrovert.toNetlifyFunction(async function webhookGitHubComment(params) { const conn = await connect(); const Subscriber = conn.model('Subscriber'); - const { token } = await createTokenAuth(config.githubAccessTokenForMongoose)(); + const { token } = await createTokenAuth(githubAccessTokenForMongoose)(); - const { action, issue, sender, ref, ref_type } = req.body; + const { action, issue, sender, ref, ref_type } = params; if (action === 'opened' && issue != null) { // Opened new issue @@ -71,7 +72,7 @@ module.exports = extrovert.toNetlifyFunction(async function webhookGitHubComment } }, ] - }, { headers: { authorization: `Bearer ${config.slackToken}` } }); + }, { headers: { authorization: `Bearer ${slackToken}` } }); } else if (ref != null && ref_type === 'tag') { // Assume tag was created, so create a release await createReleaseFromChangelog(ref); diff --git a/src/db/index.js b/src/db/index.js index fff0577..123ca2b 100644 --- a/src/db/index.js +++ b/src/db/index.js @@ -1,6 +1,5 @@ 'use strict'; -const config = require('../../.config'); const mongoose = require('mongoose'); let conn = null; @@ -10,9 +9,11 @@ const jobSchema = require('./Job'); const subscriberSchema = require('./subscriber'); const taskSchema = require('./task'); +const uri = process.env.MONGODB_CONNECTION_STRING; + module.exports = async function connect() { if (conn == null) { - conn = mongoose.createConnection(config.uri); + conn = mongoose.createConnection(uri); await conn.asPromise(); } conn.model('AccessToken', accessTokenSchema, 'AccessToken');