Skip to content

(FACT-3451) Restore os facts for AmazonLinux 2 #2661

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
Jan 3, 2024
Merged

(FACT-3451) Restore os facts for AmazonLinux 2 #2661

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
7 changes: 6 additions & 1 deletion lib/facter/facts/amzn/os/distro/release.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,12 @@ def call_the_resolver
end

def determine_release_version
version = Facter::Resolvers::Amzn::OsReleaseRpm.resolve(:version)
# For backwards compatibility, use system-release for AL1/AL2
version = Facter::Resolvers::ReleaseFromFirstLine.resolve(:release, release_file: '/etc/system-release')
if !version.nil? && version != '2'
# Use os-release for AL2023 and up
version = Facter::Resolvers::Amzn::OsReleaseRpm.resolve(:version)
end
version ||= Facter::Resolvers::OsRelease.resolve(:version_id)

Facter::Util::Facts.release_hash_from_string(version, include_patch: true)
Expand Down
7 changes: 6 additions & 1 deletion lib/facter/facts/amzn/os/release.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,12 @@ def call_the_resolver
end

def determine_release_version
version = Facter::Resolvers::Amzn::OsReleaseRpm.resolve(:version)
# For backwards compatibility, use system-release for AL1/AL2
version = Facter::Resolvers::ReleaseFromFirstLine.resolve(:release, release_file: '/etc/system-release')
if !version.nil? && version != '2'
# Use os-release for AL2023 and up
version = Facter::Resolvers::Amzn::OsReleaseRpm.resolve(:version)
end
version ||= Facter::Resolvers::OsRelease.resolve(:version_id)

Facter::Util::Facts.release_hash_from_string(version)
Expand Down
59 changes: 40 additions & 19 deletions spec/facter/facts/amzn/os/distro/release_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,21 @@
subject(:fact) { Facts::Amzn::Os::Distro::Release.new }

before do
allow(Facter::Resolvers::Amzn::OsReleaseRpm).to receive(:resolve)
.with(:version)
.and_return(value)
allow(Facter::Resolvers::ReleaseFromFirstLine).to receive(:resolve)
.with(:release, { release_file: '/etc/system-release' })
.and_return(system_release_value)
end

context 'when version is retrieved from rpm' do
let(:value) { '2.13.0' }
let(:release) { { 'full' => '2.13.0', 'major' => '2', 'minor' => '13', 'patch' => '0' } }
context 'when version is retrieved from rpm on AL2023' do
let(:system_release_value) { '2023' }
let(:os_release_value) { '2023.1.20230912' }
let(:release) { { 'full' => '2023.1.20230912', 'major' => '2023', 'minor' => '1', 'patch' => '20230912' } }

it 'returns os distro release fact including patch' do
allow(Facter::Resolvers::Amzn::OsReleaseRpm).to receive(:resolve)
.with(:version)
.and_return(os_release_value)

it 'returns os distro release fact' do
expect(fact.call_the_resolver).to be_an_instance_of(Array).and \
contain_exactly(an_object_having_attributes(name: 'os.distro.release', value: release),
an_object_having_attributes(name: 'lsbdistrelease',
Expand All @@ -26,14 +31,27 @@
end
end

context 'when version is retrieved from os-release file' do
let(:value) { nil }
let(:os_release) { '2' }
let(:release) { { 'full' => '2', 'major' => '2' } }
context 'when version is retrieved from os-release file on AL1' do
let(:system_release_value) { nil }
let(:os_release_value) { '2017.03' }
let(:release) { { 'full' => '2017.03', 'major' => '2017', 'minor' => '03' } }

before do
allow(Facter::Resolvers::OsRelease).to receive(:resolve).with(:version_id).and_return(os_release)
it 'returns os distro release fact' do
allow(Facter::Resolvers::OsRelease).to receive(:resolve).with(:version_id).and_return(os_release_value)
expect(fact.call_the_resolver).to be_an_instance_of(Array).and \
contain_exactly(an_object_having_attributes(name: 'os.distro.release', value: release),
an_object_having_attributes(name: 'lsbdistrelease',
value: release['full'], type: :legacy),
an_object_having_attributes(name: 'lsbmajdistrelease',
value: release['major'], type: :legacy),
an_object_having_attributes(name: 'lsbminordistrelease',
value: release['minor'], type: :legacy))
end
end

context 'when version is retrieved from os-release file on AL2' do
let(:system_release_value) { '2' }
let(:release) { { 'full' => '2', 'major' => '2' } }

it 'returns os distro release fact' do
expect(fact.call_the_resolver).to be_an_instance_of(Array).and \
Expand All @@ -45,14 +63,17 @@
an_object_having_attributes(name: 'lsbminordistrelease',
value: release['minor'], type: :legacy))
end
end

context 'when release can\'t be retrieved' do
let(:system_release_value) { nil }
let(:os_release_value) { nil }

context 'when release can\'t be received' do
let(:os_release) { nil }
it 'returns os distro release fact as nil' do
allow(Facter::Resolvers::OsRelease).to receive(:resolve).with(:version_id).and_return(os_release_value)

it 'returns os distro release fact as nil' do
expect(fact.call_the_resolver).to be_an_instance_of(Facter::ResolvedFact).and \
have_attributes(name: 'os.distro.release', value: nil)
end
expect(fact.call_the_resolver).to be_an_instance_of(Facter::ResolvedFact).and \
have_attributes(name: 'os.distro.release', value: nil)
end
end
end
Expand Down
58 changes: 39 additions & 19 deletions spec/facter/facts/amzn/os/release_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,21 @@
subject(:fact) { Facts::Amzn::Os::Release.new }

before do
allow(Facter::Resolvers::Amzn::OsReleaseRpm).to receive(:resolve)
.with(:version)
.and_return(value)
allow(Facter::Resolvers::ReleaseFromFirstLine).to receive(:resolve)
.with(:release, { release_file: '/etc/system-release' })
.and_return(system_release_value)
end

context 'when version is retrieved from rpm' do
let(:value) { '2.13.0' }
let(:release) { { 'full' => '2.13.0', 'major' => '2', 'minor' => '13' } }
context 'when version is retrieved from rpm on AL2023' do
let(:system_release_value) { '2023' }
let(:os_release_value) { '2023.1.20230912' }
let(:release) { { 'full' => '2023.1.20230912', 'major' => '2023', 'minor' => '1' } }

it 'returns os release fact excluding patch' do
allow(Facter::Resolvers::Amzn::OsReleaseRpm).to receive(:resolve)
.with(:version)
.and_return(os_release_value)

it 'returns os release fact' do
expect(fact.call_the_resolver).to be_an_instance_of(Array).and \
contain_exactly(an_object_having_attributes(name: 'os.release', value: release),
an_object_having_attributes(name: 'operatingsystemmajrelease',
Expand All @@ -24,14 +29,26 @@
end
end

context 'when version is retrieved from os-release file' do
let(:value) { nil }
let(:os_release) { '2' }
let(:release) { { 'full' => '2', 'major' => '2' } }
context 'when version is retrieved from os-release file on AL1' do
let(:system_release_value) { nil }
let(:os_release_value) { '2017.03' }
let(:release) { { 'full' => '2017.03', 'major' => '2017', 'minor' => '03' } }

it 'returns os release fact' do
allow(Facter::Resolvers::OsRelease).to receive(:resolve).with(:version_id).and_return(os_release_value)

before do
allow(Facter::Resolvers::OsRelease).to receive(:resolve).with(:version_id).and_return(os_release)
expect(fact.call_the_resolver).to be_an_instance_of(Array).and \
contain_exactly(an_object_having_attributes(name: 'os.release', value: release),
an_object_having_attributes(name: 'operatingsystemmajrelease',
value: release['major'], type: :legacy),
an_object_having_attributes(name: 'operatingsystemrelease',
value: release['full'], type: :legacy))
end
end

context 'when version is retrieved from os-release file on AL2' do
let(:system_release_value) { '2' }
let(:release) { { 'full' => '2', 'major' => '2' } }

it 'returns os release fact' do
expect(fact.call_the_resolver).to be_an_instance_of(Array).and \
Expand All @@ -41,14 +58,17 @@
an_object_having_attributes(name: 'operatingsystemrelease',
value: release['full'], type: :legacy))
end
end

context 'when version can\'t be retrieved' do
let(:system_release_value) { nil }
let(:os_release_value) { nil }

context 'when version can\'t be retrieved' do
let(:os_release) { nil }
it 'returns os release fact as nil' do
allow(Facter::Resolvers::OsRelease).to receive(:resolve).with(:version_id).and_return(os_release_value)

it 'returns os release fact as nil' do
expect(fact.call_the_resolver).to be_an_instance_of(Facter::ResolvedFact).and \
have_attributes(name: 'os.release', value: nil)
end
expect(fact.call_the_resolver).to be_an_instance_of(Facter::ResolvedFact).and \
have_attributes(name: 'os.release', value: nil)
end
end
end
Expand Down