Add attribute hoisting into core

This commit implements RFC-105 and adds specs to verify attribute hoisting is working correctly in conjunction with existing attributes.

Signed-off-by: Jon Cowie <jonlives@gmail.com>

1 files changed, 13 insertions, 0 deletions

diff --git a/lib/chef/policy_builder/policyfile.rb b/lib/chef/policy_builder/policyfile.rb
index 545d36cb0e..900abb23cc 100644
--- a/lib/chef/policy_builder/policyfile.rb
+++ b/lib/chef/policy_builder/policyfile.rb
@@ -263,6 +263,19 @@ class Chef
       def apply_policyfile_attributes
         node.attributes.role_default = policy["default_attributes"]
         node.attributes.role_override = policy["override_attributes"]
+        policy_group = (defined?(node.policy_group) && node.policy_group) || \
+          Chef::Config[:policy_group] || \
+          (Chef::Config[:deployment_group] && Chef::Config[:deployment_group].split(/-/).last)
+        hoist_policyfile_attributes(policy_group) if policy_group
+      end
+
+      # @api private
+      #
+      # Hoists attributes from role_X[policy_group] up to the equivalent role_X level
+      def hoist_policyfile_attributes(policy_group)
+        Chef::Log.debug("Running attribute Hoist for group #{policy_group}")
+        Chef::Mixin::DeepMerge.hash_only_merge!(node.role_default, node.role_default[policy_group]) if node.role_default.include?(policy_group)
+        Chef::Mixin::DeepMerge.hash_only_merge!(node.role_override, node.role_override[policy_group]) if node.role_override.include?(policy_group)
       end
 
       # @api private