[style] puppet-lint and rubocop updates

wyardley · wyardley · commit 331d517b2828 · 2020-07-29T13:04:30.000-07:00
* modulesync 3.0 updates some style guidelines
diff --git a/examples/erlang_deps.pp b/examples/erlang_deps.pp
@@ -1,5 +1,5 @@
 # install first the garethr-erlang module. See README.md
 include erlang
 
-class { 'erlang': epel_enable => true}
+class { 'erlang': epel_enable => true }
 Class['erlang'] -> Class['rabbitmq']
diff --git a/examples/plugin.pp b/examples/plugin.pp
@@ -1,4 +1,4 @@
-$rabbitmq_plugins = [ 'amqp_client', 'rabbitmq_stomp' ]
+$rabbitmq_plugins = ['amqp_client', 'rabbitmq_stomp']
 
 class { 'rabbitmq':
   config_stomp => true,
diff --git a/examples/site.pp b/examples/site.pp
@@ -1,6 +1,5 @@
 node default {
-
-  $rabbitmq_plugins = [ 'amqp_client', 'rabbitmq_stomp' ]
+  $rabbitmq_plugins = ['amqp_client', 'rabbitmq_stomp']
 
   class { 'rabbitmq':
     config => '[ {rabbit_stomp, [{tcp_listeners, [1234]} ]} ].',
@@ -13,4 +12,3 @@
     provider => 'rabbitmqplugins',
   }
 }
-
diff --git a/manifests/config.pp b/manifests/config.pp
@@ -3,7 +3,6 @@
 #
 # @api private
 class rabbitmq::config {
-
   $admin_enable                        = $rabbitmq::admin_enable
   $management_enable                   = $rabbitmq::management_enable
   $use_config_file_for_plugins         = $rabbitmq::use_config_file_for_plugins
@@ -104,7 +103,7 @@
     $management_ip_address = $rabbitmq::node_ip_address
   }
 
-  $inetrc_env = {'export ERL_INETRC' => $inetrc_config_path}
+  $inetrc_env = { 'export ERL_INETRC' => $inetrc_config_path }
 
   # Handle env variables.
   $_environment_variables = $default_ssl_env_variables + $inetrc_env + $rabbitmq::environment_variables
@@ -125,7 +124,7 @@
       $proto_dist = 'inet6_tcp'
       $ssl_path = ''
     }
-    $ipv6_or_tls_env = ['SERVER_ADDITIONAL', 'CTL'].reduce({}) |$memo, $item| {
+    $ipv6_or_tls_env = ['SERVER_ADDITIONAL', 'CTL'].reduce( {}) |$memo, $item| {
       $orig = $_environment_variables["RABBITMQ_${item}_ERL_ARGS"]
       $munged = $orig ? {
         # already quoted, keep quoting
@@ -136,7 +135,7 @@
         default           => "\"${orig}${ssl_path} -proto_dist ${proto_dist}\"",
       }
 
-      merge($memo, {"RABBITMQ_${item}_ERL_ARGS" => $munged})
+      merge($memo, { "RABBITMQ_${item}_ERL_ARGS" => $munged })
     }
 
     $environment_variables = $_environment_variables + $ipv6_or_tls_env
@@ -227,12 +226,12 @@
         mode    => '0644',
       }
     }
-    default: { }
+    default: {}
   }
 
   if $facts['systemd'] { # systemd fact provided by systemd module
     systemd::service_limits { "${service_name}.service":
-      limits          => {'LimitNOFILE' => $file_limit},
+      limits          => { 'LimitNOFILE' => $file_limit },
       # The service will be notified when config changes
       restart_service => false,
     }
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -298,7 +298,7 @@
 # @param loopback_users
 #   This option configures a list of users to allow access via the loopback interfaces
 #
-class rabbitmq(
+class rabbitmq (
   Boolean $admin_enable                                                                            = true,
   Boolean $management_enable                                                                       = false,
   Boolean $use_config_file_for_plugins                                                             = false,
@@ -399,12 +399,11 @@
   Array $loopback_users                                                                            = ['guest'],
   Boolean $service_restart                                                                         = true,
 ) {
-
   if $ssl_only and ! $ssl {
     fail('$ssl_only => true requires that $ssl => true')
   }
 
-  if $config_stomp and $stomp_ssl_only and ! $ssl_stomp_port  {
+  if $config_stomp and $stomp_ssl_only and ! $ssl_stomp_port {
     fail('$stomp_ssl_only requires that $ssl_stomp_port be set')
   }
 
@@ -498,5 +497,4 @@
 
   # Make sure the various providers have their requirements in place.
   Class['rabbitmq::install'] -> Rabbitmq_plugin<| |>
-
 }
diff --git a/manifests/install.pp b/manifests/install.pp
@@ -2,7 +2,6 @@
 #
 # @api private
 class rabbitmq::install {
-
   $package_ensure   = $rabbitmq::package_ensure
   $package_name     = $rabbitmq::package_name
   $rabbitmq_group   = $rabbitmq::rabbitmq_group
diff --git a/manifests/install/rabbitmqadmin.pp b/manifests/install/rabbitmqadmin.pp
@@ -2,14 +2,12 @@
 #
 # @api private
 class rabbitmq::install::rabbitmqadmin {
-
   if $rabbitmq::rabbitmqadmin_package {
-    package{'rabbitmqadmin':
+    package { 'rabbitmqadmin':
       ensure => 'present',
       name   => $rabbitmq::rabbitmqadmin_package,
     }
   } else {
-
     $python_package = $rabbitmq::python_package
     # Some systems (e.g., Ubuntu 16.04) don't ship Python 2 by default
     if $rabbitmq::manage_python {
diff --git a/manifests/management.pp b/manifests/management.pp
@@ -2,14 +2,12 @@
 #
 # @api private
 class rabbitmq::management {
-
   $delete_guest_user = $rabbitmq::delete_guest_user
 
   if $delete_guest_user {
-    rabbitmq_user{ 'guest':
+    rabbitmq_user { 'guest':
       ensure   => absent,
       provider => 'rabbitmqctl',
     }
   }
-
 }
diff --git a/manifests/repo/apt.pp b/manifests/repo/apt.pp
@@ -3,16 +3,15 @@
 #   puppetlabs-stdlib
 #
 # @api private
-class rabbitmq::repo::apt(
+class rabbitmq::repo::apt (
   String $location               = 'https://packagecloud.io/rabbitmq/rabbitmq-server',
   String $repos                  = 'main',
   Boolean $include_src           = false,
   String $key                    = '8C695B0219AFDEB04A058ED8F4E789204D206F89',
   String $key_source             = $rabbitmq::package_gpg_key,
   Optional[String] $key_content  = $rabbitmq::key_content,
   Optional[String] $architecture = undef,
-  ) {
-
+) {
   $osname = downcase($facts['os']['name'])
   $pin    = $rabbitmq::package_apt_pin
 
diff --git a/manifests/repo/rhel.pp b/manifests/repo/rhel.pp
@@ -1,11 +1,10 @@
 # Makes sure that the Packagecloud repo is installed
 #
 # @api private
-class rabbitmq::repo::rhel(
-    $location          = "https://packagecloud.io/rabbitmq/rabbitmq-server/el/${facts['os'][release][major]}/\$basearch",
-    String $key_source = $rabbitmq::package_gpg_key,
-  ) {
-
+class rabbitmq::repo::rhel (
+  $location          = "https://packagecloud.io/rabbitmq/rabbitmq-server/el/${facts['os'][release][major]}/\$basearch",
+  String $key_source = $rabbitmq::package_gpg_key,
+) {
   yumrepo { 'rabbitmq':
     ensure   => present,
     name     => 'rabbitmq_rabbitmq-server',
diff --git a/manifests/service.pp b/manifests/service.pp
@@ -1,12 +1,11 @@
 # This class manages the rabbitmq server service itself.
 #
 # @api private
-class rabbitmq::service(
+class rabbitmq::service (
   Enum['running', 'stopped'] $service_ensure  = $rabbitmq::service_ensure,
   Boolean $service_manage                     = $rabbitmq::service_manage,
   $service_name                               = $rabbitmq::service_name,
 ) inherits rabbitmq {
-
   if ($service_manage) {
     if $service_ensure == 'running' {
       $ensure_real = 'running'
@@ -28,5 +27,4 @@
       Class['systemd::systemctl::daemon_reload'] -> Service['rabbitmq-server']
     }
   }
-
 }
diff --git a/spec/acceptance/parameter_spec.rb b/spec/acceptance/parameter_spec.rb
@@ -35,8 +35,6 @@ class { 'rabbitmq':
       apply_manifest(pp, catch_failures: true)
       apply_manifest(pp, catch_changes: true)
     end
-
-    # rubocop:disable RSpec/MultipleExpectations
     it 'has the parameter' do
       shell('rabbitmqctl list_parameters -p fedhost') do |r|
         expect(r.stdout).to match(%r{federation-upstream.*documentumFed.*expires.*3600000})
diff --git a/spec/acceptance/policy_spec.rb b/spec/acceptance/policy_spec.rb
@@ -46,8 +46,6 @@ class { 'rabbitmq':
       apply_manifest(pp, catch_failures: true)
       expect(apply_manifest(pp, catch_changes: true).exit_code).to be_zero
     end
-
-    # rubocop:disable RSpec/MultipleExpectations
     it 'has the policy' do
       shell('rabbitmqctl list_policies -p myhost') do |r|
         expect(r.stdout).to match(%r{myhost.*ha-all.*ha-sync-mode})
diff --git a/spec/acceptance/queue_spec.rb b/spec/acceptance/queue_spec.rb
@@ -59,8 +59,6 @@ class { 'rabbitmq':
       apply_manifest(pp, catch_failures: true)
       apply_manifest(pp, catch_changes: true)
     end
-
-    # rubocop:disable RSpec/MultipleExpectations
     it 'has the binding' do
       shell('rabbitmqctl list_bindings -q -p host1') do |r|
         expect(r.stdout).to match(%r{exchange1\sexchange\squeue1\squeue\s#})
@@ -149,8 +147,6 @@ class { 'rabbitmq':
       apply_manifest(pp, catch_failures: true)
       apply_manifest(pp, catch_changes: true)
     end
-
-    # rubocop:disable RSpec/MultipleExpectations
     it 'has the bindings' do
       shell('rabbitmqctl list_bindings -q -p host1') do |r|
         expect(r.stdout).to match(%r{exchange1\sexchange\squeue1\squeue\stest1})
@@ -226,8 +222,6 @@ class { 'rabbitmq':
       apply_manifest(pp, catch_failures: true)
       apply_manifest(pp, catch_changes: true)
     end
-
-    # rubocop:disable RSpec/MultipleExpectations
     it 'has the binding' do
       shell('rabbitmqctl list_bindings -q -p host2') do |r|
         expect(r.stdout).to match(%r{exchange2\sexchange\squeue2\squeue\s#})
diff --git a/spec/acceptance/user_spec.rb b/spec/acceptance/user_spec.rb
@@ -24,8 +24,6 @@ class { 'rabbitmq':
       apply_manifest(pp, catch_failures: true)
       apply_manifest(pp, catch_changes: true)
     end
-
-    # rubocop:disable RSpec/MultipleExpectations
     it 'has the user' do
       shell('rabbitmqctl list_users -q') do |r|
         expect(r.stdout).to match(%r{dan.*administrator})
diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
@@ -23,8 +23,6 @@ class { 'rabbitmq':
       apply_manifest(pp, catch_failures: true)
       apply_manifest(pp, catch_changes: true)
     end
-
-    # rubocop:disable RSpec/MultipleExpectations
     it 'has the vhost' do
       shell('rabbitmqctl list_vhosts') do |r|
         expect(r.stdout).to match(%r{myhost})
diff --git a/spec/unit/puppet/provider/rabbitmq_binding/rabbitmqadmin_spec.rb b/spec/unit/puppet/provider/rabbitmq_binding/rabbitmqadmin_spec.rb
@@ -12,7 +12,6 @@
   end
   let(:provider) { provider_class.new(resource) }
 
-  # rubocop:disable RSpec/MultipleExpectations
   describe '#instances' do
     it 'returns instances' do
       provider_class.expects(:rabbitmqctl_list).with('vhosts').returns <<-EOT
@@ -42,8 +41,6 @@
                  ])
     end
     # rubocop:enable RSpec/MultipleExpectations
-
-    # rubocop:disable RSpec/MultipleExpectations
     it 'returns multiple instances' do
       provider_class.expects(:rabbitmqctl_list).with('vhosts').returns <<-EOT
 /
diff --git a/spec/unit/puppet/provider/rabbitmq_parameter/rabbitmqctl_spec.rb b/spec/unit/puppet/provider/rabbitmq_parameter/rabbitmqctl_spec.rb
@@ -57,8 +57,6 @@
       instances = provider_class.instances
       expect(instances.size).to eq(0)
     end
-
-    # rubocop:disable RSpec/MultipleExpectations
     it 'return one instance' do
       provider_class.expects(:rabbitmqctl_list).with('vhosts').returns <<-EOT
 /
@@ -90,8 +88,6 @@
       )
     end
     # rubocop:enable RSpec/MultipleExpectations
-
-    # rubocop:disable RSpec/MultipleExpectations
     it 'return multiple instances' do
       provider_class.expects(:rabbitmqctl_list).with('vhosts').returns <<-EOT
 /
diff --git a/spec/unit/puppet/type/rabbitmq_user_permissions_spec.rb b/spec/unit/puppet/type/rabbitmq_user_permissions_spec.rb
@@ -36,7 +36,6 @@
       end.to raise_error(Puppet::Error, %r{Invalid regexp})
     end
   end
-  # rubocop:disable RSpec/MultipleExpectations
   { rabbitmq_vhost: 'dan@test', rabbitmq_user: 'test@dan' }.each do |k, v|
     it "should autorequire #{k}" do
       vhost = if k == :rabbitmq_vhost

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-$rabbitmq_plugins = [ 'amqp_client', 'rabbitmq_stomp' ]`
	`1`	`+$rabbitmq_plugins = ['amqp_client', 'rabbitmq_stomp']`
`2`	`2`
`3`	`3`	`class { 'rabbitmq':`
`4`	`4`	`config_stomp => true,`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`node default {`
`2`		`-`
`3`		`- $rabbitmq_plugins = [ 'amqp_client', 'rabbitmq_stomp' ]`
	`2`	`+ $rabbitmq_plugins = ['amqp_client', 'rabbitmq_stomp']`
`4`	`3`
`5`	`4`	`class { 'rabbitmq':`
`6`	`5`	`config => '[ {rabbit_stomp, [{tcp_listeners, [1234]} ]} ].',`
`@@ -13,4 +12,3 @@`
`13`	`12`	`provider => 'rabbitmqplugins',`
`14`	`13`	`}`
`15`	`14`	`}`
`16`		`-`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@`
`3`	`3`	`#`
`4`	`4`	`# @api private`
`5`	`5`	`class rabbitmq::config {`
`6`		`-`
`7`	`6`	`$admin_enable = $rabbitmq::admin_enable`
`8`	`7`	`$management_enable = $rabbitmq::management_enable`
`9`	`8`	`$use_config_file_for_plugins = $rabbitmq::use_config_file_for_plugins`
`@@ -104,7 +103,7 @@`
`104`	`103`	`$management_ip_address = $rabbitmq::node_ip_address`
`105`	`104`	`}`
`106`	`105`
`107`		`- $inetrc_env = {'export ERL_INETRC' => $inetrc_config_path}`
	`106`	`+ $inetrc_env = { 'export ERL_INETRC' => $inetrc_config_path }`
`108`	`107`
`109`	`108`	`# Handle env variables.`
`110`	`109`	`$_environment_variables = $default_ssl_env_variables + $inetrc_env + $rabbitmq::environment_variables`
`@@ -125,7 +124,7 @@`
`125`	`124`	`$proto_dist = 'inet6_tcp'`
`126`	`125`	`$ssl_path = ''`
`127`	`126`	`}`
`128`		`- $ipv6_or_tls_env = ['SERVER_ADDITIONAL', 'CTL'].reduce({}) \|$memo, $item\| {`
	`127`	`+ $ipv6_or_tls_env = ['SERVER_ADDITIONAL', 'CTL'].reduce( {}) \|$memo, $item\| {`
`129`	`128`	`$orig = $_environment_variables["RABBITMQ_${item}_ERL_ARGS"]`
`130`	`129`	`$munged = $orig ? {`
`131`	`130`	`# already quoted, keep quoting`
`@@ -136,7 +135,7 @@`
`136`	`135`	`default => "\"${orig}${ssl_path} -proto_dist ${proto_dist}\"",`
`137`	`136`	`}`
`138`	`137`
`139`		`- merge($memo, {"RABBITMQ_${item}_ERL_ARGS" => $munged})`
	`138`	`+ merge($memo, { "RABBITMQ_${item}_ERL_ARGS" => $munged })`
`140`	`139`	`}`
`141`	`140`
`142`	`141`	`$environment_variables = $_environment_variables + $ipv6_or_tls_env`
`@@ -227,12 +226,12 @@`
`227`	`226`	`mode => '0644',`
`228`	`227`	`}`
`229`	`228`	`}`
`230`		`- default: { }`
	`229`	`+ default: {}`
`231`	`230`	`}`
`232`	`231`
`233`	`232`	`if $facts['systemd'] { # systemd fact provided by systemd module`
`234`	`233`	`systemd::service_limits { "${service_name}.service":`
`235`		`- limits => {'LimitNOFILE' => $file_limit},`
	`234`	`+ limits => { 'LimitNOFILE' => $file_limit },`
`236`	`235`	`# The service will be notified when config changes`
`237`	`236`	`restart_service => false,`
`238`	`237`	`}`
Original file line number	Diff line number	Diff line change
`@@ -298,7 +298,7 @@`
`298`	`298`	`# @param loopback_users`
`299`	`299`	`# This option configures a list of users to allow access via the loopback interfaces`
`300`	`300`	`#`
`301`		`-class rabbitmq(`
	`301`	`+class rabbitmq (`
`302`	`302`	`Boolean $admin_enable = true,`
`303`	`303`	`Boolean $management_enable = false,`
`304`	`304`	`Boolean $use_config_file_for_plugins = false,`
`@@ -399,12 +399,11 @@`
`399`	`399`	`Array $loopback_users = ['guest'],`
`400`	`400`	`Boolean $service_restart = true,`
`401`	`401`	`) {`
`402`		`-`
`403`	`402`	`if $ssl_only and ! $ssl {`
`404`	`403`	`fail('$ssl_only => true requires that $ssl => true')`
`405`	`404`	`}`
`406`	`405`
`407`		`- if $config_stomp and $stomp_ssl_only and ! $ssl_stomp_port {`
	`406`	`+ if $config_stomp and $stomp_ssl_only and ! $ssl_stomp_port {`
`408`	`407`	`fail('$stomp_ssl_only requires that $ssl_stomp_port be set')`
`409`	`408`	`}`
`410`	`409`
`@@ -498,5 +497,4 @@`
`498`	`497`
`499`	`498`	`# Make sure the various providers have their requirements in place.`
`500`	`499`	`Class['rabbitmq::install'] -> Rabbitmq_plugin<\| \|>`
`501`		`-`
`502`	`500`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@`
`2`	`2`	`#`
`3`	`3`	`# @api private`
`4`	`4`	`class rabbitmq::install {`
`5`		`-`
`6`	`5`	`$package_ensure = $rabbitmq::package_ensure`
`7`	`6`	`$package_name = $rabbitmq::package_name`
`8`	`7`	`$rabbitmq_group = $rabbitmq::rabbitmq_group`
Original file line number	Diff line number	Diff line change
`@@ -2,14 +2,12 @@`
`2`	`2`	`#`
`3`	`3`	`# @api private`
`4`	`4`	`class rabbitmq::management {`
`5`		`-`
`6`	`5`	`$delete_guest_user = $rabbitmq::delete_guest_user`
`7`	`6`
`8`	`7`	`if $delete_guest_user {`
`9`		`- rabbitmq_user{ 'guest':`
	`8`	`+ rabbitmq_user { 'guest':`
`10`	`9`	`ensure => absent,`
`11`	`10`	`provider => 'rabbitmqctl',`
`12`	`11`	`}`
`13`	`12`	`}`
`14`		`-`
`15`	`13`	`}`