FacterDB: Use stringified keys

voxpupuli · Sep 28, 2024 · a2c9ec8 · a2c9ec8
1 parent fd9cb3f
commit a2c9ec8
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 25 deletions.
diff --git a/.sync.yml b/.sync.yml
@@ -6,3 +6,4 @@ Gemfile:
       - gem: 'mock_redis'
 spec/spec_helper.rb:
   mock_with: ":mocha"
+  facterdb_string_keys: true
diff --git a/spec/classes/redis_sentinel_spec.rb b/spec/classes/redis_sentinel_spec.rb
@@ -4,17 +4,17 @@
 
 # rubocop:disable RSpec/MultipleMemoizedHelpers
 describe 'redis::sentinel' do
-  on_supported_os.each do |os, facts|
+  on_supported_os.each do |os, os_facts|
     context "on #{os}" do
-      let(:facts) { facts }
+      let(:facts) { os_facts }
       let(:config_file_orig) do
-        case facts[:os]['family']
+        case facts['os']['family']
         when 'Archlinux', 'Debian', 'Suse'
           '/etc/redis/redis-sentinel.conf.puppet'
         when 'FreeBSD'
           '/usr/local/etc/redis-sentinel.conf.puppet'
         when 'RedHat'
-          if facts[:os]['release']['major'].to_i > 8
+          if facts['os']['release']['major'].to_i > 8
             '/etc/redis/sentinel.conf.puppet'
           else
             '/etc/redis-sentinel.conf.puppet'
@@ -23,7 +23,7 @@
       end
 
       let(:pidfile) do
-        case facts[:os]['name']
+        case facts['os']['name']
         when 'Ubuntu'
           '/var/run/sentinel/redis-sentinel.pid'
         when 'Debian'
@@ -38,7 +38,7 @@
       end
 
       let(:sentinel_package_name) do
-        if facts[:os]['family'] == 'Debian'
+        if facts['os']['family'] == 'Debian'
           'redis-sentinel'
         else
           'redis'
@@ -49,8 +49,8 @@
         let(:expected_content) do
           <<~CONFIG
             port 26379
-            dir #{facts[:os]['family'] == 'Debian' ? '/var/lib/redis' : '/tmp'}
-            daemonize #{facts[:os]['family'] == 'RedHat' ? 'no' : 'yes'}
+            dir #{facts['os']['family'] == 'Debian' ? '/var/lib/redis' : '/tmp'}
+            daemonize #{facts['os']['family'] == 'RedHat' ? 'no' : 'yes'}
             supervised auto
             pidfile #{pidfile}
             protected-mode yes
@@ -61,7 +61,7 @@
             sentinel failover-timeout mymaster 180000
 
             loglevel notice
-            logfile #{facts[:os]['family'] == 'Debian' ? '/var/log/redis/redis-sentinel.log' : '/var/log/redis/sentinel.log'}
+            logfile #{facts['os']['family'] == 'Debian' ? '/var/log/redis/redis-sentinel.log' : '/var/log/redis/sentinel.log'}
           CONFIG
         end
 
@@ -138,7 +138,7 @@ class { 'redis':
             port 26379
             tls-port 26380
             dir /tmp/redis
-            daemonize #{facts[:os]['family'] == 'RedHat' ? 'no' : 'yes'}
+            daemonize #{facts['os']['family'] == 'RedHat' ? 'no' : 'yes'}
             supervised auto
             pidfile #{pidfile}
             protected-mode no
@@ -193,7 +193,7 @@ class { 'redis':
             bind 192.0.2.10 192.168.1.1
             port 26379
             dir /tmp/redis
-            daemonize #{facts[:os]['family'] == 'RedHat' ? 'no' : 'yes'}
+            daemonize #{facts['os']['family'] == 'RedHat' ? 'no' : 'yes'}
             supervised auto
             pidfile #{pidfile}
             protected-mode yes
@@ -232,7 +232,7 @@ class { 'redis':
         end
 
         let(:package_ensure) do
-          if facts[:os]['family'] == 'Debian'
+          if facts['os']['family'] == 'Debian'
             'latest'
           else
             'installed'

diff --git a/spec/classes/redis_spec.rb b/spec/classes/redis_spec.rb
@@ -4,20 +4,21 @@
 
 # rubocop:disable RSpec/MultipleMemoizedHelpers
 describe 'redis' do
-  let(:package_name) { facts[:os]['family'] == 'Debian' ? 'redis-server' : 'redis' }
+  let(:package_name) { facts['os']['family'] == 'Debian' ? 'redis-server' : 'redis' }
   let(:service_name) { package_name }
   let(:config_file) do
-    case facts[:os]['family']
+    case facts['os']['family']
     when 'Archlinux', 'Debian'
       '/etc/redis/redis.conf'
     when 'FreeBSD'
       '/usr/local/etc/redis.conf'
     when 'RedHat'
-      if facts[:os]['release']['major'].to_i > 8
+      if facts['os']['release']['major'].to_i > 8
         '/etc/redis/redis.conf'
       else
         '/etc/redis.conf'
       end
+      '/etc/redis/redis.conf'
     end
   end
   let(:config_file_orig) { "#{config_file}.puppet" }
@@ -42,7 +43,7 @@
             with_content(%r{logfile /var/log/redis/redis\.log}).
             without_content(%r{undef})
 
-          if facts[:os]['family'] == 'FreeBSD'
+          if facts['os']['family'] == 'FreeBSD'
             is_expected.to contain_file(config_file_orig).
               with_content(%r{dir /var/db/redis}).
               with_content(%r{pidfile /var/run/redis/redis\.pid})
@@ -51,7 +52,7 @@
 
         it { is_expected.to contain_service(service_name).with_ensure('running').with_enable('true') }
 
-        describe 'with manage_dnf_module true', if: facts[:os]['family'] == 'RedHat' && facts[:os]['release']['major'].to_i == 8 do
+        describe 'with manage_dnf_module true', if: facts['os']['family'] == 'RedHat' && facts['os']['release']['major'].to_i == 8 do
           let(:pre_condition) do
             <<-PUPPET
             class { 'redis':
@@ -473,7 +474,7 @@ class { 'redis':
         describe 'with ppa' do
           let(:params) { super().merge(ppa_repo: 'ppa:rwky/redis') }
 
-          if facts[:os]['name'] == 'Ubuntu'
+          if facts['os']['name'] == 'Ubuntu'
             it { is_expected.to contain_apt__ppa('ppa:rwky/redis') }
           else
             it { is_expected.not_to contain_apt__ppa('ppa:rwky/redis') }
@@ -1712,7 +1713,7 @@ class { 'redis':
           )
         }
 
-        if facts[:os]['family'] == 'Debian'
+        if facts['os']['family'] == 'Debian'
           it {
             is_expected.to contain_file('/etc/default/redis-server').
               with(
@@ -1737,7 +1738,7 @@ class { 'redis':
           }
         end
 
-        if facts[:os]['family'] == 'Debian'
+        if facts['os']['family'] == 'Debian'
           it {
             is_expected.to contain_file('/etc/default/redis-server').
               with(

diff --git a/spec/defines/instance_spec.rb b/spec/defines/instance_spec.rb
@@ -11,16 +11,16 @@ class { 'redis':
     PUPPET
   end
 
-  on_supported_os.each do |os, facts|
+  on_supported_os.each do |os, os_facts|
     context "on #{os}" do
-      let(:facts) { facts }
+      let(:facts) { os_facts }
 
       context 'with app2 title' do
         let(:title) { 'app2' }
         let(:config_file) do
-          case facts[:os]['family']
+          case facts['os']['family']
           when 'RedHat'
-            if facts[:os]['release']['major'].to_i > 8
+            if facts['os']['release']['major'].to_i > 8
               '/etc/redis/redis-server-app2.conf'
             else
               '/etc/redis-server-app2.conf'

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -10,7 +10,7 @@
 require 'voxpupuli/test/spec_helper'
 
 RSpec.configure do |c|
-  c.facterdb_string_keys = false
+  c.facterdb_string_keys = true
   c.mock_with :mocha
 end