chef 12.2.1 → 12.3.0.rc.0

data/lib/chef/knife.rb

@@ -373,6 +373,9 @@ class Chef
       Chef::Config[:environment]       = config[:environment]     if config[:environment]
 
       Chef::Config.local_mode = config[:local_mode] if config.has_key?(:local_mode)
+
+      Chef::Config.listen = config[:listen] if config.has_key?(:listen)
+
       if Chef::Config.local_mode && !Chef::Config.has_key?(:cookbook_path) && !Chef::Config.has_key?(:chef_repo_path)
         Chef::Config.chef_repo_path = Chef::Config.find_chef_repo_path(Dir.pwd)
       end

data/lib/chef/knife/bootstrap.rb

@@ -378,7 +378,7 @@ class Chef
         command = render_template
 
         if config[:use_sudo]
-          command = config[:use_sudo_password] ? "echo '#{config[:ssh_password]}' | sudo -S #{command}" : "sudo #{command}"
+          command = config[:use_sudo_password] ? "echo '#{config[:ssh_password]}' | sudo -SH #{command}" : "sudo -H #{command}"
         end
 
         command

data/lib/chef/knife/core/status_presenter.rb

@@ -66,16 +66,16 @@ class Chef
           list.each do |node|
             result = {}
 
-            result["name"] = node.name
-            result["chef_environment"] = node.chef_environment
-            ip = (node[:ec2] && node[:ec2][:public_ipv4]) || node[:ipaddress]
-            fqdn = (node[:ec2] && node[:ec2][:public_hostname]) || node[:fqdn]
+            result["name"] = node["name"] || node.name
+            result["chef_environment"] = node["chef_environment"]
+            ip = (node["ec2"] && node["ec2"]["public_ipv4"]) || node["ipaddress"]
+            fqdn = (node["ec2"] && node["ec2"]["public_hostname"]) || node["fqdn"]
             result["ip"] = ip if ip
             result["fqdn"] = fqdn if fqdn
-            result["run_list"] = node.run_list if config[:run_list]
-            result["ohai_time"] = node[:ohai_time]
-            result["platform"] = node[:platform] if node[:platform]
-            result["platform_version"] = node[:platform_version] if node[:platform_version]
+            result["run_list"] = node.run_list if config["run_list"]
+            result["ohai_time"] = node["ohai_time"]
+            result["platform"] = node["platform"] if node["platform"]
+            result["platform_version"] = node["platform_version"] if node["platform_version"]
 
             if config[:long_output]
               result["default"]   = node.default_attrs
@@ -99,11 +99,12 @@ class Chef
             # special case ec2 with their split horizon whatsis.
             ip = (node[:ec2] && node[:ec2][:public_ipv4]) || node[:ipaddress]
             fqdn = (node[:ec2] && node[:ec2][:public_hostname]) || node[:fqdn]
+            name = node['name'] || node.name
 
-            hours, minutes, seconds = time_difference_in_hms(node["ohai_time"])
+            hours, minutes, _ = time_difference_in_hms(node["ohai_time"])
             hours_text   = "#{hours} hour#{hours == 1 ? ' ' : 's'}"
             minutes_text = "#{minutes} minute#{minutes == 1 ? ' ' : 's'}"
-            run_list = "#{node.run_list}" if config[:run_list]
+            run_list = "#{node['run_list']}" if config[:run_list]
             if hours > 24
               color = :red
               text = hours_text
@@ -116,7 +117,7 @@ class Chef
             end
 
             line_parts = Array.new
-            line_parts << @ui.color(text, color) + ' ago' << node.name
+            line_parts << @ui.color(text, color) + ' ago' << name
             line_parts << fqdn if fqdn
             line_parts << ip if ip
             line_parts << run_list if run_list

data/lib/chef/knife/ssh.rb

@@ -175,7 +175,9 @@ class Chef
           if config[:attribute_from_cli]
             Chef::Log.debug("Using node attribute '#{config[:attribute_from_cli]}' from the command line as the ssh target")
             host = extract_nested_value(item, config[:attribute_from_cli])
-          elsif item[:cloud] && item[:cloud][:public_hostname]
+          elsif item[:cloud] &&
+                item[:cloud][:public_hostname] &&
+                !item[:cloud][:public_hostname].empty?
             Chef::Log.debug("Using node attribute 'cloud[:public_hostname]' automatically as the ssh target")
             host = item[:cloud][:public_hostname]
           else

data/lib/chef/knife/status.rb

@@ -18,10 +18,12 @@
 
 require 'chef/knife'
 require 'chef/knife/core/status_presenter'
+require 'chef/knife/core/node_presenter'
 
 class Chef
   class Knife
     class Status < Knife
+      include Knife::Core::NodeFormattingOptions
 
       deps do
         require 'chef/search/query'
@@ -44,20 +46,43 @@ class Chef
         :long => "--hide-healthy",
         :description => "Hide nodes that have run chef in the last hour"
 
+      def append_to_query(term)
+        @query << " AND " unless @query.empty?
+        @query << term
+      end
+
       def run
         ui.use_presenter Knife::Core::StatusPresenter
-        all_nodes = []
-        q = Chef::Search::Query.new
-        query = @name_args[0] ? @name_args[0].dup : '*:*' 
+
+        if config[:long_output]
+          opts = {}
+        else
+          opts = {filter_result:
+                 { name: ["name"], ipaddress: ["ipaddress"], ohai_time: ["ohai_time"],
+                  ec2: ["ec2"], run_list: ["run_list"], platform: ["platform"],
+                  platform_version: ["platform_version"], chef_environment: ["chef_environment"]}}
+        end
+
+        @query ||= ""
+        append_to_query(@name_args[0]) if @name_args[0]
+        append_to_query("chef_environment:#{config[:environment]}") if config[:environment]
+
         if config[:hide_healthy]
           time = Time.now.to_i
-          query_unhealthy = "NOT ohai_time:[" << (time - 60*60).to_s << " TO " << time.to_s << "]"
-          query << ' AND ' << query_unhealthy << @name_args[0] if @name_args[0]
-          query = query_unhealthy unless @name_args[0]
+          # AND NOT is not valid lucene syntax, so don't use append_to_query
+          @query << " " unless @query.empty?
+          @query << "NOT ohai_time:[#{(time - 60*60).to_s} TO #{time.to_s}]"
         end
-        q.search(:node, query) do |node|
+
+        @query = @query.empty? ? "*:*" : @query
+
+        all_nodes = []
+        q = Chef::Search::Query.new
+        Chef::Log.info("Sending query: #{@query}")
+        q.search(:node, @query, opts) do |node|
           all_nodes << node
         end
+
         output(all_nodes.sort { |n1, n2|
           if (config[:sort_reverse] || Chef::Config[:knife][:sort_status_reverse])
             (n2["ohai_time"] or 0) <=> (n1["ohai_time"] or 0)

data/lib/chef/local_mode.rb

@@ -18,6 +18,7 @@ require 'chef/config'
 
 class Chef
   module LocalMode
+
     # Create a chef local server (if the configuration requires one) for the
     # duration of the given block.
     #
@@ -59,12 +60,21 @@ class Chef
         server_options = {}
         server_options[:data_store] = data_store
         server_options[:log_level] = Chef::Log.level
+
         server_options[:host] = Chef::Config.chef_zero.host
         server_options[:port] = parse_port(Chef::Config.chef_zero.port)
         @chef_zero_server = ChefZero::Server.new(server_options)
-        @chef_zero_server.start_background
-        Chef::Log.info("Started chef-zero at #{@chef_zero_server.url} with #{@chef_fs.fs_description}")
-        Chef::Config.chef_server_url = @chef_zero_server.url
+
+        if Chef::Config[:listen]
+          @chef_zero_server.start_background
+        else
+          @chef_zero_server.start_socketless
+        end
+
+        local_mode_url = @chef_zero_server.local_mode_url
+
+        Chef::Log.info("Started chef-zero at #{local_mode_url} with #{@chef_fs.fs_description}")
+        Chef::Config.chef_server_url = local_mode_url
       end
     end
 

data/lib/chef/mixin/provides.rb

@@ -0,0 +1,32 @@
+
+require 'chef/mixin/descendants_tracker'
+
+class Chef
+  module Mixin
+    module Provides
+      include Chef::Mixin::DescendantsTracker
+
+      def node_map
+        @node_map ||= Chef::NodeMap.new
+      end
+
+      def provides(short_name, opts={}, &block)
+        if !short_name.kind_of?(Symbol)
+          # YAGNI: this is probably completely unnecessary and can be removed?
+          Chef::Log.deprecation "Passing a non-Symbol to Chef::Resource#provides will be removed"
+          if short_name.kind_of?(String)
+            short_name.downcase!
+            short_name.gsub!(/\s/, "_")
+          end
+          short_name = short_name.to_sym
+        end
+        node_map.set(short_name, true, opts, &block)
+      end
+
+      # provides a node on the resource (early binding)
+      def provides?(node, resource_name)
+        node_map.get(node, resource_name)
+      end
+    end
+  end
+end

data/lib/chef/platform/provider_priority_map.rb

@@ -1,6 +1,4 @@
 
-require 'chef/providers'
-
 class Chef
   class Platform
     class ProviderPriorityMap
@@ -10,7 +8,22 @@ class Chef
         load_default_map
       end
 
+      def get_priority_array(node, resource_name)
+        priority_map.get(node, resource_name.to_sym)
+      end
+
+      def set_priority_array(resource_name, priority_array, *filter)
+        priority(resource_name.to_sym, priority_array.to_a, *filter)
+      end
+
+      def priority(*args)
+        priority_map.set(*args)
+      end
+
+      private
+
       def load_default_map
+        require 'chef/providers'
 
         #
         # Linux
@@ -71,13 +84,9 @@ class Chef
       end
 
       def priority_map
+        require 'chef/node_map'
         @priority_map ||= Chef::NodeMap.new
       end
-
-      def priority(*args)
-        priority_map.set(*args)
-      end
-
     end
   end
 end

data/lib/chef/platform/resource_priority_map.rb

@@ -0,0 +1,37 @@
+class Chef
+  class Platform
+    class ResourcePriorityMap
+      include Singleton
+
+      def initialize
+        load_default_map
+      end
+
+      def get_priority_array(node, resource_name)
+        priority_map.get(node, resource_name.to_sym)
+      end
+
+      def set_priority_array(resource_name, priority_array, *filter)
+        priority resource_name.to_sym, priority_array.to_a, *filter
+      end
+
+      def priority(*args)
+        priority_map.set(*args)
+      end
+
+      private
+
+      def load_default_map
+        require 'chef/resources'
+
+        # MacOSX
+        priority :package, Chef::Resource::HomebrewPackage, os: "darwin"
+      end
+
+      def priority_map
+        require 'chef/node_map'
+        @priority_map ||= Chef::NodeMap.new
+      end
+    end
+  end
+end

data/lib/chef/policy_builder/expand_node_object.rb

@@ -24,6 +24,7 @@ require 'chef/rest'
 require 'chef/run_context'
 require 'chef/config'
 require 'chef/node'
+require 'chef/chef_class'
 
 class Chef
   module PolicyBuilder
@@ -54,6 +55,15 @@ class Chef
         @run_list_expansion = nil
       end
 
+      # This method injects the run_context and provider and resource priority
+      # maps into the Chef class.  The run_context has to be injected here, the provider and
+      # resource maps could be moved if a better place can be found to do this work.
+      #
+      # @param run_context [Chef::RunContext] the run_context to inject
+      def setup_chef_class(run_context)
+        Chef.set_run_context(run_context)
+      end
+
       def setup_run_context(specific_recipes=nil)
         if Chef::Config[:solo]
           Chef::Cookbook::FileVendor.fetch_from_disk(Chef::Config[:cookbook_path])
@@ -68,6 +78,10 @@ class Chef
           run_context = Chef::RunContext.new(node, cookbook_collection, @events)
         end
 
+        # TODO: this is really obviously not the place for this
+        # FIXME: need same edits
+        setup_chef_class(run_context)
+
         # TODO: this is not the place for this. It should be in Runner or
         # CookbookCompiler or something.
         run_context.load(@run_list_expansion)

data/lib/chef/policy_builder/policyfile.rb

@@ -385,4 +385,3 @@ class Chef
     end
   end
 end
-

data/lib/chef/provider.rb

@@ -22,7 +22,7 @@ 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/mixin/provides'
 require 'chef/platform/service_helpers'
 require 'chef/node_map'
 
@@ -30,26 +30,11 @@ class Chef
   class Provider
     include Chef::Mixin::WhyRun
     include Chef::Mixin::ShellOut
-    extend Chef::Mixin::DescendantsTracker
+    extend Chef::Mixin::Provides
 
-    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
+    # supports the given resource and action (late binding)
+    def self.supports?(resource, action)
+      true
     end
 
     attr_accessor :new_resource

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

@@ -538,8 +538,11 @@ class Chef
         def install_via_gem_command(name, version)
           if @new_resource.source =~ /\.gem$/i
             name = @new_resource.source
+          elsif @new_resource.clear_sources
+            src = ' --clear-sources'
+            src << (@new_resource.source && " --source=#{@new_resource.source}" || '')
           else
-            src = @new_resource.source && "  --source=#{@new_resource.source} --source=https://rubygems.org"
+            src = @new_resource.source && " --source=#{@new_resource.source} --source=https://rubygems.org"
           end
           if !version.nil? && version.length > 0
             shell_out!("#{gem_binary_path} install #{name} -q --no-rdoc --no-ri -v \"#{version}\"#{src}#{opts}", :env=>nil)

data/lib/chef/provider/service/macosx.rb

@@ -16,8 +16,10 @@
 # limitations under the License.
 #
 
+require 'etc'
 require 'rexml/document'
 require 'chef/resource/service'
+require 'chef/resource/macosx_service'
 require 'chef/provider/service/simple'
 require 'chef/util/path_helper'
 
@@ -27,6 +29,7 @@ class Chef
       class Macosx < Chef::Provider::Service::Simple
 
         provides :service, os: "darwin"
+        provides :macosx_service, os: "darwin"
 
         def self.gather_plist_dirs
           locations = %w{/Library/LaunchAgents
@@ -40,18 +43,32 @@ class Chef
         PLIST_DIRS = gather_plist_dirs
 
         def load_current_resource
-          @current_resource = Chef::Resource::Service.new(@new_resource.name)
+          @current_resource = Chef::Resource::MacosxService.new(@new_resource.name)
           @current_resource.service_name(@new_resource.service_name)
           @plist_size = 0
-          @plist = find_service_plist
+          @plist = @new_resource.plist ? @new_resource.plist : find_service_plist
           @service_label = find_service_label
+          # LauchAgents should be loaded as the console user.
+          @console_user = @plist ? @plist.include?('LaunchAgents') : false
+          @session_type = @new_resource.session_type
+
+          if @console_user
+            @console_user = Etc.getlogin
+            Chef::Log.debug("#{new_resource} console_user: '#{@console_user}'")
+            cmd = "su "
+            param = !node['platform_version'].include?('10.10') ? '-l ' : ''
+            @base_user_cmd = cmd + param + "#{@console_user} -c"
+            # Default LauchAgent session should be Aqua
+            @session_type = 'Aqua' if @session_type.nil?
+          end
+
+          Chef::Log.debug("#{new_resource} Plist: '#{@plist}' service_label: '#{@service_label}'")
           set_service_status
 
           @current_resource
         end
 
         def define_resource_requirements
-          #super
           requirements.assert(:reload) do |a|
             a.failure_message Chef::Exceptions::UnsupportedAction, "#{self.to_s} does not support :reload"
           end
@@ -61,6 +78,12 @@ class Chef
             a.failure_message Chef::Exceptions::Service, "Several plist files match service name. Please use full service name."
           end
 
+          requirements.assert(:all_actions) do |a|
+            a.assertion {::File.exists?(@plist.to_s) }
+            a.failure_message Chef::Exceptions::Service,
+              "Could not find plist for #{@new_resource}"
+          end
+
           requirements.assert(:enable, :disable) do |a|
             a.assertion { !@service_label.to_s.empty? }
             a.failure_message Chef::Exceptions::Service,
@@ -69,7 +92,7 @@ class Chef
 
           requirements.assert(:all_actions) do |a|
             a.assertion { @plist_size > 0 }
-            # No failrue here in original code - so we also will not
+            # No failure here in original code - so we also will not
             # fail. Instead warn that the service is potentially missing
             a.whyrun "Assuming that the service would have been previously installed and is currently disabled." do
               @current_resource.enabled(false)
@@ -85,7 +108,7 @@ class Chef
             if @new_resource.start_command
               super
             else
-              shell_out_with_systems_locale!("launchctl load -w '#{@plist}'", :user => @owner_uid, :group => @owner_gid)
+              load_service
             end
           end
         end
@@ -97,7 +120,7 @@ class Chef
             if @new_resource.stop_command
               super
             else
-              shell_out_with_systems_locale!("launchctl unload '#{@plist}'", :user => @owner_uid, :group => @owner_gid)
+              unload_service
             end
           end
         end
@@ -106,9 +129,9 @@ class Chef
           if @new_resource.restart_command
             super
           else
-            stop_service
+            unload_service
             sleep 1
-            start_service
+            load_service
           end
         end
 
@@ -121,10 +144,7 @@ class Chef
           if @current_resource.enabled
             Chef::Log.debug("#{@new_resource} already enabled, not enabling")
           else
-            shell_out!(
-              "launchctl load -w '#{@plist}'",
-              :user => @owner_uid, :group => @owner_gid
-            )
+            load_service
           end
         end
 
@@ -132,38 +152,49 @@ class Chef
           unless @current_resource.enabled
             Chef::Log.debug("#{@new_resource} not enabled, not disabling")
           else
-            shell_out!(
-              "launchctl unload -w '#{@plist}'",
-              :user => @owner_uid, :group => @owner_gid
-            )
+            unload_service
+          end
+        end
+
+       def load_service
+          session = @session_type ? "-S #{@session_type} " : ''
+          cmd = 'launchctl load -w ' + session + @plist
+          shell_out_as_user(cmd)
+        end
+
+        def unload_service
+          cmd = 'launchctl unload -w ' + @plist
+          shell_out_as_user(cmd)
+        end
+
+        def shell_out_as_user(cmd)
+          if @console_user
+            shell_out_with_systems_locale("#{@base_user_cmd} '#{cmd}'")
+          else
+            shell_out_with_systems_locale(cmd)
+
           end
         end
 
         def set_service_status
           return if @plist == nil or @service_label.to_s.empty?
 
-          cmd = shell_out(
-            "launchctl list #{@service_label}",
-            :user => @owner_uid, :group => @owner_gid
-          )
+          cmd = "launchctl list #{@service_label}"
+          res = shell_out_as_user(cmd)
 
-          if cmd.exitstatus == 0
+          if res.exitstatus == 0
             @current_resource.enabled(true)
           else
             @current_resource.enabled(false)
           end
 
           if @current_resource.enabled
-            @owner_uid = ::File.stat(@plist).uid
-            @owner_gid = ::File.stat(@plist).gid
-
-            shell_out!(
-              "launchctl list", :user => @owner_uid, :group => @owner_gid
-            ).stdout.each_line do |line|
-              case line
-              when /(\d+|-)\s+(?:\d+|-)\s+(.*\.?)#{@service_label}/
+            res.stdout.each_line do |line|
+              case line.downcase
+              when /\s+\"pid\"\s+=\s+(\d+).*/
                 pid = $1
                 @current_resource.running(!pid.to_i.zero?)
+                Chef::Log.debug("Current PID for #{@service_label} is #{pid}")
               end
             end
           else
@@ -178,6 +209,9 @@ class Chef
           # onto the node yet."
           return nil if @plist.nil?
 
+          # Plist must exist by this point
+          raise Chef::Exceptions::FileNotFound, "Cannot find #{@plist}!" unless ::File.exists?(@plist)
+
           # Most services have the same internal label as the name of the
           # plist file. However, there is no rule saying that *has* to be
           # the case, and some core services (notably, ssh) do not follow
@@ -185,7 +219,9 @@ class Chef
 
           # plist files can come in XML or Binary formats. this command
           # will make sure we get XML every time.
-          plist_xml = shell_out!("plutil -convert xml1 -o - #{@plist}").stdout
+          plist_xml = shell_out_with_systems_locale!(
+            "plutil -convert xml1 -o - #{@plist}"
+          ).stdout
 
           plist_doc = REXML::Document.new(plist_xml)
           plist_doc.elements[