[test] Fix unit and acceptance tests

* Fix linter and regenerate REFERENCE.md
* Fix rubocop
* Re-add opsmanager unit test
* Use both new mongosh and mongoshrc in acceptance
* Client package is now intalled by the server (mandatory for mongosh)
* Fix some tests due to changed output mongosh
* add some more rspec tests, and fix template

Author: Johan De Wit

lib/puppet/provider/mongodb.rb

@@ -141,11 +141,10 @@ def self.db_ismaster
     db = 'admin'
 
     begin
-       res = mongosh_cmd(db, conn_string, cmd_ismaster).to_s.split(%r{\n}).last.chomp
+      res = mongosh_cmd(db, conn_string, cmd_ismaster).to_s.split(%r{\n}).last.chomp
     rescue StandardError => e
-      if mongorc_file && res =~ %r{Authentication failed}
-        res = mongosh_cmd(db, conn_string, 'db.isMaster().ismaster').to_s.chomp
-      end
+      res = mongosh_cmd(db, conn_string, 'db.isMaster().ismaster').to_s.chomp if auth_enabled && e.message =~ %r{Authentication failed}
+    end
 
     res.eql?('true')
   end
@@ -160,23 +159,18 @@ def self.auth_enabled(config = nil)
   end
 
   def self.rs_initiated?
+    # TODO: not used yet, generates a stack level to deep error
     cmd_status = "rs.status('localhost').set"
     cmd_status = mongoshrc_file + cmd_status if mongoshrc_file
     db = 'admin'
-    res = mongosh_cmd(db, conn_string, cmd_ismaster).to_s.split(%r{\n}).last.chomp
+    res = mongosh_cmd(db, conn_string, cmd_status).to_s.split(%r{\n}).last.chomp
 
     # Retry command without authentication when mongorc_file is set and authentication failed
-    if mongorc_file && res =~ %r{Authentication failed}
-      res = mongosh_cmd(db, conn_string, "rs.status('localhost').set").to_s.chomp
-    end
+    res = mongosh_cmd(db, conn_string, "rs.status('localhost').set").to_s.chomp if mongorc_file && res =~ %r{Authentication failed}
 
     res == @resource[:name]
   end
 
-  def rs_initiated?
-    self.rs_initiated?
-  end
-
   # Mongo Command Wrapper
   def self.mongo_eval(cmd, db = 'admin', retries = 10, host = nil)
     retry_count = retries
@@ -194,7 +188,7 @@ def self.mongo_eval(cmd, db = 'admin', retries = 10, host = nil)
     rescue StandardError => e
       # When using the rc file, we get this eror because in most cases the admin user is not created yet
       # Can/must we move this out of the resue block ?
-      if self.auth_enabled && e.message =~ %r{Authentication failed}
+      if auth_enabled && e.message =~ %r{Authentication failed}
         out = if host
                 mongosh_cmd(db, host, no_auth_cmd)
               else
@@ -227,31 +221,4 @@ def self.mongo_version
   def mongo_version
     self.class.mongo_version
   end
-
-  def self.mongo_4?
-    v = mongo_version
-    !v[%r{^4\.}].nil?
-  end
-
-  def mongo_4?
-    self.class.mongo_4?
-  end
-
-  def self.mongo_5?
-    v = mongo_version
-    !v[%r{^5\.}].nil?
-  end
-
-  def mongo_5?
-    self.class.mongo_5?
-  end
-
-  def self.mongo_6?
-    v = mongo_version
-    !v[%r{^6\.}].nil?
-  end
-
-  def mongo_6?
-    self.class.mongo_6?
-  end
 end

lib/puppet/provider/mongodb_database/mongodb.rb

@@ -16,9 +16,9 @@ def self.instances
       new(name: db['name'],
           ensure: :present)
     end
-    rescue => e
-      Puppet.warning("Getting instances of mongodb_database failed: #{e}")
-      []
+  rescue StandardError => e
+    Puppet.warning("Getting instances of mongodb_database failed: #{e}")
+    []
   end
 
   # Assign prefetched dbs based on name.
@@ -39,12 +39,12 @@ def create
       begin
         out = mongo_eval('db.dummyData.insertOne({"created_by_puppet": 1})', @resource[:name])
       rescue StandardError => e
-        if auth_enabled && e.message =~ %r{not authorized on admin to execute commanda} && @resource[:name] == 'admin'
+        if auth_enabled && e.message =~ %r{not authorized on admin to execute command} && @resource[:name] == 'admin'
           Puppet.warning 'Skipping database creation for admin, need admin user first when security is enabled'
           @property_hash[:ensure] = :present
           @property_hash[:name] = @resource[:name]
-        else
-          raise "Failed to create DB '#{@resource[:name]}'\n#{out}" if %r{writeError} =~ out
+        elsif %r{writeError} =~ out
+          raise "Failed to create DB '#{@resource[:name]}'\n#{out}"
         end
       end
     else

lib/puppet/provider/mongodb_replset/mongo.rb

@@ -184,9 +184,9 @@ def get_hosts_status(members)
           case e.message
           when %r{no replset config has been received}
             Puppet.warning('No replicaset config received, needs initialisation')
-          when /Authentication failed/, /not authorized on admin/, /Authentication failed/
+          when %r{Authentication failed}, %r{not authorized on admin}
             Puppet.warning "Host #{host} is available, but you are unauthorized because of authentication is enabled: #{auth_enabled}"
-          when /command replSetGetStatus requires authentication/
+          when %r{command replSetGetStatus requires authentication}
             Puppet.warning("Node #{host} is reachable but requires authentication: ReplicaSet not initialized")
           end
           alive.push(member)

lib/puppet/provider/mongodb_user/mongodb.rb

@@ -118,22 +118,16 @@ def password_hash=(_value)
     end
   end
 
-  def password=(value)
-    if mongo_26?
-      mongo_eval("db.changeUserPassword(#{@resource[:username].to_json}, #{value.to_json})", @resource[:database])
-    else
-      command = {
-        updateUser: @resource[:username],
-        pwd: @resource[:password],
-        digestPassword: true
-      }
+  def password=(_value)
+    command = {
+      updateUser: @resource[:username],
+      pwd: @resource[:password],
+      digestPassword: true
+    }
 
-      if mongo_4? || mongo_5?
-        command[:mechanisms] = @resource[:auth_mechanism] == :scram_sha_256 ? ['SCRAM-SHA-256'] : ['SCRAM-SHA-1']
-      end
+    command[:mechanisms] = @resource[:auth_mechanism] == :scram_sha_256 ? ['SCRAM-SHA-256'] : ['SCRAM-SHA-1']
 
-      mongo_eval("db.runCommand(#{command.to_json})", @resource[:database])
-    end
+    mongo_eval("db.runCommand(#{command.to_json})", @resource[:database])
   end
 
   def roles=(roles)

manifests/opsmanager.pp

@@ -149,7 +149,7 @@
     }
     default:  {
       $my_package_ensure = $package_ensure
-      $file_ensure       = 'present'
+      $file_ensure       = 'file'
     }
   }
 

manifests/server.pp

@@ -4,9 +4,15 @@
 #
 #  For more details about configuration parameters consult the MongoDB Configuration File Options.
 #
-# @example
-
-
+# @example Basic usage.
+#   include mongodb::server
+#
+# @example Overrule settings
+#   class {'mongodb::server':
+#     port    => 27018,
+#     verbose => true,
+#  }
+#
 # @param ensure
 #   Used to ensure that the package is installed and the service is running, or that the package is
 #   absent/purged and the service is stopped.

manifests/server/config.pp

@@ -126,6 +126,22 @@
       mode    => '0644',
     }
 
+    # TODO: we kind of use this file to force x509 authentication in the providers when it exsists
+    #       Open for suggestions how to deal with this
+    if $admin_auth_mechanism == 'x509' and $handle_creds {
+      $_ensure = 'file'
+    } else {
+      $_ensure = 'absent'
+    }
+
+    file { '/root/.mongosh.yaml':
+      ensure  => $_ensure,
+      owner   => 'root',
+      group   => 'root',
+      mode    => '0600',
+      content => "---admin:\n  name:${admin_username}\n  auth_mechanism: ${admin_auth_mechanism}\n  tlsCertificateKeyFile: ${admin_tls_key}\n",
+    }
+
     file { $dbpath:
       ensure   => directory,
       mode     => '0750',

spec/acceptance/database_spec.rb

@@ -8,7 +8,6 @@
       it 'compiles with no errors' do
         pp = <<-EOS
           class { 'mongodb::server': }
-          -> class { 'mongodb::client': }
           -> mongodb::db { 'testdb1':
             user     => 'testuser',
             password => 'testpass',
@@ -23,8 +22,8 @@ class { 'mongodb::server': }
       end
 
       it 'creates the databases' do
-        shell("mongo testdb1 --eval 'EJSON.stringify(db.getMongo().getDBs())'")
-        shell("mongo testdb2 --eval 'EJSON.stringify(db.getMongo().getDBs())'")
+        shell("mongosh testdb1 --eval 'EJSON.stringify(db.getMongo().getDBs())'")
+        shell("mongosh testdb2 --eval 'EJSON.stringify(db.getMongo().getDBs())'")
       end
     end
 
@@ -34,7 +33,6 @@ class { 'mongodb::server': }
           class { 'mongodb::server':
             port => 27018,
           }
-          -> class { 'mongodb::client': }
           -> mongodb::db { 'testdb1':
             user     => 'testuser',
             password => 'testpass',
@@ -50,8 +48,8 @@ class { 'mongodb::server':
       end
 
       it 'creates the database' do
-        shell("mongo testdb1 --port 27018 --eval 'EJSON.stringify(db.getMongo().getDBs())'")
-        shell("mongo testdb2 --port 27018 --eval 'EJSON.stringify(db.getMongo().getDBs())'")
+        shell("mongosh testdb1 --port 27018 --eval 'EJSON.stringify(db.getMongo().getDBs())'")
+        shell("mongosh testdb2 --port 27018 --eval 'EJSON.stringify(db.getMongo().getDBs())'")
       end
     end
   end

spec/acceptance/mongos_spec.rb

@@ -25,7 +25,6 @@ class { 'mongodb::server':
           replset_members => ['127.0.0.1:27019'],
           port      => 27019,
         }
-        -> class { 'mongodb::client': }
         -> class { 'mongodb::mongos':
           configdb => ['test/127.0.0.1:27019'],
         }
@@ -56,7 +55,7 @@ class { 'mongodb::server':
       it { is_expected.to be_listening }
     end
 
-    describe command('mongo --version') do
+    describe command('mongod --version') do
       its(:exit_status) { is_expected.to eq 0 }
     end
   end
@@ -73,9 +72,6 @@ class { 'mongodb::mongos':
           service_ensure => stopped,
           service_enable => false
         }
-        -> class { 'mongodb::client':
-          ensure => absent,
-        }
       EOS
       apply_manifest(pp, catch_failures: true)
       apply_manifest(pp, catch_changes: true)