[Mongosh rc] Adjust for mongosh

Author: Johan De Wit

manifests/params.pp

@@ -19,7 +19,7 @@
   ]
   $handle_creds          = true
   $store_creds           = false
-  $rcfile                = "${facts['root_home']}/.mongorc.js"
+  $rcfile                = "${facts['root_home']}/.mongoshrc.js"
   $dbpath_fix            = false
 
   $manage_package        = pick($mongodb::globals::manage_package, $mongodb::globals::manage_package_repo, false)

manifests/server/config.pp

@@ -176,7 +176,7 @@
   if $handle_creds {
     file { $rcfile:
       ensure  => file,
-      content => template('mongodb/mongorc.js.erb'),
+      content => template('mongodb/mongoshrc.js.erb'),
       owner   => 'root',
       group   => 'root',
       mode    => '0600',

spec/acceptance/replset_spec.rb

@@ -177,26 +177,26 @@ class { 'mongodb::server':
       EOS
       apply_manifest_on(hosts_as('master'), pp, catch_failures: true)
       apply_manifest_on(hosts_as('master'), pp, catch_changes: true)
-      on(hosts_as('master'), 'mongo --quiet --eval "load(\'/root/.mongorc.js\');printjson(rs.conf())"') do |r|
+      on(hosts_as('master'), 'mongo --quiet --eval "load(\'/root/.mongoshrc.js\');printjson(rs.conf())"') do |r|
         expect(r.stdout).to match %r{#{hosts[0]}:27017}
         expect(r.stdout).to match %r{#{hosts[1]}:27017}
       end
     end
 
     it 'inserts data on the master' do
       sleep(30)
-      on hosts_as('master'), %{mongo test --verbose --eval 'load("/root/.mongorc.js");db.dummyData.insert({"created_by_puppet": 1})'}
+      on hosts_as('master'), %{mongo test --verbose --eval 'load("/root/.mongoshrc.js");db.dummyData.insert({"created_by_puppet": 1})'}
     end
 
     it 'checks the data on the master' do
-      on hosts_as('master'), %{mongo test --verbose --eval 'load("/root/.mongorc.js");printjson(db.dummyData.findOne())'} do |r|
+      on hosts_as('master'), %{mongo test --verbose --eval 'load("/root/.mongoshrc.js");printjson(db.dummyData.findOne())'} do |r|
         expect(r.stdout).to match %r{created_by_puppet}
       end
     end
 
     it 'checks the data on the slave' do
       sleep(10)
-      on hosts_as('slave'), %{mongo test --verbose --eval 'load("/root/.mongorc.js");try { rs.secondaryOk() } catch (err) { rs.slaveOk() };printjson(db.dummyData.findOne())'} do |r|
+      on hosts_as('slave'), %{mongo test --verbose --eval 'load("/root/.mongoshrc.js");try { rs.secondaryOk() } catch (err) { rs.slaveOk() };printjson(db.dummyData.findOne())'} do |r|
         expect(r.stdout).to match %r{created_by_puppet}
       end
     end

spec/classes/server_spec.rb

@@ -71,7 +71,7 @@
           it { is_expected.to contain_file(config_file).with_content(%r{^  fork: true$}) }
         end
 
-        it { is_expected.to contain_file('/root/.mongorc.js').with_ensure('file').without_content(%r{db\.auth}) }
+        it { is_expected.to contain_file('/root/.mongoshrc.js').with_ensure('file').without_content(%r{db\.auth}) }
         it { is_expected.not_to contain_exec('fix dbpath permissions') }
       end
 
@@ -165,7 +165,7 @@
         end
 
         it { is_expected.to contain_file(config_file).with_content(%r{^security\.authorization: enabled$}) }
-        it { is_expected.to contain_file('/root/.mongorc.js') }
+        it { is_expected.to contain_file('/root/.mongoshrc.js') }
       end
 
       describe 'when specifying set_parameter array value' do
@@ -262,7 +262,7 @@
           end
 
           it {
-            is_expected.to contain_file('/root/.mongorc.js').
+            is_expected.to contain_file('/root/.mongoshrc.js').
               with_ensure('file').
               with_owner('root').
               with_group('root').
@@ -278,7 +278,7 @@
             }
           end
 
-          it { is_expected.to contain_file('/root/.mongorc.js').with_ensure('file').without_content(%r{db\.auth}) }
+          it { is_expected.to contain_file('/root/.mongoshrc.js').with_ensure('file').without_content(%r{db\.auth}) }
         end
       end
 

templates/mongorc.js.erb renamed to templates/mongoshrc.js.erb

@@ -28,12 +28,7 @@ function authRequired() {
 if (authRequired()) {
   <%- if @replset -%>
   // rs.slaveOk has been deprecated, use secondaryOk if available
-  try {
-    rs.secondaryOk()
-  }
-  catch (err) {
-    rs.slaveOk()
-  }
+  db.getMongo().setReadPref('primaryPreferred')
   <%- end -%>
   try {
     var prev_db = db
@@ -43,7 +38,7 @@ if (authRequired()) {
   }
   catch (err) {
     // This isn't catching authentication errors as I'd expect...
-    abort('Unknown error')
+    throw(err)
   }
 }
 <% end -%>