chef 10.14.4 → 10.16.0.rc.0

data/lib/chef/provider/cookbook_file.rb

@@ -29,10 +29,7 @@ class Chef
 
       def load_current_resource
         @current_resource = Chef::Resource::CookbookFile.new(@new_resource.name)
-        @new_resource.path.gsub!(/\\/, "/") # for Windows
-        @current_resource.path(@new_resource.path)
-        setup_acl
-        @current_resource
+        super
       end
 
       def action_create
@@ -47,6 +44,9 @@ class Chef
               Chef::Log.debug("#{@new_resource} staging #{file_cache_location} to #{tempfile.path}")
               tempfile.close
               FileUtils.cp(file_cache_location, tempfile.path)
+              # Since the @new_resource.path file will not be updated
+              # at the time of converge, we must use the tempfile
+              update_new_file_state(tempfile.path)
             end
             Chef::Log.info("#{@new_resource} created file #{@new_resource.path}")
           end

data/lib/chef/provider/directory.rb

@@ -33,9 +33,12 @@ class Chef
       def load_current_resource
         @current_resource = Chef::Resource::Directory.new(@new_resource.name)
         @current_resource.path(@new_resource.path)
+        load_current_resource_attrs
         setup_acl
+
         @current_resource
       end
+
       def define_resource_requirements
         # this must be evaluated before whyrun messages are printed
         access_controls.requires_changes?

data/lib/chef/provider/file.rb

@@ -58,12 +58,14 @@ class Chef
 
       def is_binary?(path)
         ::File.open(path) do |file|
+
           buff = file.read(Chef::Config[:diff_filesize_threshold])
           buff = "" if buff.nil?
           return buff !~ /^[\r[:print:]]*$/
         end
       end
 
+
       def diff_current(temp_path)
         suppress_resource_reporting = false
 
@@ -123,13 +125,39 @@ class Chef
       end
 
       def load_current_resource
-        @current_resource = Chef::Resource::File.new(@new_resource.name)
+        # Every child should be specifying their own constructor, so this
+        # should only be run in the file case.
+        @current_resource ||= Chef::Resource::File.new(@new_resource.name)
         @new_resource.path.gsub!(/\\/, "/") # for Windows
         @current_resource.path(@new_resource.path)
-        if @new_resource.content && ::File.exist?(@new_resource.path)
-          @current_resource.checksum(checksum(@new_resource.path))
+        if !::File.directory?(@new_resource.path)
+          if ::File.exist?(@new_resource.path)
+            @current_resource.checksum(checksum(@new_resource.path))
+          end
         end
+        load_current_resource_attrs
         setup_acl
+        
+        @current_resource
+      end
+
+      def load_current_resource_attrs
+        if ::File.exist?(@new_resource.path)
+          stat = ::File.stat(@new_resource.path)
+          @current_resource.owner(stat.uid)
+          @current_resource.mode(stat.mode & 07777)
+          @current_resource.group(stat.gid)
+
+          if @new_resource.group.nil?
+            @new_resource.group(@current_resource.group)
+          end 
+          if @new_resource.owner.nil?
+            @new_resource.owner(@current_resource.owner)
+          end
+          if @new_resource.mode.nil?
+            @new_resource.mode(@current_resource.mode)
+          end
+        end
       end
       
       def setup_acl
@@ -183,6 +211,19 @@ class Chef
         end
       end
 
+      # if you are using a tempfile before creating, you must
+      # override the default with the tempfile, since the 
+      # file at @new_resource.path will not be updated on converge
+      def update_new_file_state(path=@new_resource.path)
+        stat = ::File.stat(path)
+        @new_resource.owner(stat.uid)
+        @new_resource.mode(stat.mode & 07777)
+        @new_resource.group(stat.gid)
+        if !::File.directory?(path) 
+          @new_resource.checksum(checksum(path))
+        end
+      end
+
       def action_create
         if !::File.exists?(@new_resource.path)
           description = []
@@ -190,10 +231,13 @@ class Chef
           desc << " with content checksum #{short_cksum(new_resource_content_checksum)}" if new_resource.content
           description << desc
           description << diff_current_from_content(@new_resource.content) 
+          
           converge_by(description) do
+            Chef::Log.info("entered create")
             ::File.open(@new_resource.path, "w+") {|f| f.write @new_resource.content }
             access_controls.set_all
             Chef::Log.info("#{@new_resource} created file #{@new_resource.path}")
+            update_new_file_state
           end
         else
           set_content unless @new_resource.content.nil?
@@ -205,6 +249,8 @@ class Chef
         if access_controls.requires_changes?
           converge_by(access_controls.describe_changes) do 
             access_controls.set_all
+            #Update file state with new access values
+            update_new_file_state
           end
         end
       end

data/lib/chef/provider/ifconfig.rb

@@ -199,7 +199,7 @@ class Chef
           ifcfg_file = "/etc/sysconfig/network-scripts/ifcfg-#{@new_resource.device}"
           if ::File.exist?(ifcfg_file)
             converge_by ("delete the #{ifcfg_file}") do
-              FileUtils.rm_f(ifcfg_file, :verbose => false, :force => true)
+              FileUtils.rm_f(ifcfg_file, :verbose => false)
             end
           end
         when "debian","ubuntu"

data/lib/chef/provider/package.rb

@@ -78,6 +78,7 @@ class Chef
         end
         description = install_version ? "version #{install_version} of" : ""
         converge_by("install #{description} package #{@new_resource.package_name}") do
+          @new_resource.version(install_version)
           install_package(@new_resource.package_name, install_version)
         end
       end
@@ -88,6 +89,7 @@ class Chef
         elsif @current_resource.version == candidate_version
           Chef::Log.debug("#{@new_resource} is at the latest version - nothing to do")
         else
+          @new_resource.version(candidate_version)
           orig_version = @current_resource.version || "uninstalled"
           converge_by("upgrade package #{@new_resource.package_name} from #{orig_version} to #{candidate_version}") do
             status = upgrade_package(@new_resource.package_name, candidate_version)

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

@@ -53,10 +53,19 @@ class Chef
         def candidate_version
           return @candidate_version if @candidate_version
 
+          repos = ["extra","core","community"]
+
+          if(::File.exists?("/etc/pacman.conf"))
+            pacman = ::File.read("/etc/pacman.conf")
+            repos = pacman.scan(/\[(.+)\]/).flatten
+          end
+
+          package_repos = repos.map {|r| Regexp.escape(r) }.join('|')
+
           status = popen4("pacman -Ss #{@new_resource.package_name}") do |pid, stdin, stdout, stderr|
             stdout.each do |line|
               case line
-                when /^(extra|core|community)\/#{Regexp.escape(@new_resource.package_name)} (.+)$/
+                when /^(#{package_repos})\/#{Regexp.escape(@new_resource.package_name)} (.+)$/
                   # $2 contains a string like "4.4.0-1 (kde kdenetwork)" or "3.10-4 (base)"
                   # simply split by space and use first token
                   @candidate_version = $2.split(" ").first

data/lib/chef/provider/remote_file.rb

@@ -27,8 +27,8 @@ class Chef
     class RemoteFile < Chef::Provider::File
 
       def load_current_resource
+        @current_resource = Chef::Resource::RemoteFile.new(@new_resource.name)
         super
-        @current_resource.checksum(checksum(@current_resource.path)) if ::File.exist?(@current_resource.path)
       end
 
       def action_create

data/lib/chef/provider/service.rb

@@ -34,6 +34,17 @@ class Chef
         true
       end
 
+     def load_new_resource_state
+        # If the user didn't specify a change in enabled state, 
+        # it will be the same as the old resource
+       if ( @new_resource.enabled.nil? )
+         @new_resource.enabled(@current_resource.enabled)
+       end
+       if ( @new_resource.running.nil? )
+         @new_resource.running(@current_resource.running)
+       end
+     end
+
       def shared_resource_requirements
       end
 
@@ -56,6 +67,8 @@ class Chef
             Chef::Log.info("#{@new_resource} enabled")
           end
         end
+        load_new_resource_state
+        @new_resource.enabled(true)
       end
 
       def action_disable
@@ -67,6 +80,8 @@ class Chef
         else
           Chef::Log.debug("#{@new_resource} already disabled - nothing to do")
         end
+        load_new_resource_state
+        @new_resource.enabled(false)
       end
 
       def action_start
@@ -78,6 +93,8 @@ class Chef
         else
           Chef::Log.debug("#{@new_resource} already running - nothing to do")
         end
+        load_new_resource_state
+        @new_resource.running(true)
       end
 
       def action_stop
@@ -89,6 +106,8 @@ class Chef
         else
           Chef::Log.debug("#{@new_resource} already stopped - nothing to do")
         end
+        load_new_resource_state
+        @new_resource.running(false)
       end
 
       def action_restart
@@ -96,6 +115,8 @@ class Chef
           restart_service
           Chef::Log.info("#{@new_resource} restarted")
         end
+        load_new_resource_state
+        @new_resource.running(true)
       end
 
       def action_reload
@@ -105,6 +126,7 @@ class Chef
             Chef::Log.info("#{@new_resource} reloaded")
           end
         end
+        load_new_resource_state
       end
 
       def enable_service

data/lib/chef/provider/template.rb

@@ -31,8 +31,8 @@ class Chef
       include Chef::Mixin::Template
 
       def load_current_resource
+        @current_resource = Chef::Resource::Template.new(@new_resource.name)
         super
-        @current_resource.checksum(checksum(@current_resource.path)) if ::File.exist?(@current_resource.path)
       end
       
       def define_resource_requirements
@@ -64,6 +64,14 @@ class Chef
               FileUtils.mv(rendered_template.path, @new_resource.path)
               Chef::Log.info("#{@new_resource} updated content")
               access_controls.set_all!
+              stat = ::File.stat(@new_resource.path)
+
+              # template depends on the checksum not changing, and updates it
+              # itself later in the code, so we cannot set it here, as we do with
+              # all other < File child provider classes
+              @new_resource.owner(stat.uid)
+              @new_resource.mode(stat.mode & 07777)
+              @new_resource.group(stat.gid)
             end
           end
         end  

data/lib/chef/resource.rb

@@ -606,8 +606,8 @@ F
           raise customize_exception(e)
         end
       ensure
-        events.resource_completed(self)
         @elapsed_time = Time.now - start_time
+        events.resource_completed(self)
       end
     end
 

data/lib/chef/resource/cookbook_file.rb

@@ -1,6 +1,7 @@
 #
 # Author:: Adam Jacob (<adam@opscode.com>)
 # Author:: Seth Chisamore (<schisamo@opscode.com>)
+# Author:: Tyler Cloke (<tyler@opscode.com>)
 # Copyright:: Copyright (c) 2008, 2011 Opscode, Inc.
 # License:: Apache License, Version 2.0
 #

data/lib/chef/resource/cron.rb

@@ -1,5 +1,6 @@
 #
 # Author:: Bryan McLellan (btm@loftninjas.org)
+# Author:: Tyler Cloke (<tyler@opscode.com>)
 # Copyright:: Copyright (c) 2009 Bryan McLellan
 # License:: Apache License, Version 2.0
 #
@@ -22,6 +23,10 @@ class Chef
   class Resource
     class Cron < Chef::Resource
       
+      identity_attr :command
+
+      state_attrs :minute, :hour, :day, :month, :weekday, :user
+
       def initialize(name, run_context=nil)
         super
         @resource_name = :cron

data/lib/chef/resource/deploy.rb

@@ -1,5 +1,6 @@
 #
 # Author:: Daniel DeLeo (<dan@kallistec.com>)
+# Author:: Tyler Cloke (<tyler@opscode.com>)
 # Copyright:: Copyright (c) 2008 Opscode, Inc.
 # License:: Apache License, Version 2.0
 #
@@ -49,9 +50,13 @@ class Chef
     # release directory. Callback files can contain chef code (resources, etc.)
     #
     class Deploy < Chef::Resource
-
+      
       provider_base Chef::Provider::Deploy
       
+      identity_attr :repository
+
+      state_attrs :deploy_to, :revision
+
       def initialize(name, run_context=nil)
         super
         @resource_name = :deploy

data/lib/chef/resource/directory.rb

@@ -1,6 +1,7 @@
 #
 # Author:: Adam Jacob (<adam@opscode.com>)
 # Author:: Seth Chisamore (<schisamo@opscode.com>)
+# Author:: Tyler Cloke (<tyler@opscode.com>)
 # Copyright:: Copyright (c) 2008, 2011 Opscode, Inc.
 # License:: Apache License, Version 2.0
 #
@@ -24,6 +25,11 @@ require 'chef/mixin/securable'
 class Chef
   class Resource
     class Directory < Chef::Resource
+      
+      identity_attr :path
+
+      state_attrs :group, :mode, :owner
+      
       include Chef::Mixin::Securable
 
       provides :directory, :on_platforms => :all

data/lib/chef/resource/env.rb

@@ -1,5 +1,6 @@
 #
 # Author:: Doug MacEachern (<dougm@vmware.com>)
+# Author:: Tyler Cloke (<tyler@opscode.com>)
 # Copyright:: Copyright (c) 2010 VMware, Inc.
 # License:: Apache License, Version 2.0
 #
@@ -20,6 +21,10 @@ class Chef
   class Resource
     class Env < Chef::Resource
 
+      identity_attr :key_name
+
+      state_attrs :value
+
       def initialize(name, run_context=nil)
         super
         @resource_name = :env

data/lib/chef/resource/erl_call.rb

@@ -1,5 +1,6 @@
 #
 # Author:: Joe Williams (<joe@joetify.com>)
+# Author:: Tyler Cloke (<tyler@opscode.com>)
 # Copyright:: Copyright (c) 2009 Joe Williams
 # License:: Apache License, Version 2.0
 #
@@ -24,6 +25,8 @@ class Chef
 
       # erl_call : http://erlang.org/doc/man/erl_call.html
       
+      identity_attr :code
+
       def initialize(name, run_context=nil)
         super
         @resource_name = :erl_call

data/lib/chef/resource/execute.rb

@@ -1,5 +1,6 @@
 #
 # Author:: Adam Jacob (<adam@opscode.com>)
+# Author:: Tyler Cloke (<tyler@opscode.com>)
 # Copyright:: Copyright (c) 2008 Opscode, Inc.
 # License:: Apache License, Version 2.0
 #
@@ -22,6 +23,8 @@ class Chef
   class Resource
     class Execute < Chef::Resource
 
+      identity_attr :command
+
       def initialize(name, run_context=nil)
         super
         @resource_name = :execute

data/lib/chef/resource/file.rb

@@ -29,11 +29,11 @@ class Chef
 
       identity_attr :path
 
-      state_attrs :checksum, :owner, :group, :mode
-
-      # By default, windows gets `state_attrs :rights, :deny_rights`
       if Platform.windows?
-        state_attrs :rights, :deny_rights
+        # Use Windows rights instead of standard *nix permissions
+        state_attrs :checksum, :rights, :deny_rights
+      else
+        state_attrs :checksum, :owner, :group, :mode
       end
 
       provides :file, :on_platforms => :all
@@ -52,7 +52,7 @@ class Chef
 
       def content(arg=nil)
         set_or_return(
-          :content,
+                      :content,
           arg,
           :kind_of => String
         )

data/lib/chef/resource/group.rb

@@ -1,5 +1,6 @@
 #
 # Author:: Adam Jacob (<adam@opscode.com>)
+# Author:: Tyler Cloke (<tyler@opscode.com>)
 # Copyright:: Copyright (c) 2008 OpsCode, Inc.
 # License:: Apache License, Version 2.0
 #
@@ -20,6 +21,10 @@ class Chef
   class Resource
     class Group < Chef::Resource
       
+      identity_attr :group_name
+
+      state_attrs :members
+
       def initialize(name, run_context=nil)
         super
         @resource_name = :group