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

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

@@ -66,7 +66,7 @@ class Chef
           { 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)}")
+              logger.trace("#{new_resource} setting #{field} to #{new_resource.send(field)}")
               opts << "#{option}=#{new_resource.send(field)}"
             end
           end

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

@@ -51,7 +51,7 @@ class Chef
             group_info = safe_dscl("read", "/Groups/#{new_resource.group_name}")
           rescue Chef::Exceptions::Group
             @group_exists = false
-            Chef::Log.debug("#{new_resource} group does not exist")
+            logger.trace("#{new_resource} group does not exist")
           end
 
           if group_info
@@ -105,7 +105,7 @@ class Chef
         def set_members
           # First reset the memberships if the append is not set
           unless new_resource.append
-            Chef::Log.debug("#{new_resource} removing group members #{current_resource.members.join(' ')}") unless current_resource.members.empty?
+            logger.trace("#{new_resource} removing group members #{current_resource.members.join(' ')}") unless current_resource.members.empty?
             safe_dscl("create", "/Groups/#{new_resource.group_name}", "GroupMembers", "") # clear guid list
             safe_dscl("create", "/Groups/#{new_resource.group_name}", "GroupMembership", "") # clear user list
             current_resource.members([ ])
@@ -118,7 +118,7 @@ class Chef
               members_to_be_added << member unless current_resource.members.include?(member)
             end
             unless members_to_be_added.empty?
-              Chef::Log.debug("#{new_resource} setting group members #{members_to_be_added.join(', ')}")
+              logger.trace("#{new_resource} setting group members #{members_to_be_added.join(', ')}")
               safe_dscl("append", "/Groups/#{new_resource.group_name}", "GroupMembership", *members_to_be_added)
             end
           end
@@ -130,7 +130,7 @@ class Chef
               members_to_be_removed << member if current_resource.members.include?(member)
             end
             unless members_to_be_removed.empty?
-              Chef::Log.debug("#{new_resource} removing group members #{members_to_be_removed.join(', ')}")
+              logger.trace("#{new_resource} removing group members #{members_to_be_removed.join(', ')}")
               safe_dscl("delete", "/Groups/#{new_resource.group_name}", "GroupMembership", *members_to_be_removed)
             end
           end

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

@@ -67,7 +67,7 @@ class Chef
                 members_to_be_added << member unless current_resource.members.include?(member)
               end
               members_to_be_added.each do |member|
-                Chef::Log.debug("#{new_resource} appending member #{member} to group #{new_resource.group_name}")
+                logger.trace("#{new_resource} appending member #{member} to group #{new_resource.group_name}")
                 add_member(member)
               end
             end
@@ -79,13 +79,13 @@ class Chef
               end
 
               members_to_be_removed.each do |member|
-                Chef::Log.debug("#{new_resource} removing member #{member} from group #{new_resource.group_name}")
+                logger.trace("#{new_resource} removing member #{member} from group #{new_resource.group_name}")
                 remove_member(member)
               end
             end
           else
             members_description = new_resource.members.empty? ? "none" : new_resource.members.join(", ")
-            Chef::Log.debug("#{new_resource} setting group members to: #{members_description}")
+            logger.trace("#{new_resource} setting group members to: #{members_description}")
             set_members(new_resource.members)
           end
         end
@@ -113,7 +113,7 @@ class Chef
             next unless new_resource.send(field)
             opts << option
             opts << new_resource.send(field)
-            Chef::Log.debug("#{new_resource} set #{field} to #{new_resource.send(field)}")
+            logger.trace("#{new_resource} set #{field} to #{new_resource.send(field)}")
           end
           opts << new_resource.group_name
           opts

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

@@ -66,13 +66,13 @@ class Chef
               end
             end
 
-            Chef::Log.debug("#{new_resource} not changing group members, the group has no members to add") if members_to_be_added.empty?
+            logger.trace("#{new_resource} not changing group members, the group has no members to add") if members_to_be_added.empty?
 
             add_group_members(members_to_be_added)
           else
             # We are resetting the members of a group so use the same trick
             reset_group_membership
-            Chef::Log.debug("#{new_resource} setting group members to: none") if new_resource.members.empty?
+            logger.trace("#{new_resource} setting group members to: none") if new_resource.members.empty?
             add_group_members(new_resource.members)
           end
         end
@@ -84,7 +84,7 @@ class Chef
 
         # Adds a list of usernames to the group using `user mod`
         def add_group_members(members)
-          Chef::Log.debug("#{new_resource} adding members #{members.join(', ')}") unless members.empty?
+          logger.trace("#{new_resource} adding members #{members.join(', ')}") unless members.empty?
           members.each do |user|
             shell_out_compact!("user", "mod", "-G", new_resource.group_name, user)
           end

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

@@ -44,7 +44,7 @@ class Chef
             # new or existing group. Because pw groupadd does not support the -m
             # and -d options used by manage_group, we treat group creation as a
             # special case and use -M.
-            Chef::Log.debug("#{new_resource} setting group members: #{new_resource.members.join(',')}")
+            logger.trace("#{new_resource} setting group members: #{new_resource.members.join(',')}")
             command += [ "-M", new_resource.members.join(",") ]
           end
 
@@ -75,7 +75,7 @@ class Chef
         def set_options
           opts = [ new_resource.group_name ]
           if new_resource.gid && (current_resource.gid != new_resource.gid)
-            Chef::Log.debug("#{new_resource}: current gid (#{current_resource.gid}) doesnt match target gid (#{new_resource.gid}), changing it")
+            logger.trace("#{new_resource}: current gid (#{current_resource.gid}) doesnt match target gid (#{new_resource.gid}), changing it")
             opts << "-g"
             opts << new_resource.gid
           end
@@ -119,12 +119,12 @@ class Chef
           end
 
           unless members_to_be_added.empty?
-            Chef::Log.debug("#{new_resource} adding group members: #{members_to_be_added.join(',')}")
+            logger.trace("#{new_resource} adding group members: #{members_to_be_added.join(',')}")
             opts << [ "-m", members_to_be_added.join(",") ]
           end
 
           unless members_to_be_removed.empty?
-            Chef::Log.debug("#{new_resource} removing group members: #{members_to_be_removed.join(',')}")
+            logger.trace("#{new_resource} removing group members: #{members_to_be_removed.join(',')}")
             opts << [ "-d", members_to_be_removed.join(",") ]
           end
 

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

@@ -42,7 +42,7 @@ class Chef
             members = @net_group.local_get_members
           rescue
             @group_exists = false
-            Chef::Log.debug("#{new_resource} group does not exist")
+            logger.trace("#{new_resource} group does not exist")
           end
 
           if members
@@ -99,7 +99,7 @@ class Chef
         def lookup_account_name(account_name)
           Chef::ReservedNames::Win32::Security.lookup_account_name(locally_qualified_name(account_name))[1].to_s
         rescue Chef::Exceptions::Win32APIError
-          Chef::Log.warn("SID for '#{locally_qualified_name(account_name)}' could not be found")
+          logger.warn("SID for '#{locally_qualified_name(account_name)}' could not be found")
           ""
         end
 

data/lib/chef/provider/http_request.rb

@@ -40,8 +40,8 @@ class Chef
           "#{new_resource.url}",
           new_resource.headers
         )
-        Chef::Log.info("#{new_resource} HEAD to #{new_resource.url} successful")
-        Chef::Log.debug("#{new_resource} HEAD request response: #{modified}")
+        logger.info("#{new_resource} HEAD to #{new_resource.url} successful")
+        logger.trace("#{new_resource} HEAD request response: #{modified}")
         # :head is usually used to trigger notifications, which converge_by now does
         if modified != false
           converge_by("#{new_resource} HEAD to #{new_resource.url} returned modified, trigger notifications") {}
@@ -57,8 +57,8 @@ class Chef
             "#{new_resource.url}",
             new_resource.headers
           )
-          Chef::Log.info("#{new_resource} GET to #{new_resource.url} successful")
-          Chef::Log.debug("#{new_resource} GET request response: #{body}")
+          logger.info("#{new_resource} GET to #{new_resource.url} successful")
+          logger.trace("#{new_resource} GET request response: #{body}")
         end
       end
 
@@ -71,8 +71,8 @@ class Chef
             message,
             new_resource.headers
           )
-          Chef::Log.info("#{new_resource} PATCH to #{new_resource.url} successful")
-          Chef::Log.debug("#{new_resource} PATCH request response: #{body}")
+          logger.info("#{new_resource} PATCH to #{new_resource.url} successful")
+          logger.trace("#{new_resource} PATCH request response: #{body}")
         end
       end
 
@@ -85,8 +85,8 @@ class Chef
             message,
             new_resource.headers
           )
-          Chef::Log.info("#{new_resource} PUT to #{new_resource.url} successful")
-          Chef::Log.debug("#{new_resource} PUT request response: #{body}")
+          logger.info("#{new_resource} PUT to #{new_resource.url} successful")
+          logger.trace("#{new_resource} PUT request response: #{body}")
         end
       end
 
@@ -99,8 +99,8 @@ class Chef
             message,
             new_resource.headers
           )
-          Chef::Log.info("#{new_resource} POST to #{new_resource.url} message: #{message.inspect} successful")
-          Chef::Log.debug("#{new_resource} POST request response: #{body}")
+          logger.info("#{new_resource} POST to #{new_resource.url} message: #{message.inspect} successful")
+          logger.trace("#{new_resource} POST request response: #{body}")
         end
       end
 
@@ -112,8 +112,8 @@ class Chef
             new_resource.headers
           )
           new_resource.updated_by_last_action(true)
-          Chef::Log.info("#{new_resource} DELETE to #{new_resource.url} successful")
-          Chef::Log.debug("#{new_resource} DELETE request response: #{body}")
+          logger.info("#{new_resource} DELETE to #{new_resource.url} successful")
+          logger.trace("#{new_resource} DELETE request response: #{body}")
         end
       end
 

data/lib/chef/provider/ifconfig.rb

@@ -164,7 +164,7 @@ class Chef
             command = add_command
             converge_by("run #{command.join(' ')} to add #{new_resource}") do
               shell_out_compact!(command)
-              Chef::Log.info("#{new_resource} added")
+              logger.info("#{new_resource} added")
             end
           end
         end
@@ -180,7 +180,7 @@ class Chef
         command = enable_command
         converge_by("run #{command.join(' ')} to enable #{new_resource}") do
           shell_out_compact!(command)
-          Chef::Log.info("#{new_resource} enabled")
+          logger.info("#{new_resource} enabled")
         end
       end
 
@@ -190,10 +190,10 @@ class Chef
           command = delete_command
           converge_by("run #{command.join(' ')} to delete #{new_resource}") do
             shell_out_compact!(command)
-            Chef::Log.info("#{new_resource} deleted")
+            logger.info("#{new_resource} deleted")
           end
         else
-          Chef::Log.debug("#{new_resource} does not exist - nothing to do")
+          logger.trace("#{new_resource} does not exist - nothing to do")
         end
         delete_config
       end
@@ -205,10 +205,10 @@ class Chef
           command = disable_command
           converge_by("run #{command.join(' ')} to disable #{new_resource}") do
             shell_out_compact!(command)
-            Chef::Log.info("#{new_resource} disabled")
+            logger.info("#{new_resource} disabled")
           end
         else
-          Chef::Log.debug("#{new_resource} does not exist - nothing to do")
+          logger.trace("#{new_resource} does not exist - nothing to do")
         end
       end
 

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

@@ -22,7 +22,7 @@ class Chef
   class Provider
     class Ifconfig
       class Aix < Chef::Provider::Ifconfig
-        provides :ifconfig, platform: %w{aix}
+        provides :ifconfig, platform: "aix"
 
         def load_current_resource
           @current_resource = Chef::Resource::Ifconfig.new(new_resource.name)

data/lib/chef/provider/ifconfig/debian.rb

@@ -36,11 +36,11 @@ class Chef
 <% if new_resource.onboot == "yes" %>auto <%= new_resource.device %><% end %>
 <% case new_resource.bootproto
    when "dhcp" %>
-iface <%= new_resource.device %> inet dhcp
+iface <%= new_resource.device %> <%= new_resource.family %> dhcp
 <% when "bootp" %>
-iface <%= new_resource.device %> inet bootp
+iface <%= new_resource.device %> <%= new_resource.family %> bootp
 <% else %>
-iface <%= new_resource.device %> inet static
+iface <%= new_resource.device %> <%= new_resource.family %> static
     <% if new_resource.target %>address <%= new_resource.target %><% end %>
     <% if new_resource.mask %>netmask <%= new_resource.mask %><% end %>
     <% if new_resource.network %>network <%= new_resource.network %><% end %>
@@ -62,8 +62,6 @@ iface <%= new_resource.device %> inet static
         protected
 
         def enforce_interfaces_dot_d_sanity
-          # on ubuntu 18.04 there's no interfaces file and it uses interfaces.d by default
-          return if ::File.directory?(INTERFACES_DOT_D_DIR) && !::File.exist?(INTERFACES_FILE)
           # create /etc/network/interfaces.d via dir resource (to get reporting, etc)
           dir = Chef::Resource::Directory.new(INTERFACES_DOT_D_DIR, run_context)
           dir.run_action(:create)

data/lib/chef/provider/launchd.rb

@@ -119,7 +119,7 @@ class Chef
         end
         invalid_type = lltstype != "LoginWindow"
         if root && agent && invalid_action && invalid_type
-          Chef::Log.debug("#{label}: Aqua LaunchAgents shouldn't be loaded as root")
+          logger.trace("#{label}: Aqua LaunchAgents shouldn't be loaded as root")
           return false
         end
         true

data/lib/chef/provider/link.rb

@@ -115,8 +115,8 @@ class Chef
           if new_resource.link_type == :symbolic
             converge_by("create symlink at #{new_resource.target_file} to #{new_resource.to}") do
               file_class.symlink(canonicalize(new_resource.to), new_resource.target_file)
-              Chef::Log.debug("#{new_resource} created #{new_resource.link_type} link from #{new_resource.target_file} -> #{new_resource.to}")
-              Chef::Log.info("#{new_resource} created")
+              logger.trace("#{new_resource} created #{new_resource.link_type} link from #{new_resource.target_file} -> #{new_resource.to}")
+              logger.info("#{new_resource} created")
               # file_class.symlink will create the link with default access controls.
               # This means that the access controls of the file could be different
               # than those captured during the initial evaluation of current_resource.
@@ -127,8 +127,8 @@ class Chef
           elsif new_resource.link_type == :hard
             converge_by("create hard link at #{new_resource.target_file} to #{new_resource.to}") do
               file_class.link(new_resource.to, new_resource.target_file)
-              Chef::Log.debug("#{new_resource} created #{new_resource.link_type} link from #{new_resource.target_file} -> #{new_resource.to}")
-              Chef::Log.info("#{new_resource} created")
+              logger.trace("#{new_resource} created #{new_resource.link_type} link from #{new_resource.target_file} -> #{new_resource.to}")
+              logger.info("#{new_resource} created")
             end
           end
         end
@@ -146,12 +146,12 @@ class Chef
           if Chef::Platform.windows? && ::File.directory?(current_resource.target_file)
             converge_by("delete link to dir at #{new_resource.target_file}") do
               ::Dir.delete(new_resource.target_file)
-              Chef::Log.info("#{new_resource} deleted")
+              logger.info("#{new_resource} deleted")
             end
           else
             converge_by("delete link to file at #{new_resource.target_file}") do
               ::File.delete(new_resource.target_file)
-              Chef::Log.info("#{new_resource} deleted")
+              logger.info("#{new_resource} deleted")
             end
           end
         end

data/lib/chef/provider/log.rb

@@ -34,7 +34,7 @@ class Chef
         #
         # @return [true] Always returns true
         def action_write
-          Chef::Log.send(new_resource.level, new_resource.message)
+          logger.send(new_resource.level, new_resource.message)
           new_resource.updated_by_last_action(true) if Chef::Config[:count_log_resource_updates]
         end
       end

data/lib/chef/provider/lwrp_base.rb

@@ -52,7 +52,7 @@ class Chef
 
         def build_from_file(cookbook_name, filename, run_context)
           if LWRPBase.loaded_lwrps[filename]
-            Chef::Log.debug("LWRP provider #{filename} from cookbook #{cookbook_name} has already been loaded!  Skipping the reload.")
+            Chef::Log.trace("LWRP provider #{filename} from cookbook #{cookbook_name} has already been loaded!  Skipping the reload.")
             return loaded_lwrps[filename]
           end
 
@@ -71,7 +71,7 @@ class Chef
             define_singleton_method(:inspect) { to_s }
           end
 
-          Chef::Log.debug("Loaded contents of #{filename} into provider #{resource_name} (#{provider_class})")
+          Chef::Log.trace("Loaded contents of #{filename} into provider #{resource_name} (#{provider_class})")
 
           LWRPBase.loaded_lwrps[filename] = true
 

data/lib/chef/provider/mdadm.rb

@@ -28,7 +28,7 @@ class Chef
       def load_current_resource
         @current_resource = Chef::Resource::Mdadm.new(new_resource.name)
         current_resource.raid_device(new_resource.raid_device)
-        Chef::Log.debug("#{new_resource} checking for software raid device #{current_resource.raid_device}")
+        logger.trace("#{new_resource} checking for software raid device #{current_resource.raid_device}")
 
         device_not_found = 4
         mdadm = shell_out!("mdadm --detail --test #{new_resource.raid_device}", :returns => [0, device_not_found])
@@ -45,12 +45,12 @@ class Chef
             command << " --bitmap=#{new_resource.bitmap}" if new_resource.bitmap
             command << " --layout=#{new_resource.layout}" if new_resource.layout
             command << " --raid-devices #{new_resource.devices.length} #{new_resource.devices.join(" ")}"
-            Chef::Log.debug("#{new_resource} mdadm command: #{command}")
+            logger.trace("#{new_resource} mdadm command: #{command}")
             shell_out!(command)
-            Chef::Log.info("#{new_resource} created raid device (#{new_resource.raid_device})")
+            logger.info("#{new_resource} created raid device (#{new_resource.raid_device})")
           end
         else
-          Chef::Log.debug("#{new_resource} raid device already exists, skipping create (#{new_resource.raid_device})")
+          logger.trace("#{new_resource} raid device already exists, skipping create (#{new_resource.raid_device})")
         end
       end
 
@@ -58,12 +58,12 @@ class Chef
         unless current_resource.exists
           converge_by("assemble RAID device #{new_resource.raid_device}") do
             command = "yes | mdadm --assemble #{new_resource.raid_device} #{new_resource.devices.join(" ")}"
-            Chef::Log.debug("#{new_resource} mdadm command: #{command}")
+            logger.trace("#{new_resource} mdadm command: #{command}")
             shell_out!(command)
-            Chef::Log.info("#{new_resource} assembled raid device (#{new_resource.raid_device})")
+            logger.info("#{new_resource} assembled raid device (#{new_resource.raid_device})")
           end
         else
-          Chef::Log.debug("#{new_resource} raid device already exists, skipping assemble (#{new_resource.raid_device})")
+          logger.trace("#{new_resource} raid device already exists, skipping assemble (#{new_resource.raid_device})")
         end
       end
 
@@ -71,12 +71,12 @@ class Chef
         if current_resource.exists
           converge_by("stop RAID device #{new_resource.raid_device}") do
             command = "yes | mdadm --stop #{new_resource.raid_device}"
-            Chef::Log.debug("#{new_resource} mdadm command: #{command}")
+            logger.trace("#{new_resource} mdadm command: #{command}")
             shell_out!(command)
-            Chef::Log.info("#{new_resource} stopped raid device (#{new_resource.raid_device})")
+            logger.info("#{new_resource} stopped raid device (#{new_resource.raid_device})")
           end
         else
-          Chef::Log.debug("#{new_resource} raid device doesn't exist (#{new_resource.raid_device}) - not stopping")
+          logger.trace("#{new_resource} raid device doesn't exist (#{new_resource.raid_device}) - not stopping")
         end
       end
 

data/lib/chef/provider/mount.rb

@@ -41,10 +41,10 @@ class Chef
         unless current_resource.mounted
           converge_by("mount #{current_resource.device} to #{current_resource.mount_point}") do
             mount_fs
-            Chef::Log.info("#{new_resource} mounted")
+            logger.info("#{new_resource} mounted")
           end
         else
-          Chef::Log.debug("#{new_resource} is already mounted")
+          logger.trace("#{new_resource} is already mounted")
         end
       end
 
@@ -52,10 +52,10 @@ class Chef
         if current_resource.mounted
           converge_by("unmount #{current_resource.device}") do
             umount_fs
-            Chef::Log.info("#{new_resource} unmounted")
+            logger.info("#{new_resource} unmounted")
           end
         else
-          Chef::Log.debug("#{new_resource} is already unmounted")
+          logger.trace("#{new_resource} is already unmounted")
         end
       end
 
@@ -64,21 +64,21 @@ class Chef
           if new_resource.supports[:remount]
             converge_by("remount #{current_resource.device}") do
               remount_fs
-              Chef::Log.info("#{new_resource} remounted")
+              logger.info("#{new_resource} remounted")
             end
           else
             converge_by("unmount #{current_resource.device}") do
               umount_fs
-              Chef::Log.info("#{new_resource} unmounted")
+              logger.info("#{new_resource} unmounted")
             end
             wait_until_unmounted(unmount_retries)
             converge_by("mount #{current_resource.device}") do
               mount_fs
-              Chef::Log.info("#{new_resource} mounted")
+              logger.info("#{new_resource} mounted")
             end
           end
         else
-          Chef::Log.debug("#{new_resource} not mounted, nothing to remount")
+          logger.trace("#{new_resource} not mounted, nothing to remount")
         end
       end
 
@@ -86,10 +86,10 @@ class Chef
         unless current_resource.enabled && mount_options_unchanged? && device_unchanged?
           converge_by("enable #{current_resource.device}") do
             enable_fs
-            Chef::Log.info("#{new_resource} enabled")
+            logger.info("#{new_resource} enabled")
           end
         else
-          Chef::Log.debug("#{new_resource} already enabled")
+          logger.trace("#{new_resource} already enabled")
         end
       end
 
@@ -97,10 +97,10 @@ class Chef
         if current_resource.enabled
           converge_by("disable #{current_resource.device}") do
             disable_fs
-            Chef::Log.info("#{new_resource} disabled")
+            logger.info("#{new_resource} disabled")
           end
         else
-          Chef::Log.debug("#{new_resource} already disabled")
+          logger.trace("#{new_resource} already disabled")
         end
       end