chef 13.12.14-universal-mingw32 → 14.0.190-universal-mingw32

data/lib/chef/node/attribute_collections.rb

@@ -1,6 +1,6 @@
 #--
 # Author:: Daniel DeLeo (<dan@chef.io>)
-# Copyright:: Copyright 2012-2017, Chef Software Inc.
+# Copyright:: Copyright 2012-2018, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -175,7 +175,7 @@ class Chef
       def []=(key, value)
         ret = super
         send_reset_cache(__path__, key)
-        ret
+        ret # rubocop:disable Lint/Void
       end
 
       alias :attribute? :has_key?

data/lib/chef/node/immutable_collections.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright:: Copyright 2012-2017, Chef Software Inc.
+# Copyright:: Copyright 2012-2018, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/chef/node/mixin/immutablize_array.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright:: Copyright 2016-2017, Chef Software Inc.
+# Copyright:: Copyright 2016-2018, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,15 +19,119 @@ class Chef
   class Node
     module Mixin
       module ImmutablizeArray
+        # Allowed methods that MUST NOT mutate the object
+        # (if any of these methods mutate the underlying object that is a bug that needs to be fixed)
+        ALLOWED_METHODS = [
+          :&,
+          :*,
+          :+,
+          :-,
+          :[],
+          :abbrev,
+          :all?,
+          :any?,
+          :assoc,
+          :at,
+          :bsearch,
+          :bsearch_index,
+          :chunk,
+          :chunk_while,
+          :collect,
+          :collect_concat,
+          :combination,
+          :compact,
+          :count,
+          :cycle,
+          :detect,
+          :dig,
+          :drop,
+          :drop_while,
+          :each,
+          :each_cons,
+          :each_entry,
+          :each_index,
+          :each_slice,
+          :each_with_index,
+          :each_with_object,
+          :empty?,
+          :entries,
+          :fetch,
+          :find,
+          :find_all,
+          :find_index,
+          :first,
+          :flat_map,
+          :flatten,
+          :grep,
+          :grep_v,
+          :group_by,
+          :include?,
+          :index,
+          :inject,
+          :join,
+          :last,
+          :lazy,
+          :length,
+          :map,
+          :max,
+          :max_by,
+          :member?,
+          :min,
+          :min_by,
+          :minmax,
+          :minmax_by,
+          :none?,
+          :one?,
+          :pack,
+          :partition,
+          :permutation,
+          :product,
+          :rassoc,
+          :reduce,
+          :reject,
+          :repeated_combination,
+          :repeated_permutation,
+          :reverse,
+          :reverse_each,
+          :rindex,
+          :rotate,
+          :sample,
+          :save_plist,
+          :select,
+          :shelljoin,
+          :shuffle,
+          :size,
+          :slice,
+          :slice_after,
+          :slice_before,
+          :slice_when,
+          :sort,
+          :sort_by,
+          :sum,
+          :take,
+          :take_while,
+          :to_a,
+          :to_ary,
+          :to_h,
+          :to_plist,
+          :to_set,
+          :transpose,
+          :uniq,
+          :values_at,
+          :zip,
+          :|,
+        ]
         # A list of methods that mutate Array. Each of these is overridden to
         # raise an error, making this instances of this class more or less
         # immutable.
         DISALLOWED_MUTATOR_METHODS = [
           :<<,
           :[]=,
+          :append,
           :clear,
           :collect!,
           :compact!,
+          :concat,
           :default=,
           :default_proc=,
           :delete,
@@ -40,18 +144,21 @@ class Chef
           :map!,
           :merge!,
           :pop,
+          :prepend,
           :push,
-          :update,
           :reject!,
-          :reverse!,
           :replace,
+          :reverse!,
+          :rotate!,
           :select!,
           :shift,
+          :shuffle!,
           :slice!,
           :sort!,
           :sort_by!,
           :uniq!,
           :unshift,
+          :update,
         ]
 
         # Redefine all of the methods that mutate a Hash to raise an error when called.

data/lib/chef/node/mixin/immutablize_hash.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright:: Copyright 2016-2017, Chef Software Inc.
+# Copyright:: Copyright 2016-2018, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,10 +19,112 @@ class Chef
   class Node
     module Mixin
       module ImmutablizeHash
+        # allowed methods that MUST NOT mutate the object
+        # (if any of these methods mutate the underlying object that is a bug that needs to be fixed)
+        ALLOWED_METHODS = [
+          :<,
+          :<=,
+          :>,
+          :>=,
+          :[],
+          :all?,
+          :any?,
+          :assoc,
+          :chunk,
+          :chunk_while,
+          :collect,
+          :collect_concat,
+          :compact,
+          :compare_by_identity,
+          :compare_by_identity?,
+          :count,
+          :cycle,
+          :default,
+          :default_proc,
+          :detect,
+          :dig,
+          :drop,
+          :drop_while,
+          :each,
+          :each_cons,
+          :each_entry,
+          :each_key,
+          :each_pair,
+          :each_slice,
+          :each_value,
+          :each_with_index,
+          :each_with_object,
+          :empty?,
+          :entries,
+          :fetch,
+          :fetch_values,
+          :find,
+          :find_all,
+          :find_index,
+          :first,
+          :flat_map,
+          :flatten,
+          :grep,
+          :grep_v,
+          :group_by,
+          :has_key?,
+          :has_value?,
+          :include?,
+          :index,
+          :inject,
+          :invert,
+          :key,
+          :key?,
+          :keys,
+          :lazy,
+          :length,
+          :map,
+          :max,
+          :max_by,
+          :member?,
+          :merge,
+          :min,
+          :min_by,
+          :minmax,
+          :minmax_by,
+          :none?,
+          :one?,
+          :partition,
+          :rassoc,
+          :reduce,
+          :reject,
+          :reverse_each,
+          :save_plist,
+          :select,
+          :size,
+          :slice,
+          :slice_after,
+          :slice_before,
+          :slice_when,
+          :sort,
+          :sort_by,
+          :sum,
+          :take,
+          :take_while,
+          :to_a,
+          :to_h,
+          :to_hash,
+          :to_plist,
+          :to_proc,
+          :to_set,
+          :transform_keys,
+          :transform_values,
+          :uniq,
+          :value?,
+          :values,
+          :values_at,
+          :zip,
+        ]
         DISALLOWED_MUTATOR_METHODS = [
           :[]=,
           :clear,
           :collect!,
+          :compact!,
           :default=,
           :default_proc=,
           :delete,
@@ -30,15 +132,19 @@ class Chef
           :keep_if,
           :map!,
           :merge!,
-          :update,
+          :rehash,
           :reject!,
           :replace,
           :select!,
           :shift,
-          :write,
-          :write!,
-          :unlink,
+          :store,
+          :transform_keys!,
+          :transform_values!,
           :unlink!,
+          :unlink,
+          :update,
+          :write!,
+          :write,
         ]
 
         # Redefine all of the methods that mutate a Hash to raise an error when called.

data/lib/chef/node_map.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Lamont Granquist (<lamont@chef.io>)
-# Copyright:: Copyright 2014-2017, Chef Software Inc.
+# Copyright:: Copyright 2014-2018, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -218,8 +218,10 @@ class Chef
       !!canonical == !!matcher[:canonical]
     end
 
-    # @api private
-    def dispatch_compare_matchers(key, new_matcher, matcher)
+    #
+    # "provides" lines with identical filters sort by class name (ascending).
+    #
+    def compare_matchers(key, new_matcher, matcher)
       cmp = compare_matcher_properties(new_matcher[:block], matcher[:block])
       return cmp if cmp != 0
       cmp = compare_matcher_properties(new_matcher[:platform_version], matcher[:platform_version])
@@ -236,26 +238,6 @@ class Chef
       0
     end
 
-    #
-    # "provides" lines with identical filters sort by class name (ascending).
-    #
-    def compare_matchers(key, new_matcher, matcher)
-      cmp = dispatch_compare_matchers(key, new_matcher, matcher)
-      if cmp == 0
-        # Sort by class name (ascending) as well, if all other properties
-        # are exactly equal
-        # XXX: remove this in Chef-14 and use last-writer-wins (prepend if they match)
-        if !new_matcher[:override]
-          # we only sort classes, which only sorts the handler array, this magically does not sort
-          # the priority array via the invisible else here.
-          if new_matcher[:klass].is_a?(Class)
-            cmp = compare_matcher_properties(new_matcher[:klass].name, matcher[:klass].name)
-          end
-        end
-      end
-      cmp
-    end
-
     def compare_matcher_properties(a, b)
       # falsity comparisons here handle both "nil" and "false"
       return 1 if !a && b

data/lib/chef/platform/query_helpers.rb

@@ -24,18 +24,6 @@ class Chef
         ChefConfig.windows?
       end
 
-      def windows_server_2003?
-        # WMI startup shouldn't be performed unless we're on Windows.
-        return false unless windows?
-        require "wmi-lite/wmi"
-
-        wmi = WmiLite::Wmi.new
-        host = wmi.first_of("Win32_OperatingSystem")
-        is_server_2003 = (host["version"] && host["version"].start_with?("5.2"))
-
-        is_server_2003
-      end
-
       def windows_nano_server?
         return false unless windows?
         require "win32/registry"

data/lib/chef/policy_builder/dynamic.rb

@@ -63,7 +63,7 @@ class Chef
       # @return [Chef::Node] the loaded node.
       def load_node
         events.node_load_start(node_name, config)
-        Chef::Log.debug("Building node object for #{node_name}")
+        Chef::Log.trace("Building node object for #{node_name}")
 
         @node =
           if Chef::Config[:solo_legacy_mode]

data/lib/chef/policy_builder/expand_node_object.rb

@@ -170,7 +170,7 @@ class Chef
       # === Returns
       # Hash:: The hash of cookbooks with download URLs as given by the server
       def sync_cookbooks
-        Chef::Log.debug("Synchronizing cookbooks")
+        Chef::Log.trace("Synchronizing cookbooks")
 
         begin
           events.cookbook_resolution_start(@expanded_run_list_with_versions)

data/lib/chef/policy_builder/policyfile.rb

@@ -164,6 +164,11 @@ class Chef
         events.node_load_completed(node, run_list_with_versions_for_display, Chef::Config)
         events.run_list_expanded(run_list_expansion_ish)
 
+        # we must do this after `node.consume_external_attrs`
+        node.automatic_attrs[:policy_name] = node.policy_name
+        node.automatic_attrs[:policy_group] = node.policy_group
+        node.automatic_attrs[:chef_environment] = node.policy_group
+
         node
       rescue Exception => e
         events.node_load_failed(node_name, e, Chef::Config)
@@ -211,7 +216,7 @@ class Chef
       # @return [Hash{String => Chef::CookbookManifest}] A map of
       #   CookbookManifest objects by cookbook name.
       def sync_cookbooks
-        Chef::Log.debug("Synchronizing cookbooks")
+        Chef::Log.trace("Synchronizing cookbooks")
         synchronizer = Chef::CookbookSynchronizer.new(cookbooks_to_sync, events)
         synchronizer.sync_cookbooks
 
@@ -263,6 +268,16 @@ class Chef
       def apply_policyfile_attributes
         node.attributes.role_default = policy["default_attributes"]
         node.attributes.role_override = policy["override_attributes"]
+        hoist_policyfile_attributes(node.policy_group) if node.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.trace("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
@@ -390,6 +405,7 @@ class Chef
 
         node.policy_name = policy_name_to_set
         node.policy_group = policy_group_to_set
+        node.chef_environment = policy_group_to_set
 
         Chef::Config[:policy_name] = policy_name_to_set
         Chef::Config[:policy_group] = policy_group_to_set