This repository has been archived by the owner on Nov 9, 2022. It is now read-only.
Fixes #11214 - support node attribute whitelisting, blacklisting and caching #19
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
| @@ -55,7 +62,15 @@ def normalize(os) | |||
| def plain_attributes | |||
| # chef 10 attributes can be access by to_hash directly, chef 11 uses attributes method | |||
| attributes = node.respond_to?(:attributes) ? node.attributes : node.to_hash | |||
| plainify(attributes.to_hash).flatten.inject(&:merge) | |||
| if @whitelist | |||
| attrs = plainify((attributes.select {|key| @whitelist.include?(key)}).to_hash).flatten.inject(&:merge) | |||
There was a problem hiding this comment.
a bit more DRY version
attributes = attributes.select { |key, value| @whitelist.include?(key) } if @whitelist
attrs = plainify((attributes.to_hash).flatten.inject(&:merge)also note that two arguments in select block (key, value) are required to be compatible with ruby 1.8
|
|
||
| module ChefHandlerForeman | ||
| class ForemanFacts < Chef::Handler | ||
| attr_accessor :uploader | ||
| attr_accessor :blacklist | ||
| attr_accessor :whitelist | ||
| attr_accessor :cachefile |
There was a problem hiding this comment.
last nitpick, could you please rename cachefile to cache_file throughout the PR? sounds more like two words to me and it would be more consistent with cache_expired name.
|
Tested, works perfectly. Could you please squash all commits into one and change the message to "Fixes #11214 - support node attribute whitelisting, blacklisting and caching" so I can merge it? |
|
Done! |
ares
changed the title
|
Thank you very much for awesome contribution, I'll release chef-handler-foreman gem 0.0.9 with this feature shortly. |
ares
added a commit
that referenced
this pull request
Jul 30, 2015
Fixes #11214 - support node attribute whitelisting, blacklisting and caching
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
As per http://projects.theforeman.org/issues/11214