(MODULES-1482) Fix Autorequires to only include resource title #46
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
Previously the acl module was using autorequires that include the resource name and type, like Group['None']. With PUP-3177 (first available in Puppet 3.7.1 and in PE 3.7.0), this call now results in invalid calls to `Puppet::Resource`. Specifying the resource type is incorrect and not a best practice (it is already handled by `autorequire(:type)` at the start of each of the autorequire methods. This adjusts the autorequires to follow the correct practice of only including the resource title. This also adjusts file autorequires to greatly simplify the logic and reduce the extra call to `catalog.resource` which is called later by `Puppet::Resource`. The reduction in logic means the file resource name case needs to match exactly, but that is in line with how other requires should be specified.
|
This supersedes joshcooper@c7b68ff |
|
👍 |
|
@cyberious you want to take a look sir? |
|
👍 |
cyberious
added a commit
that referenced
this pull request
Dec 3, 2014
…x-autorequires (MODULES-1482) Fix Autorequires to only include resource title
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.
Previously the acl module was using autorequires that include the resource name
and type, like
Group['None']. With PUP-3177 (first available in Puppet 3.7.1and in PE 3.7.0), this now results in invalid calls to
Puppet::Resource.Specifying the resource type is incorrect and not a best practice (it
is already handled by
autorequire(:type)at the start of each of theautorequire methods.
This adjusts the autorequires to follow the correct practice of only including
the resource title.
This also adjusts file autorequires to greatly simplify the logic and reduce
the extra call to
catalog.resourcewhich is called later byPuppet::Resource. The reduction in logic means the file resource name caseneeds to match exactly, but that is in line with how other requires should be
specified.