From: Paula Muir Date: Wed, 24 Jan 2018 11:47:43 +0000 (+0000) Subject: (MODULES-6455) - PDK convert firewall (#753) X-Git-Tag: 1.12.0~1 X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=471653e2cf15a55179ec768e65c9d758c246b66b;p=puppet-modules%2Fpuppetlabs-firewall.git (MODULES-6455) - PDK convert firewall (#753) * Rubocop and puppet-lint errors * pdk convert firewall * Remove bundler update --- diff --git a/.gitignore b/.gitignore index a102277..d17e987 100644 --- a/.gitignore +++ b/.gitignore @@ -1,23 +1,23 @@ -# This file is generated by ModuleSync, do not edit. -*.iml .*.sw[op] -.DS_Store -.bundle/ -.idea/ .metadata -.vagrant/ .yardoc .yardwarns -Gemfile.local -Gemfile.lock -bin/ -coverage/ -doc/ -junit/ -log/ -pkg/ -spec/fixtures/manifests/ -spec/fixtures/modules/ -tmp/ -vendor/ +*.iml +/.bundle/ +/.idea/ +/.vagrant/ +/coverage/ +/bin/ +/doc/ +/Gemfile.local +/Gemfile.lock +/junit/ +/log/ +/log/ +/pkg/ +/spec/fixtures/manifests/ +/spec/fixtures/modules/ +/tmp/ +/vendor/ +/convert_report.txt diff --git a/.rubocop.yml b/.rubocop.yml index 515ef63..a658984 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,7 +1,7 @@ --- -require: - - rubocop-rspec +require: rubocop-rspec AllCops: + DisplayCopNames: true TargetRubyVersion: '2.1' Include: - "./**/*.rb" @@ -13,7 +13,6 @@ AllCops: - pkg/**/* - spec/fixtures/**/* - vendor/**/* -inherit_from: .rubocop_todo.yml Metrics/LineLength: Description: People have wide screens, use them. Max: 200 @@ -70,6 +69,8 @@ Style/MethodCalledOnDoEndBlock: Enabled: true Style/StringMethods: Enabled: true +Layout/EndOfLine: + Enabled: false Metrics/AbcSize: Enabled: false Metrics/BlockLength: @@ -88,8 +89,14 @@ Metrics/PerceivedComplexity: Enabled: false RSpec/DescribeClass: Enabled: false +RSpec/ExampleLength: + Enabled: false RSpec/MessageExpectation: Enabled: false +RSpec/MultipleExpectations: + Enabled: false +RSpec/NestedGroups: + Enabled: false Style/AsciiComments: Enabled: false Style/IfUnlessModifier: diff --git a/.sync.yml b/.sync.yml index 89d925b..648965d 100644 --- a/.sync.yml +++ b/.sync.yml @@ -1,15 +1,60 @@ --- appveyor.yml: - delete: true -# only run a minimal subset of tests on travis, as many of the tests exercise the kernel, which is the "wrong" one anyways + environment: + PUPPET_GEM_VERSION: "~> 4.0" + matrix: + - RUBY_VERSION: 24-x64 + CHECK: "syntax lint" + - RUBY_VERSION: 24-x64 + CHECK: metadata_lint + - RUBY_VERSION: 24-x64 + CHECK: rubocop + .travis.yml: + bundle_args: --without system_tests docker_sets: - - set: docker/ubuntu-14.04 - options: - env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=@@SET@@ SPEC_OPTS="--tag docker" - - set: docker/centos-7 - options: - env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=@@SET@@ SPEC_OPTS=""--tag docker" + - set: docker/centos-7 + options: + - set: docker/ubuntu-14.04 + options: + docker_defaults: + bundler_args: "" + secure: "" + branches: + - release extras: - rvm: 2.1.9 - script: bundle exec rake rubocop \ No newline at end of file + script: "\"bundle exec rake release_checks\"" + +Gemfile: + required: + ':system_tests': + - gem: 'puppet-module-posix-system-r#{minor_version}' + platforms: ruby + - gem: 'puppet-module-win-system-r#{minor_version}' + platforms: + - mswin + - mingw + - x64_mingw + - gem: beaker + version: '~> 3.13' + from_env: BEAKER_VERSION + - gem: beaker-abs + from_env: BEAKER_ABS_VERSION + version: '~> 0.1' + - gem: beaker-pe + - gem: beaker-hostgenerator + from_env: BEAKER_HOSTGENERATOR_VERSION + - gem: beaker-rspec + from_env: BEAKER_RSPEC_VERSION + ':development': + - gem: puppet-blacksmith + version: '~> 3.4' + +Rakefile: + requires: + - puppet_blacksmith/rake_tasks + +spec/spec_helper.rb: + spec_overrides: + - "require 'spec_helper_local'" diff --git a/.travis.yml b/.travis.yml index c8a7ce1..1597cfb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,31 +1,64 @@ -#This file is generated by ModuleSync, do not edit. --- sudo: false +dist: trusty language: ruby cache: bundler -script: "bundle exec rake release_checks" +before_install: + - bundle -v + - rm Gemfile.lock || true + - gem update --system + - gem --version + - bundle -v +script: + - 'bundle exec rake $CHECK' +bundler_args: --without system_tests +rvm: + - 2.4.1 + - 2.1.9 +env: + - PUPPET_GEM_VERSION="~> 4.0" CHECK=spec + - PUPPET_GEM_VERSION="~> 5.0" CHECK=spec matrix: fast_finish: true include: - - rvm: 2.3.1 - dist: trusty - env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/ubuntu-14.04 SPEC_OPTS="--tag docker" - script: bundle exec rake beaker - services: docker - sudo: required - - rvm: 2.3.1 - dist: trusty - env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/centos-7 SPEC_OPTS=""--tag docker" - script: bundle exec rake beaker - services: docker - sudo: required - - rvm: 2.4.1 - bundler_args: --without system_tests - env: PUPPET_GEM_VERSION="~> 5.0" - - rvm: 2.1.9 - bundler_args: --without system_tests - env: PUPPET_GEM_VERSION="~> 4.0" - - rvm: 2.1.9 - script: bundle exec rake rubocop + - + bundler_args: + dist: trusty + env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/centos-7 + rvm: 2.4.1 + script: bundle exec rake beaker + services: docker + sudo: required + - + bundler_args: + dist: trusty + env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/ubuntu-14.04 + rvm: 2.4.1 + script: bundle exec rake beaker + services: docker + sudo: required + - + env: CHECK=rubocop + - + env: CHECK="syntax lint" + - + env: CHECK=metadata_lint + - + rvm: 2.1.9 + script: "bundle exec rake release_checks" +branches: + only: + - master + - /^v\d/ + - release notifications: email: false +deploy: + provider: puppetforge + user: puppet + password: + secure: "" + on: + tags: true + all_branches: true + condition: "$DEPLOY_TO_FORGE = yes" diff --git a/Gemfile b/Gemfile index 84b23f2..37597a3 100644 --- a/Gemfile +++ b/Gemfile @@ -1,84 +1,136 @@ -#This file is generated by ModuleSync, do not edit. +source ENV['GEM_SOURCE'] || 'https://rubygems.org' -source ENV['GEM_SOURCE'] || "https://rubygems.org" +def location_for(place_or_version, fake_version = nil) + if place_or_version =~ %r{\A(git[:@][^#]*)#(.*)} + [fake_version, { git: Regexp.last_match(1), branch: Regexp.last_match(2), require: false }].compact + elsif place_or_version =~ %r{\Afile:\/\/(.*)} + ['>= 0', { path: File.expand_path(Regexp.last_match(1)), require: false }] + else + [place_or_version, { require: false }] + end +end -# Determines what type of gem is requested based on place_or_version. def gem_type(place_or_version) - if place_or_version =~ /^git:/ + if place_or_version =~ %r{\Agit[:@]} :git - elsif place_or_version =~ /^file:/ + elsif !place_or_version.nil? && place_or_version.start_with?('file:') :file else :gem end end -# Find a location or specific version for a gem. place_or_version can be a -# version, which is most often used. It can also be git, which is specified as -# `git://somewhere.git#branch`. You can also use a file source location, which -# is specified as `file://some/location/on/disk`. -def location_for(place_or_version, fake_version = nil) - if place_or_version =~ /^(git[:@][^#]*)#(.*)/ - [fake_version, { :git => $1, :branch => $2, :require => false }].compact - elsif place_or_version =~ /^file:\/\/(.*)/ - ['>= 0', { :path => File.expand_path($1), :require => false }] - else - [place_or_version, { :require => false }] - end -end - -# Used for gem conditionals ruby_version_segments = Gem::Version.new(RUBY_VERSION.dup).segments -minor_version = "#{ruby_version_segments[0]}.#{ruby_version_segments[1]}" - -# The following gems are not included by default as they require DevKit on Windows. -# You should probably include them in a Gemfile.local or a ~/.gemfile -#gem 'pry' #this may already be included in the gemfile -#gem 'pry-stack_explorer', :require => false -#if RUBY_VERSION =~ /^2/ -# gem 'pry-byebug' -#else -# gem 'pry-debugger' -#end +minor_version = ruby_version_segments[0..1].join('.') group :development do - gem "puppet-module-posix-default-r#{minor_version}", :require => false, :platforms => "ruby" - gem "puppet-module-win-default-r#{minor_version}", :require => false, :platforms => ["mswin", "mingw", "x64_mingw"] - gem "puppet-module-posix-dev-r#{minor_version}", :require => false, :platforms => "ruby" - gem "puppet-module-win-dev-r#{minor_version}", '0.0.7', :require => false, :platforms => ["mswin", "mingw", "x64_mingw"] - gem "json_pure", '<= 2.0.1', :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0') - gem "fast_gettext", '1.1.0', :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.1.0') - gem "fast_gettext", :require => false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.1.0') + gem "fast_gettext", '1.1.0', require: false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.1.0') + gem "fast_gettext", require: false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.1.0') + gem "json_pure", '<= 2.0.1', require: false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0') + gem "json", '= 1.8.1', require: false if Gem::Version.new(RUBY_VERSION.dup) == Gem::Version.new('2.1.9') + gem "puppet-module-posix-default-r#{minor_version}", require: false, platforms: [:ruby] + gem "puppet-module-posix-dev-r#{minor_version}", require: false, platforms: [:ruby] + gem "puppet-module-win-default-r#{minor_version}", require: false, platforms: [:mswin, :mingw, :x64_mingw] + gem "puppet-module-win-dev-r#{minor_version}", require: false, platforms: [:mswin, :mingw, :x64_mingw] + gem "puppet-blacksmith", '~> 3.4', require: false end - group :system_tests do - gem "puppet-module-posix-system-r#{minor_version}", :require => false, :platforms => "ruby" - gem "puppet-module-win-system-r#{minor_version}", :require => false, :platforms => ["mswin", "mingw", "x64_mingw"] - gem "beaker", *location_for(ENV['BEAKER_VERSION'] || '>= 3') - gem "beaker-pe", :require => false - gem "beaker-rspec", *location_for(ENV['BEAKER_RSPEC_VERSION']) - gem "beaker-hostgenerator", *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION']) - gem "beaker-abs", *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 0.1') - gem "puppet-blacksmith", '~> 3.4', :require => false + gem "puppet-module-posix-system-r#{minor_version}", require: false, platforms: [:ruby] + gem "puppet-module-win-system-r#{minor_version}", require: false, platforms: [:mswin, :mingw, :x64_mingw] + gem "beaker", *location_for(ENV['BEAKER_VERSION'] || '~> 3.13') + gem "beaker-abs", *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 0.1') + gem "beaker-pe", require: false + gem "beaker-hostgenerator" + gem "beaker-rspec" +end + +puppet_version = ENV['PUPPET_GEM_VERSION'] +puppet_type = gem_type(puppet_version) +facter_version = ENV['FACTER_GEM_VERSION'] +hiera_version = ENV['HIERA_GEM_VERSION'] + +def puppet_older_than?(version) + puppet_version = ENV['PUPPET_GEM_VERSION'] + !puppet_version.nil? && + Gem::Version.correct?(puppet_version) && + Gem::Requirement.new("< #{version}").satisfied_by?(Gem::Version.new(puppet_version.dup)) end -gem 'puppet', *location_for(ENV['PUPPET_GEM_VERSION']) +gems = {} -# Only explicitly specify Facter/Hiera if a version has been specified. -# Otherwise it can lead to strange bundler behavior. If you are seeing weird -# gem resolution behavior, try setting `DEBUG_RESOLVER` environment variable -# to `1` and then run bundle install. -gem 'facter', *location_for(ENV['FACTER_GEM_VERSION']) if ENV['FACTER_GEM_VERSION'] -gem 'hiera', *location_for(ENV['HIERA_GEM_VERSION']) if ENV['HIERA_GEM_VERSION'] +gems['puppet'] = location_for(puppet_version) -# Evaluate Gemfile.local if it exists -if File.exists? "#{__FILE__}.local" - eval(File.read("#{__FILE__}.local"), binding) +# If facter or hiera versions have been specified via the environment +# variables, use those versions. If not, and if the puppet version is < 3.5.0, +# use known good versions of both for puppet < 3.5.0. +if facter_version + gems['facter'] = location_for(facter_version) +elsif puppet_type == :gem && puppet_older_than?('3.5.0') + gems['facter'] = ['>= 1.6.11', '<= 1.7.5', require: false] end -# Evaluate ~/.gemfile if it exists -if File.exists?(File.join(Dir.home, '.gemfile')) - eval(File.read(File.join(Dir.home, '.gemfile')), binding) +if hiera_version + gems['hiera'] = location_for(ENV['HIERA_GEM_VERSION']) +elsif puppet_type == :gem && puppet_older_than?('3.5.0') + gems['hiera'] = ['>= 1.0.0', '<= 1.3.0', require: false] end -# vim:ft=ruby +if Gem.win_platform? && (puppet_type != :gem || puppet_older_than?('3.5.0')) + # For Puppet gems < 3.5.0 (tested as far back as 3.0.0) on Windows + if puppet_type == :gem + gems['ffi'] = ['1.9.0', require: false] + gems['minitar'] = ['0.5.4', require: false] + gems['win32-eventlog'] = ['0.5.3', '<= 0.6.5', require: false] + gems['win32-process'] = ['0.6.5', '<= 0.7.5', require: false] + gems['win32-security'] = ['~> 0.1.2', '<= 0.2.5', require: false] + gems['win32-service'] = ['0.7.2', '<= 0.8.8', require: false] + else + gems['ffi'] = ['~> 1.9.0', require: false] + gems['minitar'] = ['~> 0.5.4', require: false] + gems['win32-eventlog'] = ['~> 0.5', '<= 0.6.5', require: false] + gems['win32-process'] = ['~> 0.6', '<= 0.7.5', require: false] + gems['win32-security'] = ['~> 0.1', '<= 0.2.5', require: false] + gems['win32-service'] = ['~> 0.7', '<= 0.8.8', require: false] + end + + gems['win32-dir'] = ['~> 0.3', '<= 0.4.9', require: false] + + if RUBY_VERSION.start_with?('1.') + gems['win32console'] = ['1.3.2', require: false] + # sys-admin was removed in Puppet 3.7.0 and doesn't compile under Ruby 2.x + gems['sys-admin'] = ['1.5.6', require: false] + end + + # Puppet < 3.7.0 requires these. + # Puppet >= 3.5.0 gem includes these as requirements. + # The following versions are tested to work with 3.0.0 <= puppet < 3.7.0. + gems['win32-api'] = ['1.4.8', require: false] + gems['win32-taskscheduler'] = ['0.2.2', require: false] + gems['windows-api'] = ['0.4.3', require: false] + gems['windows-pr'] = ['1.2.3', require: false] +elsif Gem.win_platform? + # If we're using a Puppet gem on Windows which handles its own win32-xxx gem + # dependencies (>= 3.5.0), set the maximum versions (see PUP-6445). + gems['win32-dir'] = ['<= 0.4.9', require: false] + gems['win32-eventlog'] = ['<= 0.6.5', require: false] + gems['win32-process'] = ['<= 0.7.5', require: false] + gems['win32-security'] = ['<= 0.2.5', require: false] + gems['win32-service'] = ['<= 0.8.8', require: false] +end + +gems.each do |gem_name, gem_params| + gem gem_name, *gem_params +end + +# Evaluate Gemfile.local and ~/.gemfile if they exist +extra_gemfiles = [ + "#{__FILE__}.local", + File.join(Dir.home, '.gemfile'), +] + +extra_gemfiles.each do |gemfile| + if File.file?(gemfile) && File.readable?(gemfile) + eval(File.read(gemfile), binding) + end +end +# vim: syntax=ruby diff --git a/Rakefile b/Rakefile index d12d854..802f67b 100644 --- a/Rakefile +++ b/Rakefile @@ -1,37 +1,3 @@ require 'puppetlabs_spec_helper/rake_tasks' -require 'puppet-lint/tasks/puppet-lint' -require 'puppet_blacksmith/rake_tasks' if Bundler.rubygems.find_name('puppet-blacksmith').any? - -PuppetLint.configuration.fail_on_warnings = true -PuppetLint.configuration.send('relative') - -desc 'Generate pooler nodesets' -task :gen_nodeset do - require 'beaker-hostgenerator' - require 'securerandom' - require 'fileutils' - - agent_target = ENV['TEST_TARGET'] - if ! agent_target - STDERR.puts 'TEST_TARGET environment variable is not set' - STDERR.puts 'setting to default value of "redhat-64default."' - agent_target = 'redhat-64default.' - end - - master_target = ENV['MASTER_TEST_TARGET'] - if ! master_target - STDERR.puts 'MASTER_TEST_TARGET environment variable is not set' - STDERR.puts 'setting to default value of "redhat7-64mdcl"' - master_target = 'redhat7-64mdcl' - end - - targets = "#{master_target}-#{agent_target}" - cli = BeakerHostGenerator::CLI.new([targets]) - nodeset_dir = "tmp/nodesets" - nodeset = "#{nodeset_dir}/#{targets}-#{SecureRandom.uuid}.yaml" - FileUtils.mkdir_p(nodeset_dir) - File.open(nodeset, 'w') do |fh| - fh.print(cli.execute) - end - puts nodeset -end +require 'puppet-syntax/tasks/puppet-syntax' +require 'puppet_blacksmith/rake_tasks' diff --git a/manifests/linux/debian.pp b/manifests/linux/debian.pp index 4bb8f6f..b2a8844 100644 --- a/manifests/linux/debian.pp +++ b/manifests/linux/debian.pp @@ -24,9 +24,10 @@ class firewall::linux::debian ( if $package_name { #Fixes hang while installing iptables-persistent on debian 8 exec {'iptables-persistent-debconf': - command => "/bin/echo \"${package_name} ${package_name}/autosave_v4 boolean false\" - | /usr/bin/debconf-set-selections && /bin/echo \"${package_name} ${package_name}/autosave_v6 boolean false\" - | /usr/bin/debconf-set-selections", + command => "/bin/echo \"${package_name} ${package_name}/autosave_v4 boolean false\" | + /usr/bin/debconf-set-selections && /bin/echo \"${package_name} ${package_name}/autosave_v6 boolean false\" | + /usr/bin/debconf-set-selections", + refreshonly => true, } package { $package_name: diff --git a/metadata.json b/metadata.json index dd81801..35a9308 100644 --- a/metadata.json +++ b/metadata.json @@ -7,6 +7,12 @@ "source": "https://github.com/puppetlabs/puppetlabs-firewall", "project_page": "http://github.com/puppetlabs/puppetlabs-firewall", "issues_url": "https://tickets.puppetlabs.com/browse/MODULES", + "dependencies": [ + { + "name": "puppetlabs/stdlib", + "version_requirement": ">= 4.0.0 < 5.0.0" + } + ], "operatingsystem_support": [ { "operatingsystem": "RedHat", @@ -74,7 +80,6 @@ "version_requirement": ">= 4.7.0 < 6.0.0" } ], - "dependencies": [ - {"name":"puppetlabs/stdlib","version_requirement":">= 4.0.0 < 5.0.0"} - ] + "template-url": "file:///opt/puppetlabs/pdk/share/cache/pdk-templates.git", + "template-ref": "1.3.2-0-g07678c8" } diff --git a/spec/acceptance/firewall_spec.rb b/spec/acceptance/firewall_spec.rb index 5e8e68f..f4c3d67 100644 --- a/spec/acceptance/firewall_spec.rb +++ b/spec/acceptance/firewall_spec.rb @@ -2130,8 +2130,7 @@ describe 'firewall basics', docker: true do it 'applies' do apply_manifest(pp88, catch_failures: true) end - # rubocop:disable RSpec/ExampleLength : Cannot reduce lines to required size - it 'contains the rule' do # rubocop:disable RSpec/MultipleExpectations : Second expectation required + it 'contains the rule' do shell('iptables-save') do |r| if (fact('osfamily') == 'RedHat' && fact('operatingsystemmajrelease') == '5') || (default['platform'] =~ %r{sles-10}) expect(r.stdout).to match(%r{-A INPUT -s 10.1.5.28 -p tcp -m mac --mac-source 0A:1B:3C:4D:5E:6F -m comment --comment "610 - test"}) diff --git a/spec/acceptance/params_spec.rb b/spec/acceptance/params_spec.rb index 725daef..76eb682 100644 --- a/spec/acceptance/params_spec.rb +++ b/spec/acceptance/params_spec.rb @@ -65,7 +65,7 @@ describe 'param based tests' do purge => true, } PUPPETCODE - it 'test log rule - changing names' do # rubocop:disable RSpec/MultipleExpectations + it 'test log rule - changing names' do iptables_flush_all_tables expect(apply_manifest(ppm3, catch_failures: true).exit_code).to eq(2) diff --git a/spec/acceptance/purge_spec.rb b/spec/acceptance/purge_spec.rb index 7d056b5..353631c 100644 --- a/spec/acceptance/purge_spec.rb +++ b/spec/acceptance/purge_spec.rb @@ -24,7 +24,7 @@ describe 'purge tests' do apply_manifest(pp1, expect_changes: true) end - it 'saves' do # rubocop:disable RSpec/MultipleExpectations + it 'saves' do shell('iptables-save') do |r| expect(r.stdout).not_to match(%r{1\.2\.1\.2}) expect(r.stderr).to eq('') @@ -50,8 +50,7 @@ describe 'purge tests' do purge => true, } PUPPETCODE - # rubocop:disable RSpec/ExampleLength - it 'purges only the specified chain' do # rubocop:disable RSpec/MultipleExpectations + it 'purges only the specified chain' do apply_manifest(pp2, expect_changes: true) shell('iptables-save') do |r| @@ -145,8 +144,7 @@ describe 'purge tests' do purge => true, } PUPPETCODE - # rubocop:disable RSpec/ExampleLength - it 'purges only the specified chain' do # rubocop:disable RSpec/MultipleExpectations + it 'purges only the specified chain' do apply_manifest(pp6, expect_changes: true) shell('ip6tables-save') do |r| diff --git a/spec/default_facts.yml b/spec/default_facts.yml new file mode 100644 index 0000000..3248be5 --- /dev/null +++ b/spec/default_facts.yml @@ -0,0 +1,8 @@ +# Use default_module_facts.yml for module specific facts. +# +# Facts specified here will override the values provided by rspec-puppet-facts. +--- +concat_basedir: "/tmp" +ipaddress: "172.16.254.254" +is_pe: false +macaddress: "AA:AA:AA:AA:AA:AA" diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index c808092..c20a317 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,17 +1,24 @@ -# This file is generated by ModuleSync, do not edit. require 'puppetlabs_spec_helper/module_spec_helper' +require 'rspec-puppet-facts' +include RspecPuppetFacts -if Puppet::Util::Package.versioncmp(Puppet.version, '4.5.0') >= 0 - RSpec.configure do |c| - c.before :each do - Puppet.settings[:strict] = :error - end - end +default_facts = { + puppetversion: Puppet.version, + facterversion: Facter.version, +} + +default_facts_path = File.expand_path(File.join(File.dirname(__FILE__), 'default_facts.yml')) +default_module_facts_path = File.expand_path(File.join(File.dirname(__FILE__), 'default_module_facts.yml')) + +if File.exist?(default_facts_path) && File.readable?(default_facts_path) + default_facts.merge!(YAML.safe_load(File.read(default_facts_path))) +end + +if File.exist?(default_module_facts_path) && File.readable?(default_module_facts_path) + default_facts.merge!(YAML.safe_load(File.read(default_module_facts_path))) end -# put local configuration and setup into spec_helper_local -begin - require 'spec_helper_local' -rescue LoadError => loaderror - puts "Could not require spec_helper_local: #{loaderror.message}" +RSpec.configure do |c| + c.default_facts = default_facts end +require 'spec_helper_local' diff --git a/spec/unit/classes/firewall_spec.rb b/spec/unit/classes/firewall_spec.rb index 0fe37fd..a26ddb5 100644 --- a/spec/unit/classes/firewall_spec.rb +++ b/spec/unit/classes/firewall_spec.rb @@ -5,8 +5,6 @@ describe 'firewall', type: :class do with_debian_facts it { is_expected.to contain_class('firewall::linux').with_ensure('running') } end - - # rubocop:disable RSpec/MultipleExpectations context 'with kernel => Windows' do let(:facts) { { kernel: 'Windows' } } diff --git a/spec/unit/puppet/provider/iptables_chain_spec.rb b/spec/unit/puppet/provider/iptables_chain_spec.rb index c5c8461..1aacb6b 100755 --- a/spec/unit/puppet/provider/iptables_chain_spec.rb +++ b/spec/unit/puppet/provider/iptables_chain_spec.rb @@ -75,7 +75,7 @@ describe 'iptables chain' do allow(provider).to receive(:execute).with(['/sbin/iptables-save']).and_return('') end - it 'is able to get a list of existing rules' do # rubocop:disable RSpec/MultipleExpectations + it 'is able to get a list of existing rules' do provider.instances.each do |chain| expect(chain).to be_instance_of(provider) expect(chain.properties[:provider].to_s).to eq(provider.name.to_s) diff --git a/spec/unit/puppet/provider/iptables_spec.rb b/spec/unit/puppet/provider/iptables_spec.rb index b686116..45716e9 100644 --- a/spec/unit/puppet/provider/iptables_spec.rb +++ b/spec/unit/puppet/provider/iptables_spec.rb @@ -61,7 +61,7 @@ describe 'iptables provider' do .and_return '/sbin/iptables-save' end - it 'is expected to be able to get a list of existing rules' do # rubocop:disable RSpec/MultipleExpectations + it 'is expected to be able to get a list of existing rules' do provider.instances.each do |rule| expect(rule).to be_instance_of(provider) expect(rule.properties[:provider].to_s).to eq(provider.name.to_s) @@ -234,7 +234,7 @@ describe 'iptables provider' do # Iterate across each parameter, creating an example for comparison data[:params].each do |param_name, param_value| - it "the parameter '#{param_name}' should match #{param_value.inspect}" do # rubocop:disable RSpec/MultipleExpectations + it "the parameter '#{param_name}' should match #{param_value.inspect}" do # booleans get cludged to string "true" if param_value == true expect(resource[param_name]).to be_truthy @@ -383,7 +383,7 @@ describe 'ip6tables provider' do .and_return '/sbin/ip6tables-save' end - it 'is expected to be able to get a list of existing rules' do # rubocop:disable RSpec/MultipleExpectations + it 'is expected to be able to get a list of existing rules' do provider6.instances.each do |rule| expect(rule).to be_instance_of(provider6) expect(rule.properties[:provider6].to_s).to eql provider6.name.to_s diff --git a/spec/unit/puppet/type/firewall_spec.rb b/spec/unit/puppet/type/firewall_spec.rb index bba2f15..8018b6b 100755 --- a/spec/unit/puppet/type/firewall_spec.rb +++ b/spec/unit/puppet/type/firewall_spec.rb @@ -520,8 +520,6 @@ describe firewall do # rubocop:disable RSpec/MultipleDescribes [:chain, :jump].each do |param| describe param do - # rubocop:disable RSpec/ExampleLength - # rubocop:disable RSpec/MultipleExpectations it 'autorequires fwchain when table and provider are undefined' do resource[param] = 'FOO' expect(resource[:table]).to be :filter @@ -677,8 +675,6 @@ describe firewall do # rubocop:disable RSpec/MultipleDescribes end describe 'autorequire packages' do - # rubocop:disable RSpec/ExampleLength - # rubocop:disable RSpec/MultipleExpectations [:iptables, :ip6tables].each do |provider| it "provider #{provider} should autorequire package iptables" do resource[:provider] = provider @@ -720,7 +716,7 @@ describe firewall do # rubocop:disable RSpec/MultipleDescribes end describe 'firewall on unsupported platforms' do - it 'is not suitable' do # rubocop:disable RSpec/ExampleLength + it 'is not suitable' do # Stub iptables version allow(Facter.fact(:iptables_version)).to receive(:value).and_return(nil) allow(Facter.fact(:ip6tables_version)).to receive(:value).and_return(nil) diff --git a/spec/unit/puppet/type/firewallchain_spec.rb b/spec/unit/puppet/type/firewallchain_spec.rb index 3a0e0af..fcabcfd 100755 --- a/spec/unit/puppet/type/firewallchain_spec.rb +++ b/spec/unit/puppet/type/firewallchain_spec.rb @@ -112,8 +112,6 @@ describe firewallchain do # rubocop:disable RSpec/MultipleDescribes end describe 'autorequire packages' do - # rubocop:disable RSpec/ExampleLength - # rubocop:disable RSpec/MultipleExpectations it 'provider iptables_chain should autorequire package iptables' do expect(resource[:provider]).to be :iptables_chain package = Puppet::Type.type(:package).new(name: 'iptables') @@ -200,7 +198,7 @@ PUPPETCODE end describe 'firewall on unsupported platforms' do - it 'is not suitable' do # rubocop:disable RSpec/ExampleLength + it 'is not suitable' do # Stub iptables version allow(Facter.fact(:iptables_version)).to receive(:value).and_return(nil) allow(Facter.fact(:ip6tables_version)).to receive(:value).and_return(nil) diff --git a/spec/unit/puppet/util/firewall_spec.rb b/spec/unit/puppet/util/firewall_spec.rb index e6cebd6..1d21fc4 100644 --- a/spec/unit/puppet/util/firewall_spec.rb +++ b/spec/unit/puppet/util/firewall_spec.rb @@ -14,7 +14,7 @@ describe 'Puppet::Util::Firewall' do describe '#host_to_ip' do subject(:host) { resource } - it { # rubocop:disable RSpec/MultipleExpectations + it { allow(Resolv).to receive(:each_address).at_least(:once).with('puppetlabs.com').and_yield('96.126.112.51').and_yield('2001:DB8:4650::13:8A') expect(host.host_to_ip('puppetlabs.com', :IPv4)).to eql '96.126.112.51/32' expect(host.host_to_ip('puppetlabs.com', :IPv6)).to eql '2001:db8:4650::13:8a/128' @@ -30,7 +30,7 @@ describe 'Puppet::Util::Firewall' do describe '#host_to_mask' do subject(:host) { resource } - it { # rubocop:disable RSpec/MultipleExpectations + it { allow(Resolv).to receive(:each_address).at_least(:once).with('puppetlabs.com').and_yield('96.126.112.51').and_yield('2001:DB8:4650::13:8A') expect(host.host_to_mask('puppetlabs.com', :IPv4)).to eql '96.126.112.51/32' expect(host.host_to_mask('!puppetlabs.com', :IPv4)).to eql '! 96.126.112.51/32' @@ -177,7 +177,7 @@ describe 'Puppet::Util::Firewall' do host.persist_iptables(proto) end - it 'is expected to raise a warning when exec fails' do # rubocop:disable RSpec/ExampleLength + it 'is expected to raise a warning when exec fails' do allow(Facter.fact(:osfamily)).to receive(:value).and_return('RedHat') allow(Facter.fact(:operatingsystem)).to receive(:value).and_return('RedHat') allow(Facter.fact(:operatingsystemrelease)).to receive(:value).and_return('6')