fix rubocop

Author: Johan De Wit

lib/puppet/provider/mongodb.rb

@@ -101,8 +101,7 @@ def self.mongosh_cmd(db, host, cmd)
     end
 
     args += ['--eval', cmd]
-    out = mongosh(args)
-    out
+    mongosh(args)
   end
 
   def self.conn_string
@@ -141,17 +140,10 @@ def self.db_ismaster
     cmd_ismaster = mongoshrc_file + cmd_ismaster if mongoshrc_file
     db = 'admin'
 
-    full_command = if mongoshrc_file
-                     mongoshrc_file + cmd_ismaster
-                   else
-                     cmd_ismaster
-                   end
     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 self.auth_enabled && e.message =~ %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')
@@ -167,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
@@ -201,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

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

@@ -133,6 +133,16 @@ def self.replset_properties
     conn_string = conn_string # rubocop:disable Lint/SelfAssignment
     begin
       output = mongo_command('rs.conf()', conn_string)
+      if output['members']
+        return {
+          name: output['_id'], # replica set name
+          ensure: :present,
+          members: output['members'],
+          settings: output['settings'],
+          provider: :mongo
+        }
+      end
+      nil
     rescue Puppet::ExecutionFailure => e
       if e.message =~ %r{command replSetGetConfig requires authentication} || e.message =~ %r{not authorized on admin to execute command}
         output = mongo_command('rs.status()', conn_string)
@@ -141,28 +151,16 @@ def self.replset_properties
           output['members'].each do |m|
             memb << { 'host' => m['name'] }
           end
-          {
+          return {
             name: output['set'],
             ensure: :present,
             members: memb,
-            #settings: @resource[:settings],
             provider: :mongo
           }
         end
-      else
         nil
       end
     end
-    if output['members']
-      return {
-        name: output['_id'], # replica set name
-        ensure: :present,
-        members: output['members'],
-        settings: output['settings'],
-        provider: :mongo
-      }
-    end
-    nil
   end
 
   def get_hosts_status(members)
@@ -255,7 +253,6 @@ def set_members
       return
     end
 
-    #Puppet.debug("REPLICASET DEBUG BIG Is replicaset initiated ? #{rs_initiated?}")
     # When no replicaset is initiated yet, and authenticatoin is anabled,
     # mongo_eval still adds the mongorcsh.js.  This gives an 'MongoServerError: Authentication failed.' error.
     # In this stage, we only can connect to localhost, and only rs.status() and rs.initiate() is possible.

spec/classes/mongos_spec.rb

@@ -26,11 +26,7 @@
         # install
         it { is_expected.to contain_class('mongodb::mongos::install') }
 
-        if facts[:os]['release']['major'] =~ %r{(10)}
-          it { is_expected.to contain_package('mongodb_mongos').with_ensure('6.0').with_name(package_name).with_tag('mongodb_package') }
-        else
-          it { is_expected.to contain_package('mongodb_mongos').with_ensure('6.0').with_name(package_name).with_tag('mongodb_package') }
-        end
+        it { is_expected.to contain_package('mongodb_mongos').with_ensure('6.0').with_name(package_name).with_tag('mongodb_package') }
 
         # config
         it { is_expected.to contain_class('mongodb::mongos::config') }
@@ -91,11 +87,7 @@
 
         it { is_expected.to compile.with_all_deps }
 
-        if facts[:os]['release']['major'] =~ %r{(10)}
-          it { is_expected.to contain_package('mongodb_mongos').with_name('mongo-foo').with_ensure('6.0').with_tag('mongodb_package') }
-        else
-          it { is_expected.to contain_package('mongodb_mongos').with_name('mongo-foo').with_ensure('6.0').with_tag('mongodb_package') }
-        end
+        it { is_expected.to contain_package('mongodb_mongos').with_name('mongo-foo').with_ensure('6.0').with_tag('mongodb_package') }
       end
 
       context 'service_manage => false' do

spec/classes/server_spec.rb

@@ -46,9 +46,7 @@
       describe 'with defaults' do
         it_behaves_like 'server classes'
 
-        if facts[:os]['family'] == 'RedHat' || facts[:os]['family'] == 'Suse'
-          it { is_expected.to contain_package('mongodb_server').with_ensure('6.0').with_name('mongodb-org-server').with_tag('mongodb_package') }
-        elsif facts[:os]['release']['major'] =~ %r{(10)}
+        if facts[:os]['family'] == 'RedHat' || facts[:os]['family'] == 'Suse' || facts[:os]['release']['major'] =~ %r{(10)}
           it { is_expected.to contain_package('mongodb_server').with_ensure('6.0').with_name('mongodb-org-server').with_tag('mongodb_package') }
         else
           it { is_expected.to contain_package('mongodb_server').with_ensure('6.0').with_name('mongodb-server').with_tag('mongodb_package') }