Merge pull request #230 from voxpupuli/modulesync

bastelfreak · web-flow · commit 5de6e94e73dd · 2020-08-21T23:37:53.000+02:00
modulesync 3.0.0 &amp; puppet-lint updates
diff --git a/.github/SECURITY.md b/.github/SECURITY.md
@@ -0,0 +1,3 @@
+# Vox Pupuli Security Policy
+
+Our vulnerabilities reporting process is at https://voxpupuli.org/security/
diff --git a/.msync.yml b/.msync.yml
@@ -1 +1 @@
-modulesync_config_version: '2.12.0'
+modulesync_config_version: '3.0.0'
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -528,6 +528,9 @@ RSpec/RepeatedDescription:
 RSpec/NestedGroups:
   Enabled: False
 
+RSpec/MultipleExpectations:
+  Enabled: false
+
 # this is broken on ruby1.9
 Layout/IndentHeredoc:
   Enabled: False
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,5 @@
 ---
+os: linux
 dist: bionic
 language: ruby
 cache: bundler
@@ -7,7 +8,7 @@ before_install:
   - bundle --version
 script:
   - 'bundle exec rake $CHECK'
-matrix:
+jobs:
   fast_finish: true
   include:
   - rvm: 2.4.4
@@ -92,7 +93,7 @@ notifications:
       - "chat.freenode.org#voxpupuli-notifications"
 deploy:
   provider: puppetforge
-  user: puppet
+  username: puppet
   password:
     secure: "IdEJp5VThHh+3f+EKA1mRtJva+QPZLMJ/8t+y/xNfmOQzT7tx5z0JAON01GBwa9vfsu5uuI1mnnXIJzMJiY7TNl4ogejQoHK/IYKHHqxVq4lerIcCk/eZCpSy1gMOot6+yfoR42n6oiDbXxu638QtCO80KC/S+4TMA6I+QRHw/Y="
   on:
diff --git a/Gemfile b/Gemfile
@@ -11,9 +11,9 @@ def location_for(place, fake_version = nil)
 end
 
 group :test do
-  gem 'voxpupuli-test', '>= 1.0.0',  :require => false
-  gem 'coveralls',                   :require => false
-  gem 'simplecov-console',           :require => false
+  gem 'voxpupuli-test', '~> 2.0',  :require => false
+  gem 'coveralls',                 :require => false
+  gem 'simplecov-console',         :require => false
 end
 
 group :development do
diff --git a/examples/snmpd-snmptrapd.pp b/examples/snmpd-snmptrapd.pp
@@ -6,5 +6,5 @@
     'default /usr/bin/perl /usr/bin/traptoemail me@somewhere.local',
     'IF-MIB::linkDown /home/nba/bin/traps down',
   ],
-  trap_forwards       => [ 'default udp:2.3.4.5:162' ],
+  trap_forwards       => ['default udp:2.3.4.5:162'],
 }
diff --git a/examples/snmpv3_user.pp b/examples/snmpv3_user.pp
@@ -3,4 +3,3 @@
   authpass => '1234auth',
   privpass => '5678priv',
 }
-
diff --git a/examples/trapd.pp b/examples/trapd.pp
@@ -7,5 +7,5 @@
     'default /usr/bin/perl /usr/bin/traptoemail me@somewhere.local',
     'IF-MIB::linkDown /home/nba/bin/traps down',
   ],
-  trap_forwards       => [ 'default udp:55.55.55.55:162' ],
+  trap_forwards       => ['default udp:55.55.55.55:162'],
 }
diff --git a/manifests/client.pp b/manifests/client.pp
@@ -34,7 +34,6 @@
   Optional[String[1]]        $package_name  = undef,
   Stdlib::Absolutepath       $client_config = '/etc/snmp/snmp.conf',
 ) {
-
   include snmp
 
   if $ensure == 'present' {
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -246,8 +246,8 @@
 #
 class snmp (
   Enum['present','absent']                                        $ensure        = 'present',
-  Array[String[1]]                                                $agentaddress  = [ 'udp:127.0.0.1:161', 'udp6:[::1]:161' ],
-  Array[String[1]]                                                $snmptrapdaddr = [ 'udp:127.0.0.1:162', 'udp6:[::1]:162' ],
+  Array[String[1]]                                                $agentaddress  = ['udp:127.0.0.1:161', 'udp6:[::1]:161'],
+  Array[String[1]]                                                $snmptrapdaddr = ['udp:127.0.0.1:162', 'udp6:[::1]:162'],
   Variant[Undef, String[1], Array[String[1]]]                     $ro_community  = 'public',
   Variant[Undef, String[1], Array[String[1]]]                     $ro_community6 = 'public',
   Variant[Undef, String[1], Array[String[1]]]                     $rw_community  = undef,
@@ -260,8 +260,8 @@
   String[1]                                                       $location      = 'Unknown',
   String[1]                                                       $sysname       = $facts['networking']['fqdn'],
   Integer                                                         $services      = 72,
-  Array[String[1]]                                                $com2sec       = [ 'notConfigUser  default       public' ],
-  Array[String[1]]                                                $com2sec6      = [ 'notConfigUser  default       public' ],
+  Array[String[1]]                                                $com2sec       = ['notConfigUser  default       public'],
+  Array[String[1]]                                                $com2sec6      = ['notConfigUser  default       public'],
   Array[String[1]] $groups = [
     'notConfigGroup v1            notConfigUser',
     'notConfigGroup v2c           notConfigUser',
@@ -321,7 +321,6 @@
   String[1]                  $varnetsnmp_group             = 'root',
   Stdlib::Filemode           $varnetsnmp_perms             = '0755',
 ) {
-
   $template_snmpd_conf           = 'snmp/snmpd.conf.erb'
   $template_snmpd_sysconfig      = "snmp/snmpd.sysconfig-${facts['os']['family']}.erb"
   $template_snmpd_service_dropin = "snmp/snmpd.service-dropin-${facts['os']['family']}.epp"
@@ -429,7 +428,6 @@
     require => Package['snmpd'],
   }
 
-
   file { 'snmpd.sysconfig':
     ensure  => $file_ensure,
     path    => $sysconfig,
@@ -461,9 +459,8 @@
       notify  => Service['snmptrapd'],
     }
   } elsif
-    ( $facts['os']['name'] == 'Ubuntu' and versioncmp($facts['os']['release']['major'], '16.04') >= 0 ) or
-    ( $facts['os']['name'] == 'Debian' and versioncmp($facts['os']['release']['major'], '8') >= 0 )
-  {
+  ( $facts['os']['name'] == 'Ubuntu' and versioncmp($facts['os']['release']['major'], '16.04') >= 0 ) or
+  ( $facts['os']['name'] == 'Debian' and versioncmp($facts['os']['release']['major'], '8') >= 0 ) {
     file { 'snmptrapd.sysconfig':
       ensure  => $file_ensure,
       path    => $trap_sysconfig,
diff --git a/manifests/snmpv3_user.pp b/manifests/snmpv3_user.pp
@@ -30,7 +30,6 @@
   Enum['AES','DES']         $privtype = 'AES',
   Enum['snmpd','snmptrapd'] $daemon   = 'snmpd'
 ) {
-
   include snmp
 
   if ($daemon == 'snmptrapd') and ($facts['os']['family'] != 'Debian') {
@@ -76,7 +75,7 @@
         user    => 'root',
         cwd     => '/',
         path    => '/bin:/sbin:/usr/bin:/usr/sbin',
-        require => [ Package['snmpd'], File['var-net-snmp'], ],
+        require => [Package['snmpd'], File['var-net-snmp'],],
       }
     }
 
diff --git a/spec/classes/snmp_init_spec.rb b/spec/classes/snmp_init_spec.rb
@@ -165,11 +165,7 @@
         describe 'ensure => badvalue' do
           let(:params) { { ensure: 'badvalue' } }
 
-          it 'fails' do
-            expect do
-              is_expected.to raise_error(Puppet::Error, %r{ensure parameter must be present or absent})
-            end
-          end
+          it { is_expected.to compile.and_raise_error(%r{expects a match for}) }
         end
 
         describe 'autoupgrade => true' do
@@ -189,21 +185,13 @@
         describe 'autoupgrade => badvalue' do
           let(:params) { { autoupgrade: 'badvalue' } }
 
-          it 'fails' do
-            expect do
-              is_expected.to raise_error(Puppet::Error, %r{"badvalue" is not a boolean.})
-            end
-          end
+          it { is_expected.to compile.and_raise_error(%r{expects a Boolean value, got String}) }
         end
 
         describe 'service_ensure => badvalue' do
           let(:params) { { service_ensure: 'badvalue' } }
 
-          it 'fails' do
-            expect do
-              is_expected.to raise_error(Puppet::Error, %r{service_ensure parameter must be running or stopped})
-            end
-          end
+          it { is_expected.to compile.and_raise_error(%r{expects a match for Stdlib::Ensure::Service}) }
         end
 
         describe 'service_config_perms => "0123"' do
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
@@ -1,3 +1,6 @@
+# This file is completely managed via modulesync
 require 'voxpupuli/acceptance/spec_helper_acceptance'
 
 configure_beaker
+
+Dir['./spec/support/acceptance/**/*.rb'].sort.each { |f| require f }

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+# Vox Pupuli Security Policy`
	`2`	`+`
	`3`	`+Our vulnerabilities reporting process is at https://voxpupuli.org/security/`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-modulesync_config_version: '2.12.0'`
	`1`	`+modulesync_config_version: '3.0.0'`
Original file line number	Diff line number	Diff line change
`@@ -6,5 +6,5 @@`
`6`	`6`	`'default /usr/bin/perl /usr/bin/traptoemail me@somewhere.local',`
`7`	`7`	`'IF-MIB::linkDown /home/nba/bin/traps down',`
`8`	`8`	`],`
`9`		`- trap_forwards => [ 'default udp:2.3.4.5:162' ],`
	`9`	`+ trap_forwards => ['default udp:2.3.4.5:162'],`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,4 +3,3 @@`
`3`	`3`	`authpass => '1234auth',`
`4`	`4`	`privpass => '5678priv',`
`5`	`5`	`}`
`6`		`-`
Original file line number	Diff line number	Diff line change
`@@ -7,5 +7,5 @@`
`7`	`7`	`'default /usr/bin/perl /usr/bin/traptoemail me@somewhere.local',`
`8`	`8`	`'IF-MIB::linkDown /home/nba/bin/traps down',`
`9`	`9`	`],`
`10`		`- trap_forwards => [ 'default udp:55.55.55.55:162' ],`
	`10`	`+ trap_forwards => ['default udp:55.55.55.55:162'],`
`11`	`11`	`}`