chef 16.5.64-universal-mingw32 → 16.8.14-universal-mingw32

data/lib/chef/formatters/error_inspectors/resource_failure_inspector.rb

@@ -16,7 +16,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-require "chef-utils" unless defined?(ChefUtils)
+require "chef-utils" unless defined?(ChefUtils::CANARY)
 
 class Chef
   module Formatters
@@ -79,8 +79,8 @@ class Chef
               loop do
 
                 # low rent parser. try to gracefully handle nested blocks in resources
-                nesting += 1 if /[\s]+do[\s]*/.match?(lines[current_line])
-                nesting -= 1 if /end[\s]*$/.match?(lines[current_line])
+                nesting += 1 if /\s+do\s*/.match?(lines[current_line])
+                nesting -= 1 if /end\s*$/.match?(lines[current_line])
 
                 relevant_lines << format_line(current_line, lines[current_line])
 
@@ -114,11 +114,11 @@ class Chef
         end
 
         def parse_source
-          resource.source_line[/^(([\w]:)?[^:]+):([\d]+)/, 1]
+          resource.source_line[/^((\w:)?[^:]+):(\d+)/, 1]
         end
 
         def parse_line(source)
-          resource.source_line[/^#{Regexp.escape(source)}:([\d]+)/, 1].to_i
+          resource.source_line[/^#{Regexp.escape(source)}:(\d+)/, 1].to_i
         end
 
       end

data/lib/chef/formatters/indentable_output_stream.rb

@@ -20,7 +20,7 @@ class Chef
       # pastel.decorate is a lightweight replacement for highline.color
       def pastel
         @pastel ||= begin
-          require "pastel"
+          require "pastel" unless defined?(Pastel)
           Pastel.new
         end
       end
@@ -126,7 +126,7 @@ class Chef
         indent_line(options)
 
         # Note that the next line will need to be started
-        if line[-1..-1] == "\n"
+        if line[-1..] == "\n"
           @line_started = false
         end
 

data/lib/chef/guard_interpreter/resource_guard_interpreter.rb

@@ -20,19 +20,30 @@ require_relative "../guard_interpreter"
 
 class Chef
   class GuardInterpreter
-    class ResourceGuardInterpreter < DefaultGuardInterpreter
-
+    class ResourceGuardInterpreter
       def initialize(parent_resource, command, opts)
-        super(command, opts)
+        @command = command
+        @opts = opts
+
         @parent_resource = parent_resource
         @resource = get_interpreter_resource(parent_resource)
       end
 
+      # This class used to inherit from DefaultGuardInterpreter and it responds
+      # to #output, so leave this in for potential backwards compatibility.
+      def output
+        nil
+      end
+
       def evaluate
         # Add attributes inherited from the parent class
         # to the resource
         merge_inherited_attributes
 
+        @opts.each do |attribute, value|
+          @resource.send(attribute, value)
+        end
+
         # Only execute and script resources and use guard attributes.
         # The command to be executed on them are passed via different attributes.
         # Script resources use code attribute and execute resources use
@@ -42,9 +53,9 @@ class Chef
         # We need to make sure we check for Script first because any resource
         # that can get to here is an Execute resource.
         if @resource.is_a? Chef::Resource::Script
-          block_attributes = @command_opts.merge({ code: @command })
+          @resource.code @command
         else
-          block_attributes = @command_opts.merge({ command: @command })
+          @resource.command @command
         end
 
         # Handles cases like powershell_script where default
@@ -53,33 +64,24 @@ class Chef
         # the one attribute that causes this changes its default to be
         # the same after some period to prepare for deprecation
         if @resource.class.respond_to?(:get_default_attributes)
-          block_attributes = @resource.class.send(:get_default_attributes, @command_opts).merge(block_attributes)
+          @resource.class.send(:get_default_attributes).each do |attribute, value|
+            @resource.send(attribute, value)
+          end
         end
 
-        resource_block = block_from_attributes(block_attributes)
-        evaluate_action(nil, &resource_block)
-      end
-
-      protected
-
-      def evaluate_action(action = nil, &block)
-        @resource.instance_eval(&block)
-
-        run_action = action || @resource.action
-
         begin
           # Coerce to an array to be safe. This could happen with a legacy
           # resource or something overriding the default_action code in a
           # subclass.
-          Array(run_action).each { |action_to_run| @resource.run_action(action_to_run) }
-          resource_updated = @resource.updated
+          Array(@resource.action).each { |action_to_run| @resource.run_action(action_to_run) }
+          @resource.updated
         rescue Mixlib::ShellOut::ShellCommandFailed
-          resource_updated = nil
+          nil
         end
-
-        resource_updated
       end
 
+      private
+
       def get_interpreter_resource(parent_resource)
         if parent_resource.nil? || parent_resource.node.nil?
           raise ArgumentError, "Node for guard resource parent must not be nil"
@@ -106,14 +108,6 @@ class Chef
         interpreter_resource
       end
 
-      def block_from_attributes(attributes)
-        Proc.new do
-          attributes.each_key do |attribute_name|
-            send(attribute_name, attributes[attribute_name]) if respond_to?(attribute_name)
-          end
-        end
-      end
-
       def merge_inherited_attributes
         inherited_attributes = []
 
@@ -121,15 +115,10 @@ class Chef
           inherited_attributes = @parent_resource.class.send(:guard_inherited_attributes)
         end
 
-        if inherited_attributes && !inherited_attributes.empty?
-          inherited_attributes.each do |attribute|
-            if @parent_resource.respond_to?(attribute) && @resource.respond_to?(attribute)
-              parent_value = @parent_resource.send(attribute)
-              child_value = @resource.send(attribute)
-              if parent_value || child_value
-                @resource.send(attribute, parent_value)
-              end
-            end
+        inherited_attributes.each do |attribute|
+          if @parent_resource.respond_to?(attribute) && @resource.respond_to?(attribute)
+            parent_value = @parent_resource.send(attribute)
+            @resource.send(attribute, parent_value)
           end
         end
       end

data/lib/chef/http.rb

@@ -25,8 +25,8 @@ require "tempfile" unless defined?(Tempfile)
 autoload :OpenSSL, "openssl"
 autoload :URI, "uri"
 module Net
-  autoload :HTTP, File.expand_path("monkey_patches/net_http", __dir__)
-  autoload :HTTPClientException, File.expand_path("monkey_patches/net_http", __dir__)
+  autoload :HTTP, "net/http"
+  autoload :HTTPClientException, "net/http"
 end
 require_relative "http/basic_client"
 require_relative "config"
@@ -165,10 +165,6 @@ class Chef
       end
     rescue Exception => exception
       log_failed_request(response, return_value) unless response.nil?
-
-      if exception.respond_to?(:chef_rest_request=)
-        exception.chef_rest_request = rest_request
-      end
       raise
     end
 
@@ -204,9 +200,6 @@ class Chef
       end
     rescue Exception => e
       log_failed_request(response, return_value) unless response.nil?
-      if e.respond_to?(:chef_rest_request=)
-        e.chef_rest_request = rest_request
-      end
       raise
     end
 
@@ -260,9 +253,6 @@ class Chef
       end
     rescue Exception => e
       log_failed_request(response, return_value) unless response.nil?
-      if e.respond_to?(:chef_rest_request=)
-        e.chef_rest_request = rest_request
-      end
       raise
     end
 

data/lib/chef/http/basic_client.rb

@@ -22,7 +22,7 @@
 #
 autoload :URI, "uri"
 module Net
-  autoload :HTTP, File.expand_path("../monkey_patches/net_http", __dir__)
+  autoload :HTTP, "net/http"
 end
 require_relative "ssl_policies"
 require_relative "http_request"

data/lib/chef/http/http_request.rb

@@ -23,7 +23,7 @@
 autoload :URI, "uri"
 autoload :CGI, "cgi"
 module Net
-  autoload :HTTP, File.expand_path("../monkey_patches/net_http", __dir__)
+  autoload :HTTP, "net/http"
 end
 require "chef-utils/dist" unless defined?(ChefUtils::Dist)
 

data/lib/chef/http/socketless_chef_zero_client.rb

@@ -46,7 +46,7 @@
 require "chef_zero/server"
 require "chef-utils/dist" unless defined?(ChefUtils::Dist)
 module Net
-  autoload :HTTPResponse, File.expand_path("../monkey_patches/net_http", __dir__)
+  autoload :HTTPResponse, "net/http"
 end
 
 class Chef

data/lib/chef/http/ssl_policies.rb

@@ -70,6 +70,12 @@ class Chef
           end
 
           http_client.ca_file = config[:ssl_ca_file]
+        elsif ENV["SSL_CERT_FILE"]
+          unless ::File.exist?(ENV["SSL_CERT_FILE"])
+            raise Chef::Exceptions::ConfigurationError, "The configured ssl_ca_file #{ENV["SSL_CERT_FILE"]} does not exist"
+          end
+
+          http_client.ca_file = ENV["SSL_CERT_FILE"]
         end
       end
 

data/lib/chef/json_compat.rb

@@ -24,18 +24,15 @@ require "json" unless defined?(JSON)
 
 class Chef
   class JSONCompat
-    JSON_MAX_NESTING = 1000
 
     class <<self
 
-      # API to use to avoid create_additions
       def parse(source, opts = {})
         FFI_Yajl::Parser.parse(source, opts)
       rescue FFI_Yajl::ParseError => e
         raise Chef::Exceptions::JSON::ParseError, e.message
       end
 
-      # Just call the JSON gem's parse method with a modified :max_nesting field
       def from_json(source, opts = {})
         obj = parse(source, opts)
 
@@ -56,10 +53,8 @@ class Chef
       end
 
       def to_json_pretty(obj, opts = nil)
-        opts ||= {}
-        options_map = {}
-        options_map[:pretty] = true
-        options_map[:indent] = opts[:indent] if opts.key?(:indent)
+        options_map = { pretty: true }
+        options_map[:indent] = opts[:indent] if opts.respond_to?(:key?) && opts.key?(:indent)
         to_json(obj, options_map).chomp
       end
 

data/lib/chef/key.rb

@@ -46,7 +46,7 @@ class Chef
       # Actor that the key is for, either a client or a user.
       @actor = actor
 
-      unless actor_field_name == "user" || actor_field_name == "client"
+      unless %w{user client}.include?(actor_field_name)
         raise Chef::Exceptions::InvalidKeyArgument, "the second argument to initialize must be either 'user' or 'client'"
       end
 

data/lib/chef/knife/bootstrap.rb

@@ -330,7 +330,7 @@ class Chef
         long: "--bootstrap-vault-item VAULT_ITEM",
         description: 'A single vault and item to update as "vault:item".',
         proc: Proc.new { |i, accumulator|
-          (vault, item) = i.split(/:/)
+          (vault, item) = i.split(":")
           accumulator ||= {}
           accumulator[vault] ||= []
           accumulator[vault].push(item)
@@ -407,6 +407,7 @@ class Chef
       deps do
         require "erubis" unless defined?(Erubis)
 
+        require "net/ssh" unless defined?(Net::SSH)
         require_relative "../json_compat"
         require_relative "../util/path_helper"
         require_relative "bootstrap/chef_vault_handler"

data/lib/chef/knife/bootstrap/templates/windows-chef-client-msi.erb

@@ -230,9 +230,9 @@ echo Writing validation key...
 echo Validation key written.
 @echo on
 
-<% if @config[:secret] -%>
+<% if secret -%>
 > <%= bootstrap_directory %>\encrypted_data_bag_secret (
- <%= secret %>
+ <%= encrypted_data_bag_secret %>
 )
 <% end -%>
 

data/lib/chef/knife/bootstrap/train_connector.rb

@@ -285,7 +285,7 @@ class Chef
           # Train.unpack_target_from_uri only works for complete URIs in
           # form of proto://[user[:pass]@]host[:port]/
           # So we'll add the protocol prefix if it's not supplied.
-          uri_to_check = if URI.regexp.match(uri)
+          uri_to_check = if URI::DEFAULT_PARSER.make_regexp.match(uri)
                            uri
                          else
                            "#{default_protocol}://#{uri}"

data/lib/chef/knife/config_show.rb

@@ -79,7 +79,7 @@ class Chef
               end
             else
               # It's a dotted path string.
-              filter_parts = filter.split(/\./)
+              filter_parts = filter.split(".")
               extract = lambda do |memo, filter_part|
                 memo.is_a?(Hash) ? memo[filter_part.to_sym] : nil
               end

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

@@ -22,7 +22,7 @@ class Chef
   class Knife
     class CookbookSCMRepo
 
-      DIRTY_REPO = /^[\s]+M/.freeze
+      DIRTY_REPO = /^\s+M/.freeze
 
       include Chef::Mixin::ShellOut
 

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

@@ -22,7 +22,7 @@ class Chef
   class Knife
     class SubcommandLoader
       class GemGlobLoader < Chef::Knife::SubcommandLoader
-        MATCHES_CHEF_GEM ||= %r{/chef-[\d]+\.[\d]+\.[\d]+}.freeze
+        MATCHES_CHEF_GEM ||= %r{/chef-\d+\.\d+\.\d+}.freeze
         MATCHES_THIS_CHEF_GEM ||= %r{/chef-#{Chef::VERSION}(-\w+)?(-\w+)?/}.freeze
 
         def subcommand_files

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

@@ -64,13 +64,16 @@ class Chef
       # Creates a new object of class TTY::Prompt
       # with interrupt as exit so that it can be terminated with status code.
       def prompt
-        @prompt ||= TTY::Prompt.new(interrupt: :exit)
+        @prompt ||= begin
+          require "tty-prompt"
+          TTY::Prompt.new(interrupt: :exit)
+        end
       end
 
       # pastel.decorate is a lightweight replacement for highline.color
       def pastel
         @pastel ||= begin
-          require "pastel"
+          require "pastel" unless defined?(Pastel)
           Pastel.new
         end
       end

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

@@ -32,6 +32,7 @@ class Chef
       class WindowsBootstrapContext < BootstrapContext
         attr_accessor :config
         attr_accessor :chef_config
+        attr_accessor :secret
 
         def initialize(config, run_list, chef_config, secret = nil)
           @config       = config
@@ -49,8 +50,8 @@ class Chef
           end
         end
 
-        def secret
-          escape_and_echo(config[:secret])
+        def encrypted_data_bag_secret
+          escape_and_echo(@secret)
         end
 
         def trusted_certs_script
@@ -134,8 +135,8 @@ class Chef
             client_rb << %Q{no_proxy       "#{config[:bootstrap_no_proxy]}"\n}
           end
 
-          if config[:secret]
-            client_rb << %Q{encrypted_data_bag_secret "#{ChefConfig::Config.etc_chef_dir(windows: true)}/encrypted_data_bag_secret"\n}
+          if secret
+            client_rb << %Q{encrypted_data_bag_secret "#{ChefConfig::PathHelper.escapepath(ChefConfig::Config.etc_chef_dir(windows: true))}\\\\encrypted_data_bag_secret"\n}
           end
 
           unless trusted_certs_script.empty?
@@ -255,6 +256,8 @@ class Chef
                [String] $localPath
             )
 
+            [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+
             $ProxyUrl = $env:http_proxy;
             $webClient = new-object System.Net.WebClient;
 

data/lib/chef/knife/node_policy_set.rb

@@ -45,7 +45,7 @@ class Chef
 
       # Set policy name and group to node
       def set_policy(node)
-        policy_group, policy_name = @name_args[1..-1]
+        policy_group, policy_name = @name_args[1..]
         node.policy_name  = policy_name
         node.policy_group = policy_group
       end
@@ -70,7 +70,7 @@ class Chef
 
       # True if one of policy_name or policy_group was given, but not both
       def incomplete_policyfile_options?
-        policy_group, policy_name = @name_args[1..-1]
+        policy_group, policy_name = @name_args[1..]
         (policy_group.nil? || policy_name.nil? || @name_args[1..-1].size > 2)
       end
 

data/lib/chef/knife/node_run_list_add.rb

@@ -43,7 +43,7 @@ class Chef
         node = Chef::Node.load(@name_args[0])
         if @name_args.size > 2
           # Check for nested lists and create a single plain one
-          entries = @name_args[1..-1].map do |entry|
+          entries = @name_args[1..].map do |entry|
             entry.split(",").map(&:strip)
           end.flatten
         else