Merge pull request #451 from atarax/master

(MODULES-10055) fix linter-errors in puppetlabs/puppet_agent

Author: gimmyxd

manifests/init.pp

@@ -162,7 +162,7 @@
       $_expected_package_version = $master_or_package_version
     }
 
-    $aio_upgrade_required = versioncmp("${::aio_agent_version}", "${_expected_package_version}") < 0
+    $aio_upgrade_required = versioncmp($::aio_agent_version, $_expected_package_version) < 0
 
     if $::operatingsystem == 'Solaris' and $::operatingsystemmajrelease == '11' {
       # Strip letters from development builds. Unique to Solaris 11 packaging.

manifests/install/darwin.pp

@@ -15,7 +15,7 @@
   notice("Puppet install log file at ${_logfile}")
 
   $_installsh = "${::env_temp_variable}/osx_install.sh"
-  file { "${_installsh}":
+  file { $_installsh:
     ensure  => file,
     mode    => '0755',
     content => template('puppet_agent/do_install.sh.erb')

manifests/install/solaris.pp

@@ -35,7 +35,7 @@
       notice ("Puppet install log file at ${_logfile}")
 
       $_installsh = "${::env_temp_variable}/solaris_install.sh"
-      file { "${_installsh}":
+      file { $_installsh:
         ensure  => file,
         mode    => '0755',
         content => template('puppet_agent/do_install.sh.erb')

manifests/install/windows.pp

@@ -39,7 +39,7 @@
 
   $_installps1 = windows_native_path("${::env_temp_variable}/install_puppet.ps1")
   puppet_agent_upgrade_error { 'puppet_agent_upgrade_failure.log': }
-  file { "${_installps1}":
+  file { $_installps1:
     ensure  => file,
     content => file('puppet_agent/install_puppet.ps1')
   }
@@ -67,14 +67,14 @@
                   -NoLogo \
                   -NonInteractive \
                   -Command {\$CurrentVersion = [string](facter.bat -p aio_agent_version); \
-                            if (\$CurrentVersion -eq '${puppet_agent::_expected_package_version}') { \
+                            if (\$CurrentVersion -eq '${::puppet_agent::_expected_package_version}') { \
                               exit 0; \
                             } \
                             exit 1; }.Invoke()",
     path    => $::path,
     require => [
       Puppet_agent_upgrade_error['puppet_agent_upgrade_failure.log'],
-      File["${_installps1}"]
+      File[$_installps1]
     ]
   }
 

manifests/osfamily/redhat.pp

@@ -137,7 +137,7 @@
         descr               => "Puppet Labs ${::puppet_agent::collection} Repository",
         enabled             => true,
         gpgcheck            => '1',
-        gpgkey              => "${gpg_keys}",
+        gpgkey              => $gpg_keys,
         proxy               => $_proxy,
         sslcacert           => $_sslcacert_path,
         sslclientcert       => $_sslclientcert_path,

manifests/params.pp

@@ -3,7 +3,7 @@
 # This class is meant to be called from puppet_agent
 # It sets variables according to platform.
 #
-class puppet_agent::params {
+class puppet_agent::params{
   # Which services should be started after the upgrade process?
   if ($::osfamily == 'Solaris' and $::operatingsystemmajrelease == '11') {
     # Solaris 11 is a special case; it uses a custom script.
@@ -51,11 +51,11 @@
     # Calculate the default collection
     $_pe_version = pe_build_version()
     # Not PE or pe_version < 2018.1.3, use PC1
-    if ($_pe_version == undef or versioncmp("${_pe_version}", '2018.1.3') < 0) {
+    if ($_pe_version == undef or versioncmp($_pe_version, '2018.1.3') < 0) {
       $collection = 'PC1'
     }
     # 2018.1.3 <= pe_version < 2018.2, use puppet5
-    elsif versioncmp("${_pe_version}", '2018.2') < 0 {
+    elsif versioncmp($_pe_version, '2018.2') < 0 {
       $collection = 'puppet5'
     }
     # pe_version >= 2018.2, use puppet6

manifests/prepare.pp

@@ -8,7 +8,7 @@
 #   The puppet-agent version to install.
 #
 class puppet_agent::prepare(
-  $package_version = undef,
+  $package_version = undef
 ){
   include puppet_agent::params
   $_windows_client = downcase($::osfamily) == 'windows'

manifests/prepare/puppet_config.pp

@@ -3,7 +3,7 @@
 # Private class called from puppet_agent::prepare class
 #
 class puppet_agent::prepare::puppet_config (
-  $package_version
+  $package_version,
 ) {
   assert_private()
   $puppetconf = $::puppet_agent::params::config
@@ -24,7 +24,7 @@
 
   # manage puppet.conf contents, using inifile module
   $_deprecations.each |$_min_version, $_setting_names| {
-    if (versioncmp("${_pkg_version}", "${_min_version}") >= 0) {
+    if (versioncmp($_pkg_version, $_min_version) >= 0) {
       $_setting_names.each |$_setting_name| {
         ['', 'master', 'agent', 'main'].each |$_section_name| {
           $_setting_key = "${_section_name}/${_setting_name}"

manifests/service.pp

@@ -3,7 +3,7 @@
 # This class is meant to be called from puppet_agent.
 # It ensures that managed services are running.
 #
-class puppet_agent::service {
+class puppet_agent::service{
   assert_private()
 
   # Starting with puppet6 collections we no longer carry the mcollective service