chef 13.0.118 → 13.1.31

data/lib/chef/provider/execute.rb

@@ -37,7 +37,7 @@ class Chef
       def define_resource_requirements
         if creates && creates_relative? && !cwd
           # FIXME? move this onto the resource?
-          raise Chef::Exceptions::Execute, "Please either specify a full path for the creates attribute, or specify a cwd propoerty to the #{new_resource} resource"
+          raise Chef::Exceptions::Execute, "Please either specify a full path for the creates attribute, or specify a cwd property to the #{new_resource} resource"
         end
       end
 

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

@@ -81,34 +81,39 @@ class Chef
         end
 
         def installed_version
-          stdout = dism_command("/Get-PackageInfo /PackagePath:\"#{cab_file_source}\"").stdout
-          package_info = parse_dism_get_package_info(stdout)
           # e.g. Package_for_KB2975719~31bf3856ad364e35~amd64~~6.3.1.8
-          package = split_package_identity(package_info["package_information"]["package_identity"])
+          package = new_cab_identity
           # Search for just the package name to catch a different version being installed
           Chef::Log.debug("#{new_resource} searching for installed package #{package['name']}")
-          found_packages = installed_packages.select { |p| p["package_identity"] =~ /^#{package['name']}~/ }
+          existing_package_identities = installed_packages.map do |p|
+            split_package_identity(p["package_identity"])
+          end
+          found_packages = existing_package_identities.select do |existing_package_ident|
+            existing_package_ident["name"] == package["name"]
+          end
           if found_packages.empty?
             nil
           elsif found_packages.length == 1
-            stdout = dism_command("/Get-PackageInfo /PackageName:\"#{found_packages.first['package_identity']}\"").stdout
-            find_version(stdout)
+            found_packages.first["version"]
           else
             # Presuming this won't happen, otherwise we need to handle it
             raise Chef::Exceptions::Package, "Found multiple packages installed matching name #{package['name']}, found: #{found_packages.length} matches"
           end
         end
 
-        def package_version
-          Chef::Log.debug("#{new_resource} getting product version for package at #{cab_file_source}")
+        def cab_identity_from_cab_file
           stdout = dism_command("/Get-PackageInfo /PackagePath:\"#{cab_file_source}\"").stdout
-          find_version(stdout)
+          package_info = parse_dism_get_package_info(stdout)
+          split_package_identity(package_info["package_information"]["package_identity"])
         end
 
-        def find_version(stdout)
-          package_info = parse_dism_get_package_info(stdout)
-          package = split_package_identity(package_info["package_information"]["package_identity"])
-          package["version"]
+        def new_cab_identity
+          Chef::Log.debug("#{new_resource} getting product version for package at #{cab_file_source}")
+          @new_cab_identity ||= cab_identity_from_cab_file
+        end
+
+        def package_version
+          new_cab_identity["version"].chomp
         end
 
         # returns a hash of package state information given the output of dism /get-packages

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

@@ -78,7 +78,7 @@ class Chef
         def get_cab_package(cab_file)
           cab_resource = new_resource
           cab_resource.source = cab_file
-          cab_pkg = Chef::Provider::Package::Cab.new(cab_resource, nil)
+          Chef::Provider::Package::Cab.new(cab_resource, nil)
         end
 
         def download_source_file
@@ -141,7 +141,7 @@ class Chef
           else
             # msu package contains only single xml file. So using xml_files.first is sufficient
             doc = ::File.open(xml_files.first.to_s) { |f| REXML::Document.new f }
-            locations = doc.elements.each("unattend/servicing/package/source") { |element| puts element.attributes["location"] }
+            locations = doc.elements.each("unattend/servicing/package/source") { |element| element.attributes["location"] }
             locations.each do |loc|
               cab_files << msu_dir + "/" + loc.attribute("location").value.split("\\")[1]
             end

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

@@ -21,6 +21,7 @@ require "uri"
 require "chef/provider/package"
 require "chef/resource/package"
 require "chef/mixin/get_source_from_package"
+require "chef/mixin/which"
 
 # Class methods on Gem are defined in rubygems
 require "rubygems"
@@ -359,6 +360,7 @@ class Chef
         provides :gem_package
 
         include Chef::Mixin::GetSourceFromPackage
+        include Chef::Mixin::Which
 
         def initialize(new_resource, run_context = nil)
           super
@@ -410,11 +412,7 @@ class Chef
         end
 
         def find_gem_by_path
-          Chef::Log.debug("#{new_resource} searching for 'gem' binary in path: #{ENV['PATH']}")
-          separator = ::File::ALT_SEPARATOR ? ::File::ALT_SEPARATOR : ::File::SEPARATOR
-          path_to_first_gem = ENV["PATH"].split(::File::PATH_SEPARATOR).find { |path| ::File.exist?(path + separator + "gem") }
-          raise Chef::Exceptions::FileNotFound, "Unable to find 'gem' binary in path: #{ENV['PATH']}" if path_to_first_gem.nil?
-          path_to_first_gem + separator + "gem"
+          which("gem", extra_path: RbConfig::CONFIG["bindir"])
         end
 
         def gem_dependency

data/lib/chef/provider/user/aix.rb

@@ -81,7 +81,7 @@ class Chef
 
         # Aix specific handling to update users home directory.
         def manage_home
-          return unless updating_home? && managing_home_dir?
+          return unless updating_home? && new_resource.manage_home
           # -m option does not work on aix, so move dir.
           universal_options.delete("-m")
           if ::File.directory?(current_resource.home)

data/lib/chef/provider/user/windows.rb

@@ -36,7 +36,7 @@ class Chef
 
         def load_current_resource
           if new_resource.gid
-            Chef::Log.warn("The 'gid' attribute is not implemented by the Windows platform. Please use the 'group' resource to assign a user to a group.")
+            Chef::Log.warn("The 'gid' (or 'group') property is not implemented on the Windows platform. Please use the `members` property of the  'group' resource to assign a user to a group.")
           end
 
           @current_resource = Chef::Resource::User.new(new_resource.name)

data/lib/chef/providers.rb

@@ -19,7 +19,6 @@
 require "chef/provider/apt_update"
 require "chef/provider/apt_repository"
 require "chef/provider/batch"
-require "chef/provider/breakpoint"
 require "chef/provider/cookbook_file"
 require "chef/provider/cron"
 require "chef/provider/cron/solaris"

data/lib/chef/resource/breakpoint.rb

@@ -21,12 +21,24 @@ require "chef/resource"
 class Chef
   class Resource
     class Breakpoint < Chef::Resource
+      provides :breakpoint
+      resource_name :breakpoinst
+
       default_action :break
 
       def initialize(action = "break", *args)
         super(caller.first, *args)
       end
 
+      action :break do
+        if defined?(Shell) && Shell.running?
+          with_run_context :parent do
+            run_context.resource_collection.iterator.pause
+            new_resource.updated_by_last_action(true)
+            run_context.resource_collection.iterator
+          end
+        end
+      end
     end
   end
 end

data/lib/chef/resource/env.rb

@@ -20,46 +20,14 @@
 class Chef
   class Resource
     class Env < Chef::Resource
-
-      identity_attr :key_name
-
-      state_attrs :value
-
       provides :env, os: "windows"
 
       default_action :create
       allowed_actions :create, :delete, :modify
 
-      def initialize(name, run_context = nil)
-        super
-        @key_name = name
-        @value = nil
-        @delim = nil
-      end
-
-      def key_name(arg = nil)
-        set_or_return(
-          :key_name,
-          arg,
-          :kind_of => [ String ]
-        )
-      end
-
-      def value(arg = nil)
-        set_or_return(
-          :value,
-          arg,
-          :kind_of => [ String ]
-        )
-      end
-
-      def delim(arg = nil)
-        set_or_return(
-          :delim,
-          arg,
-          :kind_of => [ String ]
-        )
-      end
+      property :key_name, String, identity: true, name_property: true
+      property :value, String, required: true
+      property :delim, [ String, nil, false ], desired_state: false
     end
   end
 end

data/lib/chef/resource/route.rb

@@ -22,116 +22,22 @@ require "chef/resource"
 class Chef
   class Resource
     class Route < Chef::Resource
-      identity_attr :target
-
-      state_attrs :netmask, :gateway
-
       default_action :add
       allowed_actions :add, :delete
 
-      def initialize(name, run_context = nil)
-        super
-        @target = name
-        @netmask = nil
-        @gateway = nil
-        @metric = nil
-        @device = nil
-        @route_type = :host
-        @networking = nil
-        @networking_ipv6 = nil
-        @hostname = nil
-        @domainname = nil
-        @domain = nil
-      end
-
-      def networking(arg = nil)
-        set_or_return(
-          :networking,
-          arg,
-          :kind_of => String
-        )
-      end
-
-      def networking_ipv6(arg = nil)
-        set_or_return(
-          :networking_ipv6,
-          arg,
-          :kind_of => String
-        )
-      end
-
-      def hostname(arg = nil)
-        set_or_return(
-          :hostname,
-          arg,
-          :kind_of => String
-        )
-      end
-
-      def domainname(arg = nil)
-        set_or_return(
-          :domainname,
-          arg,
-          :kind_of => String
-        )
-      end
-
-      def domain(arg = nil)
-        set_or_return(
-          :domain,
-          arg,
-          :kind_of => String
-        )
-      end
-
-      def target(arg = nil)
-        set_or_return(
-          :target,
-          arg,
-          :kind_of => String
-        )
-      end
-
-      def netmask(arg = nil)
-        set_or_return(
-          :netmask,
-          arg,
-          :kind_of => String
-        )
-      end
-
-      def gateway(arg = nil)
-        set_or_return(
-          :gateway,
-          arg,
-          :kind_of => String
-        )
-      end
-
-      def metric(arg = nil)
-        set_or_return(
-          :metric,
-          arg,
-          :kind_of => Integer
-        )
-      end
-
-      def device(arg = nil)
-        set_or_return(
-          :device,
-          arg,
-          :kind_of => String
-        )
-      end
-
-      def route_type(arg = nil)
-        real_arg = arg.kind_of?(String) ? arg.to_sym : arg
-        set_or_return(
-          :route_type,
-          real_arg,
-          :equal_to => [ :host, :net ]
-        )
-      end
+      property :target, String, identity: true, name_property: true
+      property :netmask, [String, nil]
+      property :gateway, [String, nil]
+      property :device, [String, nil], desired_state: false # Has a partial default in the provider of eth0.
+      property :route_type, [:host, :net], default: :host, coerce: proc { |x| x.to_sym }, desired_state: false
+
+      # I can find no evidence of these properties actually being used by Chef. NK 2017-04-11
+      property :networking, [String, nil], desired_state: false
+      property :networking_ipv6, [String, nil], desired_state: false
+      property :hostname, [String, nil], desired_state: false
+      property :domainname, [String, nil], desired_state: false
+      property :domain, [String, nil], desired_state: false
+      property :metric, [Integer, nil], desired_state: false
     end
   end
 end

data/lib/chef/resource/service.rb

@@ -78,7 +78,7 @@ class Chef
         set_or_return(
           :start_command,
           arg,
-          :kind_of => [ String ]
+          :kind_of => [ String, NilClass, FalseClass ]
         )
       end
 
@@ -87,7 +87,7 @@ class Chef
         set_or_return(
           :stop_command,
           arg,
-          :kind_of => [ String ]
+          :kind_of => [ String, NilClass, FalseClass ]
         )
       end
 
@@ -96,7 +96,7 @@ class Chef
         set_or_return(
           :status_command,
           arg,
-          :kind_of => [ String ]
+          :kind_of => [ String, NilClass, FalseClass ]
         )
       end
 
@@ -105,7 +105,7 @@ class Chef
         set_or_return(
           :restart_command,
           arg,
-          :kind_of => [ String ]
+          :kind_of => [ String, NilClass, FalseClass ]
         )
       end
 
@@ -113,7 +113,7 @@ class Chef
         set_or_return(
           :reload_command,
           arg,
-          :kind_of => [ String ]
+          :kind_of => [ String, NilClass, FalseClass ]
         )
       end
 

data/lib/chef/resource/user.rb

@@ -62,19 +62,21 @@ class Chef
         )
       end
 
-      def uid(arg = nil)
+      def uid(arg = Chef::NOT_PASSED)
         set_or_return(
           :uid,
           arg,
-          :kind_of => [ String, Integer ]
+          :kind_of => [ String, Integer, NilClass ],
+          :coerce => proc { |x| x || nil }
         )
       end
 
-      def gid(arg = nil)
+      def gid(arg = Chef::NOT_PASSED)
         set_or_return(
           :gid,
           arg,
-          :kind_of => [ String, Integer ]
+          :kind_of => [ String, Integer, NilClass ],
+          :coerce => proc { |x| x || nil }
         )
       end
 

data/lib/chef/resource/windows_task.rb

@@ -24,7 +24,7 @@ class Chef
 
       provides :windows_task, os: "windows"
 
-      allowed_actions :create, :delete, :run, :end, :change, :enable, :disable
+      allowed_actions :create, :delete, :run, :end, :enable, :disable
       default_action :create
 
       def initialize(name, run_context = nil)
@@ -161,8 +161,8 @@ class Chef
       end
 
       def validate_create_day(day, frequency)
-        unless [:weekly].include?(frequency)
-          raise "day attribute is only valid for tasks that run weekly"
+        unless [:weekly, :monthly].include?(frequency)
+          raise "day attribute is only valid for tasks that run monthly or weekly"
         end
         if day.is_a?(String) && day.to_i.to_s != day
           days = day.split(",")

data/lib/chef/run_context.rb

@@ -110,6 +110,11 @@ class Chef
     #
     attr_reader :audits
 
+    #
+    # Pointer back to the Chef::Runner that created this
+    #
+    attr_accessor :runner
+
     #
     # Notification handling
     #
@@ -646,6 +651,8 @@ ERROR_MESSAGE
         root_run_context
         resource_collection
         resource_collection=
+        runner
+        runner=
       }.map { |x| x.to_sym }
 
       # Verify that we didn't miss any methods