chef 13.12.14-universal-mingw32 → 14.0.190-universal-mingw32

data/lib/chef/data_collector/messages.rb

@@ -36,7 +36,7 @@ class Chef
       #
       def self.run_start_message(run_status)
         {
-          "chef_server_fqdn"  => chef_server_fqdn(run_status),
+          "chef_server_fqdn"  => chef_server_fqdn,
           "entity_uuid"       => node_uuid,
           "id"                => run_status.run_id,
           "message_version"   => "1.0.0",
@@ -61,7 +61,7 @@ class Chef
         run_status = reporter_data[:run_status]
 
         message = {
-          "chef_server_fqdn"       => chef_server_fqdn(run_status),
+          "chef_server_fqdn"       => chef_server_fqdn,
           "entity_uuid"            => node_uuid,
           "expanded_run_list"      => reporter_data[:expanded_run_list],
           "id"                     => run_status.run_id,

data/lib/chef/data_collector/messages/helpers.rb

@@ -27,11 +27,9 @@ class Chef
         # If the chef_server_url cannot be parsed as a URI, the node["fqdn"] attribute
         # will be returned, or "localhost" if the run_status is unavailable to us.
         #
-        # @param run_status [Chef::RunStatus] The RunStatus object for this Chef Run.
-        #
         # @return [String] FQDN of the configured Chef Server, or node/localhost if not found.
         #
-        def chef_server_fqdn(run_status)
+        def chef_server_fqdn
           if !Chef::Config[:chef_server_url].nil?
             URI(Chef::Config[:chef_server_url]).host
           elsif !Chef::Config[:node_name].nil?
@@ -108,7 +106,7 @@ class Chef
         # @return [String] UUID for the node
         #
         def node_uuid
-          read_node_uuid || generate_node_uuid
+          Chef::Config[:chef_guid] || read_node_uuid || generate_node_uuid
         end
 
         #

data/lib/chef/deprecated.rb

@@ -285,10 +285,6 @@ class Chef
       def inspect
         "#{message}\n#{location}"
       end
-
-      def target
-        "property.html"
-      end
     end
 
     class Generic < Base

data/lib/chef/dsl/data_query.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Adam Jacob (<adam@chef.io>)
-# Copyright:: Copyright 2008-2016, Chef Software Inc.
+# Copyright:: Copyright 2008-2018, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -83,7 +83,3 @@ class Chef
     end
   end
 end
-
-# **DEPRECATED**
-# This used to be part of chef/mixin/language. Load the file to activate the deprecation code.
-require "chef/mixin/language"

data/lib/chef/dsl/include_attribute.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Adam Jacob (<adam@chef.io>)
-# Copyright:: Copyright 2008-2016, Chef Software Inc.
+# Copyright:: Copyright 2008-2018, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -31,9 +31,9 @@ class Chef
         attr_file_specs.flatten.each do |attr_file_spec|
           cookbook_name, attr_file = parse_attribute_file_spec(attr_file_spec)
           if run_context.loaded_fully_qualified_attribute?(cookbook_name, attr_file)
-            Chef::Log.debug("I am not loading attribute file #{cookbook_name}::#{attr_file}, because I have already seen it.")
+            Chef::Log.trace("I am not loading attribute file #{cookbook_name}::#{attr_file}, because I have already seen it.")
           else
-            Chef::Log.debug("Loading Attribute #{cookbook_name}::#{attr_file}")
+            Chef::Log.trace("Loading Attribute #{cookbook_name}::#{attr_file}")
             run_context.loaded_attribute(cookbook_name, attr_file)
             attr_file_path = run_context.resolve_attribute(cookbook_name, attr_file)
             node.from_file(attr_file_path)
@@ -55,7 +55,3 @@ class Chef
     end
   end
 end
-
-# **DEPRECATED**
-# This used to be part of chef/mixin/language_include_attribute. Load the file to activate the deprecation code.
-require "chef/mixin/language_include_attribute"

data/lib/chef/dsl/include_recipe.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Adam Jacob (<adam@chef.io>)
-# Copyright:: Copyright 2008-2016, Chef Software Inc.
+# Copyright:: Copyright 2008-2018, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -38,7 +38,3 @@ class Chef
     end
   end
 end
-
-# **DEPRECATED**
-# This used to be part of chef/mixin/language_include_recipe. Load the file to activate the deprecation code.
-require "chef/mixin/language_include_recipe"

data/lib/chef/dsl/platform_introspection.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Adam Jacob (<adam@chef.io>)
-# Copyright:: Copyright 2008-2016, Chef Software Inc.
+# Copyright:: Copyright 2008-2018, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -79,8 +79,8 @@ class Chef
                 key_matches << k
               end
             rescue Chef::Exceptions::InvalidVersionConstraint => e
-              Chef::Log.debug "Caught InvalidVersionConstraint. This means that a key in value_for_platform cannot be interpreted as a Chef::VersionConstraint::Platform."
-              Chef::Log.debug(e)
+              Chef::Log.trace "Caught InvalidVersionConstraint. This means that a key in value_for_platform cannot be interpreted as a Chef::VersionConstraint::Platform."
+              Chef::Log.trace(e)
             end
           end
           return @values[platform][version] if key_matches.include?(version)
@@ -94,13 +94,13 @@ class Chef
           end
         rescue Chef::Exceptions::InvalidCookbookVersion => e
           # Lets not break because someone passes a weird string like 'default' :)
-          Chef::Log.debug(e)
-          Chef::Log.debug "InvalidCookbookVersion exceptions are common and expected here: the generic constraint matcher attempted to match something which is not a constraint. Moving on to next version or constraint"
-          return nil
+          Chef::Log.trace(e)
+          Chef::Log.trace "InvalidCookbookVersion exceptions are common and expected here: the generic constraint matcher attempted to match something which is not a constraint. Moving on to next version or constraint"
+          nil
         rescue Chef::Exceptions::InvalidPlatformVersion => e
-          Chef::Log.debug "Caught InvalidPlatformVersion, this means that Chef::Version::Platform does not know how to turn #{node_version} into an x.y.z format"
-          Chef::Log.debug(e)
-          return nil
+          Chef::Log.trace "Caught InvalidPlatformVersion, this means that Chef::Version::Platform does not know how to turn #{node_version} into an x.y.z format"
+          Chef::Log.trace(e)
+          nil
         end
 
         def set(platforms, value)
@@ -262,7 +262,3 @@ class Chef
     end
   end
 end
-
-# **DEPRECATED**
-# This used to be part of chef/mixin/language. Load the file to activate the deprecation code.
-require "chef/mixin/language"

data/lib/chef/dsl/reboot_pending.rb

@@ -44,14 +44,7 @@ class Chef
             registry_key_exists?('HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\WindowsUpdate\Auto Update\RebootRequired') ||
 
           # Vista + Server 2008 and newer may have reboots pending from CBS
-            registry_key_exists?('HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Component Based Servicing\RebootPending') ||
-
-          # The mere existence of the UpdateExeVolatile key should indicate a pending restart for certain updates
-          # http://support.microsoft.com/kb/832475
-            Chef::Platform.windows_server_2003? &&
-              (registry_key_exists?('HKLM\SOFTWARE\Microsoft\Updates\UpdateExeVolatile') &&
-              !registry_get_values('HKLM\SOFTWARE\Microsoft\Updates\UpdateExeVolatile').select { |v| v[:name] == "Flags" }[0].nil? &&
-              [1, 2, 3].include?(registry_get_values('HKLM\SOFTWARE\Microsoft\Updates\UpdateExeVolatile').select { |v| v[:name] == "Flags" }[0][:data]))
+            registry_key_exists?('HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Component Based Servicing\RebootPending')
         elsif platform?("ubuntu")
           # This should work for Debian as well if update-notifier-common happens to be installed. We need an API for that.
           File.exists?("/var/run/reboot-required")

data/lib/chef/dsl/recipe.rb

@@ -1,7 +1,7 @@
-#--
+#
 # Author:: Adam Jacob (<adam@chef.io>)
 # Author:: Christopher Walters (<cw@chef.io>)
-# Copyright:: Copyright 2008-2017, Chef Software Inc.
+# Copyright:: Copyright 2008-2018, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -74,19 +74,9 @@ class Chef
       def exec(args)
         raise Chef::Exceptions::ResourceNotFound, "exec was called, but you probably meant to use an execute resource.  If not, please call Kernel#exec explicitly.  The exec block called was \"#{args}\""
       end
-
-      # @deprecated Use Chef::DSL::Recipe instead, will be removed in Chef 13
-      module FullDSL
-        include Chef::DSL::Recipe
-        extend Chef::Mixin::LazyModuleInclude
-      end
     end
   end
 end
 
 # Avoid circular references for things that are only used in instance methods
 require "chef/resource"
-
-# **DEPRECATED**
-# This used to be part of chef/mixin/recipe_definition_dsl_core. Load the file to activate the deprecation code.
-require "chef/mixin/recipe_definition_dsl_core"

data/lib/chef/dsl/universal.rb

@@ -1,7 +1,7 @@
 #--
 # Author:: Adam Jacob (<adam@chef.io>)
 # Author:: Christopher Walters (<cw@chef.io>)
-# Copyright:: Copyright 2008-2019, Chef Software Inc.
+# Copyright:: Copyright 2008-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,9 +18,9 @@
 #
 
 require "chef/dsl/platform_introspection"
+require "chef/mixin/powershell_exec"
 require "chef/mixin/powershell_out"
 require "chef/mixin/shell_out"
-require "chef/mixin/lazy_module_include"
 
 class Chef
   module DSL
@@ -44,9 +44,9 @@ class Chef
     #
     module Universal
       include Chef::DSL::PlatformIntrospection
+      include Chef::Mixin::PowershellExec
       include Chef::Mixin::PowershellOut
       include Chef::Mixin::ShellOut
-      extend Chef::Mixin::LazyModuleInclude
     end
   end
 end

data/lib/chef/environment.rb

@@ -3,7 +3,7 @@
 # Author:: Seth Falcon (<seth@chef.io>)
 # Author:: John Keiser (<jkeiser@ospcode.com>)
 # Author:: Kyle Goodwin (<kgoodwin@primerevenue.com>)
-# Copyright:: Copyright 2010-2016, Chef Software Inc.
+# Copyright:: Copyright 2010-2018, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -34,8 +34,6 @@ class Chef
     include Chef::Mixin::ParamsValidate
     include Chef::Mixin::FromFile
 
-    attr_accessor :chef_server_rest
-
     COMBINED_COOKBOOK_CONSTRAINT = /(.+)(?:[\s]+)((?:#{Chef::VersionConstraint::OPS.join('|')})(?:[\s]+).+)$/
 
     def initialize(chef_server_rest: nil)
@@ -297,7 +295,7 @@ class Chef
 
     def self.validate_cookbook_versions(cv)
       return false unless cv.kind_of?(Hash)
-      cv.each do |cookbook, version|
+      cv.each_value do |version|
         return false unless Chef::Environment.validate_cookbook_version(version)
       end
       true

data/lib/chef/event_dispatch/dsl.rb

@@ -35,10 +35,10 @@ class Chef
         # and associated event dispatcher is set, else fallback to
         # Chef::Config[:event_handlers]
         if Chef.run_context && Chef.run_context.events
-          Chef::Log.debug("Registering handler '#{name}' using events api")
+          Chef::Log.trace("Registering handler '#{name}' using events api")
           Chef.run_context.events.register(handler)
         else
-          Chef::Log.debug("Registering handler '#{name}' using global config")
+          Chef::Log.trace("Registering handler '#{name}' using global config")
           Chef::Config[:event_handlers] << handler
         end
       end

data/lib/chef/exceptions.rb

@@ -45,7 +45,7 @@ class Chef
     class SigInt < RuntimeError; end
     class SigTerm < RuntimeError; end
     class Cron < RuntimeError; end
-    class Env < RuntimeError; end
+    class WindowsEnv < RuntimeError; end
     class Exec < RuntimeError; end
     class Execute < RuntimeError; end
     class ErlCall < RuntimeError; end

data/lib/chef/file_access_control/unix.rb

@@ -79,18 +79,18 @@ class Chef
       def should_update_owner?
         if target_uid.nil?
           # the user has not specified a permission on the new resource, so we never manage it with FAC
-          Chef::Log.debug("Found target_uid == nil, so no owner was specified on resource, not managing owner")
+          Chef::Log.trace("Found target_uid == nil, so no owner was specified on resource, not managing owner")
           false
         elsif current_uid.nil?
           # the user has specified a permission, and we are creating a file, so always enforce permissions
-          Chef::Log.debug("Found current_uid == nil, so we are creating a new file, updating owner")
+          Chef::Log.trace("Found current_uid == nil, so we are creating a new file, updating owner")
           true
         elsif target_uid != current_uid
           # the user has specified a permission, and it does not match the file, so fix the permission
-          Chef::Log.debug("Found target_uid != current_uid, updating owner")
+          Chef::Log.trace("Found target_uid != current_uid, updating owner")
           true
         else
-          Chef::Log.debug("Found target_uid == current_uid, not updating owner")
+          Chef::Log.trace("Found target_uid == current_uid, not updating owner")
           # the user has specified a permission, but it matches the file, so behave idempotently
           false
         end
@@ -132,24 +132,24 @@ class Chef
           a.failure_message(Chef::Exceptions::GroupIDNotFound, "cannot determine group id for '#{resource.group}', does the group exist on this system?")
           a.whyrun("Assuming group #{resource.group} would have been created")
         end
-        return nil
+        nil
       end
 
       def should_update_group?
         if target_gid.nil?
           # the user has not specified a permission on the new resource, so we never manage it with FAC
-          Chef::Log.debug("Found target_gid == nil, so no group was specified on resource, not managing group")
+          Chef::Log.trace("Found target_gid == nil, so no group was specified on resource, not managing group")
           false
         elsif current_gid.nil?
           # the user has specified a permission, and we are creating a file, so always enforce permissions
-          Chef::Log.debug("Found current_gid == nil, so we are creating a new file, updating group")
+          Chef::Log.trace("Found current_gid == nil, so we are creating a new file, updating group")
           true
         elsif target_gid != current_gid
           # the user has specified a permission, and it does not match the file, so fix the permission
-          Chef::Log.debug("Found target_gid != current_gid, updating group")
+          Chef::Log.trace("Found target_gid != current_gid, updating group")
           true
         else
-          Chef::Log.debug("Found target_gid == current_gid, not updating group")
+          Chef::Log.trace("Found target_gid == current_gid, not updating group")
           # the user has specified a permission, but it matches the file, so behave idempotently
           false
         end
@@ -187,20 +187,20 @@ class Chef
       def should_update_mode?
         if target_mode.nil?
           # the user has not specified a permission on the new resource, so we never manage it with FAC
-          Chef::Log.debug("Found target_mode == nil, so no mode was specified on resource, not managing mode")
+          Chef::Log.trace("Found target_mode == nil, so no mode was specified on resource, not managing mode")
           false
         elsif current_mode.nil?
           # the user has specified a permission, and we are creating a file, so always enforce permissions
-          Chef::Log.debug("Found current_mode == nil, so we are creating a new file, updating mode")
+          Chef::Log.trace("Found current_mode == nil, so we are creating a new file, updating mode")
           true
         elsif target_mode != current_mode
           # the user has specified a permission, and it does not match the file, so fix the permission
-          Chef::Log.debug("Found target_mode != current_mode, updating mode")
+          Chef::Log.trace("Found target_mode != current_mode, updating mode")
           true
         elsif suid_bit_set? && (should_update_group? || should_update_owner?)
           true
         else
-          Chef::Log.debug("Found target_mode == current_mode, not updating mode")
+          Chef::Log.trace("Found target_mode == current_mode, not updating mode")
           # the user has specified a permission, but it matches the file, so behave idempotently
           false
         end
@@ -279,7 +279,7 @@ class Chef
           a.failure_message(Chef::Exceptions::UserIDNotFound, "cannot determine user id for '#{resource.owner}', does the user exist on this system?")
           a.whyrun("Assuming user #{resource.owner} would have been created")
         end
-        return nil
+        nil
       end
 
       def suid_bit_set?

data/lib/chef/file_content_management/content_base.rb

@@ -23,12 +23,14 @@ class Chef
       attr_reader :run_context
       attr_reader :new_resource
       attr_reader :current_resource
+      attr_reader :logger
 
-      def initialize(new_resource, current_resource, run_context)
+      def initialize(new_resource, current_resource, run_context, logger = Chef::Log.with_child)
         @new_resource = new_resource
         @current_resource = current_resource
         @run_context = run_context
         @tempfile_loaded = false
+        @logger = logger
       end
 
       def tempfile

data/lib/chef/file_content_management/deploy/cp.rb

@@ -34,12 +34,12 @@ class Chef
       #
       class Cp
         def create(file)
-          Chef::Log.debug("Touching #{file} to create it")
+          Chef::Log.trace("Touching #{file} to create it")
           FileUtils.touch(file)
         end
 
         def deploy(src, dst)
-          Chef::Log.debug("Copying temporary file #{src} into place at #{dst}")
+          Chef::Log.trace("Copying temporary file #{src} into place at #{dst}")
           FileUtils.cp(src, dst)
         end
       end

data/lib/chef/file_content_management/deploy/mv_unix.rb

@@ -30,19 +30,19 @@ class Chef
         def create(file)
           # this is very simple, but it ensures that ownership and file modes take
           # good defaults, in particular mode needs to obey umask on create
-          Chef::Log.debug("Touching #{file} to create it")
+          Chef::Log.trace("Touching #{file} to create it")
           FileUtils.touch(file)
         end
 
         def deploy(src, dst)
           # we are only responsible for content so restore the dst files perms
-          Chef::Log.debug("Reading modes from #{dst} file")
+          Chef::Log.trace("Reading modes from #{dst} file")
           stat = ::File.stat(dst)
           mode = stat.mode & 07777
           uid  = stat.uid
           gid  = stat.gid
 
-          Chef::Log.debug("Applying mode = #{mode.to_s(8)}, uid = #{uid}, gid = #{gid} to #{src}")
+          Chef::Log.trace("Applying mode = #{mode.to_s(8)}, uid = #{uid}, gid = #{gid} to #{src}")
 
           # i own the inode, so should be able to at least chmod it
           ::File.chmod(mode, src)
@@ -67,7 +67,7 @@ class Chef
             Chef::Log.warn("Could not set gid = #{gid} on #{src}, file modes not preserved")
           end
 
-          Chef::Log.debug("Moving temporary file #{src} into place at #{dst}")
+          Chef::Log.trace("Moving temporary file #{src} into place at #{dst}")
           FileUtils.mv(src, dst)
         end
       end

data/lib/chef/file_content_management/deploy/mv_windows.rb

@@ -35,7 +35,7 @@ class Chef
         ACL = Security::ACL
 
         def create(file)
-          Chef::Log.debug("Touching #{file} to create it")
+          Chef::Log.trace("Touching #{file} to create it")
           FileUtils.touch(file)
         end
 

data/lib/chef/file_content_management/tempfile.rb

@@ -45,7 +45,7 @@ class Chef
             break
           rescue SystemCallError => e
             message = "Creating temp file under '#{tempfile_dirname}' failed with: '#{e.message}'"
-            Chef::Log.debug(message)
+            Chef::Log.trace(message)
             errors << message
           end
         end