diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/chef/property.rb | 16 | ||||
| -rw-r--r-- | lib/chef/resource.rb | 2 |
2 files changed, 11 insertions, 7 deletions
diff --git a/lib/chef/property.rb b/lib/chef/property.rb index 5b6a969d5f..7f42616bdd 100644 --- a/lib/chef/property.rb +++ b/lib/chef/property.rb @@ -86,22 +86,24 @@ class Chef # def initialize(**options) options.each { |k,v| options[k.to_sym] = v if k.is_a?(String) } + # Only pick the first of :default, :name_property and :name_attribute if # more than one is specified. - found_default = false + found_defaults = [] options.reject! do |k,v| if [ :name_property, :name_attribute, :default ].include?(k) - if found_default - true - else - found_default = true - false - end + found_defaults << k + # Reject all but the first default key you find + found_defaults.size > 1 else false end end + if found_defaults.size > 1 + Chef::Log.deprecation("Cannot specify keys #{found_defaults.join(", ")} together on property #{options[:name]}--only the first one (#{found_defaults[0]}) will be obeyed. Please pick one.", caller(5..5)[0]) + end options[:name_property] = options.delete(:name_attribute) if options.has_key?(:name_attribute) && !options.has_key?(:name_property) + @options = options options[:name] = options[:name].to_sym if options[:name] diff --git a/lib/chef/resource.rb b/lib/chef/resource.rb index 6c2f91ed8b..9e40fdccfd 100644 --- a/lib/chef/resource.rb +++ b/lib/chef/resource.rb @@ -782,6 +782,8 @@ class Chef def self.property(name, type=NOT_PASSED, **options) name = name.to_sym + options.each { |k,v| options[k.to_sym] = v if k.is_a?(String) } + options[:instance_variable_name] = :"@#{name}" if !options.has_key?(:instance_variable_name) options.merge!(name: name, declared_in: self) |