Skip to content

Commit 22bc531

Browse files
author
sanfrancrisko
authored
Merge pull request #312 from da-ar/gh-311/main/facter
(GH-311) Explicitly require Facter
2 parents 8262ebc + 8bc8ed5 commit 22bc531

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

lib/puppet-languageserver-sidecar/puppet_environment_monkey_patches.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ class Directories
66
# environment, create a new Puppet::Node::Environment object for the workspace
77
alias_method :original_get, :get
88
def get(name)
9-
if name == PuppetLanguageServerSidecar::PuppetHelper::SIDECAR_PUPPET_ENVIRONMENT
9+
if name.intern == PuppetLanguageServerSidecar::PuppetHelper::SIDECAR_PUPPET_ENVIRONMENT.intern
1010
env_symbol = name.intern
1111
setting_values = Puppet.settings.values(env_symbol, Puppet.settings.preferred_run_mode)
1212
env = Puppet::Node::Environment.create(
@@ -26,7 +26,7 @@ def get(name)
2626
# from the workspace.
2727
alias_method :original_get_conf, :get_conf
2828
def get_conf(name)
29-
if name == PuppetLanguageServerSidecar::PuppetHelper::SIDECAR_PUPPET_ENVIRONMENT.intern
29+
if name.intern == PuppetLanguageServerSidecar::PuppetHelper::SIDECAR_PUPPET_ENVIRONMENT.intern
3030
conf = Puppet::Settings::EnvironmentConf.load_from(PuppetLanguageServerSidecar::Workspace.root_path, @global_module_path)
3131
# Unfortunately the environment.conf expects OS style delimiters which means
3232
# it fails if written for windows and read on Unix and vice versa. So we just

lib/puppet_languageserver.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ def self.require_gems(options)
7272
begin
7373
require 'lsp/lsp'
7474
require 'puppet'
75+
require 'facter'
7576
rescue LoadError => e
7677
log_message(:error, "Error while loading a critical gem: #{e} #{e.backtrace}")
7778
return

0 commit comments

Comments
 (0)