Skip to content

(maint) Fix external fact cache #2123

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
BogdanIrimie merged 1 commit into from
Oct 7, 2020
Merged

(maint) Fix external fact cache #2123

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
29 changes: 17 additions & 12 deletions lib/facter/framework/core/cache_manager.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,15 @@ def fact_cache_enabled?(fact_name)
private

def resolve_fact(searched_fact)
return unless fact_cache_enabled?(searched_fact.name)
fact_name = if searched_fact.file
File.basename(searched_fact.file)
else
searched_fact.name
end

fact = if searched_fact.file
@fact_groups.get_fact(File.basename(searched_fact.file))
else
@fact_groups.get_fact(searched_fact.name)
end
return unless fact_cache_enabled?(fact_name)

fact = @fact_groups.get_fact(fact_name)

return unless fact

Expand Down Expand Up @@ -97,14 +99,17 @@ def create_facts(searched_fact, data)
end

def cache_fact(fact)
group_name = if fact.file
File.basename(fact.file)
else
@fact_groups.get_fact_group(fact.name)
end
fact_name = if fact.file
File.basename(fact.file)
else
fact.name
end

group_name = @fact_groups.get_fact_group(fact_name)

return if !group_name || fact.value.nil?

return unless fact_cache_enabled?(fact.name)
return unless fact_cache_enabled?(fact_name)

@groups[group_name] ||= {}
@groups[group_name][fact.name] = fact.value
Expand Down
4 changes: 2 additions & 2 deletions spec/facter/cache_manager_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
user_query: '', type: :custom, file: nil)
end
let(:searched_external_fact) do
instance_spy(Facter::SearchedFact, name: 'ext_file.txt', fact_class: nil, filter_tokens: [],
instance_spy(Facter::SearchedFact, name: 'my_external_fact', fact_class: nil, filter_tokens: [],
user_query: '', type: :file, file: '/tmp/ext_file.txt')
end
let(:searched_facts) { [searched_core_fact, searched_custom_fact, searched_external_fact] }
Expand Down Expand Up @@ -103,7 +103,7 @@
sf, _cf = cache_manager.resolve_facts(searched_facts)
expect(sf).to be_an_instance_of(Array).and contain_exactly(
an_object_having_attributes(name: 'my_custom_fact', type: :custom),
an_object_having_attributes(name: 'ext_file.txt', type: :file)
an_object_having_attributes(name: 'my_external_fact', type: :file)
)
end

Expand Down
⚡