Skip to content

Commit

Permalink
Fix use of legacy facts
Browse files Browse the repository at this point in the history
Also ensure we're testing against latest upstream modules.

Fixes #116
  • Loading branch information
silug committed Nov 26, 2024
1 parent 27bf87c commit 2e8fc0b
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 20 deletions.
4 changes: 1 addition & 3 deletions .fixtures.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,7 @@ fixtures:
rsyslog: https://github.com/simp/pupmod-simp-rsyslog.git
simplib: https://github.com/simp/pupmod-simp-simplib.git
stdlib: https://github.com/simp/puppetlabs-stdlib.git
systemd:
repo: https://github.com/simp/puppet-systemd.git
branch: simp-master
systemd: https://github.com/simp/puppet-systemd.git
disa_stig-el7-baseline:
repo: https://github.com/simp/inspec-profile-disa_stig-el7.git
branch: master
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
* Mon Nov 25 2024 Steven Pritchard <steve@sicura-us> - 6.12.1
- Fix use of legacy facts

* Fri Sep 13 2024 Steven Pritchard <[email protected]> - 6.12.0
- [puppetsync] Update module dependencies to support simp-iptables 7.x

Expand Down
28 changes: 14 additions & 14 deletions SIMP/compliance_profiles/checks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ checks:
- SI-7:3
- SI-7:8
confine:
osfamily: RedHat
os.family: RedHat
oval:com.puppet.forge.simp.aide.aliases.el7:
settings:
parameter: aide::aliases
Expand Down Expand Up @@ -120,8 +120,8 @@ checks:
- SRG-OS-000480-GPOS-00227
- CCI-000366
confine:
osfamily: RedHat
operatingsystemmajrelease: '7'
os.family: RedHat
os.release.major: '7'
oval:com.puppet.forge.simp.aide.aliases.el8:
settings:
parameter: aide::aliases
Expand All @@ -146,8 +146,8 @@ checks:
- SRG-OS-000480-GPOS-00227
- CCI-000366
confine:
osfamily: RedHat
operatingsystemmajrelease: '8'
os.family: RedHat
os.release.major: '8'
oval:com.puppet.forge.simp.aide.enable:
settings:
parameter: aide::enable
Expand All @@ -162,7 +162,7 @@ checks:
- CCI-001744
- SRG-OS-000363-GPOS-00150
confine:
osfamily: RedHat
os.family: RedHat
oval:com.puppet.forge.simp.aide.cron_command:
settings:
parameter: aide::cron_command
Expand All @@ -177,7 +177,7 @@ checks:
- CCI-001744
- SRG-OS-000363-GPOS-00150
confine:
osfamily: RedHat
os.family: RedHat
oval:com.puppet.forge.simp.aide.cron_method:
settings:
parameter: aide::cron_method
Expand All @@ -192,7 +192,7 @@ checks:
- CCI-001744
- SRG-OS-000363-GPOS-00150
confine:
osfamily: RedHat
os.family: RedHat
oval:com.puppet.forge.simp.aide.hour:
settings:
parameter: aide::hour
Expand All @@ -207,8 +207,8 @@ checks:
- CCI-001744
- SRG-OS-000363-GPOS-00150
confine:
osfamily: RedHat
operatingsystemmajrelease: '7'
os.family: RedHat
os.release.major: '7'
oval-ids:
- xccdf_org:ssgproject:content_rule_aide_periodic_cron_checking
- aide_periodic_cron_checking
Expand All @@ -226,8 +226,8 @@ checks:
- CCI-001744
- SRG-OS-000363-GPOS-00150
confine:
osfamily: RedHat
operatingsystemmajrelease: '7'
os.family: RedHat
os.release.major: '7'
oval-ids:
- xccdf_org:ssgproject:content_rule_aide_periodic_cron_checking
- aide_periodic_cron_checking
Expand All @@ -245,8 +245,8 @@ checks:
- CCI-001744
- SRG-OS-000363-GPOS-00150
confine:
osfamily: RedHat
operatingsystemmajrelease: '7'
os.family: RedHat
os.release.major: '7'
oval-ids:
- xccdf_org:ssgproject:content_rule_aide_periodic_cron_checking
- aide_periodic_cron_checking
2 changes: 1 addition & 1 deletion metadata.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "simp-aide",
"version": "6.12.0",
"version": "6.12.1",
"author": "SIMP Team",
"summary": "manages AIDE",
"license": "Apache-2.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
hosts.each do |host|
context "on #{host}" do
before(:all) do
@os_str = fact_on(host, 'operatingsystem') + ' ' + fact_on(host, 'operatingsystemrelease')
@os_str = fact_on(host, 'os.name') + ' ' + fact_on(host, 'os.release.full')

@ssg_supported = true

Expand Down

0 comments on commit 2e8fc0b

Please sign in to comment.