From 520b458f11e3890667b04518c2243cbae844a7ad Mon Sep 17 00:00:00 2001
From: Steve Traylen <steve.traylen@cern.ch>
Date: Wed, 2 Dec 2020 17:18:04 +0100
Subject: [PATCH] lint - remove legacy facts

---
 manifests/params.pp                 | 10 +++++-----
 manifests/service.pp                |  2 +-
 spec/classes/xinetd_init_spec.rb    | 10 +++++-----
 spec/defines/xinetd_service_spec.rb |  4 ++--
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index 023045e..bec640f 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -4,12 +4,12 @@
   $default_user   = 'root'
   $package_ensure = 'installed'
 
-  case $::osfamily {
+  case $facts['os']['family'] {
     'FreeBSD': { $default_group = 'wheel' }
     default: { $default_group = 'root' }
   }
 
-  case $::osfamily {
+  case $facts['os']['family'] {
     'Debian':  {
       $confdir            = '/etc/xinetd.d'
       $conffile           = '/etc/xinetd.conf'
@@ -71,7 +71,7 @@
       $service_status     = undef
     }
     'Linux': {
-      case $::operatingsystem {
+      case $facts['os']['name'] {
         'Amazon': {
           $confdir            = '/etc/xinetd.d'
           $conffile           = '/etc/xinetd.conf'
@@ -83,12 +83,12 @@
           $service_status     = undef
         }
         default: {
-          fail("xinetd: module does not support Linux operatingsystem ${::operatingsystem}")
+          fail("xinetd: module does not support Linux operatingsystem ${facts['os']['name']}")
         }
       }
     }
     default:   {
-      fail("xinetd: module does not support osfamily ${::osfamily}")
+      fail("xinetd: module does not support osfamily ${facts['os']['family']}")
     }
   }
 
diff --git a/manifests/service.pp b/manifests/service.pp
index 2fdafa0..8425a20 100644
--- a/manifests/service.pp
+++ b/manifests/service.pp
@@ -98,7 +98,7 @@
   $redirect                         = undef,
 ) {
 
-  include ::xinetd
+  include xinetd
 
   unless ($server or $redirect) {
     fail('xinetd::service needs either of server or redirect')
diff --git a/spec/classes/xinetd_init_spec.rb b/spec/classes/xinetd_init_spec.rb
index 2601e61..08d4561 100644
--- a/spec/classes/xinetd_init_spec.rb
+++ b/spec/classes/xinetd_init_spec.rb
@@ -4,7 +4,7 @@
 
   context 'When using default values' do
     let :facts do
-      { :osfamily => 'Debian' }
+      { operatingsystem: 'Debian',  osfmaily: 'Debian', os: { 'family' => 'Debian' } }
     end
     it {
       should contain_package('xinetd')
@@ -39,7 +39,7 @@
 
   context 'When overriding the default vaules' do
     let :facts do
-      { :osfamily => 'Debian' }
+      { operatingsystem: 'Debian',  osfmaily: 'Debian', os: { 'family' => 'Debian' }}
     end
     let :params do
       { :enabled        => 'tftp nrpe',
@@ -93,7 +93,7 @@
 
   context 'with defaults on Linux' do
     let :facts do
-      { :osfamily => 'Debian' }
+      { operatingsystem: 'Debian',  osfmaily: 'Debian', os: { 'family' => 'Debian' } }
     end
     it {
       should contain_package('xinetd')
@@ -105,7 +105,7 @@
 
   context 'with defaults on FreeBSD' do
     let :facts do
-      { :osfamily => 'FreeBSD' }
+      { operatingsystem: 'FreeBSD',  osfmaily: 'FreeBSD', os: { 'family' => 'FreeBSD' } }
     end
     it {
       should contain_package('security/xinetd')
@@ -117,7 +117,7 @@
 
   context 'with managed confdir' do
     let :facts do
-      { :osfamily => 'Debian' }
+      { operatingsystem: 'Debian',  osfmaily: 'Debian', os: { 'family' => 'Debian' } }
     end
     let :params do
       { :purge_confdir => true }
diff --git a/spec/defines/xinetd_service_spec.rb b/spec/defines/xinetd_service_spec.rb
index 99ff74a..331acaf 100644
--- a/spec/defines/xinetd_service_spec.rb
+++ b/spec/defines/xinetd_service_spec.rb
@@ -15,7 +15,7 @@
 
   describe "ensure proper user/group are set in FreeBSD" do
     let :facts do
-      { :osfamily => 'FreeBSD' }
+      { operatingsystem: 'FreeBSD',  osfamily: 'FreeBSD', os: { 'family' => 'FreeBSD' }}
     end
 
     let :params do
@@ -29,7 +29,7 @@
   end
 
   let :facts do
-    { :osfamily => 'Debian' }
+    { operatingsystem: 'Debian',  osfamily: 'Debian', os: { 'family' => 'Debian' }}
   end
 
   describe 'with default ensure' do