puppet-lint autofix with voxpupuli-test 5

ekohl · ekohl · commit c45bdb96594c · 2023-01-11T17:01:44.000+01:00
diff --git a/manifests/agent/config.pp b/manifests/agent/config.pp
@@ -1,7 +1,7 @@
 # Puppet agent configuration
 # @api private
 class puppet::agent::config inherits puppet::config {
-  puppet::config::agent{
+  puppet::config::agent {
     'classfile':         value => $puppet::classfile;
     'localconfig':       value => '$vardir/localconfig';
     'default_schedules': value => false;
diff --git a/manifests/agent/install.pp b/manifests/agent/install.pp
@@ -1,6 +1,6 @@
 # Install the puppet agent package
 # @api private
-class puppet::agent::install(
+class puppet::agent::install (
   $manage_packages = $puppet::manage_packages,
   $package_name = $puppet::client_package,
   $package_version = $puppet::version,
diff --git a/manifests/agent/service.pp b/manifests/agent/service.pp
@@ -1,7 +1,6 @@
 # Set up the puppet agent as a service
 # @api private
 class puppet::agent::service {
-
   case $puppet::runmode {
     'service': {
       $service_enabled = true
@@ -29,7 +28,7 @@
   }
 
   if $puppet::runmode in $puppet::unavailable_runmodes {
-    fail("Runmode of ${puppet::runmode} not supported on ${::kernel} operating systems!")
+    fail("Runmode of ${puppet::runmode} not supported on ${facts['kernel']} operating systems!")
   }
 
   class { 'puppet::agent::service::daemon':
diff --git a/manifests/agent/service/cron.pp b/manifests/agent/service/cron.pp
@@ -19,7 +19,7 @@
         hour    => $_hour,
         minute  => $_minute,
       }
-    } else{
+    } else {
       cron { 'puppet':
         ensure => absent,
       }
diff --git a/manifests/agent/service/daemon.pp b/manifests/agent/service/daemon.pp
@@ -5,7 +5,7 @@
 ) {
   unless $puppet::runmode == 'unmanaged' or 'service' in $puppet::unavailable_runmodes {
     if $enabled {
-      service {'puppet':
+      service { 'puppet':
         ensure     => running,
         name       => $puppet::service_name,
         hasstatus  => true,
@@ -14,7 +14,7 @@
         restart    => $puppet::agent_restart_command,
       }
     } else {
-      service {'puppet':
+      service { 'puppet':
         ensure    => stopped,
         name      => $puppet::service_name,
         hasstatus => true,
diff --git a/manifests/config.pp b/manifests/config.pp
@@ -1,6 +1,6 @@
 # Set up the puppet config
 # @api private
-class puppet::config(
+class puppet::config (
   $allow_any_crl_auth  = $puppet::allow_any_crl_auth,
   $auth_allowed        = $puppet::auth_allowed,
   $auth_template       = $puppet::auth_template,
@@ -18,7 +18,7 @@
   $additional_settings = $puppet::additional_settings,
   $client_certname     = $puppet::client_certname,
 ) {
-  puppet::config::main{
+  puppet::config::main {
     'vardir': value => $puppet::vardir;
     'logdir': value => $puppet::logdir;
     'rundir': value => $puppet::rundir;
@@ -30,22 +30,22 @@
   }
 
   if $module_repository and !empty($module_repository) {
-    puppet::config::main{'module_repository': value => $module_repository; }
+    puppet::config::main { 'module_repository': value => $module_repository; }
   }
   if $ca_server and !empty($ca_server) {
-    puppet::config::main{'ca_server': value => $ca_server; }
+    puppet::config::main { 'ca_server': value => $ca_server; }
   }
   if $ca_port {
-    puppet::config::main{'ca_port': value => $ca_port; }
+    puppet::config::main { 'ca_port': value => $ca_port; }
   }
   if $dns_alt_names and !empty($dns_alt_names) {
-    puppet::config::main{'dns_alt_names': value => $dns_alt_names; }
+    puppet::config::main { 'dns_alt_names': value => $dns_alt_names; }
   }
   if $use_srv_records {
     unless $srv_domain {
       fail('domain fact found to be undefined and $srv_domain is undefined')
     }
-    puppet::config::main{
+    puppet::config::main {
       'use_srv_records': value => true;
       'srv_domain': value => $srv_domain;
     }
@@ -55,13 +55,13 @@
     }
   }
   if $pluginsource {
-    puppet::config::main{'pluginsource': value => $pluginsource; }
+    puppet::config::main { 'pluginsource': value => $pluginsource; }
   }
   if $pluginfactsource {
-    puppet::config::main{'pluginfactsource': value => $pluginfactsource; }
+    puppet::config::main { 'pluginfactsource': value => $pluginfactsource; }
   }
   if $syslogfacility and !empty($syslogfacility) {
-    puppet::config::main{'syslogfacility': value => $syslogfacility; }
+    puppet::config::main { 'syslogfacility': value => $syslogfacility; }
   }
   if $client_certname {
     puppet::config::main {
diff --git a/manifests/config/agent.pp b/manifests/config/agent.pp
@@ -11,7 +11,7 @@
   String $key    = $name,
   String $joiner = ','
 ) {
-  puppet::config::entry{"agent_${name}":
+  puppet::config::entry { "agent_${name}":
     key          => $key,
     value        => $value,
     joiner       => $joiner,
diff --git a/manifests/config/entry.pp b/manifests/config/entry.pp
@@ -41,14 +41,14 @@
 
   # this adds the '$key =' for the first value,
   # otherwise it just appends it with the joiner to separate it from the previous value.
-  if (!defined(Concat::Fragment["puppet.conf_${section}_${key}"])){
-    concat::fragment{"puppet.conf_${section}_${key}":
+  if (!defined(Concat::Fragment["puppet.conf_${section}_${key}"])) {
+    concat::fragment { "puppet.conf_${section}_${key}":
       target  => "${puppet::dir}/puppet.conf",
       content => "\n    ${key} = ${_value}",
       order   => "${sectionorder}_${section}_${key} ",
     }
   } else {
-    concat::fragment{"puppet.conf_${section}_${key}_${name}":
+    concat::fragment { "puppet.conf_${section}_${key}_${name}":
       target  => "${puppet::dir}/puppet.conf",
       content => "${joiner}${_value}",
       order   => "${sectionorder}_${section}_${key}_${name} ",
diff --git a/manifests/config/main.pp b/manifests/config/main.pp
@@ -11,7 +11,7 @@
   String $key    = $name,
   String $joiner = ','
 ) {
-  puppet::config::entry{"main${name}":
+  puppet::config::entry { "main${name}":
     key          => $key,
     value        => $value,
     joiner       => $joiner,
diff --git a/manifests/config/master.pp b/manifests/config/master.pp
@@ -11,7 +11,7 @@
   String $key    = $name,
   String $joiner = ','
 ) {
-  puppet::config::entry{"master_${name}":
+  puppet::config::entry { "master_${name}":
     key          => $key,
     value        => $value,
     joiner       => $joiner,
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -1,7 +1,6 @@
 # Default parameters
 # @api private
 class puppet::params {
-
   # Basic config
   $version             = 'present'
   $manage_user         = true
@@ -370,8 +369,8 @@
   $server_connect_timeout                 = 120000
   $server_ca_auth_required                = true
   $server_ca_client_self_delete           = false
-  $server_admin_api_whitelist             = [ 'localhost', $lower_fqdn ]
-  $server_ca_client_whitelist             = [ 'localhost', $lower_fqdn ]
+  $server_admin_api_whitelist             = ['localhost', $lower_fqdn]
+  $server_ca_client_whitelist             = ['localhost', $lower_fqdn]
   $server_cipher_suites                   = [
     'TLS_DHE_RSA_WITH_AES_128_GCM_SHA256',
     'TLS_DHE_RSA_WITH_AES_256_GCM_SHA384',
@@ -380,7 +379,7 @@
     'TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256',
     'TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384',
   ]
-  $server_ssl_protocols                   = [ 'TLSv1.2' ]
+  $server_ssl_protocols                   = ['TLSv1.2']
   $server_ssl_chain_filepath              = undef
   $server_check_for_updates               = true
   $server_environment_class_cache_enabled = false
diff --git a/manifests/server.pp b/manifests/server.pp
@@ -338,7 +338,7 @@
 #
 # $jolokia_metrics_whitelist::         The whitelist of clients that
 #                                      can query the jolokia /metrics/v2 endpoint
-class puppet::server(
+class puppet::server (
   Variant[Boolean, Stdlib::Absolutepath] $autosign = $puppet::autosign,
   Array[String] $autosign_entries = $puppet::autosign_entries,
   Pattern[/^[0-9]{3,4}$/] $autosign_mode = $puppet::autosign_mode,
diff --git a/manifests/server/config.pp b/manifests/server/config.pp
@@ -39,7 +39,7 @@
   $primary_envs_dir            = $puppet::server::envs_dir[0]
 
   if $server_external_nodes and $server_external_nodes != '' {
-    class{ 'puppet::server::enc':
+    class { 'puppet::server::enc':
       enc_path => $server_external_nodes,
     }
   }
@@ -59,7 +59,7 @@
     'reports':            value => $puppet::server::reports;
     'environmentpath':    value => $puppet::server::envs_dir.join(':');
   }
-  if $puppet::server::hiera_config and !empty($puppet::server::hiera_config){
+  if $puppet::server::hiera_config and !empty($puppet::server::hiera_config) {
     puppet::config::main {
       'hiera_config':       value => $puppet::server::hiera_config;
     }
@@ -147,15 +147,15 @@
 
   # If the ssl dir is not the default dir, it needs to be created before running
   # the generate ca cert or it will fail.
-  exec {'puppet_server_config-create_ssl_dir':
+  exec { 'puppet_server_config-create_ssl_dir':
     creates => $puppet::server::ssl_dir,
     command => "/bin/mkdir -p ${puppet::server::ssl_dir}",
     umask   => '0022',
   }
 
   # Generate a new CA and host cert if our host cert doesn't exist
   if $puppet::server::ca {
-    exec {'puppet_server_config-generate_ca_cert':
+    exec { 'puppet_server_config-generate_ca_cert':
       creates => $puppet::server::ssl_ca_cert,
       command => "${puppet::puppetserver_cmd} ca setup",
       umask   => '0022',
diff --git a/manifests/server/enc.pp b/manifests/server/enc.pp
@@ -1,6 +1,6 @@
 # Set up the ENC config
 # @api private
-class puppet::server::enc(
+class puppet::server::enc (
   $enc_path = $puppet::server::external_nodes
 ) {
   puppet::config::master {
diff --git a/manifests/server/install.pp b/manifests/server/install.pp
@@ -1,7 +1,6 @@
 # Install the puppet server
 # @api private
 class puppet::server::install {
-
   # Mirror the relationship, as defined() is parse-order dependent
   # Ensures 'puppet' user group is present before managing users
   if defined(Class['foreman_proxy::config']) {
diff --git a/manifests/server/puppetserver.pp b/manifests/server/puppetserver.pp
@@ -164,10 +164,10 @@
   $jvm_cmd = strip(join(flatten($jvm_cmd_arr), ' '))
 
   if $facts['os']['family'] == 'FreeBSD' {
-    $server_gem_paths = [ '${jruby-puppet.gem-home}', "\"${server_puppetserver_vardir}/vendored-jruby-gems\"", ] # lint:ignore:single_quote_string_with_variables
+    $server_gem_paths = ['${jruby-puppet.gem-home}', "\"${server_puppetserver_vardir}/vendored-jruby-gems\"",] # lint:ignore:single_quote_string_with_variables
     augeas { 'puppet::server::puppetserver::jvm':
       context => '/files/etc/rc.conf',
-      changes => [ "set puppetserver_java_opts '\"${jvm_cmd}\"'" ],
+      changes => ["set puppetserver_java_opts '\"${jvm_cmd}\"'"],
     }
   } else {
     if $jvm_cli_args {
@@ -191,7 +191,7 @@
 
     $bootstrap_paths = "${server_puppetserver_dir}/services.d/,/opt/puppetlabs/server/apps/puppetserver/config/services.d/"
 
-    $server_gem_paths = [ '${jruby-puppet.gem-home}', "\"${server_puppetserver_vardir}/vendored-jruby-gems\"", "\"/opt/puppetlabs/puppet/lib/ruby/vendor_gems\""] # lint:ignore:single_quote_string_with_variables
+    $server_gem_paths = ['${jruby-puppet.gem-home}', "\"${server_puppetserver_vardir}/vendored-jruby-gems\"", "\"/opt/puppetlabs/puppet/lib/ruby/vendor_gems\""] # lint:ignore:single_quote_string_with_variables
 
     augeas { 'puppet::server::puppetserver::bootstrap':
       lens    => 'Shellvars.lns',
diff --git a/manifests/server/service.pp b/manifests/server/service.pp
@@ -4,7 +4,7 @@
 # @param $service_name The service name to manage
 #
 # @api private
-class puppet::server::service(
+class puppet::server::service (
   Boolean $enable = true,
   String $service_name = 'puppetserver',
 ) {

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`# Set up the puppet agent as a service`
`2`	`2`	`# @api private`
`3`	`3`	`class puppet::agent::service {`
`4`		`-`
`5`	`4`	`case $puppet::runmode {`
`6`	`5`	`'service': {`
`7`	`6`	`$service_enabled = true`
`@@ -29,7 +28,7 @@`
`29`	`28`	`}`
`30`	`29`
`31`	`30`	`if $puppet::runmode in $puppet::unavailable_runmodes {`
`32`		`- fail("Runmode of ${puppet::runmode} not supported on ${::kernel} operating systems!")`
	`31`	`+ fail("Runmode of ${puppet::runmode} not supported on ${facts['kernel']} operating systems!")`
`33`	`32`	`}`
`34`	`33`
`35`	`34`	`class { 'puppet::agent::service::daemon':`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`hour => $_hour,`
`20`	`20`	`minute => $_minute,`
`21`	`21`	`}`
`22`		`- } else{`
	`22`	`+ } else {`
`23`	`23`	`cron { 'puppet':`
`24`	`24`	`ensure => absent,`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`# Set up the puppet config`
`2`	`2`	`# @api private`
`3`		`-class puppet::config(`
	`3`	`+class puppet::config (`
`4`	`4`	`$allow_any_crl_auth = $puppet::allow_any_crl_auth,`
`5`	`5`	`$auth_allowed = $puppet::auth_allowed,`
`6`	`6`	`$auth_template = $puppet::auth_template,`
`@@ -18,7 +18,7 @@`
`18`	`18`	`$additional_settings = $puppet::additional_settings,`
`19`	`19`	`$client_certname = $puppet::client_certname,`
`20`	`20`	`) {`
`21`		`- puppet::config::main{`
	`21`	`+ puppet::config::main {`
`22`	`22`	`'vardir': value => $puppet::vardir;`
`23`	`23`	`'logdir': value => $puppet::logdir;`
`24`	`24`	`'rundir': value => $puppet::rundir;`
`@@ -30,22 +30,22 @@`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`if $module_repository and !empty($module_repository) {`
`33`		`- puppet::config::main{'module_repository': value => $module_repository; }`
	`33`	`+ puppet::config::main { 'module_repository': value => $module_repository; }`
`34`	`34`	`}`
`35`	`35`	`if $ca_server and !empty($ca_server) {`
`36`		`- puppet::config::main{'ca_server': value => $ca_server; }`
	`36`	`+ puppet::config::main { 'ca_server': value => $ca_server; }`
`37`	`37`	`}`
`38`	`38`	`if $ca_port {`
`39`		`- puppet::config::main{'ca_port': value => $ca_port; }`
	`39`	`+ puppet::config::main { 'ca_port': value => $ca_port; }`
`40`	`40`	`}`
`41`	`41`	`if $dns_alt_names and !empty($dns_alt_names) {`
`42`		`- puppet::config::main{'dns_alt_names': value => $dns_alt_names; }`
	`42`	`+ puppet::config::main { 'dns_alt_names': value => $dns_alt_names; }`
`43`	`43`	`}`
`44`	`44`	`if $use_srv_records {`
`45`	`45`	`unless $srv_domain {`
`46`	`46`	`fail('domain fact found to be undefined and $srv_domain is undefined')`
`47`	`47`	`}`
`48`		`- puppet::config::main{`
	`48`	`+ puppet::config::main {`
`49`	`49`	`'use_srv_records': value => true;`
`50`	`50`	`'srv_domain': value => $srv_domain;`
`51`	`51`	`}`
`@@ -55,13 +55,13 @@`
`55`	`55`	`}`
`56`	`56`	`}`
`57`	`57`	`if $pluginsource {`
`58`		`- puppet::config::main{'pluginsource': value => $pluginsource; }`
	`58`	`+ puppet::config::main { 'pluginsource': value => $pluginsource; }`
`59`	`59`	`}`
`60`	`60`	`if $pluginfactsource {`
`61`		`- puppet::config::main{'pluginfactsource': value => $pluginfactsource; }`
	`61`	`+ puppet::config::main { 'pluginfactsource': value => $pluginfactsource; }`
`62`	`62`	`}`
`63`	`63`	`if $syslogfacility and !empty($syslogfacility) {`
`64`		`- puppet::config::main{'syslogfacility': value => $syslogfacility; }`
	`64`	`+ puppet::config::main { 'syslogfacility': value => $syslogfacility; }`
`65`	`65`	`}`
`66`	`66`	`if $client_certname {`
`67`	`67`	`puppet::config::main {`