chef 12.0.3 → 12.1.0.rc.0

data/lib/chef/platform/provider_mapping.rb

@@ -365,7 +365,9 @@ class Chef
             },
             :openbsd => {
               :default => {
-                :group => Chef::Provider::Group::Usermod
+                :group => Chef::Provider::Group::Usermod,
+                :package => Chef::Provider::Package::Openbsd,
+                :service => Chef::Provider::Service::Openbsd
               }
             },
             :hpux => {
@@ -471,7 +473,6 @@ class Chef
 
       def provider_for_node(node, resource_type)
         raise NotImplementedError, "#{self.class.name} no longer supports #provider_for_node"
-        find_provider_for_node(node, resource_type).new(node, resource_type)
       end
 
       def find_provider_for_node(node, resource_type)

data/lib/chef/platform/provider_priority_map.rb

@@ -54,6 +54,7 @@ class Chef
         #
 
         priority :service, Chef::Provider::Service::Freebsd, os: [ "freebsd", "netbsd" ]
+        priority :service, Chef::Provider::Service::Openbsd, os: [ "openbsd" ]
 
         #
         # Solaris-en
@@ -66,6 +67,7 @@ class Chef
         #
 
         priority :service, Chef::Provider::Service::Macosx, os: "darwin"
+        priority :package, Chef::Provider::Package::Homebrew, os: "darwin"
       end
 
       def priority_map

data/lib/chef/platform/query_helpers.rb

@@ -35,14 +35,11 @@ class Chef
         # 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
-        WIN32OLE.ole_initialize
 
         wmi = WmiLite::Wmi.new
         host = wmi.first_of('Win32_OperatingSystem')
         is_server_2003 = (host['version'] && host['version'].start_with?("5.2"))
 
-        WIN32OLE.ole_uninitialize
-
         is_server_2003
       end
 

data/lib/chef/policy_builder/policyfile.rb

@@ -237,7 +237,12 @@ class Chef
       end
 
       def policyfile_location
-        "data/policyfiles/#{deployment_group}"
+        if Chef::Config[:policy_document_native_api]
+          validate_policy_config!
+          "policies/#{policy_group}/#{policy_name}"
+        else
+          "data/policyfiles/#{deployment_group}"
+        end
       end
 
       # Do some mimimal validation of the policyfile we fetched from the
@@ -281,6 +286,22 @@ class Chef
           raise ConfigurationError, "Setting `deployment_group` is not configured."
       end
 
+      def validate_policy_config!
+        policy_group or
+          raise ConfigurationError, "Setting `policy_group` is not configured."
+
+        policy_name or
+          raise ConfigurationError, "Setting `policy_name` is not configured."
+      end
+
+      def policy_group
+        Chef::Config[:policy_group]
+      end
+
+      def policy_name
+        Chef::Config[:policy_name]
+      end
+
       # Builds a 'cookbook_hash' map of the form
       #   "COOKBOOK_NAME" => "IDENTIFIER"
       #
@@ -314,13 +335,11 @@ class Chef
       # cookbooks are fetched by the "dotted_decimal_identifier": a
       # representation of a SHA1 in the traditional x.y.z version format.
       def manifest_for(cookbook_name, lock_data)
-        xyz_version = lock_data["dotted_decimal_identifier"]
-        http_api.get("cookbooks/#{cookbook_name}/#{xyz_version}")
-      rescue Exception => e
-        message = "Error loading cookbook #{cookbook_name} at version #{xyz_version}: #{e.class} - #{e.message}"
-        err = Chef::Exceptions::CookbookNotFound.new(message)
-        err.set_backtrace(e.backtrace)
-        raise err
+        if Chef::Config[:policy_document_native_api]
+          artifact_manifest_for(cookbook_name, lock_data)
+        else
+          compat_mode_manifest_for(cookbook_name, lock_data)
+        end
       end
 
       def cookbook_locks
@@ -335,6 +354,30 @@ class Chef
         Chef::Config
       end
 
+      private
+
+      def compat_mode_manifest_for(cookbook_name, lock_data)
+        xyz_version = lock_data["dotted_decimal_identifier"]
+        rel_url = "cookbooks/#{cookbook_name}/#{xyz_version}"
+        http_api.get(rel_url)
+      rescue Exception => e
+        message = "Error loading cookbook #{cookbook_name} at version #{xyz_version} from #{rel_url}: #{e.class} - #{e.message}"
+        err = Chef::Exceptions::CookbookNotFound.new(message)
+        err.set_backtrace(e.backtrace)
+        raise err
+      end
+
+      def artifact_manifest_for(cookbook_name, lock_data)
+        xyz_version = lock_data["dotted_decimal_identifier"]
+        rel_url = "cookbook_artifacts/#{cookbook_name}/#{xyz_version}"
+        http_api.get(rel_url)
+      rescue Exception => e
+        message = "Error loading cookbook #{cookbook_name} at version #{xyz_version} from #{rel_url}: #{e.class} - #{e.message}"
+        err = Chef::Exceptions::CookbookNotFound.new(message)
+        err.set_backtrace(e.backtrace)
+        raise err
+      end
+
     end
   end
 end

data/lib/chef/provider/deploy.rb

@@ -18,7 +18,6 @@
 
 require "chef/mixin/command"
 require "chef/mixin/from_file"
-require "chef/monkey_patches/fileutils"
 require "chef/provider/git"
 require "chef/provider/subversion"
 require "chef/dsl/recipe"
@@ -126,7 +125,7 @@ class Chef
         # * Move release_path directory before deploy and move it back when error occurs
         # * Rollback to previous commit
         # * Do nothing - because deploy is force, it will be retried in short time
-        # Because last is simpliest, keep it
+        # Because last is simplest, keep it
         deploy
       end
 

data/lib/chef/provider/directory.rb

@@ -61,7 +61,7 @@ class Chef
               is_parent_writable = lambda do |base_dir|
                 base_dir = ::File.dirname(base_dir)
                 if ::File.exists?(base_dir)
-                  ::File.writable?(base_dir)
+                  Chef::FileAccessControl.writable?(base_dir)
                 else
                   is_parent_writable.call(base_dir)
                 end
@@ -71,7 +71,7 @@ class Chef
               # 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.exists?(parent_directory)
-                ::File.writable?(parent_directory)
+                Chef::FileAccessControl.writable?(parent_directory)
               else
                 true
               end
@@ -84,7 +84,7 @@ class Chef
         requirements.assert(:delete) do |a|
           a.assertion do
             if ::File.exists?(@new_resource.path)
-              ::File.directory?(@new_resource.path) && ::File.writable?(@new_resource.path)
+              ::File.directory?(@new_resource.path) && Chef::FileAccessControl.writable?(@new_resource.path)
             else
               true
             end

data/lib/chef/provider/dsc_script.rb

@@ -32,11 +32,11 @@ class Chef
         @dsc_resource = dsc_resource
         @resource_converged = false
         @operations = {
-          :set => Proc.new { |config_manager, document|
-            config_manager.set_configuration(document)
+          :set => Proc.new { |config_manager, document, shellout_flags|
+            config_manager.set_configuration(document, shellout_flags)
           },
-          :test => Proc.new { |config_manager, document|
-            config_manager.test_configuration(document)
+          :test => Proc.new { |config_manager, document, shellout_flags|
+            config_manager.test_configuration(document, shellout_flags)
           }}
       end
 
@@ -89,9 +89,15 @@ class Chef
 
         config_manager = Chef::Util::DSC::LocalConfigurationManager.new(@run_context.node, config_directory)
 
+        shellout_flags = {
+          :cwd => @dsc_resource.cwd,
+          :environment => @dsc_resource.environment,
+          :timeout => @dsc_resource.timeout
+        }
+
         begin
           configuration_document = generate_configuration_document(config_directory, configuration_flags)
-          @operations[operation].call(config_manager, configuration_document)
+          @operations[operation].call(config_manager, configuration_document, shellout_flags)
         rescue Exception => e
           Chef::Log.error("DSC operation failed: #{e.message.to_s}")
           raise e
@@ -123,7 +129,7 @@ class Chef
         else
           # If code is also not provided, we mimic what the other script resources do (execute nothing)
           Chef::Log.warn("Neither code or command were provided for dsc_resource[#{@dsc_resource.name}].") unless @dsc_resource.code
-          generator.configuration_document_from_script_code(@dsc_resource.code || '', configuration_flags, shellout_flags)
+          generator.configuration_document_from_script_code(@dsc_resource.code || '', configuration_flags, @dsc_resource.imports, shellout_flags)
         end
       end
 
@@ -161,7 +167,7 @@ class Chef
               cleaned_messages = resource.change_log[0..-2].map { |c| c.sub(/^#{Regexp.escape(resource.name)}/, '').strip }
               "converge DSC resource #{resource.name} by #{cleaned_messages.find_all{ |c| c != ''}.join("\n")}"
             else
-              # This is needed because a dsc script can have resouces that are both converged and not
+              # This is needed because a dsc script can have resources that are both converged and not
               "converge DSC resource #{resource.name} by doing nothing because it is already converged"
             end
           end

data/lib/chef/provider/env.rb

@@ -61,9 +61,12 @@ class Chef
       def requires_modify_or_create?
         if @new_resource.delim
           #e.g. check for existing value within PATH
-          not new_values.all? do |val|
-            current_values.include? val
+          new_values.inject(0) do |index, val|
+            next_index = current_values.find_index val
+            return true if next_index.nil? || next_index < index
+            next_index
           end
+          false
         else
           @new_resource.value != @current_resource.value
         end
@@ -99,9 +102,9 @@ class Chef
           return true #do not delete the key
         else
           new_value =
-            current_values.select { |item|
+            current_values.select do |item|
               not new_values.include?(item)
-          }.join(@new_resource.delim)
+            end.join(@new_resource.delim)
 
           if new_value.empty?
             return false #nothing left here, delete the key
@@ -145,10 +148,7 @@ class Chef
 
       def modify_env
         if @new_resource.delim
-          values = new_values.reject do |v|
-            current_values.include?(v)
-          end
-          @new_resource.value((values + [@current_resource.value]).join(@new_resource.delim))
+          @new_resource.value((new_values + current_values).uniq.join(@new_resource.delim))
         end
         create_env
       end

data/lib/chef/provider/execute.rb

@@ -18,67 +18,86 @@
 
 require 'chef/log'
 require 'chef/provider'
+require 'forwardable'
 
 class Chef
   class Provider
     class Execute < Chef::Provider
+      extend Forwardable
 
       provides :execute
 
+      def_delegators :@new_resource, :command, :returns, :environment, :user, :group, :cwd, :umask, :creates
+
       def load_current_resource
-        true
+        current_resource = Chef::Resource::Execute.new(new_resource.name)
+        current_resource
       end
 
       def whyrun_supported?
         true
       end
 
-      def action_run
-        opts = {}
-
-        if sentinel_file = sentinel_file_if_exists
-          Chef::Log.debug("#{@new_resource} sentinel file #{sentinel_file} exists - nothing to do")
-          return false
-        end
+      def define_resource_requirements
+         # @todo: this should change to raise in some appropriate major version bump.
+         if creates && creates_relative? && !cwd
+           Chef::Log.warn "Providing a relative path for the creates attribute without the cwd is deprecated and will be changed to fail (CHEF-3819)"
+         end
+      end
 
+      def timeout
         # original implementation did not specify a timeout, but ShellOut
         # *always* times out. So, set a very long default timeout
-        opts[:timeout] = @new_resource.timeout || 3600
-        opts[:returns] = @new_resource.returns if @new_resource.returns
-        opts[:environment] = @new_resource.environment if @new_resource.environment
-        opts[:user] = @new_resource.user if @new_resource.user
-        opts[:group] = @new_resource.group if @new_resource.group
-        opts[:cwd] = @new_resource.cwd if @new_resource.cwd
-        opts[:umask] = @new_resource.umask if @new_resource.umask
-        opts[:log_level] = :info
-        opts[:log_tag] = @new_resource.to_s
-        if STDOUT.tty? && !Chef::Config[:daemon] && Chef::Log.info? && !@new_resource.sensitive
-          opts[:live_stream] = STDOUT
+        new_resource.timeout || 3600
+      end
+
+      def action_run
+        if creates && sentinel_file.exist?
+          Chef::Log.debug("#{new_resource} sentinel file #{sentinel_file} exists - nothing to do")
+          return false
         end
-        description = @new_resource.sensitive ? "sensitive resource" : @new_resource.command
+
         converge_by("execute #{description}") do
-          result = shell_out!(@new_resource.command, opts)
-          Chef::Log.info("#{@new_resource} ran successfully")
+          result = shell_out!(command, opts)
+          Chef::Log.info("#{new_resource} ran successfully")
         end
       end
 
       private
 
-      def sentinel_file_if_exists
-        if sentinel_file = @new_resource.creates
-          relative = Pathname(sentinel_file).relative?
-          cwd = @new_resource.cwd
-          if relative && !cwd
-            Chef::Log.warn "You have provided relative path for execute#creates (#{sentinel_file}) without execute#cwd (see CHEF-3819)"
-          end
-
-          if ::File.exists?(sentinel_file)
-            sentinel_file
-          elsif cwd && relative
-            sentinel_file = ::File.join(cwd, sentinel_file)
-            sentinel_file if ::File.exists?(sentinel_file)
-          end
+      def sensitive?
+        !!new_resource.sensitive
+      end
+
+      def opts
+        opts = {}
+        opts[:timeout]     = timeout
+        opts[:returns]     = returns if returns
+        opts[:environment] = environment if environment
+        opts[:user]        = user if user
+        opts[:group]       = group if group
+        opts[:cwd]         = cwd if cwd
+        opts[:umask]       = umask if umask
+        opts[:log_level]   = :info
+        opts[:log_tag]     = new_resource.to_s
+        if STDOUT.tty? && !Chef::Config[:daemon] && Chef::Log.info? && !sensitive?
+          opts[:live_stream] = STDOUT
         end
+        opts
+      end
+
+      def description
+        sensitive? ? "sensitive resource" : command
+      end
+
+      def creates_relative?
+        Pathname(creates).relative?
+      end
+
+      def sentinel_file
+        Pathname.new(Chef::Util::PathHelper.cleanpath(
+           ( cwd && creates_relative? ) ? ::File.join(cwd, creates) : creates
+        ))
       end
     end
   end

data/lib/chef/provider/file.rb

@@ -345,6 +345,14 @@ class Chef
         if new_resource.checksum && tempfile && ( new_resource.checksum != tempfile_checksum )
           raise Chef::Exceptions::ChecksumMismatch.new(short_cksum(new_resource.checksum), short_cksum(tempfile_checksum))
         end
+
+        if tempfile
+          new_resource.verify.each do |v|
+            if ! v.verify(tempfile.path)
+              raise Chef::Exceptions::ValidationFailed.new "Proposed content for #{new_resource.path} failed verification #{v}"
+            end
+          end
+        end
       end
 
       def do_unlink

data/lib/chef/provider/group.rb

@@ -17,12 +17,14 @@
 #
 
 require 'chef/provider'
+require 'chef/mixin/shell_out'
 require 'chef/mixin/command'
 require 'etc'
 
 class Chef
   class Provider
     class Group < Chef::Provider
+      include Chef::Mixin::ShellOut
       include Chef::Mixin::Command
       attr_accessor :group_exists
       attr_accessor :change_desc

data/lib/chef/provider/group/dscl.rb

@@ -24,10 +24,9 @@ class Chef
         def dscl(*args)
           host = "."
           stdout_result = ""; stderr_result = ""; cmd = "dscl #{host} -#{args.join(' ')}"
-          status = popen4(cmd) do |pid, stdin, stdout, stderr|
-            stdout.each { |line| stdout_result << line }
-            stderr.each { |line| stderr_result << line }
-          end
+          status = shell_out(cmd)
+          status.stdout.each_line { |line| stdout_result << line }
+          status.stderr.each_line { |line| stderr_result << line }
           return [cmd, status, stdout_result, stderr_result]
         end
 

data/lib/chef/provider/ifconfig.rb

@@ -18,6 +18,7 @@
 
 require 'chef/log'
 require 'chef/mixin/command'
+require 'chef/mixin/shell_out'
 require 'chef/provider'
 require 'chef/resource/file'
 require 'chef/exceptions'
@@ -38,6 +39,7 @@ require 'erb'
 class Chef
   class Provider
     class Ifconfig < Chef::Provider
+      include Chef::Mixin::ShellOut
       include Chef::Mixin::Command
 
       attr_accessor :config_template
@@ -59,32 +61,30 @@ class Chef
         @ifconfig_success = true
         @interfaces = {}
 
-        @status = popen4("ifconfig") do |pid, stdin, stdout, stderr|
-          stdout.each do |line|
-
-            if !line[0..9].strip.empty?
-              @int_name = line[0..9].strip
-              @interfaces[@int_name] = {"hwaddr" => (line =~ /(HWaddr)/ ? ($') : "nil").strip.chomp }
-            else
-              @interfaces[@int_name]["inet_addr"] = (line =~ /inet addr:(\S+)/ ? ($1) : "nil") if line =~ /inet addr:/
-              @interfaces[@int_name]["bcast"] = (line =~ /Bcast:(\S+)/ ? ($1) : "nil") if line =~ /Bcast:/
-              @interfaces[@int_name]["mask"] = (line =~ /Mask:(\S+)/ ? ($1) : "nil") if line =~ /Mask:/
-              @interfaces[@int_name]["mtu"] = (line =~ /MTU:(\S+)/ ? ($1) : "nil") if line =~ /MTU:/
-              @interfaces[@int_name]["metric"] = (line =~ /Metric:(\S+)/ ? ($1) : "nil") if line =~ /Metric:/
-            end
+        @status = shell_out("ifconfig")
+        @status.stdout.each_line do |line|
+          if !line[0..9].strip.empty?
+            @int_name = line[0..9].strip
+            @interfaces[@int_name] = {"hwaddr" => (line =~ /(HWaddr)/ ? ($') : "nil").strip.chomp }
+          else
+            @interfaces[@int_name]["inet_addr"] = (line =~ /inet addr:(\S+)/ ? ($1) : "nil") if line =~ /inet addr:/
+            @interfaces[@int_name]["bcast"] = (line =~ /Bcast:(\S+)/ ? ($1) : "nil") if line =~ /Bcast:/
+            @interfaces[@int_name]["mask"] = (line =~ /Mask:(\S+)/ ? ($1) : "nil") if line =~ /Mask:/
+            @interfaces[@int_name]["mtu"] = (line =~ /MTU:(\S+)/ ? ($1) : "nil") if line =~ /MTU:/
+            @interfaces[@int_name]["metric"] = (line =~ /Metric:(\S+)/ ? ($1) : "nil") if line =~ /Metric:/
+          end
 
-            if @interfaces.has_key?(@new_resource.device)
-              @interface = @interfaces.fetch(@new_resource.device)
-
-              @current_resource.target(@new_resource.target)
-              @current_resource.device(@new_resource.device)
-              @current_resource.inet_addr(@interface["inet_addr"])
-              @current_resource.hwaddr(@interface["hwaddr"])
-              @current_resource.bcast(@interface["bcast"])
-              @current_resource.mask(@interface["mask"])
-              @current_resource.mtu(@interface["mtu"])
-              @current_resource.metric(@interface["metric"])
-            end
+          if @interfaces.has_key?(@new_resource.device)
+            @interface = @interfaces.fetch(@new_resource.device)
+
+            @current_resource.target(@new_resource.target)
+            @current_resource.device(@new_resource.device)
+            @current_resource.inet_addr(@interface["inet_addr"])
+            @current_resource.hwaddr(@interface["hwaddr"])
+            @current_resource.bcast(@interface["bcast"])
+            @current_resource.mask(@interface["mask"])
+            @current_resource.mtu(@interface["mtu"])
+            @current_resource.metric(@interface["metric"])
           end
         end
         @current_resource