(CONT-352) Syntax update

Code now compliant with rules regarding:

legacy facts

diff --git a/.puppet-lint.rc b/.puppet-lint.rc
index feb502c4f30fe0afbd4027968d6fbe2208e1c5bd..ec11b39f09f62ece926ee4e2588598cd7f07fba9 100644 (file)
--- a/.puppet-lint.rc
+++ b/.puppet-lint.rc
@@ -2,4 +2,3 @@
 --no-relative_classname_inclusion-check
 --no-parameter_types-check
 --no-top_scope_facts-check
---no-legacy_facts-check

diff --git a/.sync.yml b/.sync.yml
index 66c2cfadeb1b98d9db0eb7f471e835b9f1a31530..9b3aaea89674b30ae34edfd34dfe5e37f3699fe6 100644 (file)
--- a/.sync.yml
+++ b/.sync.yml
@@ -37,4 +37,3 @@ Rakefile:
     - relative_classname_inclusion
     - parameter_types
     - top_scope_facts
-    - legacy_facts

diff --git a/Rakefile b/Rakefile
index 7fc43e080e738d2ebb1de245710522b47e8728f3..36b90afb3ca7464929750aad9d83066f1058d758 100644 (file)
--- a/Rakefile
+++ b/Rakefile
@@ -45,7 +45,6 @@ PuppetLint.configuration.send('disable_relative')
 PuppetLint.configuration.send('disable_relative_classname_inclusion')
 PuppetLint.configuration.send('disable_parameter_types')
 PuppetLint.configuration.send('disable_top_scope_facts')
-PuppetLint.configuration.send('disable_legacy_facts')
 
 
 if Bundler.rubygems.find_name('github_changelog_generator').any?

diff --git a/manifests/linux.pp b/manifests/linux.pp
index 91cebeb43560926715fafba7f623a3e0f415b17a..2e1416c5da0b1e96dcb2233fab82ae51514dc494 100644 (file)
--- a/manifests/linux.pp
+++ b/manifests/linux.pp
@@ -56,7 +56,7 @@ class firewall::linux (
     }
   }
 
-  case $::operatingsystem {
+  case $facts['os']['name'] {
     'RedHat', 'CentOS', 'Fedora', 'Scientific', 'SL', 'SLC', 'Ascendos',
     'CloudLinux', 'PSBM', 'OracleLinux', 'OVS', 'OEL', 'Amazon', 'XenServer',
     'VirtuozzoLinux', 'Rocky', 'AlmaLinux': {

diff --git a/manifests/linux/redhat.pp b/manifests/linux/redhat.pp
index 27370c7a82bca5ef8afe3f7a01e3311f71250b72..fa1fdc807468454bfb49322816376e9f34bf4702 100644 (file)
--- a/manifests/linux/redhat.pp
+++ b/manifests/linux/redhat.pp
@@ -49,7 +49,7 @@ class firewall::linux::redhat (
   # RHEL 7 / CentOS 7 and later and Fedora 15 and later require the iptables-services
   # package, which provides the /usr/libexec/iptables/iptables.init used by
   # lib/puppet/util/firewall.rb.
-  if ($::operatingsystem != 'Amazon') {
+  if ($facts['os']['name'] != 'Amazon') {
     if $firewalld_manage {
       service { 'firewalld':
         ensure => stopped,
@@ -72,7 +72,7 @@ class firewall::linux::redhat (
     )
   }
 
-  if ($::operatingsystem != 'Amazon') {
+  if ($facts['os']['name'] != 'Amazon') {
     if $ensure == 'running' {
       $running_command = ['/usr/bin/systemctl', 'daemon-reload']
 
@@ -86,8 +86,8 @@ class firewall::linux::redhat (
     }
   }
 
-  if ($::operatingsystem == 'Amazon') and (versioncmp($::operatingsystemmajrelease, '4') >= 0)
-  or ($::operatingsystem == 'Amazon') and (versioncmp($::operatingsystemmajrelease, '2') >= 0) {
+  if ($facts['os']['name'] == 'Amazon') and (versioncmp($facts['os']['release']['major'], '4') >= 0)
+  or ($facts['os']['name'] == 'Amazon') and (versioncmp($facts['os']['release']['major'], '2') >= 0) {
     service { $service_name:
       ensure    => $ensure,
       enable    => $enable,
@@ -135,12 +135,12 @@ class firewall::linux::redhat (
 
     # Redhat 7 selinux user context for /etc/sysconfig/iptables is set to system_u
     # Redhat 7 selinux type context for /etc/sysconfig/iptables is set to system_conf_t
-    case $::selinux {
+    case $facts['os']['selinux']['enabled'] {
       #lint:ignore:quoted_booleans
       'true',true: {
-        case $::operatingsystem {
+        case $facts['os']['name'] {
           'CentOS': {
-            case $::operatingsystemrelease {
+            case $facts['os']['release']['full'] {
               /^6\..*/: {
                 $seluser = 'unconfined_u'
                 $seltype = 'system_conf_t'

diff --git a/manifests/params.pp b/manifests/params.pp
index ed408edf4badc7c5c4830be44569e8ac5994fce3..aa3b94a764411ef9d94a1e0686fb93aea868d670 100644 (file)
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -4,9 +4,9 @@
 #
 class firewall::params {
   $package_ensure = 'present'
-  case $::osfamily {
+  case $facts['os']['family'] {
     'RedHat': {
-      case $::operatingsystem {
+      case $facts['os']['name'] {
         'Amazon': {
           $service_name = 'iptables'
           $service_name_v6 = 'ip6tables'
@@ -18,7 +18,7 @@ class firewall::params {
         'Fedora': {
           $service_name = 'iptables'
           $service_name_v6 = 'ip6tables'
-          if versioncmp($::operatingsystemrelease, '34') >= 0 {
+          if versioncmp($facts['os']['release']['full'], '34') >= 0 {
             $package_name = 'iptables-services'
             $iptables_name = 'iptables-compat'
           } else {
@@ -29,21 +29,21 @@ class firewall::params {
           $firewalld_manage = true
         }
         default: {
-          if versioncmp($::operatingsystemrelease, '9') >= 0 {
+          if versioncmp($facts['os']['release']['full'], '9') >= 0 {
             $service_name = ['nftables','iptables']
             $service_name_v6 = 'ip6tables'
             $package_name = ['iptables-services', 'nftables', 'iptables-nft-services']
             $iptables_name = 'iptables-nft'
             $sysconfig_manage = false
             $firewalld_manage = false
-          } elsif versioncmp($::operatingsystemrelease, '8.0') >= 0 {
+          } elsif versioncmp($facts['os']['release']['full'], '8.0') >= 0 {
             $service_name = ['iptables', 'nftables']
             $service_name_v6 = 'ip6tables'
             $package_name = ['iptables-services', 'nftables']
             $iptables_name = 'iptables'
             $sysconfig_manage = false
             $firewalld_manage = true
-          } elsif versioncmp($::operatingsystemrelease, '7.0') >= 0 {
+          } elsif versioncmp($facts['os']['release']['full'], '7.0') >= 0 {
             $service_name = 'iptables'
             $service_name_v6 = 'ip6tables'
             $package_name = 'iptables-services'
@@ -64,12 +64,12 @@ class firewall::params {
     'Debian': {
       $service_name_v6 = undef
       $iptables_name = 'iptables'
-      case $::operatingsystem {
+      case $facts['os']['name'] {
         'Debian': {
-          if versioncmp($::operatingsystemrelease, 'unstable') >= 0 {
+          if versioncmp($facts['os']['release']['full'], 'unstable') >= 0 {
             $service_name = 'netfilter-persistent'
             $package_name = 'netfilter-persistent'
-          } elsif versioncmp($::operatingsystemrelease, '8.0') >= 0 {
+          } elsif versioncmp($facts['os']['release']['full'], '8.0') >= 0 {
             $service_name = 'netfilter-persistent'
             $package_name = 'iptables-persistent'
           } else {
@@ -78,7 +78,7 @@ class firewall::params {
           }
         }
         'Ubuntu': {
-          if versioncmp($::operatingsystemrelease, '14.10') >= 0 {
+          if versioncmp($facts['os']['release']['full'], '14.10') >= 0 {
             $service_name = 'netfilter-persistent'
             $package_name = 'iptables-persistent'
           } else {
@@ -100,7 +100,7 @@ class firewall::params {
     default: {
       $iptables_name = 'iptables'
       $service_name_v6 = undef
-      case $::operatingsystem {
+      case $facts['os']['name'] {
         'Archlinux': {
           $service_name = ['iptables','ip6tables']
           $package_name = undef

diff --git a/spec/spec_helper_local.rb b/spec/spec_helper_local.rb
index 4cffcab68d89a6f0cb92ac24122f4daa2b0cdc47..9ef515c50292fd0519732313958b568589c6f75b 100644 (file)
--- a/spec/spec_helper_local.rb
+++ b/spec/spec_helper_local.rb
@@ -33,9 +33,11 @@ def with_debian_facts
   let :facts do
     {
       kernel: 'Linux',
-      operatingsystem: 'Debian',
-      operatingsystemrelease: '8.0',
-      osfamily: 'Debian',
+      os: {
+        name: 'Debian',
+        release: { full: '8.0' },
+        family: 'Debian',
+      },
     }
   end
 end

diff --git a/spec/unit/classes/firewall_linux_archlinux_spec.rb b/spec/unit/classes/firewall_linux_archlinux_spec.rb
index eea80e15d7426756b40545c6126959f61a1fbe92..fdcb73ee02a0e6702edad42967c17094232f2cf1 100644 (file)
--- a/spec/unit/classes/firewall_linux_archlinux_spec.rb
+++ b/spec/unit/classes/firewall_linux_archlinux_spec.rb
@@ -5,8 +5,10 @@ require 'spec_helper'
 describe 'firewall::linux::archlinux', type: :class do
   let(:facts) do
     {
-      osfamily: 'Archlinux',
-      operatingsystem: 'Archlinux',
+      os: {
+        family: 'ArchLinux',
+        name: 'ArchLinux',
+      },
     }
   end
 

diff --git a/spec/unit/classes/firewall_linux_debian_spec.rb b/spec/unit/classes/firewall_linux_debian_spec.rb
index 939803ec17d18bd0b0da3ac67bc93d4e6d02feb8..079c0e71d2a76610c572cb7ee45f206e213d4b65 100644 (file)
--- a/spec/unit/classes/firewall_linux_debian_spec.rb
+++ b/spec/unit/classes/firewall_linux_debian_spec.rb
@@ -6,9 +6,11 @@ describe 'firewall::linux::debian', type: :class do
   context 'with Debian 10' do
     let(:facts) do
       {
-        osfamily: 'Debian',
-        operatingsystem: 'Debian',
-        operatingsystemrelease: '10.0',
+        os: {
+          family: 'Debian',
+          name: 'Debian',
+          release: { full: '10.0' },
+        },
       }
     end
 
@@ -29,9 +31,11 @@ describe 'firewall::linux::debian', type: :class do
   context 'with Debian 10, enable => false' do
     let(:facts) do
       {
-        osfamily: 'Debian',
-        operatingsystem: 'Debian',
-        operatingsystemrelease: '10',
+        os: {
+          family: 'Debian',
+          name: 'Debian',
+          release: { full: '10' },
+        },
       }
     end
     let(:params) { { enable: 'false' } }
@@ -46,9 +50,11 @@ describe 'firewall::linux::debian', type: :class do
   context 'with Debian 10, ensure => stopped' do
     let(:facts) do
       {
-        osfamily: 'Debian',
-        operatingsystem: 'Debian',
-        operatingsystemrelease: '10.0',
+        os: {
+          family: 'Debian',
+          name: 'Debian',
+          release: { full: '10.0' },
+        },
       }
     end
     let(:params) { { ensure: 'stopped' } }
@@ -63,9 +69,11 @@ describe 'firewall::linux::debian', type: :class do
   context 'with Debian 11' do
     let(:facts) do
       {
-        osfamily: 'Debian',
-        operatingsystem: 'Debian',
-        operatingsystemrelease: '11.0',
+        os: {
+          family: 'Debian',
+          name: 'Debian',
+          release: { full: '11.0' },
+        },
       }
     end
 
@@ -86,9 +94,11 @@ describe 'firewall::linux::debian', type: :class do
   context 'with Debian 11, enable => false' do
     let(:facts) do
       {
-        osfamily: 'Debian',
-        operatingsystem: 'Debian',
-        operatingsystemrelease: '11',
+        os: {
+          family: 'Debian',
+          name: 'Debian',
+          release: { full: '11' },
+        },
       }
     end
     let(:params) { { enable: 'false' } }
@@ -103,9 +113,11 @@ describe 'firewall::linux::debian', type: :class do
   context 'with Debian 11, ensure => stopped' do
     let(:facts) do
       {
-        osfamily: 'Debian',
-        operatingsystem: 'Debian',
-        operatingsystemrelease: '10.0',
+        os: {
+          family: 'Debian',
+          name: 'Debian',
+          release: { full: '10.0' },
+        },
       }
     end
     let(:params) { { ensure: 'stopped' } }
@@ -120,9 +132,11 @@ describe 'firewall::linux::debian', type: :class do
   context 'with Debian unstable' do
     let(:facts) do
       {
-        osfamily: 'Debian',
-        operatingsystem: 'Debian',
-        operatingsystemrelease: 'unstable',
+        os: {
+          family: 'Debian',
+          name: 'Debian',
+          release: { full: 'unstable' },
+        },
       }
     end
 
@@ -143,9 +157,11 @@ describe 'firewall::linux::debian', type: :class do
   context 'with Debian unstable, enable => false' do
     let(:facts) do
       {
-        osfamily: 'Debian',
-        operatingsystem: 'Debian',
-        operatingsystemrelease: 'unstable',
+        os: {
+          family: 'Debian',
+          name: 'Debian',
+          release: { full: 'unstable' },
+        },
       }
     end
     let(:params) { { enable: 'false' } }
@@ -160,9 +176,11 @@ describe 'firewall::linux::debian', type: :class do
   context 'with Debian unstable, ensure => stopped' do
     let(:facts) do
       {
-        osfamily: 'Debian',
-        operatingsystem: 'Debian',
-        operatingsystemrelease: '10.0',
+        os: {
+          family: 'Debian',
+          name: 'Debian',
+          release: { full: '10.0' },
+        },
       }
     end
     let(:params) { { ensure: 'stopped' } }

diff --git a/spec/unit/classes/firewall_linux_redhat_spec.rb b/spec/unit/classes/firewall_linux_redhat_spec.rb
index d46b85e9bb813601502d624986284627d075e4ec..c8e5268edef5abba42ffbb20d1db280bc5134628 100644 (file)
--- a/spec/unit/classes/firewall_linux_redhat_spec.rb
+++ b/spec/unit/classes/firewall_linux_redhat_spec.rb
@@ -42,10 +42,12 @@ describe 'firewall::linux::redhat', type: :class do
       context "os #{os} and osrel #{osrel}" do
         let(:facts) do
           {
-            operatingsystem: os,
-            operatingsystemrelease: osrel,
-            osfamily: 'RedHat',
-            selinux: false,
+            os: {
+              name: os,
+              release: { full: osrel },
+              family: 'RedHat',
+              selinux: { enabled: false },
+            },
             puppetversion: Puppet.version,
           }
         end
@@ -130,10 +132,12 @@ describe 'firewall::linux::redhat', type: :class do
       context "os #{os} and osrel #{osrel}" do
         let(:facts) do
           {
-            operatingsystem: os,
-            operatingsystemrelease: osrel,
-            osfamily: 'RedHat',
-            selinux: false,
+            os: {
+              name: os,
+              release: { full: osrel },
+              family: 'RedHat',
+              selinux: { enabled: false },
+            },
             puppetversion: Puppet.version,
           }
         end

diff --git a/spec/unit/classes/firewall_linux_spec.rb b/spec/unit/classes/firewall_linux_spec.rb
index 34b88258595ee036e4ee95f7d1bf49abba8ee312..c3e94204b36cfa8da981975f22f0fff505df8e57 100644 (file)
--- a/spec/unit/classes/firewall_linux_spec.rb
+++ b/spec/unit/classes/firewall_linux_spec.rb
@@ -11,10 +11,12 @@ describe 'firewall::linux', type: :class do
           let(:facts) do
             {
               kernel: 'Linux',
-              operatingsystem: os,
-              operatingsystemrelease: osrel,
-              osfamily: 'RedHat',
-              selinux: false,
+              os: {
+                name: os,
+                release: { full: osrel },
+                family: 'RedHat',
+                selinux: { enabled: false },
+              },
               puppetversion: Puppet.version,
             }
           end
@@ -33,10 +35,12 @@ describe 'firewall::linux', type: :class do
         let(:facts) do
           {
             kernel: 'Linux',
-            operatingsystem: os,
-            operatingsystemrelease: osrel,
-            osfamily: 'Debian',
-            selinux: false,
+            os: {
+              name: os,
+              release: { full: osrel },
+              family: 'Debian',
+              selinux: { enabled: false },
+            },
             puppetversion: Puppet.version,
           }
         end