Honor the ordering of whichever `name_attribute` or `default` comes first

2 files changed, 17 insertions, 2 deletions

diff --git a/lib/chef/property.rb b/lib/chef/property.rb
index 09198d90f1..5b6a969d5f 100644
--- a/lib/chef/property.rb
+++ b/lib/chef/property.rb
@@ -86,6 +86,21 @@ 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
+      options.reject! do |k,v|
+        if [ :name_property, :name_attribute, :default ].include?(k)
+          if found_default
+            true
+          else
+            found_default = true
+            false
+          end
+        else
+          false
+        end
+      end
       options[:name_property] = options.delete(:name_attribute) if options.has_key?(:name_attribute) && !options.has_key?(:name_property)
       @options = options
 
diff --git a/spec/unit/property_spec.rb b/spec/unit/property_spec.rb
index f758b5f403..533f0f4e4d 100644
--- a/spec/unit/property_spec.rb
+++ b/spec/unit/property_spec.rb
@@ -952,8 +952,8 @@ describe "Chef::Resource.property" do
         end
       end
       with_property ":x, #{name}: true, default: 10" do
-        it "chooses default over #{name}" do
-          expect(resource.x).to eq 10
+        it "chooses #{name} over default" do
+          expect(resource.x).to eq 'blah'
         end
       end
       with_property ":x, #{name}: true, required: true" do