ACC-1106 SSL fine tune for DB connection (#309)

* bump ecma version to use spread operator * added ssl object to connection set up * run make verify on precommit rather than on prepush to avoid typo commits * amended the tests to expect the new object keys * fix issue with object assign not liking ... being not iterable * bumped package semver for release Co-authored-by: AniaMakes <[email protected]>
Financial-Times · Jul 7, 2021 · 2af3ad1 · 2af3ad1
1 parent c8ee0b0
commit 2af3ad1
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 11 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -8,7 +8,7 @@ const config = {
 		'node': true
 	},
 	'parserOptions': {
-		'ecmaVersion': 2017,
+		'ecmaVersion': 2018,
 		'sourceType': 'module'
 	},
 	'rules': {

diff --git a/db/pg/index.js b/db/pg/index.js
@@ -12,15 +12,23 @@ const { DB } = require('config');
 const MODULE_ID = path.relative(process.cwd(), module.id) || require(path.resolve('./package.json')).name;
 const log = new Logger({source: MODULE_ID});
 
+const sslSetUp = {
+	ssl: true,
+	extra: {
+		ssl: {
+			rejectUnauthorized: false,
+		},
+	}
+}
+
 let db;
 
 module.exports = exports = async (options = DB) => {
 	if (!db || options !== DB) {
 		log.info(`${MODULE_ID} creating new DB instance with options => `, options);
 
 		if (options.uri) {
-			const conn = Object.assign({ ssl: { rejectUnauthorized : false } }, pgConn.parse(options.uri));
-
+			const conn = Object.assign({ ...sslSetUp}, pgConn.parse(options.uri));
 			log.info(`${MODULE_ID} creating new DB instance with URI String => `, conn);
 
 			db = await massive(conn);
@@ -31,13 +39,10 @@ module.exports = exports = async (options = DB) => {
 				host: options.host,
 				password: options.password,
 				port: options.port,
-				user: options.user_name
+				user: options.user_name,
+				...sslSetUp,
 			};
 
-			if (options.ssl === true) {
-				conn.ssl = { rejectUnauthorized : false };
-			}
-
 			db = await massive(conn);
 		}
 	}

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "ft-next-syndication-api",
   "description": "Next Syndication API",
-  "version": "0.38.1",
+  "version": "0.38.2",
   "private": true,
   "dependencies": {
     "@financial-times/n-es-client": "3.0.0",
@@ -107,7 +107,7 @@
   "husky": {
     "hooks": {
       "commit-msg": "node_modules/.bin/secret-squirrel-commitmsg",
-      "pre-commit": "node_modules/.bin/secret-squirrel",
+      "pre-commit": "node_modules/.bin/secret-squirrel && make verify -j3",
       "pre-push": "make verify -j3"
     }
   }

diff --git a/test/db/pg/index.spec.js b/test/db/pg/index.spec.js
@@ -57,9 +57,42 @@ describe(MODULE_ID, function () {
 			port: 'DB_PORT',
 			database: 'DB_NAME',
 			user: 'DB_USER',
-			password: 'DB_PASSWORD'
+			password: 'DB_PASSWORD',
+			ssl: true,
+			extra: {
+				ssl: {
+					rejectUnauthorized: false,
+				},
+			}
 		});
 
 		expect(DB).to.equal(db);
 	});
+
+	it('creates a new database instance if options do not match', async function() {
+		beforeEach(() => {
+			db = null;
+		})
+
+		const DB = await underTest({
+			uri: 'DATABASE_URL'
+		});
+
+		expect(massiveStub).to.have.been.calledWith({
+			database: 'DATABASE_URL',
+			user: '',
+			password: '',
+			port: null,
+			host: null,
+			ssl: true,
+			extra: {
+				ssl: {
+					rejectUnauthorized: false,
+				},
+			}
+		});
+
+		expect(DB).to.equal(db);
+	})
+
 });