Skip to content

include "local" facts in facts output #240

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
bastelfreak merged 1 commit into from
Dec 2, 2025
+17 −14
Merged

include "local" facts in facts output #240

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/puppet/indirector/facts/facter.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ def find(request)
Puppet::Node::Facts.new(request.key, facts.to_h)
end

result.add_local_facts unless request.options[:resolve_options]
result.add_local_facts(request.options[:user_query])
result.sanitize
result
end
Expand Down
11 changes: 6 additions & 5 deletions lib/puppet/node/facts.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,12 @@ def save(instance, key = nil, options = {})

attr_accessor :name, :values, :timestamp

def add_local_facts
values["implementation"] = Puppet.implementation
values["clientcert"] = Puppet.settings[:certname]
values["clientversion"] = Puppet.version.to_s
values["clientnoop"] = Puppet.settings[:noop]
def add_local_facts(query = [])
query = Array(query) # some use cases result in a nil being passed in
Comment on lines +30 to +31
Copy link
Member

@nmburgan nmburgan Nov 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very slightly less boilerplate, but totally fine as-is too.

Suggested change
def add_local_facts(query = [])
query = Array(query) # some use cases result in a nil being passed in
def add_local_facts(query)
query ||= [] # some use cases result in a nil being passed in

Copy link
Contributor Author

@binford2k binford2k Dec 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I cast to Array because I'm not 💯 sure that it won't ever get something like a single string.

values["implementation"] = Puppet.implementation if query.empty? or query.include? 'implementation'
values["clientcert"] = Puppet.settings[:certname] if query.empty? or query.include? 'clientcert'
values["clientversion"] = Puppet.version.to_s if query.empty? or query.include? 'clientversion'
values["clientnoop"] = Puppet.settings[:noop] if query.empty? or query.include? 'clientnoop'
end

def initialize(name, values = {})
Expand Down
12 changes: 10 additions & 2 deletions spec/unit/application/facts_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,11 @@
let(:expected) { <<~END }
{
"filesystems": "apfs,autofs,devfs",
"macaddress": "64:52:11:22:03:2e"
"macaddress": "64:52:11:22:03:2e",
"implementation": "#{Puppet.implementation}",
"clientcert": "#{Puppet.settings[:certname]}",
"clientversion": "#{Puppet.version}",
"clientnoop": false
}
END

Expand All @@ -81,7 +85,7 @@
end

it "warns and ignores value-only when multiple fact names are specified" do
app.command_line.args << 'filesystems' << 'macaddress' << '--value-only'
app.command_line.args << 'filesystems' << 'macaddress' << 'implementation' << 'clientcert' << 'clientversion' << 'clientnoop' << '--value-only'
expect {
app.run
}.to exit_with(0)
Expand Down Expand Up @@ -121,6 +125,10 @@
---
filesystems: apfs,autofs,devfs
macaddress: 64:52:11:22:03:2e
implementation: #{Puppet.implementation}
clientcert: #{Puppet.settings[:certname]}
clientversion: #{Puppet.version}
clientnoop: false
END

before :each do
Expand Down
6 changes: 0 additions & 6 deletions spec/unit/indirector/facts/facter_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,12 +192,6 @@ class Puppet::Node::Facts::Facter::MyCollection < Hash; end
@facter.find(@request)
end

it 'should NOT add local facts' do
expect(facts).not_to receive(:add_local_facts)

@facter.find(@request)
end

context 'when --show-legacy flag is present' do
let(:options) { { resolve_options: true, user_query: ["os", "timezone"], show_legacy: true } }

Expand Down