chef 10.34.6 → 11.0.0.beta.0

data/lib/chef/provider.rb

@@ -19,14 +19,13 @@
 
 require 'chef/mixin/from_file'
 require 'chef/mixin/convert_to_class_name'
-require 'chef/mixin/recipe_definition_dsl_core'
+require 'chef/dsl/recipe'
 require 'chef/mixin/enforce_ownership_and_permissions'
 require 'chef/mixin/why_run'
 class Chef
   class Provider
-    include Chef::Mixin::RecipeDefinitionDSLCore
+    include Chef::DSL::Recipe
     include Chef::Mixin::WhyRun
-    include Chef::Mixin::EnforceOwnershipAndPermissions
 
     attr_accessor :new_resource
     attr_accessor :current_resource
@@ -173,51 +172,5 @@ class Chef
       end
     end
 
-    public
-
-    class << self
-      include Chef::Mixin::ConvertToClassName
-
-      def build_from_file(cookbook_name, filename, run_context)
-        pname = filename_to_qualified_string(cookbook_name, filename)
-
-        # Add log entry if we override an existing light-weight provider.
-        class_name = convert_to_class_name(pname)
-        overriding = Chef::Provider.const_defined?(class_name)
-        Chef::Log.info("#{class_name} light-weight provider already initialized -- overriding!") if overriding
-
-        new_provider_class = Class.new self do |cls|
-
-          include Chef::Mixin::RecipeDefinitionDSLCore
-
-          def load_current_resource
-            # silence Chef::Exceptions::Override exception
-          end
-
-          class << cls
-            include Chef::Mixin::FromFile
-
-            # setup DSL's shortcut methods
-            def action(name, &block)
-              define_method("action_#{name.to_s}") do
-                instance_eval(&block)
-              end
-            end
-          end
-
-          # load provider definition from file
-          cls.class_from_file(filename)
-        end
-
-        # register new class as a Chef::Provider
-        pname = filename_to_qualified_string(cookbook_name, filename)
-        class_name = convert_to_class_name(pname)
-        Chef::Provider.const_set(class_name, new_provider_class)
-        Chef::Log.debug("Loaded contents of #{filename} into a provider named #{pname} defined in Chef::Provider::#{class_name}")
-
-        new_provider_class
-      end
-    end
-
   end
 end

data/lib/chef/provider/breakpoint.rb

@@ -6,9 +6,9 @@
 # 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.
@@ -19,18 +19,18 @@
 class Chef
   class Provider
     class Breakpoint < Chef::Provider
-      
+
       def load_current_resource
       end
-      
+
       def action_break
-        if defined?(Shef) && Shef.running?
+        if defined?(Shell) && Shell.running?
           run_context.resource_collection.iterator.pause
           @new_resource.updated_by_last_action(true)
           run_context.resource_collection.iterator
         end
       end
-      
+
     end
   end
 end

data/lib/chef/provider/cookbook_file.rb

@@ -23,6 +23,9 @@ require 'tempfile'
 class Chef
   class Provider
     class CookbookFile < Chef::Provider::File
+
+      include Chef::Mixin::EnforceOwnershipAndPermissions
+
       def whyrun_supported?
         true
       end
@@ -33,7 +36,7 @@ class Chef
       end
 
       def action_create
-        if file_cache_location && content_stale?
+        if file_cache_location && content_stale? 
           description = []
           description << "create a new cookbook_file #{@new_resource.path}"
           description << diff_current(file_cache_location)
@@ -44,8 +47,8 @@ class Chef
               Chef::Log.debug("#{@new_resource} staging #{file_cache_location} to #{tempfile.path}")
               tempfile.close
               FileUtils.cp(file_cache_location, tempfile.path)
-              enforce_tempfile_inheritance(tempfile.path)
             end
+            update_new_file_state
             Chef::Log.info("#{@new_resource} created file #{@new_resource.path}")
           end
         else
@@ -77,37 +80,6 @@ class Chef
         ( ! ::File.exist?(@new_resource.path)) || ( ! compare_content)
       end
 
-      protected
-
-      def enforce_tempfile_inheritance(tempfile_path)
-        # On the Windows platform, files in the temp directory
-        # default to not inherit unless the new resource specifies rights of
-        # some sort. Here we ensure that even when no rights are
-        # specified, the dacl's inheritance flag is set.
-        if Chef::Platform.windows? &&
-            @new_resource.rights.nil? &&
-            @new_resource.group.nil? &&
-            @new_resource.owner.nil? &&
-            @new_resource.deny_rights.nil?
-
-          securable_tempfile = Chef::ReservedNames::Win32::Security::SecurableObject.new(tempfile_path)
-
-          # No rights were specified, so the dacl will have no explicit aces
-          default_dacl = Chef::ReservedNames::Win32::Security::ACL.create([])
-
-          # In setting this default dacl, set inheritance to true
-          securable_tempfile.set_dacl(default_dacl, true)
-        end
-      end
-
-      private
-
-      def managing_content?
-        return true if @new_resource.checksum
-        return true if !@new_resource.source.nil? && @action != :create_if_missing
-        false
-      end
-
     end
   end
 end

data/lib/chef/provider/deploy.rb

@@ -21,12 +21,13 @@ require "chef/mixin/from_file"
 require "chef/monkey_patches/fileutils"
 require "chef/provider/git"
 require "chef/provider/subversion"
+require 'chef/dsl/recipe'
 
 class Chef
   class Provider
     class Deploy < Chef::Provider
 
-      include Chef::Mixin::RecipeDefinitionDSLCore
+      include Chef::DSL::Recipe
       include Chef::Mixin::FromFile
       include Chef::Mixin::Command
 

data/lib/chef/provider/directory.rb

@@ -26,6 +26,9 @@ require 'fileutils'
 class Chef
   class Provider
     class Directory < Chef::Provider::File
+
+      include Chef::Mixin::EnforceOwnershipAndPermissions
+
       def whyrun_supported?
         true
       end
@@ -33,7 +36,6 @@ 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
@@ -59,8 +61,8 @@ class Chef
               # find the lowest-level directory in @new_resource.path that already exists
               # make sure we have write permissions to that directory
               is_parent_writable = lambda do |base_dir|
-                base_dir = ::File.dirname(base_dir)
-                if ::File.exist?(base_dir)
+                base_dir = ::File.dirname(base_dir) 
+                if ::File.exist?(base_dir) 
                   ::File.writable?(base_dir)
                 else
                   is_parent_writable.call(base_dir)
@@ -70,27 +72,27 @@ class Chef
             else
               # in why run mode & parent directory does not exist no permissions check is required
               # If not in why run, permissions must be valid and we rely on prior assertion that dir exists
-              if !whyrun_mode? || ::File.exist?(parent_directory)
+              if !whyrun_mode? || ::File.exist?(parent_directory) 
                 ::File.writable?(parent_directory)
               else
                 true
               end
             end
           end
-          a.failure_message(Chef::Exceptions::InsufficientPermissions,
+          a.failure_message(Chef::Exceptions::InsufficientPermissions, 
             "Cannot create #{@new_resource} at #{@new_resource.path} due to insufficient permissions")
         end
 
-        requirements.assert(:delete) do |a|
-          a.assertion do
+        requirements.assert(:delete) do |a| 
+          a.assertion do 
             if ::File.exist?(@new_resource.path)
-              ::File.directory?(@new_resource.path) && ::File.writable?(@new_resource.path)
+              ::File.directory?(@new_resource.path) && ::File.writable?(@new_resource.path) 
             else
               true
             end
           end
           a.failure_message(RuntimeError, "Cannot delete #{@new_resource} at #{@new_resource.path}!")
-          # No why-run handling here:
+          # No why-run handling here: 
           #  * if we don't have permissions, this is unlikely to be changed earlier in the run
           #  * if the target is a file (not a dir), there's no reasonable path by which this would have been changed
         end
@@ -98,16 +100,17 @@ class Chef
 
       def action_create
         unless ::File.exist?(@new_resource.path)
-          converge_by("create new directory #{@new_resource.path}") do
+          converge_by("create new directory #{@new_resource.path}") do 
             if @new_resource.recursive == true
               ::FileUtils.mkdir_p(@new_resource.path)
             else
               ::Dir.mkdir(@new_resource.path)
             end
             Chef::Log.info("#{@new_resource} created directory #{@new_resource.path}")
-          end
+          end 
         end
         set_all_access_controls
+        update_new_file_state
       end
 
       def action_delete
@@ -123,12 +126,6 @@ class Chef
           end
         end
       end
-
-      private
-
-      def managing_content?
-        false
-      end
     end
   end
 end

data/lib/chef/provider/file.rb

@@ -30,6 +30,7 @@ class Chef
 
   class Provider
     class File < Chef::Provider
+      include Chef::Mixin::EnforceOwnershipAndPermissions
       include Chef::Mixin::Checksum
       include Chef::Mixin::ShellOut
 
@@ -48,9 +49,9 @@ class Chef
 
       def diff_current_from_content(new_content)
         result = nil
-        Tempfile.open("chef-diff") do |file|
+        Tempfile.open("chef-diff") do |file| 
           file.write new_content
-          file.close
+          file.close 
           result = diff_current file.path
         end
         result
@@ -96,12 +97,12 @@ class Chef
           # -u: Unified diff format
           result = shell_out("diff -u #{target_path} #{temp_path}" )
         rescue Exception => e
-          # Should *not* receive this, but in some circumstances it seems that
+          # Should *not* receive this, but in some circumstances it seems that 
           # an exception can be thrown even using shell_out instead of shell_out!
           return [ "Could not determine diff. Error: #{e.message}" ]
         end
 
-        # diff will set a non-zero return code even when there's
+        # diff will set a non-zero return code even when there's 
         # valid stdout results, if it encounters something unexpected
         # So as long as we have output, we'll show it.
         if not result.stdout.empty?
@@ -118,7 +119,7 @@ class Chef
         else
           [ "(no diff)" ]
         end
-      end
+      end 
 
       def whyrun_supported?
         true
@@ -132,46 +133,20 @@ class Chef
         @current_resource.path(@new_resource.path)
         if !::File.directory?(@new_resource.path)
           if ::File.exist?(@new_resource.path)
-            if managing_content?
+            if @action != :create_if_missing  
               @current_resource.checksum(checksum(@new_resource.path))
             end
           end
         end
-        load_current_resource_attrs
         setup_acl
 
         @current_resource
       end
 
-      def load_current_resource_attrs
-        if Chef::Platform.windows?
-          # TODO: To work around CHEF-3554, add support for Windows
-          # equivalent, or implicit resource reporting won't work for
-          # Windows.
-          return
-        end
-
-        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
-        @acl_scanner = ScanAccessControl.new(@new_resource, @current_resource)
-        @acl_scanner.set_all!
+        return if Chef::Platform.windows?
+        acl_scanner = ScanAccessControl.new(@new_resource, @current_resource)
+        acl_scanner.set_all!
       end
 
       def define_resource_requirements
@@ -191,7 +166,7 @@ class Chef
         # Make sure the file is deletable if it exists. Otherwise, fail.
         requirements.assert(:delete) do |a|
           a.assertion do
-            if ::File.exists?(@new_resource.path)
+            if ::File.exists?(@new_resource.path) 
               ::File.writable?(@new_resource.path)
             else
               true
@@ -211,7 +186,7 @@ class Chef
         unless compare_content
           description = []
           description << "update content in file #{@new_resource.path} from #{short_cksum(@current_resource.checksum)} to #{short_cksum(new_resource_content_checksum)}"
-          description << diff_current_from_content(@new_resource.content)
+          description << diff_current_from_content(@new_resource.content) 
           converge_by(description) do
             backup @new_resource.path if ::File.exists?(@new_resource.path)
             ::File.open(@new_resource.path, "w") {|f| f.write @new_resource.content }
@@ -221,10 +196,10 @@ class Chef
       end
 
       # if you are using a tempfile before creating, you must
-      # override the default with the tempfile, since the
+      # 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)
-        if !::File.directory?(path)
+        if !::File.directory?(path) 
           @new_resource.checksum(checksum(path))
         end
 
@@ -235,10 +210,8 @@ class Chef
           return
         end
 
-        stat = ::File.stat(path)
-        @new_resource.owner(stat.uid)
-        @new_resource.mode(stat.mode & 07777)
-        @new_resource.group(stat.gid)
+        acl_scanner = ScanAccessControl.new(@new_resource, @new_resource)
+        acl_scanner.set_all!
       end
 
       def action_create
@@ -247,7 +220,7 @@ class Chef
           desc = "create new file #{@new_resource.path}"
           desc << " with content checksum #{short_cksum(new_resource_content_checksum)}" if new_resource.content
           description << desc
-          description << diff_current_from_content(@new_resource.content)
+          description << diff_current_from_content(@new_resource.content) 
 
           converge_by(description) do
             Chef::Log.info("entered create")
@@ -264,7 +237,7 @@ class Chef
 
       def set_all_access_controls
         if access_controls.requires_changes?
-          converge_by(access_controls.describe_changes) do
+          converge_by(access_controls.describe_changes) do 
             access_controls.set_all
             #Update file state with new access values
             update_new_file_state
@@ -282,7 +255,7 @@ class Chef
 
       def action_delete
         if ::File.exists?(@new_resource.path)
-          converge_by("delete file #{@new_resource.path}") do
+          converge_by("delete file #{@new_resource.path}") do 
             backup unless ::File.symlink?(@new_resource.path)
             ::File.delete(@new_resource.path)
             Chef::Log.info("#{@new_resource} deleted file at #{@new_resource.path}")
@@ -342,12 +315,6 @@ class Chef
 
       private
 
-      def managing_content?
-        return true if @new_resource.checksum
-        return true if !@new_resource.content.nil? && @action != :create_if_missing
-        false
-      end
-
       def short_cksum(checksum)
         return "none" if checksum.nil?
         checksum.slice(0,6)