From c23fbc876062217e3548b47869da8290dbacaea6 Mon Sep 17 00:00:00 2001 From: Lukas Audzevicius Date: Thu, 19 Jan 2023 11:04:43 +0000 Subject: [PATCH] (CONT-360) Syntax Syntax_update This code is now compliant with the rules regarding: legacy facts top-scope facts top-scope variables variables not enclosed relative classname reference --- .puppet-lint.rc | 5 - .sync.yml | 6 - Rakefile | 6 - manifests/config.pp | 26 ++-- manifests/init.pp | 146 +++++++++++----------- plans/acceptance/provision_integration.pp | 4 +- 6 files changed, 88 insertions(+), 105 deletions(-) diff --git a/.puppet-lint.rc b/.puppet-lint.rc index 9c35b1579..cc96ece05 100644 --- a/.puppet-lint.rc +++ b/.puppet-lint.rc @@ -1,6 +1 @@ --relative ---no-legacy_facts-check ---no-top_scope_facts-check ---no-topscope_variable-check ---no-relative_classname_reference-check ---no-variables_not_enclosed-check diff --git a/.sync.yml b/.sync.yml index 6445f3ce6..f10f26d81 100644 --- a/.sync.yml +++ b/.sync.yml @@ -19,12 +19,6 @@ Rakefile: t.rspec_opts = "--tag integration" end end - extra_disabled_lint_checks: - - legacy_facts - - top_scope_facts - - topscope_variable - - relative_classname_reference - - variables_not_enclosed spec/spec_helper.rb: mock_with: ":rspec" coverage_report: true diff --git a/Rakefile b/Rakefile index 2e53dfcfc..86fb006e6 100644 --- a/Rakefile +++ b/Rakefile @@ -42,12 +42,6 @@ def changelog_future_release end PuppetLint.configuration.send('disable_relative') -PuppetLint.configuration.send('disable_legacy_facts') -PuppetLint.configuration.send('disable_top_scope_facts') -PuppetLint.configuration.send('disable_topscope_variable') -PuppetLint.configuration.send('disable_relative_classname_reference') -PuppetLint.configuration.send('disable_variables_not_enclosed') - if Bundler.rubygems.find_name('github_changelog_generator').any? GitHubChangelogGenerator::RakeTask.new :changelog do |config| diff --git a/manifests/config.pp b/manifests/config.pp index f60c3853e..5b8691afa 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -5,14 +5,14 @@ # class ntp::config { #The servers-netconfig file overrides NTP config on SLES 12, interfering with our configuration. - if ($facts['operatingsystem'] == 'SLES' and $facts['operatingsystemmajrelease'] == '12') or - ($facts['operatingsystem'] == 'OpenSuSE' and $facts['operatingsystemmajrelease'] == '42') { + if ($facts['os']['name'] == 'SLES' and $facts['os']['release']['major'] == '12') or + ($facts['os']['name'] == 'OpenSuSE' and $facts['os']['release']['major'] == '42') { file { '/var/run/ntp/servers-netconfig': ensure => 'absent', } } - case $::osfamily { + case $facts['os']['family'] { 'redhat': { $daemon_config = '/etc/sysconfig/ntpd' if $ntp::daemon_extra_opts { @@ -23,7 +23,7 @@ match => '^OPTIONS\=', } } - if $ntp::user and $facts['operatingsystemmajrelease'] != '6' { + if $ntp::user and $facts['os']['release']['major'] != '6' { file_line { 'Set NTPD daemon user': ensure => present, path => '/etc/systemd/system/multi-user.target.wants/ntpd.service', @@ -42,7 +42,7 @@ match => '^NTPD_OPTS\=', } } - if $ntp::user and $facts['operatingsystemmajrelease'] == '18.04' { + if $ntp::user and $facts['os']['release']['major'] == '18.04' { file_line { 'Set NTPD daemon user': ensure => present, path => '/usr/lib/ntp/ntp-systemd-wrapper', @@ -106,29 +106,29 @@ ensure => file, owner => 0, group => 0, - mode => $::ntp::config_file_mode, + mode => $ntp::config_file_mode, content => $config_content, } #If both epp and erb are defined, throw validation error. #Otherwise use the defined erb/epp template, or use default - if $::ntp::step_tickers_file { - if $::ntp::step_tickers_template and $::ntp::step_tickers_epp { + if $ntp::step_tickers_file { + if $ntp::step_tickers_template and $ntp::step_tickers_epp { fail('Cannot supply both step_tickers_file and step_tickers_epp templates for step ticker file') - } elsif $::ntp::step_tickers_template { + } elsif $ntp::step_tickers_template { $step_ticker_content = template($ntp::step_tickers_template) - } elsif $::ntp::step_tickers_epp { - $step_ticker_content = epp($::ntp::step_tickers_epp) + } elsif $ntp::step_tickers_epp { + $step_ticker_content = epp($ntp::step_tickers_epp) } else { $step_ticker_content = epp('ntp/step-tickers.epp') } - file { $::ntp::step_tickers_file: + file { $ntp::step_tickers_file: ensure => file, owner => 0, group => 0, - mode => $::ntp::config_file_mode, + mode => $ntp::config_file_mode, content => $step_ticker_content, } } diff --git a/manifests/init.pp b/manifests/init.pp index 2b8b338ab..2fc853ea4 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -238,76 +238,76 @@ # This is currently restricted to Redhat based systems of version 7 and above and Ubuntu 18.04. # class ntp ( - Boolean $broadcastclient, - Boolean $burst, - Stdlib::Absolutepath $config, - Optional[Stdlib::Absolutepath] $config_dir, - String $config_file_mode, - Optional[String] $config_epp, - Optional[String] $config_template, - Boolean $disable_auth, - Boolean $disable_dhclient, - Boolean $disable_kernel, - Boolean $disable_monitor, - Boolean $enable_mode7, - Optional[Array[String]] $fudge, - Stdlib::Absolutepath $driftfile, - Optional[Stdlib::Absolutepath] $leapfile, - Optional[Stdlib::Absolutepath] $logfile, - Optional[Variant[String, Integer]] $logfile_group, - String $logfile_mode, - Optional[Variant[String, Integer]] $logfile_user, - Optional[String] $logconfig, - Boolean $iburst_enable, - Array[String] $keys, - Boolean $keys_enable, - Stdlib::Absolutepath $keys_file, - Optional[Ntp::Key_id] $keys_controlkey, - Optional[Ntp::Key_id] $keys_requestkey, - Optional[Array[Ntp::Key_id]] $keys_trusted, - Optional[Ntp::Poll_interval] $minpoll, - Optional[Ntp::Poll_interval] $maxpoll, - String $package_ensure, - Boolean $package_manage, - Array[String] $package_name, - Optional[Integer[0]] $panic, - Array[String] $peers, - Optional[Array[String]] $pool, - Array[String] $preferred_servers, - Array[String] $noselect_servers, - Array[String] $restrict, - Array[String] $interfaces, - Array[String] $interfaces_ignore, - Array[String] $servers, - Boolean $service_enable, - Enum['running', 'stopped'] $service_ensure, - Boolean $service_manage, - String $service_name, - Optional[String] $service_provider, - Boolean $service_hasstatus, - Boolean $service_hasrestart, - Optional[Enum['yes','no']] $slewalways, - Optional[Array] $statistics, - Optional[Stdlib::Absolutepath] $statsdir, - Optional[Integer[0, 65535]] $stepout, - Optional[Stdlib::Absolutepath] $step_tickers_file, - Optional[String] $step_tickers_epp, - Optional[String] $step_tickers_template, - Optional[Boolean] $tinker, - Boolean $tos, - Optional[Integer[1]] $tos_maxclock, - Optional[Integer[1]] $tos_minclock, - Optional[Integer[1]] $tos_minsane, - Optional[Integer[1]] $tos_floor, - Optional[Integer[1]] $tos_ceiling, - Optional[Integer[1]] $tos_orphan, - Variant[Boolean, Integer[0,1]] $tos_cohort, - Boolean $udlc, - Optional[Integer[1,15]] $udlc_stratum, - Optional[Stdlib::Absolutepath] $ntpsigndsocket, - Optional[String] $authprov, - Optional[String] $user, - Optional[String] $daemon_extra_opts, + Boolean $broadcastclient, + Boolean $burst, + Stdlib::Absolutepath $config, + Optional[Stdlib::Absolutepath] $config_dir, + String $config_file_mode, + Optional[String] $config_epp, + Optional[String] $config_template, + Boolean $disable_auth, + Boolean $disable_dhclient, + Boolean $disable_kernel, + Boolean $disable_monitor, + Boolean $enable_mode7, + Optional[Array[String]] $fudge, + Stdlib::Absolutepath $driftfile, + Optional[Stdlib::Absolutepath] $leapfile, + Optional[Stdlib::Absolutepath] $logfile, + Optional[Variant[String, Integer]] $logfile_group, + String $logfile_mode, + Optional[Variant[String, Integer]] $logfile_user, + Optional[String] $logconfig, + Boolean $iburst_enable, + Array[String] $keys, + Boolean $keys_enable, + Stdlib::Absolutepath $keys_file, + Optional[Ntp::Key_id] $keys_controlkey, + Optional[Ntp::Key_id] $keys_requestkey, + Optional[Array[Ntp::Key_id]] $keys_trusted, + Optional[Ntp::Poll_interval] $minpoll, + Optional[Ntp::Poll_interval] $maxpoll, + String $package_ensure, + Boolean $package_manage, + Array[String] $package_name, + Optional[Integer[0]] $panic, + Array[String] $peers, + Optional[Array[String]] $pool, + Array[String] $preferred_servers, + Array[String] $noselect_servers, + Array[String] $restrict, + Array[String] $interfaces, + Array[String] $interfaces_ignore, + Array[String] $servers, + Boolean $service_enable, + Enum['running', 'stopped'] $service_ensure, + Boolean $service_manage, + String $service_name, + Optional[String] $service_provider, + Boolean $service_hasstatus, + Boolean $service_hasrestart, + Optional[Enum['yes','no']] $slewalways, + Optional[Array] $statistics, + Optional[Stdlib::Absolutepath] $statsdir, + Optional[Integer[0, 65535]] $stepout, + Optional[Stdlib::Absolutepath] $step_tickers_file, + Optional[String] $step_tickers_epp, + Optional[String] $step_tickers_template, + Optional[Boolean] $tinker, + Boolean $tos, + Optional[Integer[1]] $tos_maxclock, + Optional[Integer[1]] $tos_minclock, + Optional[Integer[1]] $tos_minsane, + Optional[Integer[1]] $tos_floor, + Optional[Integer[1]] $tos_ceiling, + Optional[Integer[1]] $tos_orphan, + Variant[Boolean, Integer[0,1]] $tos_cohort, + Boolean $udlc, + Optional[Integer[1,15]] $udlc_stratum, + Optional[Stdlib::Absolutepath] $ntpsigndsocket, + Optional[String] $authprov, + Optional[String] $user, + Optional[String] $daemon_extra_opts, ) { # defaults for tinker and panic are different, when running on virtual machines if $facts['is_virtual'] { @@ -322,7 +322,7 @@ contain ntp::config contain ntp::service - Class['::ntp::install'] - -> Class['::ntp::config'] - ~> Class['::ntp::service'] + Class['ntp::install'] + -> Class['ntp::config'] + ~> Class['ntp::service'] } diff --git a/plans/acceptance/provision_integration.pp b/plans/acceptance/provision_integration.pp index aa3703163..8a5cd5e32 100644 --- a/plans/acceptance/provision_integration.pp +++ b/plans/acceptance/provision_integration.pp @@ -9,6 +9,6 @@ Optional[String] $provision_type = 'provision_service', ) { #provision server machine, set role - run_task("provision::$provision_type", 'localhost', action => 'provision', platform => $image, vars => 'role: ntpserver') - run_task("provision::$provision_type", 'localhost', action => 'provision', platform => $image, vars => 'role: ntpclient') + run_task("provision::${provision_type}", 'localhost', action => 'provision', platform => $image, vars => 'role: ntpserver') + run_task("provision::${provision_type}", 'localhost', action => 'provision', platform => $image, vars => 'role: ntpclient') }