Remove unnecessary ETC requirement #9348
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
When the user type was originally created, it used methods from the ETC module. That code was removed in 12452ee in 2006, so we no longer need to require ETC.
joshcooper
reviewed
May 15, 2024
| @@ -1,6 1,5 @@ | |||
| # frozen_string_literal: true | |||
|
|
|||
| require 'etc' | |||
There was a problem hiding this comment.
One subtly is other user providers may be relying on this require without knowing it, for example hpux
puppet/lib/puppet/provider/user/hpux.rb
Line 51 in ca922ca
Also the base NameProvider which is extended by user and group providers depends on our Etc wrapper:
puppet/lib/puppet/provider/nameservice.rb
Line 30 in ca922ca
And our wrapper calls Etc methods without requiring 'etc' https://github.com/puppetlabs/puppet/blob/ca922ca1f7c1cbd8c28b35a59c126b39b2c90778/lib/puppet/etc.rb
Maybe we should look at these call sites:
$ git grep '^[^#:]*Etc' lib
lib/puppet/etc.rb: @password_class ||= Struct.new(*Etc::Passwd.members, *Etc::Passwd.members.map { |member| "canonical_#{member}".to_sym })
lib/puppet/etc.rb: @group_class ||= Struct.new(*Etc::Group.members, *Etc::Group.members.map { |member| "canonical_#{member}".to_sym })
lib/puppet/etc.rb: new_struct = struct.is_a?(Etc::Passwd) ? puppet_etc_passwd_class.new : puppet_etc_group_class.new
lib/puppet/feature/base.rb: !Etc.getpwuid(0).nil? && Puppet.features.syslog?
lib/puppet/file_system/uniquefile.rb: @@systmpdir ||= defined?(Etc.systmpdir) ? Etc.systmpdir : '/tmp'
lib/puppet/provider/file/posix.rb: user = Etc.getpwuid(id)
lib/puppet/provider/file/posix.rb: group = Etc.getgrgid(id)
lib/puppet/provider/group/groupadd.rb: Etc.getpwnam(user.strip)
lib/puppet/provider/nameservice.rb: "Cannot determine Etc section without a resource type"
lib/puppet/provider/user/hpux.rb: while ent = Etc.getpwent() # rubocop:disable Lint/AssignmentInCondition
lib/puppet/provider/user/hpux.rb: Etc.endpwent()
lib/puppet/provider/user/hpux.rb: ent = Etc.getpwnam(resource.name)
lib/puppet/type/exec.rb: Etc.getpwuid(Process.uid).name
lib/puppet/util/posix.rb: Etc.send(method, id).send(field)
lib/puppet/util/posix.rb: Etc.send(type) do |object|
lib/puppet/util/suidmanager.rb: gid = Etc.getpwuid(uid).gid
lib/puppet/util/suidmanager.rb: pwent = Etc.getpwuid(uid)
And make sure each of those files contain require 'etc'?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When the user type was originally created, it used methods from the ETC module. That code was removed in 12452ee in 2006, so we no longer need to require ETC.