Skip to content

(FACT-2799) Fix fact loading for nested fact calls #2108

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
Sep 29, 2020
Merged

(FACT-2799) Fix fact loading for nested fact calls #2108

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
25 changes: 14 additions & 11 deletions lib/facter/framework/core/fact_loaders/fact_loader.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,45 +20,48 @@ def load(options)

@facts = []
@external_facts = []
load_internal_facts(options)
load_external_facts(options)

@facts
@internal_facts = load_internal_facts(options)
@external_facts = load_external_facts(options)

@facts = @internal_facts + @external_facts
end

private

def load_internal_facts(options)
@log.debug('Loading internal facts')
internal_facts = []

if options[:user_query] || options[:show_legacy]
# if we have a user query, then we must search in core facts and legacy facts
@log.debug('Loading all internal facts')
@internal_facts = @internal_loader.facts
internal_facts = @internal_loader.facts
else
@log.debug('Load only core facts')
@internal_facts = @internal_loader.core_facts
internal_facts = @internal_loader.core_facts
end

@internal_facts = block_facts(@internal_facts, options)
@facts.concat(@internal_facts)
block_facts(internal_facts, options)
end

def load_external_facts(options)
@log.debug('Loading external facts')
external_facts = []

if options[:custom_facts]
@log.debug('Loading custom facts')
@external_facts.concat(@external_fact_loader.custom_facts)
external_facts += @external_fact_loader.custom_facts
end

@external_facts = block_facts(@external_facts, options)
external_facts = block_facts(external_facts, options)

if options[:external_facts]
@log.debug('Loading external facts')
@external_facts.concat(@external_fact_loader.external_facts)
external_facts += @external_fact_loader.external_facts
end

@facts.concat(@external_facts)
external_facts
end

def block_facts(facts, options)
Expand Down
⚡