Skip to content

(CAT-2215) Update legacy facts #1253

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 26, 2025
Merged

(CAT-2215) Update legacy facts #1253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/facter/iptables_persistent_version.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# frozen_string_literal: true

Facter.add(:iptables_persistent_version) do
confine operatingsystem: ['Debian', 'Ubuntu']
confine 'os.name': ['Debian', 'Ubuntu']
setcode do
# Throw away STDERR because dpkg >= 1.16.7 will make some noise if the
# package isn't currently installed.
Expand Down
20 changes: 10 additions & 10 deletions spec/unit/facter/iptables_persistent_version_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@

describe "#{os} package installed" do
before(:each) do
allow(Facter.fact(:operatingsystem)).to receive(:value).and_return(os)
allow(Facter.fact(:operatingsystemrelease)).to receive(:value).and_return(os_release)
allow(Facter.fact(:'os.name')).to receive(:value).and_return(os)
allow(Facter.fact(:'os.release.full')).to receive(:value).and_return(os_release)
allow(Facter::Core::Execution).to receive(:execute).with(dpkg_cmd, { on_fail: nil })
.and_return(ver)
end
Expand All @@ -27,8 +27,8 @@

describe 'Ubuntu package not installed' do
before(:each) do
allow(Facter.fact(:operatingsystem)).to receive(:value).and_return('Ubuntu')
allow(Facter.fact(:operatingsystemrelease)).to receive(:value).and_return('20.04')
allow(Facter.fact(:'os.name')).to receive(:value).and_return('Ubuntu')
allow(Facter.fact(:'os.release.full')).to receive(:value).and_return('20.04')
allow(Facter::Core::Execution).to receive(:execute).with(dpkg_cmd, { on_fail: nil })
.and_return(nil)
end
Expand All @@ -38,7 +38,7 @@

describe 'CentOS not supported' do
before(:each) do
allow(Facter.fact(:operatingsystem)).to receive(:value)
allow(Facter.fact(:'os.name')).to receive(:value)
.and_return('CentOS')
end

Expand All @@ -63,8 +63,8 @@

describe "#{os} package installed" do
before(:each) do
allow(Facter.fact(:operatingsystem)).to receive(:value).and_return(os)
allow(Facter.fact(:operatingsystemrelease)).to receive(:value).and_return(os_release)
allow(Facter.fact(:'os.name')).to receive(:value).and_return(os)
allow(Facter.fact(:'os.release.full')).to receive(:value).and_return(os_release)
allow(Facter::Core::Execution).to receive(:execute).with(dpkg_cmd, { on_fail: nil })
.and_return(ver)
end
Expand All @@ -76,8 +76,8 @@
describe 'Ubuntu package not installed' do
os_release = '14.10'
before(:each) do
allow(Facter.fact(:operatingsystem)).to receive(:value).and_return('Ubuntu')
allow(Facter.fact(:operatingsystemrelease)).to receive(:value).and_return(os_release)
allow(Facter.fact(:'os.name')).to receive(:value).and_return('Ubuntu')
allow(Facter.fact(:'os.release.full')).to receive(:value).and_return(os_release)
allow(Facter::Core::Execution).to receive(:execute).with(dpkg_cmd, { on_fail: nil })
.and_return(nil)
end
Expand All @@ -87,7 +87,7 @@

describe 'CentOS not supported' do
before(:each) do
allow(Facter.fact(:operatingsystem)).to receive(:value)
allow(Facter.fact(:'os.name')).to receive(:value)
.and_return('CentOS')
end

Expand Down
Loading