Merge pull request #293 from voxpupuli/modulesync

modulesync 3.0.0 & puppet-lint updates
voxpupuli · Aug 15, 2020 · 1383e59 · 1383e59
2 parents f135b46 + e24c225
commit 1383e59
Show file tree

Hide file tree

Showing 23 changed files with 63 additions and 88 deletions.
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
@@ -68,7 +69,7 @@ notifications:
       - "chat.freenode.org#voxpupuli-notifications"
 deploy:
   provider: puppetforge
-  user: puppet
+  username: puppet
   password:
     secure: "RrAmWtM6eTjZZzD954AIgR179Pqp14lzHhd/C9cpKbTPynLncuim08CEvjmq+7pgAy9XDg1d02x3udfZt4btR1sBdyNRpNN3yUhWptmGU61HRJdiZq+nSLQkIYsqXanhk+O3NndFojO58WRD01dkWEc6HRHjlivuYNxDXmMkg9k="
   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/manifests/addon.pp b/manifests/addon.pp
@@ -48,7 +48,6 @@
   String[1] $owner                            = 'splunk',
   Hash $inputs                                = {},
 ) {
-
   if defined(Class['splunk::forwarder']) {
     $mode = 'forwarder'
   } elsif defined(Class['splunk::enterprise']) {
@@ -57,7 +56,6 @@
     fail('Instances of Splunk::Addon require the declaration of one of either Class[splunk::enterprise] or Class[splunk::forwarder]')
   }
 
-
   if $splunk_home {
     $_splunk_home = $splunk_home
   } else {
@@ -122,4 +120,3 @@
     }
   }
 }
-
diff --git a/manifests/enterprise.pp b/manifests/enterprise.pp
@@ -217,7 +217,6 @@
   Stdlib::Absolutepath $secret_file          = $splunk::params::enterprise_secret_file,
   String[1] $secret                          = $splunk::params::secret,
 ) inherits splunk {
-
   if (defined(Class['splunk::forwarder'])) {
     fail('Splunk Universal Forwarder provides a subset of Splunk Enterprise capabilities, and has potentially conflicting resources when included with Splunk Enterprise on the same node.  Do not include splunk::forwarder on the same node as splunk::enterprise.  Configure Splunk Enterprise to meet your forwarding needs.'
     )
@@ -275,5 +274,4 @@
     purge_uiprefs          => $purge_uiprefs,
     purge_web              => $purge_web
   }
-
 }
diff --git a/manifests/enterprise/config.pp b/manifests/enterprise/config.pp
@@ -2,8 +2,7 @@
 #   Private class declared by Class[splunk::enterprise] to contain all the
 #   configuration needed for a base install of Splunk Enterprise
 #
-class splunk::enterprise::config() {
-
+class splunk::enterprise::config () {
   if $splunk::enterprise::seed_password {
     class { 'splunk::enterprise::password::seed':
       reset_seeded_password => $splunk::enterprise::reset_seeded_password,
@@ -49,26 +48,26 @@
   }
 
   file { ["${splunk::enterprise::enterprise_homedir}/etc/system/local/alert_actions.conf",
-          "${splunk::enterprise::enterprise_homedir}/etc/system/local/authentication.conf",
-          "${splunk::enterprise::enterprise_homedir}/etc/system/local/authorize.conf",
-          "${splunk::enterprise::enterprise_homedir}/etc/system/local/deploymentclient.conf",
-          "${splunk::enterprise::enterprise_homedir}/etc/system/local/distsearch.conf",
-          "${splunk::enterprise::enterprise_homedir}/etc/system/local/indexes.conf",
-          "${splunk::enterprise::enterprise_homedir}/etc/system/local/inputs.conf",
-          "${splunk::enterprise::enterprise_homedir}/etc/system/local/limits.conf",
-          "${splunk::enterprise::enterprise_homedir}/etc/system/local/outputs.conf",
-          "${splunk::enterprise::enterprise_homedir}/etc/system/local/props.conf",
-          "${splunk::enterprise::enterprise_homedir}/etc/system/local/server.conf",
-          "${splunk::enterprise::enterprise_homedir}/etc/system/local/serverclass.conf",
-          "${splunk::enterprise::enterprise_homedir}/etc/system/local/transforms.conf",
-          "${splunk::enterprise::enterprise_homedir}/etc/system/local/ui-prefs.conf",
-          "${splunk::enterprise::enterprise_homedir}/etc/system/local/web.conf",
-          "${splunk::enterprise::enterprise_homedir}/etc/system/metadata/local.meta"]:
-    ensure => file,
-    tag    => 'splunk_enterprise',
-    owner  => $splunk::enterprise::splunk_user,
-    group  => $splunk::enterprise::splunk_user,
-    mode   => '0600',
+      "${splunk::enterprise::enterprise_homedir}/etc/system/local/authentication.conf",
+      "${splunk::enterprise::enterprise_homedir}/etc/system/local/authorize.conf",
+      "${splunk::enterprise::enterprise_homedir}/etc/system/local/deploymentclient.conf",
+      "${splunk::enterprise::enterprise_homedir}/etc/system/local/distsearch.conf",
+      "${splunk::enterprise::enterprise_homedir}/etc/system/local/indexes.conf",
+      "${splunk::enterprise::enterprise_homedir}/etc/system/local/inputs.conf",
+      "${splunk::enterprise::enterprise_homedir}/etc/system/local/limits.conf",
+      "${splunk::enterprise::enterprise_homedir}/etc/system/local/outputs.conf",
+      "${splunk::enterprise::enterprise_homedir}/etc/system/local/props.conf",
+      "${splunk::enterprise::enterprise_homedir}/etc/system/local/server.conf",
+      "${splunk::enterprise::enterprise_homedir}/etc/system/local/serverclass.conf",
+      "${splunk::enterprise::enterprise_homedir}/etc/system/local/transforms.conf",
+      "${splunk::enterprise::enterprise_homedir}/etc/system/local/ui-prefs.conf",
+      "${splunk::enterprise::enterprise_homedir}/etc/system/local/web.conf",
+    "${splunk::enterprise::enterprise_homedir}/etc/system/metadata/local.meta"]:
+      ensure => file,
+      tag    => 'splunk_enterprise',
+      owner  => $splunk::enterprise::splunk_user,
+      group  => $splunk::enterprise::splunk_user,
+      mode   => '0600',
   }
 
   if $splunk::enterprise::use_default_config {
@@ -113,5 +112,4 @@
   File <| tag == 'splunk_enterprise' |> -> Splunk_transforms<||>       ~> Class['splunk::enterprise::service']
   File <| tag == 'splunk_enterprise' |> -> Splunk_uiprefs<||>          ~> Class['splunk::enterprise::service']
   File <| tag == 'splunk_enterprise' |> -> Splunk_web<||>              ~> Class['splunk::enterprise::service']
-
 }
diff --git a/manifests/enterprise/install.pp b/manifests/enterprise/install.pp
@@ -4,7 +4,6 @@
 #   for successfully installing Splunk Enterprise
 #
 class splunk::enterprise::install {
-
   if $facts['kernel'] == 'Linux' or $facts['kernel'] == 'SunOS' {
     include splunk::enterprise::install::nix
   }
@@ -28,7 +27,7 @@
     $_staged_package = undef
   }
 
-  Package  {
+  Package {
     source         => $splunk::enterprise::package_provider ? {
       'chocolatey' => undef,
       default      => $splunk::enterprise::manage_package_source ? {
@@ -43,5 +42,4 @@
     provider        => $splunk::enterprise::package_provider,
     install_options => $splunk::enterprise::install_options,
   }
-
 }
diff --git a/manifests/enterprise/install/nix.pp b/manifests/enterprise/install/nix.pp
@@ -3,7 +3,6 @@
 #   platform specific installation steps on Linux or Unix type systems.
 #
 class splunk::enterprise::install::nix inherits splunk::enterprise::install {
-
   if $facts['kernel'] == 'SunOS' {
     $_responsefile = "${splunk::enterprise::staging_dir}/response.txt"
     $_adminfile    = '/var/sadm/install/admin/splunk-noask'
@@ -34,9 +33,8 @@
   # Required for splunk 7.2.4.2
   if versioncmp($splunk::enterprise::version, '7.2.4.2') >= 0 {
     ensure_packages(['net-tools'], {
-      'ensure' => 'present',
-      before   => Package[$splunk::enterprise::enterprise_package_name]
+        'ensure' => 'present',
+        before   => Package[$splunk::enterprise::enterprise_package_name]
     })
   }
-
 }
diff --git a/manifests/enterprise/password/manage.pp b/manifests/enterprise/password/manage.pp
@@ -32,7 +32,7 @@
 #   is used outside of Class[splunk::enterprise::config], it is being used by
 #   Bolt
 #
-class splunk::enterprise::password::manage(
+class splunk::enterprise::password::manage (
   Boolean $manage_password                   = $splunk::params::manage_password,
   Stdlib::Absolutepath $password_config_file = $splunk::params::forwarder_password_config_file,
   String[1] $password_content                = $splunk::params::password_content,
@@ -42,7 +42,6 @@
   String[1] $service                         = $splunk::params::enterprise_service,
   Enum['agent', 'bolt'] $mode                = 'bolt',
 ) inherits splunk::params {
-
   file { $secret_file:
     ensure  => file,
     owner   => $splunk_user,

diff --git a/manifests/enterprise/password/seed.pp b/manifests/enterprise/password/seed.pp
@@ -38,7 +38,7 @@
 #   is used outside of Class[splunk::enterprise::config], it is being used by
 #   Bolt
 #
-class splunk::enterprise::password::seed(
+class splunk::enterprise::password::seed (
   Boolean $reset_seeded_password             = $splunk::params::reset_seeded_password,
   Stdlib::Absolutepath $password_config_file = $splunk::params::enterprise_password_config_file,
   Stdlib::Absolutepath $seed_config_file     = $splunk::params::enterprise_seed_config_file,
@@ -49,7 +49,6 @@
   String[1] $service                         = $splunk::params::enterprise_service,
   Enum['agent', 'bolt'] $mode                = 'bolt',
 ) inherits splunk::params {
-
   file { $secret_file:
     ensure  => file,
     owner   => $splunk_user,
@@ -66,7 +65,7 @@
       ensure  => file,
       owner   => $splunk_user,
       group   => $splunk_user,
-      content => epp('splunk/user-seed.conf.epp', { 'hash' => $password_hash}),
+      content => epp('splunk/user-seed.conf.epp', { 'hash' => $password_hash }),
       require => File[$secret_file],
     }
 

diff --git a/manifests/enterprise/service.pp b/manifests/enterprise/service.pp
@@ -4,12 +4,10 @@
 #   sub-classes
 #
 class splunk::enterprise::service {
-
   service { $splunk::enterprise::service_name:
     ensure     => running,
     enable     => true,
     hasstatus  => true,
     hasrestart => true,
   }
-
 }
diff --git a/manifests/enterprise/service/nix.pp b/manifests/enterprise/service/nix.pp
@@ -3,7 +3,6 @@
 #   platform specific service management on Linux or Unix type systems.
 #
 class splunk::enterprise::service::nix inherits splunk::enterprise::service {
-
   if $splunk::enterprise::boot_start {
     # Ensure splunk services *not* managed by the system service file are
     # gracefully shut down prior to enabling boot-start. Should the service
@@ -71,5 +70,4 @@
       pattern  => "splunkd -p ${splunk::enterprise::splunkd_port} (restart|start)",
     }
   }
-
 }
diff --git a/manifests/forwarder.pp b/manifests/forwarder.pp
@@ -147,7 +147,7 @@
 # @param addons
 #   Manage a splunk addons, see `splunk::addons`.
 #
-class splunk::forwarder(
+class splunk::forwarder (
   String[1] $server                          = $splunk::params::server,
   String[1] $version                         = $splunk::params::version,
   String[1] $package_name                    = $splunk::params::forwarder_package_name,
@@ -188,7 +188,6 @@
   String[1] $secret                          = $splunk::params::secret,
   Hash $addons                               = {},
 ) inherits splunk {
-
   if (defined(Class['splunk::enterprise'])) {
     fail('Splunk Universal Forwarder provides a subset of Splunk Enterprise capabilities, and has potentially conflicting resources when included with Splunk Enterprise on the same node.  Do not include splunk::forwarder on the same node as splunk::enterprise.  Configure Splunk Enterprise to meet your forwarding needs.'
     )
@@ -237,5 +236,4 @@
     purge_forwarder_transforms       => $purge_transforms,
     purge_forwarder_web              => $purge_web,
   }
-
 }
diff --git a/manifests/forwarder/config.pp b/manifests/forwarder/config.pp
@@ -4,7 +4,6 @@
 #   Forwarder
 #
 class splunk::forwarder::config {
-
   if $splunk::forwarder::seed_password {
     class { 'splunk::forwarder::password::seed':
       reset_seeded_password => $splunk::forwarder::reset_seeded_password,
@@ -37,25 +36,24 @@
     }
   }
 
-
   $_forwarder_file_mode = $facts['kernel'] ? {
     'windows' => undef,
     default   => '0600',
   }
 
   file { ["${splunk::forwarder::forwarder_homedir}/etc/system/local/deploymentclient.conf",
-          "${splunk::forwarder::forwarder_homedir}/etc/system/local/outputs.conf",
-          "${splunk::forwarder::forwarder_homedir}/etc/system/local/inputs.conf",
-          "${splunk::forwarder::forwarder_homedir}/etc/system/local/props.conf",
-          "${splunk::forwarder::forwarder_homedir}/etc/system/local/transforms.conf",
-          "${splunk::forwarder::forwarder_homedir}/etc/system/local/web.conf",
-          "${splunk::forwarder::forwarder_homedir}/etc/system/local/limits.conf",
-          "${splunk::forwarder::forwarder_homedir}/etc/system/local/server.conf"]:
-    ensure => file,
-    tag    => 'splunk_forwarder',
-    owner  => $splunk::forwarder::splunk_user,
-    group  => $splunk::forwarder::splunk_user,
-    mode   => $_forwarder_file_mode,
+      "${splunk::forwarder::forwarder_homedir}/etc/system/local/outputs.conf",
+      "${splunk::forwarder::forwarder_homedir}/etc/system/local/inputs.conf",
+      "${splunk::forwarder::forwarder_homedir}/etc/system/local/props.conf",
+      "${splunk::forwarder::forwarder_homedir}/etc/system/local/transforms.conf",
+      "${splunk::forwarder::forwarder_homedir}/etc/system/local/web.conf",
+      "${splunk::forwarder::forwarder_homedir}/etc/system/local/limits.conf",
+    "${splunk::forwarder::forwarder_homedir}/etc/system/local/server.conf"]:
+      ensure => file,
+      tag    => 'splunk_forwarder',
+      owner  => $splunk::forwarder::splunk_user,
+      group  => $splunk::forwarder::splunk_user,
+      mode   => $_forwarder_file_mode,
   }
 
   if $splunk::forwarder::use_default_config {
@@ -95,5 +93,4 @@
   File <| tag == 'splunk_forwarder' |> -> Splunkforwarder_web<||>              ~> Class['splunk::forwarder::service']
   File <| tag == 'splunk_forwarder' |> -> Splunkforwarder_limits<||>           ~> Class['splunk::forwarder::service']
   File <| tag == 'splunk_forwarder' |> -> Splunkforwarder_server<||>           ~> Class['splunk::forwarder::service']
-
 }
diff --git a/manifests/forwarder/install.pp b/manifests/forwarder/install.pp
@@ -4,7 +4,6 @@
 #   for successfully installing the Splunk Universal Forwarder
 #
 class splunk::forwarder::install {
-
   $_package_source = $splunk::forwarder::manage_package_source ? {
     true  => $splunk::forwarder::forwarder_package_src,
     false => $splunk::forwarder::package_source
@@ -24,7 +23,7 @@
     $_staged_package = undef
   }
 
-  Package  {
+  Package {
     source         => $splunk::forwarder::package_provider ? {
       'chocolatey' => undef,
       default      => $splunk::forwarder::manage_package_source ? {
@@ -64,8 +63,8 @@
   # Required for splunk 7.2.4.2
   if ($facts['kernel'] == 'Linux' or $facts['kernel'] == 'SunOS') and (versioncmp($splunk::forwarder::version, '7.2.4.2') >= 0) {
     ensure_packages(['net-tools'], {
-      'ensure' => 'present',
-      before   => Package[$splunk::forwarder::package_name]
+        'ensure' => 'present',
+        before   => Package[$splunk::forwarder::package_name]
     })
   }
 
@@ -74,5 +73,4 @@
     provider        => $splunk::forwarder::package_provider,
     install_options => $splunk::forwarder::install_options,
   }
-
 }
diff --git a/manifests/forwarder/password/manage.pp b/manifests/forwarder/password/manage.pp
@@ -32,7 +32,7 @@
 #   is used outside of Class[splunk::forwarder::config], it is being used by
 #   Bolt
 #
-class splunk::forwarder::password::manage(
+class splunk::forwarder::password::manage (
   Boolean $manage_password                   = $splunk::params::manage_password,
   Stdlib::Absolutepath $password_config_file = $splunk::params::enterprise_password_config_file,
   String[1] $password_content                = $splunk::params::password_content,
@@ -42,7 +42,6 @@
   String[1] $service                         = $splunk::params::forwarder_service,
   Enum['agent', 'bolt'] $mode                = 'bolt',
 ) inherits splunk::params {
-
   file { $secret_file:
     ensure  => file,
     owner   => $splunk_user,