chef 13.1.31-universal-mingw32 → 13.2.20-universal-mingw32

data/lib/chef/knife.rb

@@ -486,7 +486,11 @@ class Chef
         ui.error "Failed to authenticate to #{server_url} as #{username} with key #{api_key}"
         ui.info "Response:  #{format_rest_error(response)}"
       when Net::HTTPForbidden
-        ui.error "You authenticated successfully to #{server_url} as #{username} but you are not authorized for this action"
+        ui.error "You authenticated successfully to #{server_url} as #{username} but you are not authorized for this action."
+        proxy_env_vars = ENV.to_hash.keys.map(&:downcase) & %w{http_proxy https_proxy ftp_proxy socks_proxy no_proxy}
+        unless proxy_env_vars.empty?
+          ui.error "There are proxy servers configured, your Chef server may need to be added to NO_PROXY."
+        end
         ui.info "Response:  #{format_rest_error(response)}"
       when Net::HTTPBadRequest
         ui.error "The data in your request was invalid"

data/lib/chef/knife/cookbook_test.rb

@@ -43,7 +43,7 @@ class Chef
         :description => "Test all cookbooks, rather than just a single cookbook"
 
       def run
-        ui.warn("DEPRECATED: Please use ChefSpec or Rubocop to syntax-check cookbooks.")
+        ui.warn("DEPRECATED: Please use ChefSpec or Cookstyle to syntax-check cookbooks.")
         config[:cookbook_path] ||= Chef::Config[:cookbook_path]
 
         checked_a_cookbook = false

data/lib/chef/policy_builder/policyfile.rb

@@ -51,7 +51,32 @@ class Chef
 
       class PolicyfileError < StandardError; end
 
-      RunListExpansionIsh = Struct.new(:recipes, :roles)
+      RunListExpansionIsh = Struct.new(:recipes, :roles) do
+        # Implementing the parts of the RunListExpansion
+        # interface we need to properly send this through to
+        # events.run_list_expanded as it is expecting a RunListExpansion
+        # object.
+        def to_hash
+          # It looks like version only gets populated in the expanded_run_list when
+          # using a little used feature of roles to version lock cookbooks, so
+          # version is not reliable in here anyway (places like Automate UI are
+          # not getting version out of here.
+          #
+          # Skipped will always be false as it can only be true when two expanded
+          # roles contain the same recipe.
+          expanded_run_list = recipes.map do |r|
+            { type: "recipe", name: r, skipped: false, version: nil }
+          end
+          data_collector_hash = {}
+          data_collector_hash[:id] = "_policy_node"
+          data_collector_hash[:run_list] = expanded_run_list
+          data_collector_hash
+        end
+
+        def to_json(*opts)
+          to_hash.to_json(*opts)
+        end
+      end
 
       attr_reader :events
       attr_reader :node
@@ -137,6 +162,7 @@ class Chef
         Chef::Log.info("Run List expands to [#{run_list_with_versions_for_display.join(', ')}]")
 
         events.node_load_completed(node, run_list_with_versions_for_display, Chef::Config)
+        events.run_list_expanded(run_list_expansion_ish)
 
         node
       rescue Exception => e

data/lib/chef/provider.rb

@@ -328,8 +328,6 @@ class Chef
           resource.class.properties.each do |name, property|
             class_eval(<<-EOM, __FILE__, __LINE__)
               def #{name}(*args, &block)
-                # FIXME:  DEPRECATE THIS IN CHEF 13.1
-                #
                 # If no arguments were passed, we process "get" by defaulting
                 # the value to current_resource, not new_resource. This helps
                 # avoid issues where resources accidentally overwrite perfectly
@@ -350,9 +348,11 @@ class Chef
                 #
                 if args.empty? && !block
                   if !new_resource.property_is_set?(__method__) && current_resource
+                    Chef.deprecated(:namespace_collisions, "rename #{name} to current_resource.#{name}")
                     return current_resource.public_send(__method__)
                   end
                 end
+                Chef.deprecated(:namespace_collisions, "rename #{name} to new_resource.#{name}")
                 new_resource.public_send(__method__, *args, &block)
               end
             EOM

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

@@ -63,7 +63,7 @@ class Chef
 
         def set_options
           opts = []
-          { gid: "id" }.sort { |a, b| a[0] <=> b[0] }.each do |field, option|
+          { gid: "id" }.sort_by { |a| a[0] }.each do |field, option|
             next unless current_resource.send(field) != new_resource.send(field)
             if new_resource.send(field)
               Chef::Log.debug("#{new_resource} setting #{field} to #{new_resource.send(field)}")

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

@@ -108,7 +108,7 @@ class Chef
         # <string>:: A string containing the option and then the quoted value
         def set_options
           opts = []
-          { gid: "-g" }.sort { |a, b| a[0] <=> b[0] }.each do |field, option|
+          { gid: "-g" }.sort_by { |a| a[0] }.each do |field, option|
             next unless current_resource.send(field) != new_resource.send(field)
             next unless new_resource.send(field)
             opts << option

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

@@ -257,7 +257,7 @@ EOS
           choco_command(*args).stdout.each_line do |line|
             next if line.start_with?("Chocolatey v")
             name, version = line.split("|")
-            hash[name.downcase] = version.chomp
+            hash[name.downcase] = version&.chomp
           end
           hash
         end

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

@@ -74,7 +74,7 @@ class Chef
             "uid" => "-u",
             "shell" => "-s",
           }
-          field_list.sort { |a, b| a[0] <=> b[0] }.each do |field, option|
+          field_list.sort_by { |a| a[0] }.each do |field, option|
             field_symbol = field.to_sym
             next unless current_resource.send(field_symbol) != new_resource.send(field_symbol)
             if new_resource.send(field_symbol)

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

@@ -107,7 +107,7 @@ class Chef
             "password" => "password",
           }
 
-          field_list.sort { |a, b| a[0] <=> b[0] }.each do |field, option|
+          field_list.sort_by { |a| a[0] }.each do |field, option|
             field_symbol = field.to_sym
             next unless current_resource.send(field_symbol) != new_resource.send(field_symbol)
             next unless new_resource.send(field_symbol)

data/lib/chef/resource/breakpoint.rb

@@ -22,7 +22,7 @@ class Chef
   class Resource
     class Breakpoint < Chef::Resource
       provides :breakpoint
-      resource_name :breakpoinst
+      resource_name :breakpoint
 
       default_action :break
 

data/lib/chef/version.rb

@@ -19,9 +19,11 @@
 # task instead.
 #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
+require "chef/version_string"
+
 class Chef
   CHEF_ROOT = File.expand_path("../..", __FILE__)
-  VERSION = "13.1.31"
+  VERSION = Chef::VersionString.new("13.2.20")
 end
 
 #

data/lib/chef/version_string.rb

@@ -0,0 +1,143 @@
+# Copyright:: Copyright 2017, Noah Kantrowitz
+# License:: Apache License, Version 2.0
+#
+# 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.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+class Chef
+  # String-like object for version strings.
+  #
+  # @since 13.2
+  # @api internal
+  class VersionString < String
+    # Parsed version object for the string.
+    # @return [Gem::Version]
+    attr_reader :parsed_version
+
+    # Create a new VersionString from an input String.
+    #
+    # @param val [String] Version string to parse.
+    def initialize(val)
+      super
+      @parsed_version = ::Gem::Version.create(self)
+    end
+
+    # @!group Compat wrappers for String
+
+    # Compat wrapper for + to behave like a normal String.
+    #
+    # @param other [String]
+    # @return [String]
+    def +(other)
+      to_s + other
+    end
+
+    # Compat wrapper for * to behave like a normal String.
+    #
+    # @param other [Integer]
+    # @return [String]
+    def *(other)
+      to_s * other
+    end
+
+    # @!group Comparison operators
+
+    # Compare a VersionString to an object. If compared to another VersionString
+    # then sort like `Gem::Version`, otherwise try to treat the other object as
+    # a version but fall back to normal string comparison.
+    #
+    # @param other [Object]
+    # @return [Integer]
+    def <=>(other)
+      other_ver = case other
+                  when VersionString
+                    other.parsed_version
+                  else
+                    begin
+                      Gem::Version.create(other.to_s)
+                    rescue ArgumentError
+                      # Comparing to a string that isn't a version.
+                      return super
+                    end
+                  end
+      parsed_version <=> other_ver
+    end
+
+    # Compat wrapper for == based on <=>.
+    #
+    # @param other [Object]
+    # @return [Boolean]
+    def ==(other)
+      (self <=> other) == 0
+    end
+
+    # Compat wrapper for != based on <=>.
+    #
+    # @param other [Object]
+    # @return [Boolean]
+    def !=(other)
+      (self <=> other) != 0
+    end
+
+    # Compat wrapper for < based on <=>.
+    #
+    # @param other [Object]
+    # @return [Boolean]
+    def <(other)
+      (self <=> other) < 0
+    end
+
+    # Compat wrapper for <= based on <=>.
+    #
+    # @param other [Object]
+    # @return [Boolean]
+    def <=(other)
+      (self <=> other) < 1
+    end
+
+    # Compat wrapper for > based on <=>.
+    #
+    # @param other [Object]
+    # @return [Boolean]
+    def >(other)
+      (self <=> other) > 0
+    end
+
+    # Compat wrapper for >= based on <=>.
+    #
+    # @param other [Object]
+    # @return [Boolean]
+    def >=(other)
+      (self <=> other) > -1
+    end
+
+    # @!group Matching operators
+
+    # Matching operator to support checking against a requirement string.
+    #
+    # @param other [Regexp, String]
+    # @return [Boolean]
+    # @example Match against a Regexp
+    #   Chef::VersionString.new('1.0.0') =~ /^1/
+    # @example Match against a requirement
+    #   Chef::VersionString.new('1.0.0') =~ '~> 1.0'
+    def =~(other)
+      case other
+      when Regexp
+        super
+      else
+        Gem::Requirement.create(other) =~ parsed_version
+      end
+    end
+
+  end
+end

data/spec/functional/mixin/powershell_out_spec.rb

@@ -22,8 +22,16 @@ describe Chef::Mixin::PowershellOut, windows_only: true do
   include Chef::Mixin::PowershellOut
 
   describe "#powershell_out" do
-    it "runs a powershell command and collects stdout" do
-      expect(powershell_out("get-process").run_command.stdout).to match /Handles\s+NPM\(K\)\s+PM\(K\)\s+WS\(K\)\s+VM\(M\)\s+CPU\(s\)\s+Id\s+/
+    context "for windows version less than 10", windows_lt_10: true do
+      it "runs a powershell command and collects stdout" do
+        expect(powershell_out("get-process").run_command.stdout).to match /Handles\s+NPM\(K\)\s+PM\(K\)\s+WS\(K\)\s+VM\(M\)\s+CPU\(s\)\s+Id\s+/
+      end
+    end
+
+    context "for windows version greater than 10", windows_gte_10: true do
+      it "runs a powershell command and collects stdout" do
+        expect(powershell_out("get-process").run_command.stdout).to match /Handles\s+NPM\(K\)\s+PM\(K\)\s+WS\(K\)\s+CPU\(s\)\s+Id\s+SI\s+ProcessName\s+/
+      end
     end
 
     it "does not raise exceptions when the command is invalid" do
@@ -32,8 +40,16 @@ describe Chef::Mixin::PowershellOut, windows_only: true do
   end
 
   describe "#powershell_out!" do
-    it "runs a powershell command and collects stdout" do
-      expect(powershell_out!("get-process").run_command.stdout).to match /Handles\s+NPM\(K\)\s+PM\(K\)\s+WS\(K\)\s+VM\(M\)\s+CPU\(s\)\s+Id\s+/
+    context "for windows version less than 10", windows_lt_10: true do
+      it "runs a powershell command and collects stdout" do
+        expect(powershell_out!("get-process").run_command.stdout).to match /Handles\s+NPM\(K\)\s+PM\(K\)\s+WS\(K\)\s+VM\(M\)\s+CPU\(s\)\s+Id\s+/
+      end
+    end
+
+    context "for windows version less than 10", windows_gte_10: true do
+      it "runs a powershell command and collects stdout" do
+        expect(powershell_out("get-process").run_command.stdout).to match /Handles\s+NPM\(K\)\s+PM\(K\)\s+WS\(K\)\s+CPU\(s\)\s+Id\s+SI\s+ProcessName\s+/
+      end
     end
 
     it "raises exceptions when the command is invalid" do

data/spec/functional/resource/group_spec.rb

@@ -335,19 +335,6 @@ downthestreetalwayshadagoodsmileonhisfacetheoldmanwalkingdownthestree" end
       end
     end
 
-    describe "when group name length is more than 256", :windows_only do
-      let!(:group_name) do
-        "theoldmanwalkingdownthestreetalwayshadagood\
-smileonhisfacetheoldmanwalkingdownthestreetalwayshadagoodsmileonhisface\
-theoldmanwalkingdownthestreetalwayshadagoodsmileonhisfacetheoldmanwalking\
-downthestreetalwayshadagoodsmileonhisfacetheoldmanwalkingdownthestreeQQQQQQ" end
-
-      it "should not create a group" do
-        expect { group_resource.run_action(:create) }.to raise_error(ArgumentError)
-        group_should_not_exist(group_name)
-      end
-    end
-
     # not_supported_on_solaris because of the use of excluded_members
     describe "should raise an error when same member is included in the members and excluded_members", :not_supported_on_solaris do
       it "should raise an error" do
@@ -359,6 +346,25 @@ downthestreetalwayshadagoodsmileonhisfacetheoldmanwalkingdownthestreeQQQQQQ" end
     end
   end
 
+  # Note:This testcase is written separately from the `group create action` defined above because
+  # for group name > 256, Windows 2016 returns "The parameter is incorrect"
+  context "group create action: when group name length is more than 256", :windows_only do
+    let!(:group_name) do
+      "theoldmanwalkingdownthestreetalwayshadagood\
+smileonhisfacetheoldmanwalkingdownthestreetalwayshadagoodsmileonhisface\
+theoldmanwalkingdownthestreetalwayshadagoodsmileonhisfacetheoldmanwalking\
+downthestreetalwayshadagoodsmileonhisfacetheoldmanwalkingdownthestreeQQQQQQ" end
+
+    it "should not create a group" do
+      expect { group_resource.run_action(:create) }.to raise_error(ArgumentError)
+      if windows_gte_10?
+        expect { Chef::Util::Windows::NetGroup.new(group_name).local_get_members }.to raise_error(ArgumentError, /The parameter is incorrect./)
+      else
+        group_should_not_exist(group_name)
+      end
+    end
+  end
+
   describe "group remove action" do
     describe "when there is a group" do
       before do

data/spec/functional/resource/windows_task_spec.rb

@@ -62,7 +62,6 @@ describe Chef::Resource::WindowsTask, :windows_only do
         subject.run_action(:create)
         task_details = windows_task_provider.send(:load_task_hash, task_name)
         expect(task_details[:TaskName]).to eq("\\chef-client")
-        expect(task_details[:Status]).to eq("Ready")
         expect(task_details[:TaskToRun]).to eq("chef-client")
         expect(task_details[:"Repeat:Every"]).to eq("0 Hour(s), 15 Minute(s)")
         expect(task_details[:run_level]).to eq("HighestAvailable")
@@ -83,7 +82,6 @@ describe Chef::Resource::WindowsTask, :windows_only do
         subject.run_action(:create)
         task_details = windows_task_provider.send(:load_task_hash, task_name)
         expect(task_details[:TaskName]).to eq("\\chef-client")
-        expect(task_details[:Status]).to eq("Ready")
         expect(task_details[:TaskToRun]).to eq("chef-client")
         expect(task_details[:"Repeat:Every"]).to eq("3 Hour(s), 0 Minute(s)")
         expect(task_details[:run_level]).to eq("HighestAvailable")
@@ -103,7 +101,6 @@ describe Chef::Resource::WindowsTask, :windows_only do
         subject.run_action(:create)
         task_details = windows_task_provider.send(:load_task_hash, task_name)
         expect(task_details[:TaskName]).to eq("\\chef-client")
-        expect(task_details[:Status]).to eq("Ready")
         expect(task_details[:TaskToRun]).to eq("chef-client")
         expect(task_details[:ScheduleType]).to eq("Daily")
         expect(task_details[:Days]).to eq("Every 1 day(s)")
@@ -125,7 +122,6 @@ describe Chef::Resource::WindowsTask, :windows_only do
         subject.run_action(:create)
         task_details = windows_task_provider.send(:load_task_hash, task_name)
         expect(task_details[:TaskName]).to eq("\\chef-client")
-        expect(task_details[:Status]).to eq("Ready")
         expect(task_details[:TaskToRun]).to eq("chef-client")
         expect(task_details[:ScheduleType]).to eq("Monthly")
         expect(task_details[:Months]).to eq("FEB, APR, JUN, AUG, OCT, DEC")
@@ -154,7 +150,6 @@ describe Chef::Resource::WindowsTask, :windows_only do
           subject.run_action(:create)
           task_details = windows_task_provider.send(:load_task_hash, task_name)
           expect(task_details[:TaskName]).to eq("\\chef-client")
-          expect(task_details[:Status]).to eq("Ready")
           expect(task_details[:TaskToRun]).to eq("chef-client")
           expect(task_details[:ScheduleType]).to eq("One Time Only")
           expect(task_details[:StartTime]).to eq("5:00:00 PM")
@@ -176,7 +171,6 @@ describe Chef::Resource::WindowsTask, :windows_only do
         subject.run_action(:create)
         task_details = windows_task_provider.send(:load_task_hash, task_name)
         expect(task_details[:TaskName]).to eq("\\chef-client")
-        expect(task_details[:Status]).to eq("Ready")
         expect(task_details[:TaskToRun]).to eq("chef-client")
         expect(task_details[:ScheduleType]).to eq("Weekly")
         expect(task_details[:Months]).to eq("Every 1 week(s)")
@@ -190,7 +184,6 @@ describe Chef::Resource::WindowsTask, :windows_only do
           subject.run_action(:create)
           task_details = windows_task_provider.send(:load_task_hash, task_name)
           expect(task_details[:TaskName]).to eq("\\chef-client")
-          expect(task_details[:Status]).to eq("Ready")
           expect(task_details[:TaskToRun]).to eq("chef-client")
           expect(task_details[:Days]).to eq("MON, FRI")
           expect(task_details[:ScheduleType]).to eq("Weekly")
@@ -227,7 +220,6 @@ describe Chef::Resource::WindowsTask, :windows_only do
         subject.run_action(:create)
         task_details = windows_task_provider.send(:load_task_hash, task_name)
         expect(task_details[:TaskName]).to eq("\\chef-client")
-        expect(task_details[:Status]).to eq("Ready")
         expect(task_details[:TaskToRun]).to eq("chef-client")
         expect(task_details[:ScheduleType]).to eq("At logon time")
         expect(task_details[:run_level]).to eq("HighestAvailable")
@@ -401,7 +393,8 @@ describe Chef::Resource::WindowsTask, :windows_only do
 
     subject do
       new_resource = Chef::Resource::WindowsTask.new(task_name, run_context)
-      new_resource.command task_name
+      new_resource.command "dir"
+      new_resource.run_level :highest
       new_resource
     end