From 8e4088603f818996793fd8ebdc8535fc683efeef Mon Sep 17 00:00:00 2001 From: Cyrille Date: Thu, 9 May 2019 00:01:23 +0100 Subject: [PATCH] Improvements from Codacy. --- clean.js | 24 ++++++++++++------------ index.js | 32 ++++++++++++++++---------------- lib/accounts/check.js | 4 ++-- lib/accounts/checkKeypair.js | 16 ++++++++-------- lib/accounts/set.js | 4 ++-- lib/accounts/setKeypair.js | 14 +++++++------- lib/certificates/check.js | 22 +++++++++++----------- lib/certificates/checkKeypair.js | 12 ++++++------ lib/certificates/set.js | 28 ++++++++++++++-------------- lib/certificates/setKeypair.js | 16 ++++++++-------- lib/pathHelper.js | 14 +++++++------- test.js | 18 +++++++++--------- 12 files changed, 102 insertions(+), 102 deletions(-) diff --git a/clean.js b/clean.js index 5341ac5..d6db2f2 100644 --- a/clean.js +++ b/clean.js @@ -1,13 +1,13 @@ -console.log('Emptying the bucket.'); +console.log("Emptying the bucket."); -require('dotenv').config(); +require("dotenv").config(); -var accessKeyId = process.env.AWS_ACCESS_KEY_ID -secretAccessKey = process.env.AWS_SECRET_ACCESS_KEY -regionName = process.env.AWS_BUCKET_REGION -bucketName = process.env.AWS_BUCKET_NAME +let accessKeyId = process.env.AWS_ACCESS_KEY_ID + , secretAccessKey = process.env.AWS_SECRET_ACCESS_KEY + , regionName = process.env.AWS_BUCKET_REGION + , bucketName = process.env.AWS_BUCKET_NAME -var AWS = require('aws-sdk'); +var AWS = require("aws-sdk"); AWS.config.setPromisesDependency(Promise); AWS.config.update({ region: regionName @@ -17,13 +17,13 @@ AWS.config.update({ }) }); -const s3 = new AWS.S3({ apiVersion: '2006-03-01' }); +const s3 = new AWS.S3({ apiVersion: "2006-03-01" }); s3.listObjects({ Bucket: bucketName }).promise().then((data) => { if (data.Contents.length <= 0) { - console.log('Your bucket is already empty :)'); - return + console.log("Your bucket is already empty :)"); + return; } var objectKeys = []; @@ -31,11 +31,11 @@ s3.listObjects({ Bucket: bucketName }).promise().then((data) => { for (let i = 0; i < data.Contents.length; i++) { objectKeys.push({ Key: data.Contents[i].Key - }) + }); } s3.deleteObjects({ Delete: { Objects: objectKeys }, Bucket: bucketName }).promise().then((data) => { - console.log('Your bucket was emptied :)'); + console.log("Your bucket was emptied :)"); }).catch((err) => { console.error(err.message); throw err; diff --git a/index.js b/index.js index 2074a47..e10ef71 100644 --- a/index.js +++ b/index.js @@ -1,7 +1,7 @@ -var path = require('path'); -var Promise = require('bluebird') +var path = require("path"); +var Promise = require("bluebird"); -const AWS = require('aws-sdk'); +const AWS = require("aws-sdk"); AWS.config.setPromisesDependency(Promise); const defaultOptions = { @@ -9,14 +9,14 @@ const defaultOptions = { , secretAccessKey: null , bucketName: null , bucketRegion: null - , accountsDir: 'accounts/' - , configDir: 'acme/' + , accountsDir: "accounts/" + , configDir: "acme/" } -const s3 = new AWS.S3({ apiVersion: '2006-03-01' }); +const s3 = new AWS.S3({ apiVersion: "2006-03-01" }); -const pathHelper = require('./lib/pathHelper'); -const fileNames = require('./lib/fileNames'); +const pathHelper = require("./lib/pathHelper"); +const fileNames = require("./lib/fileNames"); module.exports.create = (createOptions) => { @@ -39,30 +39,30 @@ module.exports.create = (createOptions) => { const handlers = { certificates: { check: (opts) => { - return require('./lib/certificates/check').check(opts, options, s3); + return require("./lib/certificates/check").check(opts, options, s3); }, checkKeypair: (opts) => { - return require('./lib/certificates/checkKeypair').checkKeypair(opts, options, s3); + return require("./lib/certificates/checkKeypair").checkKeypair(opts, options, s3); }, setKeypair: (opts) => { - return require('./lib/certificates/setKeypair').setKeypair(opts, options, s3); + return require("./lib/certificates/setKeypair").setKeypair(opts, options, s3); }, set: (opts) => { - return require('./lib/certificates/set').set(opts, options, s3); + return require("./lib/certificates/set").set(opts, options, s3); } }, accounts: { check: (opts) => { - return require('./lib/accounts/check').check(opts, options, s3); + return require("./lib/accounts/check").check(opts, options, s3); }, checkKeypair: (opts) => { - return require('./lib/accounts/checkKeypair').checkKeypair(opts, options, s3); + return require("./lib/accounts/checkKeypair").checkKeypair(opts, options, s3); }, setKeypair: (opts) => { - return require('./lib/accounts/setKeypair').setKeypair(opts, options, s3); + return require("./lib/accounts/setKeypair").setKeypair(opts, options, s3); }, set: (opts) => { - return require('./lib/accounts/set').set(opts, options, s3); + return require("./lib/accounts/set").set(opts, options, s3); } } } diff --git a/lib/accounts/check.js b/lib/accounts/check.js index 24a3abe..19f9a82 100644 --- a/lib/accounts/check.js +++ b/lib/accounts/check.js @@ -1,5 +1,5 @@ -const pathHelper = require('../pathHelper'); -const fileNames = require('../fileNames'); +const pathHelper = require("../pathHelper"); +const fileNames = require("../fileNames"); module.exports.check = (opts, options, s3) => { console.log("accounts.check", opts.account.id); diff --git a/lib/accounts/checkKeypair.js b/lib/accounts/checkKeypair.js index 4188d29..e2e2bad 100644 --- a/lib/accounts/checkKeypair.js +++ b/lib/accounts/checkKeypair.js @@ -1,21 +1,21 @@ -const pathHelper = require('../pathHelper'); -const fileNames = require('../fileNames'); +const pathHelper = require("../pathHelper"); +const fileNames = require("../fileNames"); module.exports.checkKeypair = (opts, options, s3) => { - var id = opts.account.id || opts.email || 'single-user'; - console.log('accounts.checkKeypair for', id); + let id = opts.account.id || opts.email || "single-user"; + console.log("accounts.checkKeypair for", id); - key = pathHelper.accountsPath(options, id) + let key = pathHelper.accountsPath(options, id); return s3.getObject({ Key: key, Bucket: options.bucketName }).promise().then((data) => { - console.log('Successfully retrieved account keypair.'); - var keypair = JSON.parse(data.Body.toString()); + console.log("Successfully retrieved account keypair."); + let keypair = JSON.parse(data.Body.toString()); return { privateKeyPem: keypair.privateKeyPem // string PEM private key , privateKeyJwk: keypair.privateKeyJwk // object JWK private key }; }).catch((err) => { - console.error('There was an error retrieving your account keypair:', err.message); + console.error("There was an error retrieving your account keypair:", err.message); return null; }); } \ No newline at end of file diff --git a/lib/accounts/set.js b/lib/accounts/set.js index e1e9580..a76fdcb 100644 --- a/lib/accounts/set.js +++ b/lib/accounts/set.js @@ -1,5 +1,5 @@ -const pathHelper = require('../pathHelper'); -const fileNames = require('../fileNames'); +const pathHelper = require("../pathHelper"); +const fileNames = require("../fileNames"); module.exports.set = (opts, options, s3) => { console.log("accounts.set"); diff --git a/lib/accounts/setKeypair.js b/lib/accounts/setKeypair.js index a3c6edf..77a0d8d 100644 --- a/lib/accounts/setKeypair.js +++ b/lib/accounts/setKeypair.js @@ -1,11 +1,11 @@ -const pathHelper = require('../pathHelper'); -const fileNames = require('../fileNames'); +const pathHelper = require("../pathHelper"); +const fileNames = require("../fileNames"); module.exports.setKeypair = (opts, options, s3) => { - console.log('accounts.setKeypair for', opts.account); + console.log("accounts.setKeypair for", opts.account); - var id = opts.account.id || opts.email || 'single-user'; - key = pathHelper.accountsPath(options, id) + let id = opts.account.id || opts.email || "single-user"; + let key = pathHelper.accountsPath(options, id) var body = JSON.stringify({ privateKeyPem: opts.keypair.privateKeyPem // string PEM @@ -13,10 +13,10 @@ module.exports.setKeypair = (opts, options, s3) => { }); return s3.putObject({ Key: key, Body: body, Bucket: options.bucketName }).promise().then((data) => { - console.log('Successfully created account keypair.'); + console.log("Successfully created account keypair."); return null; }).catch((err) => { - console.error('There was an error creating account keypair:', err.message); + console.error("There was an error creating account keypair:", err.message); return null; }); } \ No newline at end of file diff --git a/lib/certificates/check.js b/lib/certificates/check.js index 76e9bbe..30ab079 100644 --- a/lib/certificates/check.js +++ b/lib/certificates/check.js @@ -1,9 +1,9 @@ -const pathHelper = require('../pathHelper'); -const fileNames = require('../fileNames'); +const pathHelper = require("../pathHelper"); +const fileNames = require("../fileNames"); module.exports.check = (opts, options, s3) => { var id = opts.certificate && opts.certificate.id || opts.subject; - console.log('certificates.check for', opts.subject); + console.log("certificates.check for", opts.subject); var privkeyPath = pathHelper.certificatesPath(options, id, fileNames.privkey.pem); var certPath = pathHelper.certificatesPath(options, id, fileNames.cert); @@ -11,24 +11,24 @@ module.exports.check = (opts, options, s3) => { return Promise.all([ s3.getObject({ Key: privkeyPath, Bucket: options.bucketName }).promise().then((data) => { - console.log('Successfully retrieved certificate privkey.pem'); + console.log("Successfully retrieved certificate privkey.pem"); return data.Body.toString(); }).catch((err) => { - console.error('There was an error retrieving your certificate privkey.pem:', err.message); + console.error("There was an error retrieving your certificate privkey.pem:", err.message); throw err; }), s3.getObject({ Key: certPath, Bucket: options.bucketName }).promise().then((data) => { - console.log('Successfully retrieved certificate cert.pem'); + console.log("Successfully retrieved certificate cert.pem"); return data.Body.toString(); }).catch((err) => { - console.error('There was an error retrieving your certificate cert.pem:', err.message); + console.error("There was an error retrieving your certificate cert.pem:", err.message); throw err; }), s3.getObject({ Key: chainPath, Bucket: options.bucketName }).promise().then((data) => { - console.log('Successfully retrieved certificate chain.pem'); + console.log("Successfully retrieved certificate chain.pem"); return data.Body.toString(); }).catch((err) => { - console.error('There was an error retrieving your certificate chain.pem:', err.message); + console.error("There was an error retrieving your certificate chain.pem:", err.message); throw err; }) ]).then((values) => { @@ -38,7 +38,7 @@ module.exports.check = (opts, options, s3) => { , chain: values[2] } }).catch((err) => { - console.error('There was an error checking the ceritifcates:', err.message); + console.error("There was an error checking the ceritifcates:", err.message); return null; }); -} \ No newline at end of file +}; \ No newline at end of file diff --git a/lib/certificates/checkKeypair.js b/lib/certificates/checkKeypair.js index bf0ee29..201e574 100644 --- a/lib/certificates/checkKeypair.js +++ b/lib/certificates/checkKeypair.js @@ -1,21 +1,21 @@ -const pathHelper = require('../pathHelper'); -const fileNames = require('../fileNames'); +const pathHelper = require("../pathHelper"); +const fileNames = require("../fileNames"); module.exports.checkKeypair = (opts, options, s3) => { - console.log('certificates.checkKeypair for', opts.subject); + console.log("certificates.checkKeypair for", opts.subject); - id = opts.certificate.kid || opts.certificate.id || opts.subject; + let id = opts.certificate.kid || opts.certificate.id || opts.subject; pemKeyPath = pathHelper.certificatesPath(options, id, fileNames.privkey.pem); jwkKeyPath = pathHelper.certificatesPath(options, id, fileNames.privkey.jwk); return s3.getObject({ Key: pemKeyPath, Bucket: options.bucketName }).promise().then((data) => { - console.log('Successfully retrieved certificate PEM keypair.'); + console.log("Successfully retrieved certificate PEM keypair."); return { privateKeyPem: data.Body.toString() } }).catch((err) => { - console.error('There was an error retrieving your certificate PEM keypair:', err.message); + console.error("There was an error retrieving your certificate PEM keypair:", err.message); return null; }); } \ No newline at end of file diff --git a/lib/certificates/set.js b/lib/certificates/set.js index ff3fe86..be80361 100644 --- a/lib/certificates/set.js +++ b/lib/certificates/set.js @@ -1,8 +1,8 @@ -const pathHelper = require('../pathHelper'); -const fileNames = require('../fileNames'); +const pathHelper = require("../pathHelper"); +const fileNames = require("../fileNames"); module.exports.set = (opts, options, s3) => { - console.log('certificates.set for ', opts.subject); + console.log("certificates.set for ", opts.subject); var pems = { cert: opts.pems.cert @@ -15,38 +15,38 @@ module.exports.set = (opts, options, s3) => { var fullchainPath = pathHelper.certificatesPath(options, opts.subject, fileNames.fullchain); var bundlePath = pathHelper.certificatesPath(options, opts.subject, fileNames.bundle); - var fullchainPem = [pems.cert, pems.chain].join('\n'); // for Apache, Nginx, etc - var bundlePem = [pems.privkey, pems.cert, pems.chain].join('\n'); // for HAProxy + var fullchainPem = [pems.cert, pems.chain].join("\n"); // for Apache, Nginx, etc + var bundlePem = [pems.privkey, pems.cert, pems.chain].join("\n"); // for HAProxy return Promise.all([ s3.putObject({ Key: certPath, Body: pems.cert, Bucket: options.bucketName }).promise().then((data) => { - console.log('Successfully set', certPath); + console.log("Successfully set", certPath); }).catch((err) => { - console.error('There was an error setting cert.pem:', err.message); + console.error("There was an error setting cert.pem:", err.message); throw err; }), s3.putObject({ Key: chainPath, Body: pems.chain, Bucket: options.bucketName }).promise().then((data) => { - console.log('Successfully set', chainPath); + console.log("Successfully set", chainPath); }).catch((err) => { - console.error('There was an error setting chain.pem:', err.message); + console.error("There was an error setting chain.pem:", err.message); throw err; }), s3.putObject({ Key: fullchainPath, Body: fullchainPem, Bucket: options.bucketName }).promise().then((data) => { - console.log('Successfully set', fullchainPath); + console.log("Successfully set", fullchainPath); }).catch((err) => { - console.error('There was an error setting fullchain.pem:', err.message); + console.error("There was an error setting fullchain.pem:", err.message); throw err; }), s3.putObject({ Key: bundlePath, Body: bundlePem, Bucket: options.bucketName }).promise().then((data) => { - console.log('Successfully set', bundlePath); + console.log("Successfully set", bundlePath); }).catch((err) => { - console.error('There was an error setting bundle.pem:', err.message); + console.error("There was an error setting bundle.pem:", err.message); throw err; }) ]).then((values) => { return null; }).catch((err) => { - console.error('There was an error setting the certificates:', err.message); + console.error("There was an error setting the certificates:", err.message); throw err; }); } \ No newline at end of file diff --git a/lib/certificates/setKeypair.js b/lib/certificates/setKeypair.js index a4fd4cd..25ad85b 100644 --- a/lib/certificates/setKeypair.js +++ b/lib/certificates/setKeypair.js @@ -1,18 +1,18 @@ -const pathHelper = require('../pathHelper'); -const fileNames = require('../fileNames'); +const pathHelper = require("../pathHelper"); +const fileNames = require("../fileNames"); module.exports.setKeypair = (opts, options, s3) => { - id = opts.certificate.kid || opts.certificate.id || opts.subject; - console.log('certificates.setKeypair for', id); + let id = opts.certificate.kid || opts.certificate.id || opts.subject; + console.log("certificates.setKeypair for", id); - pemKeyPath = pathHelper.certificatesPath(options, id, fileNames.privkey.pem); - jwkKeyPath = pathHelper.certificatesPath(options, id, fileNames.privkey.jwk); + let pemKeyPath = pathHelper.certificatesPath(options, id, fileNames.privkey.pem); + let jwkKeyPath = pathHelper.certificatesPath(options, id, fileNames.privkey.jwk); return s3.putObject({ Key: pemKeyPath, Body: opts.keypair.privateKeyPem, Bucket: options.bucketName }).promise().then((data) => { - console.log('Successfully set the PEM privateKey.'); + console.log("Successfully set the PEM privateKey."); return null; }).catch((err) => { - console.error('There was an error setting your PEM privateKey:', err.message); + console.error("There was an error setting your PEM privateKey:", err.message); throw err; }); } \ No newline at end of file diff --git a/lib/pathHelper.js b/lib/pathHelper.js index 2f712a9..d5ca7d3 100644 --- a/lib/pathHelper.js +++ b/lib/pathHelper.js @@ -1,21 +1,21 @@ -const path = require('path'); +const path = require("path"); tameWild = (wild) => { - return wild.replace(/\*/g, '_'); + return wild.replace(/\*/g, "_"); } module.exports = { certificatesPath: (options, id, fileName) => { - var filePath = path.join(options.configDir, 'live', tameWild(id), fileName); - console.log('filePath:', filePath); + var filePath = path.join(options.configDir, "live", tameWild(id), fileName); + console.log("filePath:", filePath); return filePath; }, accountsPath: (options, id) => { - var filePath = path.join(options.configDir, options.accountsDir, tameWild(id) + '.json'); - console.log('filePath:', filePath); + var filePath = path.join(options.configDir, options.accountsDir, tameWild(id) + ".json"); + console.log("filePath:", filePath); return filePath; } -} \ No newline at end of file +}; \ No newline at end of file diff --git a/test.js b/test.js index 7d732f6..50c834b 100644 --- a/test.js +++ b/test.js @@ -1,21 +1,21 @@ -console.log('Testing the strategy.'); +console.log("Testing the challenge."); -require('dotenv').config(); +require("dotenv").config(); let accessKeyId = process.env.AWS_ACCESS_KEY_ID - secretAccessKey = process.env.AWS_SECRET_ACCESS_KEY - regionName = process.env.AWS_BUCKET_REGION - bucketName = process.env.AWS_BUCKET_NAME + , secretAccessKey = process.env.AWS_SECRET_ACCESS_KEY + , regionName = process.env.AWS_BUCKET_REGION + , bucketName = process.env.AWS_BUCKET_NAME -let tester = require('greenlock-store-test'); +let tester = require("greenlock-store-test"); -let store = require('./index').create({ +let store = require("./index").create({ accessKeyId: accessKeyId , secretAccessKey: secretAccessKey , regionName: regionName , bucketName: bucketName - , configDir: 'acme/' - , accountsDir: 'accounts/' + , configDir: "acme/" + , accountsDir: "accounts/" , debug: true });