Skip to content

(PUP-10653) Remove Dir monkey patch #8314

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
joshcooper merged 3 commits into from
Sep 10, 2020
Merged

(PUP-10653) Remove Dir monkey patch #8314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
801c433
(PUP-10653) Remove usage of Dir constants
GabrielNagy Sep 3, 2020
28f69b2
(PUP-10653) Remove Dir monkey patch
GabrielNagy Sep 3, 2020
63c6020
Revert "(PUP-391) Fix Rdoc 4+ specs on Windows Ruby 2 x64"
GabrielNagy Sep 7, 2020
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
3 changes: 1 addition & 2 deletions acceptance/lib/puppet/acceptance/windows_utils.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@ module WindowsUtils
def profile_base(agent)
ruby = Puppet::Acceptance::CommandUtils.ruby_command(agent)
getbasedir = <<'END'
require 'puppet/util/windows/monkey_patches/dir'
puts Dir::PROFILE.match(/(.*)\\\\[^\\\\]*/)[1]
puts ENV['USERPROFILE'].match(/(.*)\\\\[^\\\\]*/)[1]
END
on(agent, "#{ruby} -e \"#{getbasedir}\"").stdout.chomp
end
Expand Down
5 changes: 1 addition & 4 deletions ext/windows/service/daemon.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,13 @@
# monkey patches ruby Process to add .create method
require 'puppet/util/windows/monkey_patches/process'

# monkey patch Dir to add constants
require 'puppet/util/windows/monkey_patches/dir'

class WindowsDaemon < Puppet::Util::Windows::Daemon
CREATE_NEW_CONSOLE = 0x00000010

@run_thread = nil
@LOG_TO_FILE = false
@loglevel = 0
LOG_FILE = File.expand_path(File.join(Dir::COMMON_APPDATA, 'PuppetLabs', 'puppet', 'var', 'log', 'windows.log'))
LOG_FILE = File.expand_path(File.join(ENV['ALLUSERSPROFILE'], 'PuppetLabs', 'puppet', 'var', 'log', 'windows.log'))
Copy link
Copy Markdown
Contributor

@joshcooper joshcooper Sep 4, 2020

Choose a reason for hiding this comment

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

If the service is configured to run under a domain service account, would COMMON_APPDATA be different than ALLUSERSPROFILE? I assume not, but wanted to check

Copy link
Copy Markdown
Contributor Author

@GabrielNagy GabrielNagy Sep 7, 2020

Choose a reason for hiding this comment

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

I set up a domain controller and client, set the puppet service to run as a domain account and confirmed that COMMON_APPDATA and ALLUSERSPROFILE are the same.

LEVELS = [:debug, :info, :notice, :warning, :err, :alert, :emerg, :crit]
LEVELS.each do |level|
define_method("log_#{level}") do |msg|
Expand Down
7 changes: 0 additions & 7 deletions lib/puppet/util/rdoc.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,6 @@ def rdoc(outputdir, files, charset = nil)

options << "--force-update"
options += [ "--charset", charset] if charset
# Rdoc root default is Dir.pwd, but the win32-dir gem monkey patches Dir.pwd
# replacing Ruby's normal / with \. When RDoc generates relative paths it
# uses relative_path_from that will generate errors when the slashes don't
# properly match. This is a workaround for that issue.
if Puppet::Util::Platform.windows? && RDoc::VERSION !~ /^[0-3]\./
options += [ "--root", Dir.pwd.tr('\\', '/')]
end
options += files

# launch the documentation process
Expand Down
2 changes: 1 addition & 1 deletion lib/puppet/util/run_mode.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ def log_dir
private

def windows_common_base(*extra)
[Dir::COMMON_APPDATA, "PuppetLabs"] + extra
[ENV['ALLUSERSPROFILE'], "PuppetLabs"] + extra
end
end
end
Expand Down
1 change: 0 additions & 1 deletion lib/puppet/util/windows.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ class EventLog; end
require 'puppet/util/windows/registry'
require 'puppet/util/windows/eventlog'
require 'puppet/util/windows/service'
require 'puppet/util/windows/monkey_patches/dir'
require 'puppet/util/windows/monkey_patches/process'
end
end
Loading
⚡