(PDK-988) restrain mungify from non-puppet resource workflows
#80
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
It turns out that a new type instance with a Hash as argument is only used by the RAL's `find` method, if there is no matching instance returned from `instances`. While this is the method used by the `puppet resource` CLI, it is not indicative of being called from it (when the instance exists, this code path is not hit). This commit changes the name of the variable to better represent what it actually signifies.
DavidS
force-pushed
the
pdk-988-restrain-mungify
branch
2 times, most recently
from
6173f6e to
61ce774
Compare
da-ar
reviewed
May 22, 2018
lib/puppet/resource_api.rb
Outdated
| @@ -517,13 +517,30 @@ def self.try_mungify(type, value, error_msg_prefix) | |||
| # fall through to default handling | |||
| end | |||
|
|
|||
| # a match! | |||
| return [value, nil] if type.instance?(value) | |||
| is_valid, error_msg = try_validate(type, value, error_msg_prefix) | |||
There was a problem hiding this comment.
Possibly, have try_validate return value, error_msg? If it fails, return nil, error_msg.
There was a problem hiding this comment.
Doing it like this would obscure the fact that try_validate doesn't change the value. But I'll change it to only return error_msg or nil, which is enough information, and lines up better with try_mungify.
lib/puppet/resource_api.rb
Outdated
| def self.validate(type, value, error_msg_prefix) | ||
| is_valid, error_msg = try_validate(type, value, error_msg_prefix) | ||
|
|
||
| raise Puppet::ResourceError, error_msg unless is_valid |
There was a problem hiding this comment.
if previous suggestion is followed unless is_valid would change here.
The mungify introduced in puppetlabs#59 would also affect strings passed in as parameters through manifests (e.g. using `puppet apply` or the agent), masking input type errors. This change fixes the behaviour so that munging is only happening when the runtime environment is actually puppet resource. Of course, long-term it would be better to have the CLI itself mungify inputs from the CLI. Such an implementation could provide more specific error messages, and reduce code complexity here. For now, this solution works across all puppet versions, and provides the same functionality. versions.
DavidS
force-pushed
the
pdk-988-restrain-mungify
branch
from
61ce774 to
b6faf26
Compare
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.
No description provided.