Merge pull request #792 from voxpupuli/modulesync

modulesync 10.6.0

Author: bastelfreak

.devcontainer/devcontainer.json

@@ -1,4 +1,3 @@
-// For format details, see https://aka.ms/devcontainer.json. For config options, see the
 {
 	"name": "VoxBox",
 	"image": "ghcr.io/voxpupuli/voxbox:latest"

.msync.yml

@@ -2,4 +2,4 @@
 # Managed by modulesync - DO NOT EDIT
 # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
 
-modulesync_config_version: '10.5.0'
+modulesync_config_version: '10.6.0'

.rubocop_todo.yml

@@ -1,32 +1,32 @@
 # This configuration was generated by
-# `rubocop --auto-gen-config`
-# on 2023-08-17 21:34:59 UTC using RuboCop version 1.50.2.
+# `rubocop --auto-gen-config --no-auto-gen-timestamp`
+# using RuboCop version 1.85.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 1
-# Configuration parameters: IgnoreLiteralBranches, IgnoreConstantBranches.
-Lint/DuplicateBranch:
-  Exclude:
-    - 'lib/puppet/provider/mongodb.rb'
-
 # Offense count: 1
 # Configuration parameters: AllowComments, AllowEmptyLambdas.
 Lint/EmptyBlock:
   Exclude:
     - 'spec/unit/puppet/provider/mongodb_shard/mongodb_spec.rb'
 
 # Offense count: 1
+Lint/LiteralAssignmentInCondition:
+  Exclude:
+    - 'lib/puppet/type/mongodb_replset.rb'
+
+# Offense count: 1
+# Configuration parameters: AllowRBSInlineAnnotation.
 Lint/SelfAssignment:
   Exclude:
     - 'lib/puppet/provider/mongodb_replset/mongo.rb'
 
 # Offense count: 7
 # Configuration parameters: EnforcedStyle, CheckMethodNames, CheckSymbols, AllowedIdentifiers, AllowedPatterns.
 # SupportedStyles: snake_case, normalcase, non_integer
-# AllowedIdentifiers: capture3, iso8601, rfc1123_date, rfc822, rfc2822, rfc3339, x86_64
+# AllowedIdentifiers: TLS1_1, TLS1_2, capture3, iso8601, rfc1123_date, rfc822, rfc2822, rfc3339, x86_64
 Naming/VariableNumber:
   Exclude:
     - 'lib/puppet/provider/mongodb_user/mongodb.rb'
@@ -38,9 +38,26 @@ RSpec/BeEq:
   Exclude:
     - 'spec/functions/mongodb_password_spec.rb'
 
-# Offense count: 1
-RSpec/MultipleExpectations:
-  Max: 2
+# Offense count: 11
+RSpec/LeakyLocalVariable:
+  Exclude:
+    - 'spec/acceptance/database_spec.rb'
+    - 'spec/acceptance/mongos_spec.rb'
+    - 'spec/acceptance/replset_spec.rb'
+    - 'spec/acceptance/server_spec.rb'
+    - 'spec/acceptance/sharding_spec.rb'
+    - 'spec/acceptance/user_spec.rb'
+    - 'spec/classes/mongos_spec.rb'
+    - 'spec/unit/puppet/provider/mongodb_replset/mongodb_spec.rb'
+    - 'spec/unit/puppet/provider/mongodb_spec.rb'
+
+# Offense count: 10
+# This cop supports unsafe autocorrection (--autocorrect-all).
+RSpec/ReceiveMessages:
+  Exclude:
+    - 'spec/unit/puppet/provider/mongodb_database/mongodb_spec.rb'
+    - 'spec/unit/puppet/provider/mongodb_replset/mongodb_spec.rb'
+    - 'spec/unit/puppet/provider/mongodb_user/mongodb_spec.rb'
 
 # Offense count: 6
 RSpec/RepeatedExampleGroupBody:
@@ -55,33 +72,18 @@ RSpec/VariableName:
   Exclude:
     - 'spec/classes/server_spec.rb'
 
-# Offense count: 44
+# Offense count: 1
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: always, always_true, never
 Style/FrozenStringLiteralComment:
-  Enabled: false
-
-# Offense count: 1
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: AllowedReceivers.
-# AllowedReceivers: Thread.current
-Style/HashEachMethods:
   Exclude:
-    - 'lib/puppet/provider/mongodb_database/mongodb.rb'
+    - '**/*.arb'
+    - 'spec/unit/puppet/util/mongodb_output_spec.rb'
 
-# Offense count: 1
+# Offense count: 14
 # This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: EnforcedStyle, AllowedMethods, AllowedPatterns.
-# SupportedStyles: predicate, comparison
-Style/NumericPredicate:
+Style/HashFetchChain:
   Exclude:
-    - 'spec/**/*'
+    - 'lib/facter/is_master.rb'
     - 'lib/puppet/provider/mongodb.rb'
-
-# Offense count: 1
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: Mode.
-Style/StringConcatenation:
-  Exclude:
-    - 'lib/puppet/provider/mongodb_database/mongodb.rb'

Gemfile

@@ -4,7 +4,7 @@
 source ENV['GEM_SOURCE'] || 'https://rubygems.org'
 
 group :test do
-  gem 'voxpupuli-test', '~> 13.0',  :require => false
+  gem 'voxpupuli-test', '~> 14.0',  :require => false
   gem 'puppet_metadata', '~> 6.0',  :require => false
 end
 
@@ -18,7 +18,7 @@ group :system_tests do
 end
 
 group :release do
-  gem 'voxpupuli-release', '~> 5.0',  :require => false
+  gem 'voxpupuli-release', '~> 5.3',  :require => false
 end
 
 gem 'rake', :require => false

lib/puppet/provider/mongodb_replset/mongo.rb

@@ -18,7 +18,7 @@
   mk_resource_methods
 
   def initialize(resource = {})
-    super(resource)
+    super
     @property_flush = {}
   end
 
@@ -164,7 +164,7 @@ def self.replset_properties
         ensure: :present,
         members: output['members'],
         settings: output['settings'],
-        provider: :mongo
+        provider: :mongo,
       }
     end
     nil
@@ -272,7 +272,7 @@ def create_replica_set(alive_hosts)
     replset_conf = {
       _id: name,
       members: members_conf,
-      settings: (@property_flush[:settings].nil? ? {} : @property_flush[:settings])
+      settings: (@property_flush[:settings].nil? ? {} : @property_flush[:settings]),
     }.to_json
 
     Puppet.debug "Starting replset config is #{replset_conf.to_json}"

lib/puppet/provider/mongodb_shard/mongo.rb

@@ -16,7 +16,7 @@
   commands mongosh: 'mongosh'
 
   def initialize(value = {})
-    super(value)
+    super
     @property_flush = {}
   end
 
@@ -111,7 +111,7 @@ def self.shard_properties(shard)
         ensure: :present,
         member: s['host'],
         keys: shard_collection_details(output['databases'], s['_id']),
-        provider: :mongo
+        provider: :mongo,
       }
     end
     properties
@@ -128,7 +128,7 @@ def self.shards_properties
                        ensure: :present,
                        member: shard['host'],
                        keys: shard_collection_details(output['databases'], shard['_id']),
-                       provider: :mongo
+                       provider: :mongo,
                      }
                    end
                  end

lib/puppet/provider/mongodb_user/mongodb.rb

@@ -48,7 +48,7 @@ def create
       command = {
         createUser: @resource[:username],
         customData: {
-          createdBy: "Puppet Mongodb_user['#{@resource[:name]}']"
+          createdBy: "Puppet Mongodb_user['#{@resource[:name]}']",
         },
         roles: role_hashes(@resource[:roles], @resource[:database]),
       }
@@ -90,7 +90,7 @@ def password_hash=(_value)
       command = {
         updateUser: @resource[:username],
         pwd: @resource[:password_hash],
-        digestPassword: false
+        digestPassword: false,
       }
 
       mongo_eval("db.runCommand(#{command.to_json})", @resource[:database])
@@ -104,7 +104,7 @@ def password=(_value)
       updateUser: @resource[:username],
       pwd: @resource[:password],
       digestPassword: true,
-      mechanisms: @resource[:auth_mechanism] == :scram_sha_256 ? ['SCRAM-SHA-256'] : ['SCRAM-SHA-1']
+      mechanisms: (@resource[:auth_mechanism] == :scram_sha_256) ? ['SCRAM-SHA-256'] : ['SCRAM-SHA-1'],
     }
 
     mongo_eval("db.runCommand(#{command.to_json})", @resource[:database])
@@ -149,12 +149,12 @@ def role_hashes(roles, db)
       if entry.include? '@'
         {
           'role' => entry.gsub(%r{^(.*)@.*$}, '\1'),
-          'db'   => entry.gsub(%r{^.*@(.*)$}, '\1')
+          'db'   => entry.gsub(%r{^.*@(.*)$}, '\1'),
         }
       else
         {
           'role' => entry,
-          'db'   => db
+          'db'   => db,
         }
       end
     end

lib/puppet/util/mongodb_scram.rb

@@ -34,7 +34,7 @@ def salted_password
           @password_hash,
           Base64.strict_decode64(@salt),
           @iterations,
-          digest.size
+          digest.size,
         )
       end
 

spec/classes/mongos_spec.rb

@@ -38,7 +38,7 @@
       describe 'with specific bind_ip values' do
         let :params do
           {
-            bind_ip: ['127.0.0.1', '10.1.1.13']
+            bind_ip: ['127.0.0.1', '10.1.1.13'],
           }
         end
 
@@ -48,7 +48,7 @@
       context 'package_name => mongo-foo' do
         let(:params) do
           {
-            package_name: 'mongo-foo'
+            package_name: 'mongo-foo',
           }
         end
 
@@ -59,7 +59,7 @@
       context 'service_manage => false' do
         let(:params) do
           {
-            service_manage: false
+            service_manage: false,
           }
         end
 
@@ -70,7 +70,7 @@
       context 'package_ensure => purged' do
         let(:params) do
           {
-            package_ensure: 'purged'
+            package_ensure: 'purged',
           }
         end
 

spec/classes/repo_spec.rb

@@ -16,7 +16,7 @@
       describe 'with version set' do
         let :params do
           {
-            version: '5.0'
+            version: '5.0',
           }
         end
 
@@ -25,31 +25,31 @@
           it { is_expected.to contain_class('mongodb::repo::yum') }
 
           it do
-            is_expected.to contain_yumrepo('mongodb').
-              with_baseurl('https://repo.mongodb.org/yum/redhat/$releasever/mongodb-org/5.0/$basearch/')
+            is_expected.to contain_yumrepo('mongodb')
+              .with_baseurl('https://repo.mongodb.org/yum/redhat/$releasever/mongodb-org/5.0/$basearch/')
           end
         when 'Suse'
           it { is_expected.to contain_class('mongodb::repo::zypper') }
 
           it do
-            is_expected.to contain_zypprepo('mongodb').
-              with_baseurl('https://repo.mongodb.org/zypper/suse/$releasever_major/mongodb-org/5.0/$basearch/')
+            is_expected.to contain_zypprepo('mongodb')
+              .with_baseurl('https://repo.mongodb.org/zypper/suse/$releasever_major/mongodb-org/5.0/$basearch/')
           end
         when 'Debian'
           it { is_expected.to contain_class('mongodb::repo::apt') }
 
           case facts[:os]['name']
           when 'Debian'
             it do
-              is_expected.to contain_apt__source('mongodb').
-                with_location('https://repo.mongodb.org/apt/debian').
-                with_release("#{facts[:os]['distro']['codename']}/mongodb-org/5.0")
+              is_expected.to contain_apt__source('mongodb')
+                .with_location('https://repo.mongodb.org/apt/debian')
+                .with_release("#{facts[:os]['distro']['codename']}/mongodb-org/5.0")
             end
           when 'Ubuntu'
             it do
-              is_expected.to contain_apt__source('mongodb').
-                with_location('https://repo.mongodb.org/apt/ubuntu').
-                with_release("#{facts[:os]['distro']['codename']}/mongodb-org/5.0")
+              is_expected.to contain_apt__source('mongodb')
+                .with_location('https://repo.mongodb.org/apt/ubuntu')
+                .with_release("#{facts[:os]['distro']['codename']}/mongodb-org/5.0")
             end
           end
         else
@@ -63,7 +63,7 @@
             version: '5.0',
             proxy: 'http://proxy-server:8080',
             proxy_username: 'proxyuser1',
-            proxy_password: 'proxypassword1'
+            proxy_password: 'proxypassword1',
           }
         end
 
@@ -72,11 +72,11 @@
           it { is_expected.to contain_class('mongodb::repo::yum') }
 
           it do
-            is_expected.to contain_yumrepo('mongodb').
-              with_enabled('1').
-              with_proxy('http://proxy-server:8080').
-              with_proxy_username('proxyuser1').
-              with_proxy_password('proxypassword1')
+            is_expected.to contain_yumrepo('mongodb')
+              .with_enabled('1')
+              .with_proxy('http://proxy-server:8080')
+              .with_proxy_username('proxyuser1')
+              .with_proxy_password('proxypassword1')
           end
         when 'Suse'
           it { is_expected.to contain_class('mongodb::repo::zypper') }