Merge pull request #221 from voxpupuli/modulesync

bastelfreak · web-flow · commit b78e9f3ac6ea · 2020-08-23T10:26:37.000+02:00
modulesync 3.0.0 &amp; puppet-lint autofix
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
@@ -33,6 +33,8 @@ By participating in this project you agree to abide by its terms.
 
 Please be prepared to repeat some of these steps as our contributors review your code.
 
+Also consider sending in your profile code that calls this component module as an acceptance test or provide it via an issue. This helps reviewers a lot to test your use case and prevents future regressions!
+
 ## Writing proper commits - short version
 
 * Make commits of logical units.
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
@@ -152,7 +152,7 @@ Style/Attr:
   Enabled: True
 
 Style/BracesAroundHashParameters:
-  Enabled: True
+  Enabled: False
 
 Style/CaseEquality:
   Enabled: True
@@ -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
@@ -52,7 +53,7 @@ notifications:
       - "chat.freenode.org#voxpupuli-notifications"
 deploy:
   provider: puppetforge
-  user: puppet
+  username: puppet
   password:
     secure: "l2HEhssQyDQGrdBkGS8f/gQ4FA5vVLM0JegyAVaaIXpRrJYgRiDAvC+u81HS//+J0v9cr4jo74ncl1HGU0QJZURJX/L8DJqUVXzSZpe9HmfrQpV1RDUSNMqzaIq5Z268Ou9n1Jkeg58WJyIaks9PQhXoWRRSnaCyDHrbGM8XcAU="
   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/client.pp b/manifests/client.pp
@@ -26,7 +26,6 @@
   String $client_package = $gluster::params::client_package,
   String $version = $gluster::params::version,
 ) inherits gluster::params {
-
   class { 'gluster::install':
     server         => false,
     client         => true,
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -38,7 +38,7 @@
 # @author Scott Merrill <smerrill@covermymeds.com>
 # @note Copyright 2014 CoverMyMeds, unless otherwise noted
 #
-class gluster  (
+class gluster (
   Boolean $client = $gluster::params::install_client,
   $client_package         = $gluster::params::client_package,
   $pool                   = $gluster::params::pool,
@@ -50,7 +50,6 @@
   $version                = $gluster::params::version,
   Hash[String, Any] $volumes = {},
 ) inherits ::gluster::params {
-
   class { 'gluster::install':
     server         => $server,
     server_package => $server_package,
diff --git a/manifests/install.pp b/manifests/install.pp
@@ -33,10 +33,9 @@
   String $server_package = $gluster::params::server_package,
   String $client_package = $gluster::params::client_package,
 ) inherits gluster::params {
-
   if $repo {
     # install the correct repo
-    if ! defined ( Class['::gluster::repo'] ) {
+    if ! defined ( Class['::gluster::repo']) {
       class { 'gluster::repo':
         version => $version,
       }
@@ -53,33 +52,41 @@
   if $client_package == $server_package {
     if $server {
       # we use ensure_packages here because on some distributions the client and server package have different names
-      ensure_packages($server_package, {
-        ensure => $_version,
-        tag    => 'gluster-packages',
-        notify => Class['::gluster::service'],
-      })
+      ensure_packages($server_package,
+        {
+          ensure => $_version,
+          tag    => 'gluster-packages',
+          notify => Class['::gluster::service'],
+        }
+      )
     } elsif $client {
-      ensure_packages($client_package, {
-        ensure => $_version,
-        tag    => 'gluster-packages',
-      })
+      ensure_packages($client_package,
+        {
+          ensure => $_version,
+          tag    => 'gluster-packages',
+        }
+      )
     }
   } else {
     if $client {
       # we use ensure_packages here because on some distributions the client and server package have different names
-      ensure_packages($client_package, {
-        ensure => $_version,
-        tag    => 'gluster-packages',
-      })
+      ensure_packages($client_package,
+        {
+          ensure => $_version,
+          tag    => 'gluster-packages',
+        }
+      )
     }
 
     if $server {
       # we use ensure_packages here because on some distributions the client and server package have different names
-      ensure_packages($server_package, {
-        ensure => $_version,
-        notify => Class['::gluster::service'],
-        tag    => 'gluster-packages',
-      })
+      ensure_packages($server_package,
+        {
+          ensure => $_version,
+          notify => Class['::gluster::service'],
+          tag    => 'gluster-packages',
+        }
+      )
     }
   }
 }
diff --git a/manifests/mount.pp b/manifests/mount.pp
@@ -49,7 +49,6 @@
   Optional[String] $direct_io_mode                                      = undef,
   Optional[Boolean] $readdirp                                           = undef,
 ) {
-
   if $log_level {
     $ll = "log-level=${log_level}"
   } else {
@@ -80,7 +79,7 @@
     $r = undef
   }
 
-  $mount_options = [ $options, $ll, $lf, $t, $dim, $r, ]
+  $mount_options = [$options, $ll, $lf, $t, $dim, $r,]
   $_options = join(delete_undef_values($mount_options), ',')
 
   mount { $title:
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -4,7 +4,6 @@
 # @note Copyright 2014 CoverMyMeds, unless otherwise noted
 #
 class gluster::params {
-
   # parameters dealing with installation
   $install_server = true
   $install_client = true
@@ -63,7 +62,6 @@
     }
   }
 
-
   # parameters dealing with a Gluster server instance
   $service_enable = true
   $service_ensure = true
diff --git a/manifests/peer.pp b/manifests/peer.pp
@@ -38,15 +38,13 @@
   $pool = 'default',
   $fqdn = $facts['networking']['fqdn'],
 ) {
-
   # we can't do much without the Gluster binary
   # but we don't necessarily want the Puppet run to fail if the
   # gluster_binary fact is absent!
   if getvar('::gluster_binary') {
     # we can't join to ourselves, so it only makes sense to operate
     # on other gluster servers in the same pool
     if $fqdn != $facts['networking']['fqdn'] {
-
       # and we don't want to attach a server that is already a member
       # of the current pool
       if getvar('::gluster_peer_list') {
@@ -61,8 +59,8 @@
       }
       if !$already_in_pool {
         exec { "gluster peer probe ${title}":
-            command => "${::gluster_binary} peer probe ${title}",
-          }
+          command => "${::gluster_binary} peer probe ${title}",
+        }
       }
     }
   }
diff --git a/manifests/repo/apt.pp b/manifests/repo/apt.pp
@@ -109,5 +109,4 @@
   create_resources(apt::source, $repo)
 
   Apt::Source["glusterfs-${version}"] -> Package<| tag == 'gluster-packages' |>
-
 }
diff --git a/manifests/repo/yum.pp b/manifests/repo/yum.pp
@@ -19,14 +19,13 @@
   String $repo_key_source = $gluster::params::repo_gpg_key_source,
   Optional[String] $priority = $gluster::params::repo_priority,
 ) inherits gluster::params {
-
   # CentOS Gluster repo only supports x86_64
   if $facts['os']['architecture'] != 'x86_64' {
     fail("Architecture ${facts['os']['architecture']} not yet supported for ${facts['os']['name']}.")
   }
 
   if $priority {
-    if ! defined( Package['yum-plugin-priorities'] ) {
+    if ! defined( Package['yum-plugin-priorities']) {
       package { 'yum-plugin-priorities':
         ensure => installed,
         before => Yumrepo["glusterfs-${facts['os']['architecture']}"],
@@ -50,5 +49,4 @@
   }
 
   Yumrepo["glusterfs-${facts['os']['architecture']}"] -> Package<| tag == 'gluster-packages' |>
-
 }
diff --git a/manifests/service.pp b/manifests/service.pp
@@ -21,7 +21,6 @@
   $enable       = $gluster::params::service_enable,
   $service_name = $gluster::params::service_name,
 ) inherits ::gluster::params {
-
   service { $service_name :
     ensure     => $ensure,
     enable     => $enable,
diff --git a/manifests/volume.pp b/manifests/volume.pp
@@ -53,7 +53,6 @@
   Optional[Integer] $replica                  = undef,
   Optional[Integer] $arbiter                  = undef,
 ) {
-
   $_force = if $force {
     'force'
   } else {
@@ -99,7 +98,7 @@
 
   $args = join(delete($cmd_args, ''), ' ')
 
-  if getvar('::gluster_binary'){
+  if getvar('::gluster_binary') {
     # we need the Gluster binary to do anything!
 
     if getvar('::gluster_volume_list') and member( split( $::gluster_volume_list, ',' ), $title ) {
@@ -152,7 +151,6 @@
         command => "${::gluster_binary} volume start ${title}",
         require => Exec["gluster create volume ${title}"],
       }
-
     } elsif $already_exists {
       # this volume exists
 
@@ -204,20 +202,19 @@
           }
 
           if $replica and $heal {
-          # there is a delay after which a brick is added before
-          # the self heal daemon comes back to life.
-          # as such, we sleep 5 here before starting the heal
+            # there is a delay after which a brick is added before
+            # the self heal daemon comes back to life.
+            # as such, we sleep 5 here before starting the heal
             exec { "gluster heal ${title}":
               command => "/bin/sleep 5; ${::gluster_binary} volume heal ${title} full",
               require => Exec["gluster add bricks to ${title}"],
             }
           }
-
         } elsif count($bricks) < $vol_count {
           # removing bricks
-          notify{ 'removing bricks is not currently supported.': }
+          notify { 'removing bricks is not currently supported.': }
         } else {
-          notify{ "unable to resolve brick changes for Gluster volume ${title}!\nDefined: ${_bricks}\nCurrent: ${vol_bricks}": }
+          notify { "unable to resolve brick changes for Gluster volume ${title}!\nDefined: ${_bricks}\nCurrent: ${vol_bricks}": }
         }
       }
 
diff --git a/manifests/volume/option.pp b/manifests/volume/option.pp
@@ -29,7 +29,6 @@
   Optional[Variant[Boolean, String, Numeric]] $value  = undef,
   Enum['present', 'absent']                   $ensure = 'present',
 ) {
-
   $arr = split( $title, ':' )
   $count = count($arr)
   # do we have more than one array element?
diff --git a/spec/acceptance/nodesets/ec2/amazonlinux-2016091.yml b/spec/acceptance/nodesets/ec2/amazonlinux-2016091.yml
diff --git a/spec/acceptance/nodesets/ec2/image_templates.yaml b/spec/acceptance/nodesets/ec2/image_templates.yaml
diff --git a/spec/acceptance/nodesets/ec2/rhel-73-x64.yml b/spec/acceptance/nodesets/ec2/rhel-73-x64.yml
diff --git a/spec/acceptance/nodesets/ec2/sles-12sp2-x64.yml b/spec/acceptance/nodesets/ec2/sles-12sp2-x64.yml
diff --git a/spec/acceptance/nodesets/ec2/ubuntu-1604-x64.yml b/spec/acceptance/nodesets/ec2/ubuntu-1604-x64.yml
diff --git a/spec/acceptance/nodesets/ec2/windows-2016-base-x64.yml b/spec/acceptance/nodesets/ec2/windows-2016-base-x64.yml
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb

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'`