chef 15.4.45-universal-mingw32 → 15.5.9-universal-mingw32

data/lib/chef/mixin/windows_architecture_helper.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Adam Edwards (<adamed@chef.io>)
-# Copyright:: Copyright 2013-2016, Chef Software Inc.
+# Copyright:: Copyright 2013-2019, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,8 +18,8 @@
 
 require_relative "../exceptions"
 require_relative "../platform/query_helpers"
-require_relative "../win32/process" if Chef::Platform.windows?
-require_relative "../win32/system" if Chef::Platform.windows?
+require_relative "../win32/process" if ChefUtils.windows?
+require_relative "../win32/system" if ChefUtils.windows?
 
 class Chef
   module Mixin
@@ -89,7 +89,7 @@ class Chef
       end
 
       def is_i386_process_on_x86_64_windows?
-        if Chef::Platform.windows?
+        if ChefUtils.windows?
           Chef::ReservedNames::Win32::Process.is_wow64_process
         else
           false
@@ -97,13 +97,13 @@ class Chef
       end
 
       def disable_wow64_file_redirection( node )
-        if ( node_windows_architecture(node) == :x86_64) && ::Chef::Platform.windows?
+        if ( node_windows_architecture(node) == :x86_64) && ::ChefUtils.windows?
           Chef::ReservedNames::Win32::System.wow64_disable_wow64_fs_redirection
         end
       end
 
       def restore_wow64_file_redirection( node, original_redirection_state )
-        if (node_windows_architecture(node) == :x86_64) && ::Chef::Platform.windows?
+        if (node_windows_architecture(node) == :x86_64) && ::ChefUtils.windows?
           Chef::ReservedNames::Win32::System.wow64_revert_wow64_fs_redirection(original_redirection_state)
         end
       end

data/lib/chef/mixin/windows_env_helper.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Adam Edwards (<adamed@chef.io>)
-# Copyright:: Copyright 2013-2016, Chef Software Inc.
+# Copyright:: Copyright 2013-2019, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,16 +19,16 @@
 require_relative "../exceptions"
 require_relative "wide_string"
 require_relative "../platform/query_helpers"
-require_relative "../win32/error" if Chef::Platform.windows?
-require_relative "../win32/api/system" if Chef::Platform.windows?
-require_relative "../win32/api/unicode" if Chef::Platform.windows?
+require_relative "../win32/error" if ChefUtils.windows?
+require_relative "../win32/api/system" if ChefUtils.windows?
+require_relative "../win32/api/unicode" if ChefUtils.windows?
 
 class Chef
   module Mixin
     module WindowsEnvHelper
       include Chef::Mixin::WideString
 
-      if Chef::Platform.windows?
+      if ChefUtils.windows?
         include Chef::ReservedNames::Win32::API::System
       end
 

data/lib/chef/node/attribute.rb

@@ -199,14 +199,14 @@ class Chef
         @role_default   = VividMash.new({}, self, node, :role_default)
         @force_default  = VividMash.new({}, self, node, :force_default)
 
-        @normal         = VividMash.new(normal, self, node, :normal)
+        @normal = VividMash.new(normal, self, node, :normal)
 
         @override       = VividMash.new(override, self, node, :override)
         @role_override  = VividMash.new({}, self, node, :role_override)
         @env_override   = VividMash.new({}, self, node, :env_override)
         @force_override = VividMash.new({}, self, node, :force_override)
 
-        @automatic      = VividMash.new(automatic, self, node, :automatic)
+        @automatic = VividMash.new(automatic, self, node, :automatic)
 
         super(nil, self, node, :merged)
       end

data/lib/chef/node_map.rb

@@ -219,6 +219,11 @@ class Chef
 
     private
 
+    def platform_family_query_helper?(node, m)
+      method = "#{m}?".to_sym
+      ChefUtils::DSL::PlatformFamily.respond_to?(method) && ChefUtils::DSL::PlatformFamily.send(method, node)
+    end
+
     #
     # Succeeds if:
     # - no negative matches (!value)
@@ -235,11 +240,19 @@ class Chef
       # Split the blacklist and whitelist
       blacklist, whitelist = filter_values.partition { |v| v.is_a?(String) && v.start_with?("!") }
 
-      # If any blacklist value matches, we don't match
-      return false if blacklist.any? { |v| v[1..-1] == value }
+      if attribute == :platform_family
+        # If any blacklist value matches, we don't match
+        return false if blacklist.any? { |v| v[1..-1] == value || platform_family_query_helper?(node, v[1..-1]) }
 
-      # If the whitelist is empty, or anything matches, we match.
-      whitelist.empty? || whitelist.any? { |v| v == :all || v == value }
+        # If the whitelist is empty, or anything matches, we match.
+        whitelist.empty? || whitelist.any? { |v| v == :all || v == value || platform_family_query_helper?(node, v) }
+      else
+        # If any blacklist value matches, we don't match
+        return false if blacklist.any? { |v| v[1..-1] == value }
+
+        # If the whitelist is empty, or anything matches, we match.
+        whitelist.empty? || whitelist.any? { |v| v == :all || v == value }
+      end
     end
 
     def matches_version_list?(node, filters, attribute)

data/lib/chef/platform/query_helpers.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Adam Jacob (<adam@chef.io>)
-# Copyright:: Copyright 2008-2016, Chef Software Inc.
+# Copyright:: Copyright 2008-2019, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,12 +16,14 @@
 # limitations under the License.
 #
 
+require "chef-utils" unless defined?(ChefUtils::CANARY)
+
 class Chef
   class Platform
 
     class << self
       def windows?
-        ChefConfig.windows?
+        ChefUtils.windows?
       end
 
       def windows_nano_server?

data/lib/chef/platform/rebooter.rb

@@ -35,7 +35,7 @@ class Chef
           reboot_info = node.run_context.reboot_info
 
           cmd = case
-                when Chef::Platform.windows?
+                when ChefUtils.windows?
                   # should this do /f as well? do we then need a minimum delay to let apps quit?
                   # Use explicit path to shutdown.exe, to protect against https://github.com/chef/chef/issues/5594
                   windows_shutdown_path = "#{ENV["SYSTEMROOT"]}/System32/shutdown.exe"

data/lib/chef/platform/service_helpers.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Lamont Granquist (<lamont@chef.io>)
-# Copyright:: Copyright 2014-2016, Chef Software, Inc.
+# Copyright:: Copyright 2014-2019, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,53 +17,22 @@
 #
 
 require_relative "../chef_class"
-require_relative "../mixin/train_helpers"
+require "chef-utils" if defined?(ChefUtils::CANARY)
 
 class Chef
   class Platform
+    # @deprecated, use ChefUtils::DSL::Service instead (via the ChefUtils Universal DSL)
     class ServiceHelpers
       class << self
-        include Chef::Mixin::TrainHelpers
-
-        # This helper is mostly used to sort out the mess of different
-        # linux mechanisms that can be used to start services.  It does
-        # not necessarily need to linux-specific, but currently all our
-        # other service providers are narrowly platform-specific with no
-        # alternatives.
-        #
-        # NOTE: if a system has (for example) chkconfig installed then we
-        # should report that chkconfig is installed.  The fact that a system
-        # may also have systemd installed does not mean that we do not
-        # report that systemd is also installed.  This module is purely for
-        # discovery of all the alternatives, handling the priority of the
-        # different services is NOT a design concern of this module.
-        #
         def service_resource_providers
           providers = []
 
-          if file_exist?(Chef.path_to("/usr/sbin/update-rc.d"))
-            providers << :debian
-          end
-
-          if file_exist?(Chef.path_to("/usr/sbin/invoke-rc.d"))
-            providers << :invokercd
-          end
-
-          if file_exist?(Chef.path_to("/sbin/initctl"))
-            providers << :upstart
-          end
-
-          if file_exist?(Chef.path_to("/sbin/insserv"))
-            providers << :insserv
-          end
-
-          if systemd_is_init?
-            providers << :systemd
-          end
-
-          if file_exist?(Chef.path_to("/sbin/chkconfig"))
-            providers << :redhat
-          end
+          providers << :debian if ChefUtils::DSL::Service.debianrcd?
+          providers << :invokercd if ChefUtils::DSL::Service.invokercd?
+          providers << :upstart if ChefUtils::DSL::Service.upstart?
+          providers << :insserv if ChefUtils::DSL::Service.insserv?
+          providers << :systemd if ChefUtils.systemd?
+          providers << :redhat if ChefUtils::DSL::Service.redhatrcd?
 
           providers
         end
@@ -71,54 +40,14 @@ class Chef
         def config_for_service(service_name)
           configs = []
 
-          if file_exist?(Chef.path_to("/etc/init.d/#{service_name}"))
-            configs += %i{initd systemd}
-          end
-
-          if file_exist?(Chef.path_to("/etc/init/#{service_name}.conf"))
-            configs << :upstart
-          end
-
-          if file_exist?(Chef.path_to("/etc/xinetd.d/#{service_name}"))
-            configs << :xinetd
-          end
-
-          if file_exist?(Chef.path_to("/etc/rc.d/#{service_name}"))
-            configs << :etc_rcd
-          end
-
-          if file_exist?(Chef.path_to("/usr/local/etc/rc.d/#{service_name}"))
-            configs << :usr_local_etc_rcd
-          end
-
-          if has_systemd_service_unit?(service_name) || has_systemd_unit?(service_name)
-            configs << :systemd
-          end
+          configs << :initd if ChefUtils::DSL::Service.service_script_exist?(:initd, service_name)
+          configs << :upstart if ChefUtils::DSL::Service.service_script_exist?(:upstart, service_name)
+          configs << :xinetd if ChefUtils::DSL::Service.service_script_exist?(:xinetd, service_name)
+          configs << :systemd if ChefUtils::DSL::Service.service_script_exist?(:systemd, service_name)
+          configs << :etc_rcd if ChefUtils::DSL::Service.service_script_exist?(:etc_rcd, service_name)
 
           configs
         end
-
-        private
-
-        def systemd_is_init?
-          file_exist?(Chef.path_to("/proc/1/comm")) &&
-            file_open(Chef.path_to("/proc/1/comm")).gets.chomp == "systemd"
-        end
-
-        def has_systemd_service_unit?(svc_name)
-          %w{ /etc /usr/lib /lib /run }.any? do |load_path|
-            file_exist?(
-              Chef.path_to("#{load_path}/systemd/system/#{svc_name.gsub(/@.*$/, "@")}.service")
-            )
-          end
-        end
-
-        def has_systemd_unit?(svc_name)
-          # TODO: stop supporting non-service units with service resource
-          %w{ /etc /usr/lib /lib /run }.any? do |load_path|
-            file_exist?(Chef.path_to("#{load_path}/systemd/system/#{svc_name}"))
-          end
-        end
       end
     end
   end

data/lib/chef/provider.rb

@@ -46,6 +46,8 @@ class Chef
 
     # includes the "core" DSL and not the "recipe" DSL by design
     include Chef::DSL::Core
+    # the class only gets the Universal DSL (no resource_collection at class parsing time)
+    extend Chef::DSL::Universal
 
     # supports the given resource and action (late binding)
     def self.supports?(resource, action)

data/lib/chef/provider/file.rb

@@ -84,7 +84,7 @@ class Chef
           end
 
         # true if we are going to be creating a new file
-        @needs_creating  = !::File.exist?(new_resource.path) || needs_unlinking?
+        @needs_creating = !::File.exist?(new_resource.path) || needs_unlinking?
 
         # Let children resources override constructing the current_resource
         @current_resource ||= Chef::Resource::File.new(new_resource.name)
@@ -453,7 +453,7 @@ class Chef
       end
 
       def load_resource_attributes_from_file(resource)
-        if Chef::Platform.windows?
+        if ChefUtils.windows?
           # This is a work around for CHEF-3554.
           # OC-6534: is tracking the real fix for this workaround.
           # Add support for Windows equivalent, or implicit resource

data/lib/chef/provider/ifconfig/redhat.rb

@@ -22,7 +22,7 @@ class Chef
   class Provider
     class Ifconfig
       class Redhat < Chef::Provider::Ifconfig
-        provides :ifconfig, platform_family: %w{fedora rhel amazon}
+        provides :ifconfig, platform_family: "fedora_derived"
 
         def initialize(new_resource, run_context)
           super(new_resource, run_context)

data/lib/chef/provider/link.rb

@@ -82,7 +82,7 @@ class Chef
       end
 
       def canonicalize(path)
-        Chef::Platform.windows? ? path.tr("/", '\\') : path
+        ChefUtils.windows? ? path.tr("/", '\\') : path
       end
 
       def action_create
@@ -101,7 +101,7 @@ class Chef
             # However if the new symlink will point to a file and the current symlink is pointing at a
             # directory we want to throw an exception and calling ::File.unlink on the directory symlink
             # will throw the correct ones.
-            if Chef::Platform.windows? && ::File.directory?(new_resource.to) &&
+            if ChefUtils.windows? && ::File.directory?(new_resource.to) &&
                 ::File.directory?(current_resource.target_file)
               converge_by("unlink existing windows symlink to dir at #{new_resource.target_file}") do
                 ::Dir.unlink(new_resource.target_file)
@@ -143,7 +143,7 @@ class Chef
 
       def action_delete
         if current_resource.to # Exists
-          if Chef::Platform.windows? && ::File.directory?(current_resource.target_file)
+          if ChefUtils.windows? && ::File.directory?(current_resource.target_file)
             converge_by("delete link to dir at #{new_resource.target_file}") do
               ::Dir.delete(new_resource.target_file)
               logger.info("#{new_resource} deleted")

data/lib/chef/provider/mount/solaris.rb

@@ -27,7 +27,7 @@ class Chef
     class Mount
       # Mount Solaris File systems
       class Solaris < Chef::Provider::Mount
-        provides :mount, platform: %w{openindiana opensolaris nexentacore omnios solaris2 smartos}
+        provides :mount, platform_family: "solaris_based"
 
         extend Forwardable
 

data/lib/chef/provider/package/yum.rb

@@ -37,7 +37,7 @@ class Chef
         use_multipackage_api
         use_package_name_for_source
 
-        provides :package, platform_family: %w{fedora amazon rhel}
+        provides :package, platform_family: "fedora_derived"
 
         provides :yum_package
 

data/lib/chef/provider/registry_key.rb

@@ -36,7 +36,7 @@ class Chef
       include Chef::Mixin::Checksum
 
       def running_on_windows!
-        unless Chef::Platform.windows?
+        unless ChefUtils.windows?
           raise Chef::Exceptions::Win32NotWindows, "Attempt to manipulate the windows registry on a non-windows node"
         end
       end

data/lib/chef/provider/remote_directory.rb

@@ -111,7 +111,7 @@ class Chef
             next if managed_files.include?(file)
 
             if ::File.directory?(file)
-              if !Chef::Platform.windows? && file_class.symlink?(file.dup)
+              if !ChefUtils.windows? && file_class.symlink?(file.dup)
                 # Unix treats dir symlinks as files
                 purge_file(file)
               else
@@ -208,7 +208,7 @@ class Chef
         # Set the sensitivity level
         res.sensitive(new_resource.sensitive)
         res.source(::File.join(source, relative_source_path))
-        if Chef::Platform.windows? && files_rights
+        if ChefUtils.windows? && files_rights
           files_rights.each_pair do |permission, *args|
             res.rights(permission, *args)
           end
@@ -244,7 +244,7 @@ class Chef
       def directory_resource(dir)
         res = Chef::Resource::Directory.new(dir, run_context)
         res.cookbook_name = resource_cookbook
-        if Chef::Platform.windows? && rights
+        if ChefUtils.windows? && rights
           # rights are only meant to be applied to the toppest-level directory;
           # Windows will handle inheritance.
           if dir == path

data/lib/chef/provider/remote_file/fetcher.rb

@@ -1,7 +1,7 @@
 #
 # Author:: Jesse Campbell (<hikeit@gmail.com>)
 # Author:: Lamont Granquist (<lamont@chef.io>)
-# Copyright:: Copyright 2013-2016, Chef Software Inc.
+# Copyright:: Copyright 2013-2019, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -24,7 +24,7 @@ class Chef
 
         def self.for_resource(uri, new_resource, current_resource)
           if network_share?(uri)
-            unless Chef::Platform.windows?
+            unless ChefUtils.windows?
               raise Exceptions::UnsupportedPlatform, "Fetching the file on a network share is supported only on the Windows platform. Please change your source: #{uri}"
             end
 

data/lib/chef/provider/remote_file/local_file.rb

@@ -41,7 +41,7 @@ class Chef
         def source_path
           @source_path ||= begin
             path = URI.unescape(uri.path)
-            Chef::Platform.windows? ? fix_windows_path(path) : path
+            ChefUtils.windows? ? fix_windows_path(path) : path
           end
         end
 

data/lib/chef/provider/script.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Adam Jacob (<adam@chef.io>)
-# Copyright:: Copyright 2008-2016, Chef Software Inc.
+# Copyright:: Copyright 2008-2019, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,7 +18,7 @@
 
 require "tempfile" unless defined?(Tempfile)
 require_relative "execute"
-require_relative "../win32/security" if Chef::Platform.windows?
+require_relative "../win32/security" if ChefUtils.windows?
 require "forwardable" unless defined?(Forwardable)
 
 class Chef
@@ -63,7 +63,7 @@ class Chef
       end
 
       def set_owner_and_group
-        if Chef::Platform.windows?
+        if ChefUtils.windows?
           # And on Windows also this is a no-op if there is no user specified.
           grant_alternate_user_read_access
         else