From eeb08e498435da3d1ac41e888cffde811cc0c879 Mon Sep 17 00:00:00 2001 From: Durran Jordan Date: Tue, 14 Feb 2017 18:03:19 +1100 Subject: [PATCH 1/2] Backport: Fix options passing with new node driver (#778) This backports 57c2e15476b1a08568e9ae2f553e1d6f0ed4d9e2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5c44bad3b8f..af785868ed8 100644 --- a/package.json +++ b/package.json @@ -147,7 +147,7 @@ "moment": "^2.10.6", "mongodb": "^2.2.8", "mongodb-collection-model": "^0.3.1", - "mongodb-connection-model": "^6.3.5", + "mongodb-connection-model": "^6.4.0", "mongodb-data-service": "^2.12.2", "mongodb-database-model": "^0.1.2", "mongodb-explain-plan-model": "^0.2.2", From 234f7f90ce71023a5060414f04482bc45fe75b2f Mon Sep 17 00:00:00 2001 From: Peter Schmidt Date: Thu, 2 Mar 2017 14:25:48 +1100 Subject: [PATCH 2/2] COMPASS-839: Backport COMPASS 830: Resolve SSL and Atlas issues (#811) * Drop clipboard override Blur one is still useful if the user types in *.mongodb.net manually. It duplicates a soon to be unnecessary check: https://github.com/mongodb-js/connection-model/pull/163/commits/0588d351983f40baf9b8024935742361595d9745 * :arrow_up: mongodb-connection-model@6.4.2 npm i --upgrade mongodb-connection-model --save * :arrow_up: mongodb-data-service@2.12.3 npm i --upgrade mongodb-data-service --save Needed to resolve COMPASS 830 as we'd like to bust any caches that may exist (node_modules), and also data-service depends on connection-model, for example it calls `connect()` from connection-model. --- package.json | 4 ++-- src/app/connect/index.js | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index af785868ed8..aa29b6a6aee 100644 --- a/package.json +++ b/package.json @@ -147,8 +147,8 @@ "moment": "^2.10.6", "mongodb": "^2.2.8", "mongodb-collection-model": "^0.3.1", - "mongodb-connection-model": "^6.4.0", - "mongodb-data-service": "^2.12.2", + "mongodb-connection-model": "^6.4.2", + "mongodb-data-service": "^2.12.3", "mongodb-database-model": "^0.1.2", "mongodb-explain-plan-model": "^0.2.2", "mongodb-extended-json": "^1.9.0", diff --git a/src/app/connect/index.js b/src/app/connect/index.js index c09cf774b5e..63e7c588477 100644 --- a/src/app/connect/index.js +++ b/src/app/connect/index.js @@ -300,10 +300,6 @@ var ConnectView = View.extend({ if (this.clipboardText.match(/[?&]ssl=true/i)) { this.connection.ssl = 'SYSTEMCA'; } - // if we connect to an Atlas instance, use SYSTEMCA as SSL option - if (this.connection.hostname.match(/mongodb.net$/i)) { - this.connection.ssl = 'SYSTEMCA'; - } this.updateForm(); // @note: durran: This fixes not being able to save a new favorite // from a collection that was auto-filled from the clipboard. Needed