Merge pull request #579 from voxpupuli/modulesync

modulesync 2.12.0

Author: ekohl

.github/CONTRIBUTING.md

@@ -256,18 +256,20 @@ Beaker also supports docker containers. We also use that in our automated CI
 pipeline at [travis-ci](http://travis-ci.org). To use that instead of Vagrant:
 
 ```sh
-PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=debian9-64{hypervisor=docker} BEAKER_destroy=yes bundle exec rake beaker
+PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=debian10-64{hypervisor=docker} BEAKER_destroy=yes bundle exec rake beaker
 ```
 
-You can replace the string `debian9` with any common operating system.
+You can replace the string `debian10` with any common operating system.
 The following strings are known to work:
 
 * ubuntu1604
 * ubuntu1804
 * debian8
 * debian9
+* debian10
 * centos6
 * centos7
+* centos8
 
 The easiest way to debug in a docker container is to open a shell:
 

.msync.yml

@@ -1 +1 @@
-modulesync_config_version: '2.10.1'
+modulesync_config_version: '2.12.0'

.rubocop.yml

@@ -1,6 +1,7 @@
 require: rubocop-rspec
 AllCops:
-  TargetRubyVersion: 2.1
+# Puppet Server 5 defaults to jruby 1.7 so TargetRubyVersion must stay at 1.9 until we drop support for puppet 5
+  TargetRubyVersion: 1.9
   Include:
     - ./**/*.rb
   Exclude:
@@ -543,6 +544,3 @@ Style/FormatStringToken:
 # are located.
 RSpec/FilePath:
   Enabled: false
-
-RSpec/MessageSpies:
-   EnforcedStyle: receive

Gemfile

@@ -11,27 +11,9 @@ def location_for(place, fake_version = nil)
 end
 
 group :test do
-  gem 'puppetlabs_spec_helper', '>= 2.14.0',                        :require => false
-  gem 'rspec-puppet-facts', '>= 1.9.5',                             :require => false
-  gem 'rspec-puppet-utils',                                         :require => false
-  gem 'puppet-lint-leading_zero-check',                             :require => false
-  gem 'puppet-lint-trailing_comma-check',                           :require => false
-  gem 'puppet-lint-version_comparison-check',                       :require => false
-  gem 'puppet-lint-classes_and_types_beginning_with_digits-check',  :require => false
-  gem 'puppet-lint-unquoted_string-check',                          :require => false
-  gem 'puppet-lint-variable_contains_upcase',                       :require => false
-  gem 'puppet-lint-absolute_classname-check', '>= 2.0.0',           :require => false
-  gem 'puppet-lint-topscope-variable-check',                        :require => false
-  gem 'puppet-lint-legacy_facts-check',                             :require => false
-  gem 'puppet-lint-anchor-check',                                   :require => false
-  gem 'metadata-json-lint',                                         :require => false
-  gem 'redcarpet',                                                  :require => false
-  gem 'rubocop', '~> 0.49.1',                                       :require => false
-  gem 'rubocop-rspec', '~> 1.15.0',                                 :require => false
-  gem 'mocha', '~> 1.4.0',                                          :require => false
-  gem 'coveralls',                                                  :require => false
-  gem 'simplecov-console',                                          :require => false
-  gem 'parallel_tests',                                             :require => false
+  gem 'voxpupuli-test', '>= 1.0.0',  :require => false
+  gem 'coveralls',                   :require => false
+  gem 'simplecov-console',           :require => false
 end
 
 group :development do
@@ -62,6 +44,7 @@ group :system_tests do
   gem 'rbnacl', '>= 4',                     :require => false
   gem 'rbnacl-libsodium',                   :require => false
   gem 'bcrypt_pbkdf',                       :require => false
+  gem 'ed25519',                            :require => false
 end
 
 group :release do

Rakefile

@@ -1,4 +1,4 @@
-require 'puppetlabs_spec_helper/rake_tasks'
+require 'voxpupuli/test/rake'
 
 # load optional tasks for releases
 # only available if gem group releases is installed
@@ -7,37 +7,6 @@ begin
 rescue LoadError
 end
 
-PuppetLint.configuration.log_format = '%{path}:%{line}:%{check}:%{KIND}:%{message}'
-
-desc 'Auto-correct puppet-lint offenses'
-task 'lint:auto_correct' do
-  Rake::Task[:lint_fix].invoke
-end
-
-desc 'Run acceptance tests'
-RSpec::Core::RakeTask.new(:acceptance) do |t|
-  t.pattern = 'spec/acceptance'
-end
-
-desc 'Run tests'
-task test: [:release_checks]
-
-namespace :check do
-  desc 'Check for trailing whitespace'
-  task :trailing_whitespace do
-    Dir.glob('**/*.md', File::FNM_DOTMATCH).sort.each do |filename|
-      next if filename =~ %r{^((modules|acceptance|\.?vendor|spec/fixtures|pkg)/|REFERENCE.md)}
-      File.foreach(filename).each_with_index do |line, index|
-        if line =~ %r{\s\n$}
-          puts "#{filename} has trailing whitespace on line #{index + 1}"
-          exit 1
-        end
-      end
-    end
-  end
-end
-Rake::Task[:release_checks].enhance ['check:trailing_whitespace']
-
 desc "Run main 'test' task and report merged results to coveralls"
 task test_with_coveralls: [:test] do
   if Dir.exist?(File.expand_path('../lib', __FILE__))

spec/spec_helper.rb

@@ -1,19 +1,12 @@
 # This file is managed via modulesync
 # https://github.com/voxpupuli/modulesync
 # https://github.com/voxpupuli/modulesync_config
-RSpec.configure do |c|
-  c.mock_with :rspec
-end
 
-require 'puppetlabs_spec_helper/module_spec_helper'
-require 'rspec-puppet-facts'
-require 'bundler'
-include RspecPuppetFacts
+# puppetlabs_spec_helper will set up coverage if the env variable is set.
+# We want to do this if lib exists and it hasn't been explicitly set.
+ENV['COVERAGE'] ||= 'yes' if Dir.exist?(File.expand_path('../../lib', __FILE__))
 
-if ENV['DEBUG']
-  Puppet::Util::Log.level = :debug
-  Puppet::Util::Log.newdestination(:console)
-end
+require 'voxpupuli/test/spec_helper'
 
 if File.exist?(File.join(__dir__, 'default_module_facts.yml'))
   facts = YAML.load(File.read(File.join(__dir__, 'default_module_facts.yml')))
@@ -23,43 +16,3 @@
     end
   end
 end
-
-if Dir.exist?(File.expand_path('../../lib', __FILE__))
-  require 'coveralls'
-  require 'simplecov'
-  require 'simplecov-console'
-  SimpleCov.formatters = [
-    SimpleCov::Formatter::HTMLFormatter,
-    SimpleCov::Formatter::Console
-  ]
-  SimpleCov.start do
-    track_files 'lib/**/*.rb'
-    add_filter '/spec'
-    add_filter '/vendor'
-    add_filter '/.vendor'
-    add_filter Bundler.configured_bundle_path.path
-  end
-end
-
-RSpec.configure do |c|
-  # getting the correct facter version is tricky. We use facterdb as a source to mock facts
-  # see https://github.com/camptocamp/facterdb
-  # people might provide a specific facter version. In that case we use it.
-  # Otherwise we need to match the correct facter version to the used puppet version.
-  # as of 2019-10-31, puppet 5 ships facter 3.11 and puppet 6 ships facter 3.14
-  # https://puppet.com/docs/puppet/5.5/about_agent.html
-  #
-  # The environment variable `PUPPET_VERSION` is available in our travis environment, but we cannot rely on it
-  # if somebody runs the tests locally. For that case we should fallback the the puppet gem version.
-  c.default_facter_version = if ENV['FACTERDB_FACTS_VERSION']
-                               ENV['FACTERDB_FACTS_VERSION']
-                             else
-                               puppet_version = ENV['PUPPET_VERSION'] ? ENV['PUPPET_VERSION'] : Gem.loaded_specs['puppet'].version.to_s
-                               Gem::Dependency.new('', puppet_version).match?('', '5') ? '3.11.0' : '3.14.0'
-                             end
-
-  # Coverage generation
-  c.after(:suite) do
-    RSpec::Puppet::Coverage.report!
-  end
-end

spec/unit/puppet/provider/mongodb_database/mongodb_spec.rb

@@ -48,15 +48,17 @@
 
   describe 'create' do
     it 'makes a database' do
-      expect(provider).to receive(:mongo_eval)
+      allow(provider).to receive(:mongo_eval)
       provider.create
+      expect(provider).to have_received(:mongo_eval)
     end
   end
 
   describe 'destroy' do
     it 'removes a database' do
-      expect(provider).to receive(:mongo_eval)
+      allow(provider).to receive(:mongo_eval)
       provider.destroy
+      expect(provider).to have_received(:mongo_eval)
     end
   end
 

spec/unit/puppet/provider/mongodb_replset/mongodb_spec.rb

@@ -39,13 +39,19 @@
 
     # rubocop:disable RSpec/MultipleExpectations
     it 'creates a replicaset' do
-      expect(provider.class).to receive(:replset_properties)
-      expect(provider).to receive(:get_hosts_status).and_return([valid_members, []])
-      expect(provider).to receive(:master_host).and_return(false)
-      expect(provider).to receive(:rs_initiate).with('{"_id":"rs_test","members":[{"host":"mongo1:27017","_id":0},{"host":"mongo2:27017","_id":1},{"host":"mongo3:27017","_id":2}],"settings":{}}', 'mongo1:27017').and_return('info' => 'Config now saved locally.  Should come online in about a minute.', 'ok' => 1)
-      expect(provider).to receive(:db_ismaster).and_return('{"ismaster" : true}')
+      allow(provider.class).to receive(:replset_properties)
+      allow(provider).to receive(:get_hosts_status).and_return([valid_members, []])
+      allow(provider).to receive(:master_host).and_return(false)
+      allow(provider).to receive(:rs_initiate).with('{"_id":"rs_test","members":[{"host":"mongo1:27017","_id":0},{"host":"mongo2:27017","_id":1},{"host":"mongo3:27017","_id":2}],"settings":{}}', 'mongo1:27017').and_return('info' => 'Config now saved locally.  Should come online in about a minute.', 'ok' => 1)
+      allow(provider).to receive(:db_ismaster).and_return('{"ismaster" : true}')
       provider.create
       provider.flush
+
+      expect(provider.class).to have_received(:replset_properties)
+      expect(provider).to have_received(:get_hosts_status)
+      expect(provider).to have_received(:master_host)
+      expect(provider).to have_received(:rs_initiate)
+      expect(provider).to have_received(:db_ismaster)
     end
     # rubocop:enable RSpec/MultipleExpectations
   end
@@ -145,9 +151,10 @@
     it 'adds missing members to an existing replicaset' do
       allow(provider.class).to receive(:replset_properties)
       allow(provider).to receive(:rs_status).and_return('set' => 'rs_test')
-      expect(provider).to receive('rs_add').thrice.and_return('ok' => 1)
+      allow(provider).to receive('rs_add').thrice.and_return('ok' => 1)
       provider.members = valid_members
       provider.flush
+      expect(provider).to have_received('rs_add').thrice
     end
 
     it 'raises an error when the master host is not available' do

spec/unit/puppet/provider/mongodb_shard/mongodb_spec.rb

@@ -50,15 +50,18 @@
   describe '#create' do
     # rubocop:disable RSpec/MultipleExpectations
     it 'makes a shard' do
-      expect(provider).to receive(:sh_addshard).with('rs_test/mongo1:27018').and_return(
+      allow(provider).to receive(:sh_addshard).with('rs_test/mongo1:27018').and_return(
         'shardAdded' => 'rs_test',
         'ok' => 1
       )
-      expect(provider).to receive(:sh_enablesharding).with('rs_test').and_return(
+      allow(provider).to receive(:sh_enablesharding).with('rs_test').and_return(
         'ok' => 1
       )
       provider.create
       provider.flush
+
+      expect(provider).to have_received(:sh_addshard)
+      expect(provider).to have_received(:sh_enablesharding)
     end
     # rubocop:enable RSpec/MultipleExpectations
   end

spec/unit/puppet/provider/mongodb_user/mongodb_spec.rb

@@ -61,15 +61,17 @@
       }
       EOS
 
-      expect(provider).to receive(:mongo_eval).with("db.runCommand(#{cmd_json})", 'new_database')
+      allow(provider).to receive(:mongo_eval).with("db.runCommand(#{cmd_json})", 'new_database')
       provider.create
+      expect(provider).to have_received(:mongo_eval)
     end
   end
 
   describe 'destroy' do
     it 'removes a user' do
-      expect(provider).to receive(:mongo_eval).with('db.dropUser("new_user")')
+      allow(provider).to receive(:mongo_eval).with('db.dropUser("new_user")')
       provider.destroy
+      expect(provider).to have_received(:mongo_eval)
     end
   end
 
@@ -94,9 +96,10 @@
           "digestPassword":false
       }
       EOS
-      expect(provider).to receive(:mongo_eval).
+      allow(provider).to receive(:mongo_eval).
         with("db.runCommand(#{cmd_json})", 'new_database')
       provider.password_hash = 'newpass'
+      expect(provider).to have_received(:mongo_eval)
     end
   end
 
@@ -121,34 +124,37 @@
   describe 'roles=' do
     it 'changes nothing' do
       resource.provider.set(name: 'new_user', ensure: :present, roles: %w[role1 role2@other_database])
-      expect(provider).not_to receive(:mongo_eval)
+      allow(provider).to receive(:mongo_eval)
       provider.roles = %w[role1 role2@other_database]
+      expect(provider).not_to have_received(:mongo_eval)
     end
 
     it 'grant a role' do
       resource.provider.set(name: 'new_user', ensure: :present, roles: %w[role1 role2@other_database])
-      expect(provider).to receive(:mongo_eval).
+      allow(provider).to receive(:mongo_eval).
         with('db.getSiblingDB("new_database").grantRolesToUser("new_user", [{"role":"role3","db":"new_database"}])')
       provider.roles = %w[role1 role2@other_database role3]
+      expect(provider).to have_received(:mongo_eval)
     end
 
     it 'revokes a role' do
       resource.provider.set(name: 'new_user', ensure: :present, roles: %w[role1 role2@other_database])
-      expect(provider).to receive(:mongo_eval).
+      allow(provider).to receive(:mongo_eval).
         with('db.getSiblingDB("new_database").revokeRolesFromUser("new_user", [{"role":"role1","db":"new_database"}])')
       provider.roles = ['role2@other_database']
+      expect(provider).to have_received(:mongo_eval)
     end
 
-    # rubocop:disable RSpec/MultipleExpectations
     it 'exchanges a role' do
       resource.provider.set(name: 'new_user', ensure: :present, roles: %w[role1 role2@other_database])
-      expect(provider).to receive(:mongo_eval).
+      allow(provider).to receive(:mongo_eval).
         with('db.getSiblingDB("new_database").revokeRolesFromUser("new_user", [{"role":"role1","db":"new_database"}])')
-      expect(provider).to receive(:mongo_eval).
+      allow(provider).to receive(:mongo_eval).
         with('db.getSiblingDB("new_database").grantRolesToUser("new_user", [{"role":"role3","db":"new_database"}])')
 
       provider.roles = %w[role2@other_database role3]
+
+      expect(provider).to have_received(:mongo_eval).twice
     end
-    # rubocop:enable RSpec/MultipleExpectations
   end
 end