diff --git a/CHANGELOG b/CHANGELOG index e6e906f..3a53ae5 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +* Mon Nov 25 2024 Steven Pritchard - 9.5.1 +- Fix use of legacy facts + * Mon Oct 23 2023 Steven Pritchard - 9.5.0 - [puppetsync] Add EL9 support diff --git a/SIMP/compliance_profiles/checks.yaml b/SIMP/compliance_profiles/checks.yaml index e30eb6a..c95d389 100644 --- a/SIMP/compliance_profiles/checks.yaml +++ b/SIMP/compliance_profiles/checks.yaml @@ -75,5 +75,5 @@ checks: - SRG-OS-000030-GPOS-00010 - SRG-OS-000480-GPOS-00227 confine: - osfamily: RedHat - operatingsystemmajrelease: '7' + os.family: RedHat + os.release.major: '7' diff --git a/metadata.json b/metadata.json index 70a58ba..314af5e 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "simp-gnome", - "version": "9.5.0", + "version": "9.5.1", "author": "SIMP Team", "summary": "Provides useful settings to set up the GNOME desktop environment", "license": "Apache-2.0", diff --git a/spec/acceptance/suites/compliance/01_simp_profile_inspec_spec.rb b/spec/acceptance/suites/compliance/01_simp_profile_inspec_spec.rb index 238cc85..d2ad066 100644 --- a/spec/acceptance/suites/compliance/01_simp_profile_inspec_spec.rb +++ b/spec/acceptance/suites/compliance/01_simp_profile_inspec_spec.rb @@ -14,7 +14,7 @@ profile_path = File.join( fixtures_path, 'inspec_profiles', - "#{fact_on(host, 'operatingsystem')}-#{fact_on(host, 'operatingsystemmajrelease')}-#{profile}" + "#{fact_on(host, 'os.name')}-#{fact_on(host, 'os.release.major')}-#{profile}" ) unless File.exist?(profile_path) diff --git a/spec/unit/compliance_engine/compliance_engine_enforce_spec.rb b/spec/unit/compliance_engine/compliance_engine_enforce_spec.rb index 64a3a19..def6a93 100644 --- a/spec/unit/compliance_engine/compliance_engine_enforce_spec.rb +++ b/spec/unit/compliance_engine/compliance_engine_enforce_spec.rb @@ -36,7 +36,7 @@ on_supported_os.each do |os, os_facts| context "on #{os}" do - if valid_systems[os_facts[:operatingsystem]] && (os_facts[:operatingsystemmajrelease] == valid_systems[os_facts[:operatingsystem]]) + if valid_systems[os_facts[:os][:name]] && (os_facts[:os][:release][:major] == valid_systems[os_facts[:os][:name]]) compliance_profiles.each do |target_profile| context "with compliance profile '#{target_profile}'" do let(:facts){ @@ -123,7 +123,7 @@ end else it 'should be on an OS with compliance engine data' do - skip "#{os_facts[:operatingsystem]} #{os_facts[:operatingsystemmajrelease]} does not have any compliance engine data" + skip "#{os_facts[:os][:name]} #{os_facts[:os][:release][:major]} does not have any compliance engine data" end end end