disallow []= without explicit precedence

1 files changed, 10 insertions, 10 deletions

diff --git a/chef/lib/chef/node/attribute.rb b/chef/lib/chef/node/attribute.rb
index c4556bfeae..36bc721b77 100644
--- a/chef/lib/chef/node/attribute.rb
+++ b/chef/lib/chef/node/attribute.rb
@@ -23,6 +23,10 @@ require 'chef/log'
 class Chef
   class Node
     class Attribute
+
+      class ImmutableAttribute < NoMethodError
+      end
+
       HIDDEN_ATTRIBUES = [:@override, :@attribute, :@default, :@normal, :@automatic]
 
       attr_accessor :normal,
@@ -55,14 +59,6 @@ class Chef
         @has_been_read = false
       end
 
-      def attribute
-        normal
-      end
-
-      def attribute=(value)
-        normal = value
-      end
-
       def set_type_hash
         case @set_type
         when :normal
@@ -317,8 +313,12 @@ class Chef
       end
 
       def []=(key, value)
-        # If we don't have one, then we'll pretend we're normal
-        @set_type ||= :normal
+        if @set_type.nil?
+          # @set_type = :normal
+          raise ImmutableAttribute, "Attributes may only be set by specifying the precedence level, e.g., node.normal[:foo] = 'bar'"
+        elsif @set_type == false
+          raise "WTF"
+        end
 
         if set_unless_value_present
           if get_value(set_type_hash, key) != nil