Skip to content

Do not rely on legacy facts #121

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

Open
bastelfreak wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Do not rely on legacy facts #121

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
5 changes: 3 additions & 2 deletions lib/puppetserver/ca/config/puppet.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,9 @@ def load(cli_overrides: {}, logger:, ca_dir_warn: true)
end

def default_certname
hostname = Facter.value(:hostname)
domain = Facter.value(:domain)
networking = Facter.value(:networking)
hostname = networking['hostname']
domain = networking['domain']
if domain and domain != ''
fqdn = [hostname, domain].join('.')
Copy link
Author

@bastelfreak bastelfreak Jun 25, 2024

Choose a reason for hiding this comment

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

wouldn't it be easier to always use the networking.fqdn fact? I think when there's no domain, facter will set the fqdn to the hostname?

Copy link

@smortex smortex Jun 26, 2024

Choose a reason for hiding this comment

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

That seems reasonable.

Copy link
Contributor

@joshcooper joshcooper Jul 11, 2024

Choose a reason for hiding this comment

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

Im assuming this was copied from puppet https://github.com/puppetlabs/puppet/blob/7739378f6fa840d6dbee237132754c64f94cc38a/lib/puppet/settings.rb#L72

else
Expand Down
6 changes: 2 additions & 4 deletions spec/puppetserver/ca/config/puppet_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,16 +338,14 @@

context 'building the default certname' do
it 'when there is a domain, concatenates the hostname and domain' do
expect(Facter).to receive(:value).with(:hostname).and_return("foo")
expect(Facter).to receive(:value).with(:domain).and_return("example.com")
expect(Facter).to receive(:value).with(:networking).and_return({'domain' => 'example.com', 'hostname' => 'foo'})

conf = Puppetserver::Ca::Config::Puppet.new
expect(conf.default_certname).to eq("foo.example.com")
end

it 'when domain is nil, returns just the hostname' do
expect(Facter).to receive(:value).with(:hostname).and_return("foo")
expect(Facter).to receive(:value).with(:domain).and_return(nil)
expect(Facter).to receive(:value).with(:networking).and_return({'domain' => nil, 'hostname' => 'foo'})

conf = Puppetserver::Ca::Config::Puppet.new
expect(conf.default_certname).to eq("foo")
Expand Down