chef 12.4.3-universal-mingw32 → 12.5.1-universal-mingw32

data/lib/chef/node_map.rb

@@ -32,8 +32,8 @@ class Chef
     # @return [NodeMap] Returns self for possible chaining
     #
     def set(key, value, platform: nil, platform_version: nil, platform_family: nil, os: nil, on_platform: nil, on_platforms: nil, canonical: nil, override: nil, &block)
-      Chef::Log.deprecation "The on_platform option to node_map has been deprecated" if on_platform
-      Chef::Log.deprecation "The on_platforms option to node_map has been deprecated" if on_platforms
+      Chef.log_deprecation("The on_platform option to node_map has been deprecated") if on_platform
+      Chef.log_deprecation("The on_platforms option to node_map has been deprecated") if on_platforms
       platform ||= on_platform || on_platforms
       filters = {}
       filters[:platform] = platform if platform

data/lib/chef/platform/handler_map.rb

@@ -31,11 +31,6 @@ class Chef
           # are exactly equal
           if new_matcher[:value].is_a?(Class) && !new_matcher[:override]
             cmp = compare_matcher_properties(new_matcher, matcher) { |m| m[:value].name }
-            if cmp < 0
-              Chef::Log.warn "You are overriding #{key} on #{new_matcher[:filters].inspect} with #{new_matcher[:value].inspect}: used to be #{matcher[:value].inspect}. Use override: true if this is what you intended."
-            elsif cmp > 0
-              Chef::Log.warn "You declared a new resource #{new_matcher[:value].inspect} for resource #{key}, but it comes alphabetically after #{matcher[:value].inspect} and has the same filters (#{new_matcher[:filters].inspect}), so it will not be used. Use override: true if you want to use it for #{key}."
-            end
           end
         end
         cmp

data/lib/chef/platform/provider_mapping.rb

@@ -200,14 +200,13 @@ class Chef
             class_name = resource_type.class.name ? resource_type.class.name.split('::').last :
               convert_to_class_name(resource_type.resource_name.to_s)
 
-            begin
-              result = Chef::Provider.const_get(class_name)
-              Chef::Log.warn("Class Chef::Provider::#{class_name} does not declare 'resource_name #{convert_to_snake_case(class_name).to_sym.inspect}'.")
-              Chef::Log.warn("This will no longer work in Chef 13: you must use 'resource_name' to provide DSL.")
-            rescue NameError
+            if Chef::Provider.const_defined?(class_name)
+              Chef::Log.warn("Class Chef::Provider::#{class_name} does not declare 'provides #{convert_to_snake_case(class_name).to_sym.inspect}'.")
+              Chef::Log.warn("This will no longer work in Chef 13: you must use 'provides' to use the resource's DSL.")
+              return Chef::Provider.const_get(class_name)
             end
           end
-          result
+          nil
         end
 
     end

data/lib/chef/platform/query_helpers.rb

@@ -25,13 +25,10 @@ class Chef
       end
 
       def windows_server_2003?
+        # WMI startup shouldn't be performed unless we're on Windows.
         return false unless windows?
         require 'wmi-lite/wmi'
 
-        # CHEF-4888: Work around ruby #2618, expected to be fixed in Ruby 2.1.0
-        # https://github.com/ruby/ruby/commit/588504b20f5cc880ad51827b93e571e32446e5db
-        # https://github.com/ruby/ruby/commit/27ed294c7134c0de582007af3c915a635a6506cd
-
         wmi = WmiLite::Wmi.new
         host = wmi.first_of('Win32_OperatingSystem')
         is_server_2003 = (host['version'] && host['version'].start_with?("5.2"))
@@ -39,6 +36,44 @@ class Chef
         is_server_2003
       end
 
+      def windows_nano_server?
+        return false unless windows?
+        require 'win32/registry'
+
+        # This method may be called before ohai runs (e.g., it may be used to
+        # determine settings in config.rb). Chef::Win32::Registry.new uses
+        # node attributes to verify the machine architecture which aren't
+        # accessible before ohai runs.
+        nano = nil
+        key = "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Server\\ServerLevels"
+        access = ::Win32::Registry::KEY_QUERY_VALUE | 0x0100 # nano is 64-bit only
+        begin
+          ::Win32::Registry::HKEY_LOCAL_MACHINE.open(key, access) do |reg|
+            nano = reg["NanoServer"]
+          end
+        rescue ::Win32::Registry::Error
+          # If accessing the registry key failed, then we're probably not on
+          # nano. Fail through.
+        end
+        return nano == 1
+      end
+
+      def supports_msi?
+        return false unless windows?
+        require 'win32/registry'
+
+        key = "System\\CurrentControlSet\\Services\\msiserver"
+        access = ::Win32::Registry::KEY_QUERY_VALUE
+
+        begin
+          ::Win32::Registry::HKEY_LOCAL_MACHINE.open(key, access) do |reg|
+            true
+          end
+        rescue ::Win32::Registry::Error
+          false
+        end
+      end
+
       def supports_powershell_execution_bypass?(node)
         node[:languages] && node[:languages][:powershell] &&
           node[:languages][:powershell][:version].to_i >= 3
@@ -55,6 +90,13 @@ class Chef
           Gem::Version.new(node[:languages][:powershell][:version]) >=
             Gem::Version.new("5.0.10018.0")
       end
+
+      def dsc_refresh_mode_disabled?(node)
+        require 'chef/util/powershell/cmdlet'
+        cmdlet = Chef::Util::Powershell::Cmdlet.new(node, "Get-DscLocalConfigurationManager", :object)
+        metadata = cmdlet.run!.return_value
+        metadata['RefreshMode'] == 'Disabled'
+      end
     end
   end
 end

data/lib/chef/platform/rebooter.rb

@@ -32,7 +32,7 @@ class Chef
 
           cmd = if Chef::Platform.windows?
             # should this do /f as well? do we then need a minimum delay to let apps quit?
-            "shutdown /r /t #{reboot_info[:delay_mins]} /c \"#{reboot_info[:reason]}\""
+            "shutdown /r /t #{reboot_info[:delay_mins]*60} /c \"#{reboot_info[:reason]}\""
           else
             # probably Linux-only.
             "shutdown -r +#{reboot_info[:delay_mins]} \"#{reboot_info[:reason]}\""

data/lib/chef/platform/service_helpers.rb

@@ -19,6 +19,7 @@
 # XXX: mixing shellout into a mixin into classes has to be code smell
 require 'chef/mixin/shell_out'
 require 'chef/mixin/which'
+require 'chef/chef_class'
 
 class Chef
   class Platform
@@ -42,56 +43,56 @@ class Chef
         # different services is NOT a design concern of this module.
         #
         def service_resource_providers
-          @service_resource_providers ||= [].tap do |service_resource_providers|
+          providers = []
 
-            if ::File.exist?("/usr/sbin/update-rc.d")
-              service_resource_providers << :debian
-            end
-
-            if ::File.exist?("/usr/sbin/invoke-rc.d")
-              service_resource_providers << :invokercd
-            end
+          if ::File.exist?(Chef.path_to("/usr/sbin/update-rc.d"))
+            providers << :debian
+          end
 
-            if ::File.exist?("/sbin/insserv")
-              service_resource_providers << :insserv
-            end
+          if ::File.exist?(Chef.path_to("/usr/sbin/invoke-rc.d"))
+            providers << :invokercd
+          end
 
-            # debian >= 6.0 has /etc/init but does not have upstart
-            if ::File.exist?("/etc/init") && ::File.exist?("/sbin/start")
-              service_resource_providers << :upstart
-            end
+          if ::File.exist?(Chef.path_to("/sbin/insserv"))
+            providers << :insserv
+          end
 
-            if ::File.exist?("/sbin/chkconfig")
-              service_resource_providers << :redhat
-            end
+          # debian >= 6.0 has /etc/init but does not have upstart
+          if ::File.exist?(Chef.path_to("/etc/init")) && ::File.exist?(Chef.path_to("/sbin/start"))
+            providers << :upstart
+          end
 
-            if systemd_sanity_check?
-              service_resource_providers << :systemd
-            end
+          if ::File.exist?(Chef.path_to("/sbin/chkconfig"))
+            providers << :redhat
+          end
 
+          if systemd_sanity_check?
+            providers << :systemd
           end
+
+          providers
         end
 
         def config_for_service(service_name)
           configs = []
 
-          if ::File.exist?("/etc/init.d/#{service_name}")
+          if ::File.exist?(Chef.path_to("/etc/init.d/#{service_name}"))
             configs << :initd
           end
 
-          if ::File.exist?("/etc/init/#{service_name}.conf")
+          if ::File.exist?(Chef.path_to("/etc/init/#{service_name}.conf"))
             configs << :upstart
           end
 
-          if ::File.exist?("/etc/xinetd.d/#{service_name}")
+          if ::File.exist?(Chef.path_to("/etc/xinetd.d/#{service_name}"))
             configs << :xinetd
           end
 
-          if ::File.exist?("/etc/rc.d/#{service_name}")
+          if ::File.exist?(Chef.path_to("/etc/rc.d/#{service_name}"))
             configs << :etc_rcd
           end
 
-          if ::File.exist?("/usr/local/etc/rc.d/#{service_name}")
+          if ::File.exist?(Chef.path_to("/usr/local/etc/rc.d/#{service_name}"))
             configs << :usr_local_etc_rcd
           end
 
@@ -105,14 +106,11 @@ class Chef
         private
 
         def systemctl_path
-          if @systemctl_path.nil?
-            @systemctl_path = which("systemctl")
-          end
-          @systemctl_path
+          which("systemctl")
         end
 
         def systemd_sanity_check?
-          systemctl_path && File.exist?("/proc/1/comm") && File.open("/proc/1/comm").gets.chomp == "systemd"
+          systemctl_path && File.exist?(Chef.path_to("/proc/1/comm")) && File.open(Chef.path_to("/proc/1/comm")).gets.chomp == "systemd"
         end
 
         def extract_systemd_services(command)
@@ -126,7 +124,7 @@ class Chef
           # this splits off the suffix after the last dot to return "sshd"
           services += services.select {|s| s.match(/\.service$/) }.map { |s| s.sub(/(.*)\.service$/, '\1') }
         rescue Mixlib::ShellOut::ShellCommandFailed
-          false
+          []
         end
 
         def platform_has_systemd_unit?(service_name)

data/lib/chef/policy_builder.rb

@@ -18,6 +18,7 @@
 
 require 'chef/policy_builder/expand_node_object'
 require 'chef/policy_builder/policyfile'
+require 'chef/policy_builder/dynamic'
 
 class Chef
 
@@ -37,13 +38,5 @@ class Chef
   # * cookbook_hash is stored in run_context
   module PolicyBuilder
 
-    def self.strategy
-      if Chef::Config[:use_policyfile]
-        Policyfile
-      else
-        ExpandNodeObject
-      end
-    end
-
   end
 end

data/lib/chef/policy_builder/dynamic.rb

@@ -0,0 +1,186 @@
+#
+# Author:: Daniel DeLeo (<dan@chef.io>)
+# Copyright:: Copyright 2015 Chef Software, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'forwardable'
+
+require 'chef/log'
+require 'chef/rest'
+require 'chef/run_context'
+require 'chef/config'
+require 'chef/node'
+require 'chef/exceptions'
+
+class Chef
+  module PolicyBuilder
+
+    # PolicyBuilder that selects either a Policyfile or non-Policyfile
+    # implementation based on the content of the node object.
+    class Dynamic
+
+      extend Forwardable
+
+      attr_reader :node
+      attr_reader :node_name
+      attr_reader :ohai_data
+      attr_reader :json_attribs
+      attr_reader :override_runlist
+      attr_reader :events
+
+      def initialize(node_name, ohai_data, json_attribs, override_runlist, events)
+        @implementation = nil
+
+        @node_name = node_name
+        @ohai_data = ohai_data
+        @json_attribs = json_attribs
+        @override_runlist = override_runlist
+        @events = events
+
+        @node = nil
+      end
+
+      ## PolicyBuilder API ##
+
+      # Loads the node state from the server, then picks the correct
+      # implementation class based on the node and json_attribs.
+      #
+      # Calls #finish_load_node on the implementation object to complete the
+      # loading process. All subsequent lifecycle calls are delegated.
+      #
+      # @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}")
+
+        @node =
+          if Chef::Config[:solo]
+            Chef::Node.build(node_name)
+          else
+            Chef::Node.find_or_create(node_name)
+          end
+        select_implementation(node)
+        implementation.finish_load_node(node)
+        node
+      rescue Exception => e
+        events.node_load_failed(node_name, e, config)
+        raise
+      end
+
+      ## Delegated Public API Methods ##
+
+      ### Accessors ###
+
+      def_delegator :implementation, :original_runlist
+      def_delegator :implementation, :run_context
+      def_delegator :implementation, :run_list_expansion
+
+      ### Lifecycle Methods ###
+
+      # @!method build_node
+      #
+      # Applies external attributes (e.g., from JSON file, environment,
+      # policyfile, etc.) and determines the correct expanded run list for the
+      # run.
+      #
+      # @return [Chef::Node]
+      def_delegator :implementation, :build_node
+
+      # @!method setup_run_context
+      #
+      # Synchronizes cookbooks and initializes the run context object for the
+      # run.
+      #
+      # @return [Chef::RunContext]
+      def_delegator :implementation, :setup_run_context
+
+      # @!method expanded_run_list
+      #
+      # Resolves the run list to a form containing only recipes and sets the
+      # `roles` and `recipes` automatic attributes on the node.
+      #
+      # @return [#recipes, #roles] A RunListExpansion or duck-type.
+      def_delegator :implementation, :expand_run_list
+
+      # @!method sync_cookbooks
+      #
+      # Synchronizes cookbooks. In a normal chef-client run, this is handled by
+      # #setup_run_context, but may be called directly in some circumstances.
+      #
+      # @return [Hash{String => Chef::CookbookManifest}] A map of
+      #   CookbookManifest objects by cookbook name.
+      def_delegator :implementation, :sync_cookbooks
+
+      # @!method temporary_policy?
+      #
+      # Indicates whether the policy is temporary, which means an
+      # override_runlist was provided. Chef::Client uses this to decide whether
+      # to do the final node save at the end of the run or not.
+      #
+      # @return [true,false]
+      def_delegator :implementation, :temporary_policy?
+
+      ## Internal Public API ##
+
+      # Returns the selected implementation, or raises if not set. The
+      # implementation is set when #load_node is called.
+      #
+      # @return [PolicyBuilder::Policyfile, PolicyBuilder::ExpandNodeObject]
+      def implementation
+        @implementation or raise Exceptions::InvalidPolicybuilderCall, "#load_node must be called before other policy builder methods"
+      end
+
+      # @api private
+      #
+      # Sets the implementation based on the content of the node, node JSON
+      # (i.e., the `-j JSON_FILE` data), and config. This is only public for
+      # testing purposes; production code should call #load_node instead.
+      def select_implementation(node)
+        if policyfile_set_in_config? ||
+            policyfile_attribs_in_node_json? ||
+            node_has_policyfile_attrs?(node) ||
+            policyfile_compat_mode_config?
+          @implementation = Policyfile.new(node_name, ohai_data, json_attribs, override_runlist, events)
+        else
+          @implementation = ExpandNodeObject.new(node_name, ohai_data, json_attribs, override_runlist, events)
+        end
+      end
+
+      def config
+        Chef::Config
+      end
+
+      private
+
+      def node_has_policyfile_attrs?(node)
+        node.policy_name || node.policy_group
+      end
+
+      def policyfile_attribs_in_node_json?
+        json_attribs.key?("policy_name") || json_attribs.key?("policy_group")
+      end
+
+      def policyfile_set_in_config?
+        config[:use_policyfile] || config[:policy_name] || config[:policy_group]
+      end
+
+      def policyfile_compat_mode_config?
+        config[:deployment_group] && !config[:policy_document_native_api]
+      end
+
+    end
+  end
+end