Skip to content

Commit 107b480

Browse files
committed
chore: replace credentials.json for a environmental variable
1 parent 0897b32 commit 107b480

File tree

5 files changed

+13
-27
lines changed

5 files changed

+13
-27
lines changed

update/add-route.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ const qs = require('querystring')
44

55
const url = 'https://api.mailgun.net/v3/routes'
66

7-
function addRoute (domain, creds, description, expression, actions, callback) {
7+
function addRoute (domain, description, expression, actions, callback) {
88
const params = {
99
description,
1010
expression,
1111
action: actions
1212
}
1313
const data = qs.stringify(params)
1414
const options = {
15-
auth: `api:${creds['api-key']}`,
15+
auth: `api:${process.env.MAILGUN_API_KEY}`,
1616
headers: {
1717
'content-type': 'application/x-www-form-urlencoded',
1818
'content-length': Buffer.byteLength(data)

update/delete-route.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ const jsonist = require('jsonist')
22

33
const url = 'https://api.mailgun.net/v3/routes'
44

5-
function deleteRoute (domain, creds, id, callback) {
6-
const options = { auth: `api:${creds['api-key']}` }
5+
function deleteRoute (domain, id, callback) {
6+
const options = { auth: `api:${process.env.MAILGUN_API_KEY}` }
77
jsonist.delete(`${url}/${id}`, options, callback)
88
}
99

update/list-routes.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ const jsonist = require('jsonist')
22

33
const url = 'https://api.mailgun.net/v3/routes'
44

5-
function listRoutes (domain, creds, callback) {
6-
const options = { auth: `api:${creds['api-key']}` }
5+
function listRoutes (domain, callback) {
6+
const options = { auth: `api:${cprocess.env.MAILGUN_API_KEY}` }
77
jsonist.get(url, options, callback)
88
}
99

update/update-aliases.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ function diff (domain, a1, a2) {
3333
})
3434
}
3535

36-
function updateAliases (domain, creds, aliases, dryRun, callback) {
36+
function updateAliases (domain, aliases, dryRun, callback) {
3737
function adjustRoutes (routes) {
3838
const current = routes.items
3939

@@ -56,19 +56,19 @@ function updateAliases (domain, creds, aliases, dryRun, callback) {
5656
const to = Array.isArray(alias.to) ? alias.to : [alias.to]
5757
console.log(`Adding ${alias.from} -> ${to.join(', ')}...`)
5858
if (!dryRun) {
59-
addRoute(domain, creds, alias.from, alias.expression, alias.actions, done)
59+
addRoute(domain, alias.from, alias.expression, alias.actions, done)
6060
}
6161
})
6262

6363
toRemove.forEach(function (alias) {
6464
console.log(`Deleting ${alias.expression}...`)
6565
if (!dryRun) {
66-
deleteRoute(domain, creds, alias.id, done)
66+
deleteRoute(domain, alias.id, done)
6767
}
6868
})
6969
}
7070

71-
listRoutes(domain, creds, function (err, routes) {
71+
listRoutes(domain, function (err, routes) {
7272
if (err) { throw err }
7373
adjustRoutes(routes)
7474
})

update/update.js

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
const fs = require('fs')
44
, path = require('path')
5-
65
, updateAliases = require('./update-aliases')
76

87
require('http').globalAgent.maxSockets = 20
@@ -15,28 +14,15 @@ if (process.argv.length < 3) {
1514
const dryRun = process.argv.includes('--dry-run')
1615
, domain = process.argv.filter((a) => a !== '--dry-run')[2].replace(/\/$/, '')
1716
, dir = path.join(__dirname, '..', domain)
18-
, credsFile = path.join(dir, 'credentials.json')
19-
20-
if (!fs.statSync(dir).isDirectory()) {
21-
console.error(`Usage: update <domain> ("domain" must be a directory above ${__dirname}`)
22-
return process.exit(1)
23-
}
24-
25-
if (!fs.existsSync(credsFile)) {
26-
console.error(`Error: ${dir} does not have a credentials.json file`)
27-
return process.exit(1)
28-
}
29-
30-
const creds = require(credsFile)
3117

32-
if (typeof creds['api-key'] != 'string') {
33-
console.error(`Error: ${credsFile} does not have an "api-key" property`)
18+
if (!process.env.MAILGUN_API_KEY) {
19+
console.error(`Error: MAILGUN_API_KEY environment variable is not set`)
3420
return process.exit(1)
3521
}
3622

3723
const aliases = require(path.join(dir, 'aliases.json'))
3824

39-
updateAliases(domain, creds, aliases, dryRun, function (err) {
25+
updateAliases(domain, aliases, dryRun, function (err) {
4026
if (err)
4127
throw err
4228
})

0 commit comments

Comments
 (0)