chef 12.0.0.alpha.2 → 12.0.0.rc.0

data/lib/chef/platform/provider_mapping.rb

@@ -40,16 +40,14 @@ class Chef
           {
             :mac_os_x => {
               :default => {
-                :package => Chef::Provider::Package::Macports,
-                :service => Chef::Provider::Service::Macosx,
+                :package => Chef::Provider::Package::Homebrew,
                 :user => Chef::Provider::User::Dscl,
                 :group => Chef::Provider::Group::Dscl
               }
             },
             :mac_os_x_server => {
               :default => {
-                :package => Chef::Provider::Package::Macports,
-                :service => Chef::Provider::Service::Macosx,
+                :package => Chef::Provider::Package::Homebrew,
                 :user => Chef::Provider::User::Dscl,
                 :group => Chef::Provider::Group::Dscl
               }
@@ -57,7 +55,6 @@ class Chef
             :freebsd => {
               :default => {
                 :group   => Chef::Provider::Group::Pw,
-                :service => Chef::Provider::Service::Freebsd,
                 :user    => Chef::Provider::User::Pw,
                 :cron    => Chef::Provider::Cron
               }
@@ -197,10 +194,14 @@ class Chef
             },
             :suse     => {
               :default => {
-                :service => Chef::Provider::Service::Redhat,
+                :service => Chef::Provider::Service::Systemd,
                 :cron => Chef::Provider::Cron,
                 :package => Chef::Provider::Package::Zypper,
-                :group => Chef::Provider::Group::Suse
+                :group => Chef::Provider::Group::Gpasswd
+              },
+              "< 12.0" => {
+                :group => Chef::Provider::Group::Suse,
+                :service => Chef::Provider::Service::Redhat
               }
             },
             :oracle  => {
@@ -223,7 +224,7 @@ class Chef
                 :ifconfig => Chef::Provider::Ifconfig::Redhat
               },
               "< 7" => {
-                :service => Chef::Provider::Service::Systemd
+                :service => Chef::Provider::Service::Redhat
               }
             },
             :ibm_powerkvm   => {
@@ -272,7 +273,6 @@ class Chef
             :mswin => {
               :default => {
                 :env =>  Chef::Provider::Env::Windows,
-                :service => Chef::Provider::Service::Windows,
                 :user => Chef::Provider::User::Windows,
                 :group => Chef::Provider::Group::Windows,
                 :mount => Chef::Provider::Mount::Windows,
@@ -283,7 +283,6 @@ class Chef
             :mingw32 => {
               :default => {
                 :env =>  Chef::Provider::Env::Windows,
-                :service => Chef::Provider::Service::Windows,
                 :user => Chef::Provider::User::Windows,
                 :group => Chef::Provider::Group::Windows,
                 :mount => Chef::Provider::Mount::Windows,
@@ -294,7 +293,6 @@ class Chef
             :windows => {
               :default => {
                 :env =>  Chef::Provider::Env::Windows,
-                :service => Chef::Provider::Service::Windows,
                 :user => Chef::Provider::User::Windows,
                 :group => Chef::Provider::Group::Windows,
                 :mount => Chef::Provider::Mount::Windows,
@@ -306,7 +304,6 @@ class Chef
             :openindiana => {
               :default => {
                 :mount => Chef::Provider::Mount::Solaris,
-                :service => Chef::Provider::Service::Solaris,
                 :package => Chef::Provider::Package::Ips,
                 :cron => Chef::Provider::Cron::Solaris,
                 :group => Chef::Provider::Group::Usermod
@@ -315,7 +312,6 @@ class Chef
             :opensolaris => {
               :default => {
                 :mount => Chef::Provider::Mount::Solaris,
-                :service => Chef::Provider::Service::Solaris,
                 :package => Chef::Provider::Package::Ips,
                 :cron => Chef::Provider::Cron::Solaris,
                 :group => Chef::Provider::Group::Usermod
@@ -324,7 +320,6 @@ class Chef
             :nexentacore => {
               :default => {
                 :mount => Chef::Provider::Mount::Solaris,
-                :service => Chef::Provider::Service::Solaris,
                 :package => Chef::Provider::Package::Solaris,
                 :cron => Chef::Provider::Cron::Solaris,
                 :group => Chef::Provider::Group::Usermod
@@ -333,7 +328,6 @@ class Chef
             :omnios => {
               :default => {
                 :mount => Chef::Provider::Mount::Solaris,
-                :service => Chef::Provider::Service::Solaris,
                 :package => Chef::Provider::Package::Ips,
                 :cron => Chef::Provider::Cron::Solaris,
                 :group => Chef::Provider::Group::Usermod,
@@ -343,7 +337,6 @@ class Chef
             :solaris2 => {
               :default => {
                 :mount => Chef::Provider::Mount::Solaris,
-                :service => Chef::Provider::Service::Solaris,
                 :package => Chef::Provider::Package::Ips,
                 :cron => Chef::Provider::Cron::Solaris,
                 :group => Chef::Provider::Group::Usermod,
@@ -351,7 +344,6 @@ class Chef
               },
               "< 5.11" => {
                 :mount => Chef::Provider::Mount::Solaris,
-                :service => Chef::Provider::Service::Solaris,
                 :package => Chef::Provider::Package::Solaris,
                 :cron => Chef::Provider::Cron::Solaris,
                 :group => Chef::Provider::Group::Usermod,
@@ -361,7 +353,6 @@ class Chef
             :smartos => {
               :default => {
                 :mount => Chef::Provider::Mount::Solaris,
-                :service => Chef::Provider::Service::Solaris,
                 :package => Chef::Provider::Package::SmartOS,
                 :cron => Chef::Provider::Cron::Solaris,
                 :group => Chef::Provider::Group::Usermod
@@ -369,7 +360,6 @@ class Chef
             },
             :netbsd => {
               :default => {
-                :service => Chef::Provider::Service::Freebsd,
                 :group => Chef::Provider::Group::Groupmod
               }
             },
@@ -390,7 +380,8 @@ class Chef
                 :ifconfig => Chef::Provider::Ifconfig::Aix,
                 :cron => Chef::Provider::Cron::Aix,
                 :package => Chef::Provider::Package::Aix,
-                :user => Chef::Provider::User::Aix
+                :user => Chef::Provider::User::Aix,
+                :service => Chef::Provider::Service::Aix
               }
             },
             :exherbo => {
@@ -402,29 +393,10 @@ class Chef
               }
             },
             :default => {
-              :file => Chef::Provider::File,
-              :directory => Chef::Provider::Directory,
-              :link => Chef::Provider::Link,
-              :template => Chef::Provider::Template,
-              :remote_directory => Chef::Provider::RemoteDirectory,
-              :execute => Chef::Provider::Execute,
               :mount => Chef::Provider::Mount::Mount,
-              :script => Chef::Provider::Script,
-              :service => Chef::Provider::Service::Init,
-              :perl => Chef::Provider::Script,
-              :python => Chef::Provider::Script,
-              :ruby => Chef::Provider::Script,
-              :bash => Chef::Provider::Script,
-              :csh => Chef::Provider::Script,
               :user => Chef::Provider::User::Useradd,
               :group => Chef::Provider::Group::Gpasswd,
-              :http_request => Chef::Provider::HttpRequest,
-              :route => Chef::Provider::Route,
               :ifconfig => Chef::Provider::Ifconfig,
-              :ruby_block => Chef::Provider::RubyBlock,
-              :whyrun_safe_ruby_block => Chef::Provider::WhyrunSafeRubyBlock,
-              :erl_call => Chef::Provider::ErlCall,
-              :log => Chef::Provider::Log::ChefLog
             }
           }
         end

data/lib/chef/platform/provider_priority_map.rb

@@ -0,0 +1,80 @@
+
+require 'chef/providers'
+
+class Chef
+  class Platform
+    class ProviderPriorityMap
+      include Singleton
+
+      def initialize
+        load_default_map
+      end
+
+      def load_default_map
+
+        #
+        # Linux
+        #
+
+        # default block for linux O/Sen must come before platform_family exceptions
+        priority :service, [
+          Chef::Provider::Service::Systemd,
+          Chef::Provider::Service::Insserv,
+          Chef::Provider::Service::Redhat,
+        ], os: "linux"
+
+        priority :service, [
+          Chef::Provider::Service::Systemd,
+          Chef::Provider::Service::Arch,
+        ], platform_family: "arch"
+
+        priority :service, [
+          Chef::Provider::Service::Systemd,
+          Chef::Provider::Service::Gentoo,
+        ], platform_family: "gentoo"
+
+        priority :service, [
+          # on debian-ish system if an upstart script exists that always wins
+          Chef::Provider::Service::Upstart,
+          Chef::Provider::Service::Systemd,
+          Chef::Provider::Service::Insserv,
+          Chef::Provider::Service::Debian,
+          Chef::Provider::Service::Invokercd,
+        ], platform_family: "debian"
+
+        priority :service, [
+          Chef::Provider::Service::Systemd,
+          Chef::Provider::Service::Insserv,
+          Chef::Provider::Service::Redhat,
+        ], platform_family: [ "rhel", "fedora", "suse" ]
+
+        #
+        # BSDen
+        #
+
+        priority :service, Chef::Provider::Service::Freebsd, os: [ "freebsd", "netbsd" ]
+
+        #
+        # Solaris-en
+        #
+
+        priority :service, Chef::Provider::Service::Solaris, os: "solaris2"
+
+        #
+        # Mac
+        #
+
+        priority :service, Chef::Provider::Service::Macosx, os: "darwin"
+      end
+
+      def priority_map
+        @priority_map ||= Chef::NodeMap.new
+      end
+
+      def priority(*args)
+        priority_map.set(*args)
+      end
+
+    end
+  end
+end

data/lib/chef/platform/query_helpers.rb

@@ -45,7 +45,11 @@ class Chef
 
         is_server_2003
       end
-    end
 
+      def supports_dsc?(node)
+        node[:languages] && node[:languages][:powershell] &&
+          node[:languages][:powershell][:version].to_i >= 4
+      end
+    end
   end
 end

data/lib/chef/platform/service_helpers.rb

@@ -0,0 +1,113 @@
+#
+# Author:: Lamont Granquist (<lamont@chef.io>)
+# Copyright:: Copyright (c) 2014 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.
+#
+
+# XXX: mixing shellout into a mixin into classes has to be code smell
+require 'chef/mixin/shell_out'
+
+class Chef
+  class Platform
+    class ServiceHelpers
+      class << self
+
+        include Chef::Mixin::ShellOut
+
+        # 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.
+        def service_resource_providers
+          service_resource_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?("/sbin/insserv")
+            service_resource_providers << :insserv
+          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?("/sbin/chkconfig")
+            service_resource_providers << :redhat
+          end
+
+          if ::File.exist?("/bin/systemctl")
+            # FIXME: look for systemd as init provider
+            service_resource_providers << :systemd
+          end
+
+          service_resource_providers
+        end
+
+        def config_for_service(service_name)
+          configs = []
+
+          if ::File.exist?("/etc/init.d/#{service_name}")
+            configs << :initd
+          end
+
+          if ::File.exist?("/etc/init/#{service_name}.conf")
+            configs << :upstart
+          end
+
+          if ::File.exist?("/etc/xinetd.d/#{service_name}")
+            configs << :xinetd
+          end
+
+          if ::File.exist?("/etc/rc.d/#{service_name}")
+            configs << :etc_rcd
+          end
+
+          if ::File.exist?("/usr/local/etc/rc.d/#{service_name}")
+            configs << :usr_local_etc_rcd
+          end
+
+          if ::File.exist?("/bin/systemctl") && platform_has_systemd_unit?(service_name)
+            configs << :systemd
+          end
+
+          configs
+        end
+
+        private
+
+        def extract_systemd_services(output)
+          # first line finds e.g. "sshd.service"
+          services = output.lines.split.map { |l| l.split[0] }
+          # this splits off the suffix after the last dot to return "sshd"
+          services += services.map { |s| s.sub(/(.*)\..*/, '\1') }
+        end
+
+        def platform_has_systemd_unit?(service_name)
+          services = extract_systemd_services(shell_out!("systemctl --all").stdout) +
+            extract_systemd_services(shell_out!("systemctl --list-unit-files").stdout)
+          services.include?(service_name)
+        end
+      end
+    end
+  end
+end

data/lib/chef/provider.rb

@@ -22,11 +22,35 @@ require 'chef/mixin/convert_to_class_name'
 require 'chef/mixin/enforce_ownership_and_permissions'
 require 'chef/mixin/why_run'
 require 'chef/mixin/shell_out'
+require 'chef/mixin/descendants_tracker'
+require 'chef/platform/service_helpers'
+require 'chef/node_map'
 
 class Chef
   class Provider
     include Chef::Mixin::WhyRun
     include Chef::Mixin::ShellOut
+    extend Chef::Mixin::DescendantsTracker
+
+    class << self
+      def node_map
+        @node_map ||= Chef::NodeMap.new
+      end
+
+      def provides(resource_name, opts={}, &block)
+        node_map.set(resource_name.to_sym, true, opts, &block)
+      end
+
+      # provides a node on the resource (early binding)
+      def provides?(node, resource)
+        node_map.get(node, resource.resource_name)
+      end
+
+      # supports the given resource and action (late binding)
+      def supports?(resource, action)
+        true
+      end
+    end
 
     attr_accessor :new_resource
     attr_accessor :current_resource

data/lib/chef/provider/breakpoint.rb

@@ -20,6 +20,8 @@ class Chef
   class Provider
     class Breakpoint < Chef::Provider
 
+      provides :breakpoint
+
       def load_current_resource
       end
 

data/lib/chef/provider/cookbook_file.rb

@@ -24,6 +24,8 @@ class Chef
   class Provider
     class CookbookFile < Chef::Provider::File
 
+      provides :cookbook_file
+
       extend Chef::Deprecation::Warnings
       include Chef::Deprecation::Provider::CookbookFile
       add_deprecation_warnings_for(Chef::Deprecation::Provider::CookbookFile.instance_methods)

data/lib/chef/provider/cron.rb

@@ -28,7 +28,7 @@ class Chef
       SPECIAL_TIME_VALUES = [:reboot, :yearly, :annually, :monthly, :weekly, :daily, :midnight, :hourly]
       CRON_ATTRIBUTES = [:minute, :hour, :day, :month, :weekday, :time, :command, :mailto, :path, :shell, :home, :environment]
       WEEKDAY_SYMBOLS = [:sunday, :monday, :tuesday, :wednesday, :thursday, :friday, :saturday]
-      
+
       CRON_PATTERN = /\A([-0-9*,\/]+)\s([-0-9*,\/]+)\s([-0-9*,\/]+)\s([-0-9*,\/]+|[a-zA-Z]{3})\s([-0-9*,\/]+|[a-zA-Z]{3})\s(.*)/
       SPECIAL_PATTERN = /\A(@(#{SPECIAL_TIME_VALUES.join('|')}))\s(.*)/
       ENV_PATTERN = /\A(\S+)=(\S*)/

data/lib/chef/provider/cron/unix.rb

@@ -25,18 +25,21 @@ class Chef
   class Provider
     class Cron
       class Unix < Chef::Provider::Cron
+        include Chef::Mixin::ShellOut
 
         private
 
         def read_crontab
-          crontab = nil
-          status = popen4("crontab -l #{@new_resource.user}") do |pid, stdin, stdout, stderr|
-            crontab = stdout.read
-          end
-          if status.exitstatus > 1
-            raise Chef::Exceptions::Cron, "Error determining state of #{@new_resource.name}, exit: #{status.exitstatus}"
+          crontab = shell_out('/usr/bin/crontab -l', :user => @new_resource.user)
+          status = crontab.status.exitstatus
+
+          Chef::Log.debug crontab.format_for_exception if status > 0
+
+          if status > 1
+            raise Chef::Exceptions::Cron, "Error determining state of #{@new_resource.name}, exit: #{status}"
           end
-          crontab
+          return nil if status > 0
+          crontab.stdout.chomp << "\n"
         end
 
         def write_crontab(crontab)
@@ -47,8 +50,9 @@ class Chef
           exit_status = 0
           error_message = ""
           begin
-            status, stdout, stderr = run_command_and_return_stdout_stderr(:command => "/usr/bin/crontab #{tempcron.path}",:user => @new_resource.user)
-            exit_status = status.exitstatus
+            crontab_write = shell_out("/usr/bin/crontab #{tempcron.path}", :user => @new_resource.user)
+            stderr = crontab_write.stderr
+            exit_status = crontab_write.status.exitstatus
             # solaris9, 10 on some failures for example invalid 'mins' in crontab fails with exit code of zero :(
             if stderr && stderr.include?("errors detected in input, no crontab file generated")
               error_message = stderr