chef 13.12.14 → 14.0.190

data/lib/chef/provider/subversion.rb

@@ -61,7 +61,7 @@ class Chef
             shell_out!(checkout_command, run_options)
           end
         else
-          Chef::Log.debug "#{new_resource} checkout destination #{new_resource.destination} already exists or is a non-empty directory - nothing to do"
+          logger.trace "#{new_resource} checkout destination #{new_resource.destination} already exists or is a non-empty directory - nothing to do"
         end
       end
 
@@ -69,7 +69,7 @@ class Chef
         if target_dir_non_existent_or_empty?
           action_force_export
         else
-          Chef::Log.debug "#{new_resource} export destination #{new_resource.destination} already exists or is a non-empty directory - nothing to do"
+          logger.trace "#{new_resource} export destination #{new_resource.destination} already exists or is a non-empty directory - nothing to do"
         end
       end
 
@@ -83,11 +83,11 @@ class Chef
         assert_target_directory_valid!
         if ::File.exist?(::File.join(new_resource.destination, ".svn"))
           current_rev = find_current_revision
-          Chef::Log.debug "#{new_resource} current revision: #{current_rev} target revision: #{revision_int}"
+          logger.trace "#{new_resource} current revision: #{current_rev} target revision: #{revision_int}"
           unless current_revision_matches_target_revision?
             converge_by("sync #{new_resource.destination} from #{new_resource.repository}") do
               shell_out!(sync_command, run_options)
-              Chef::Log.info "#{new_resource} updated to revision: #{revision_int}"
+              logger.info "#{new_resource} updated to revision: #{revision_int}"
             end
           end
         else
@@ -97,14 +97,14 @@ class Chef
 
       def sync_command
         c = scm :update, new_resource.svn_arguments, verbose, authentication, proxy, "-r#{revision_int}", new_resource.destination
-        Chef::Log.debug "#{new_resource} updated working copy #{new_resource.destination} to revision #{new_resource.revision}"
+        logger.trace "#{new_resource} updated working copy #{new_resource.destination} to revision #{new_resource.revision}"
         c
       end
 
       def checkout_command
         c = scm :checkout, new_resource.svn_arguments, verbose, authentication, proxy,
           "-r#{revision_int}", new_resource.repository, new_resource.destination
-        Chef::Log.info "#{new_resource} checked out #{new_resource.repository} at revision #{new_resource.revision} to #{new_resource.destination}"
+        logger.info "#{new_resource} checked out #{new_resource.repository} at revision #{new_resource.revision} to #{new_resource.destination}"
         c
       end
 
@@ -113,7 +113,7 @@ class Chef
         args << new_resource.svn_arguments << verbose << authentication << proxy <<
           "-r#{revision_int}" << new_resource.repository << new_resource.destination
         c = scm :export, *args
-        Chef::Log.info "#{new_resource} exported #{new_resource.repository} at revision #{new_resource.revision} to #{new_resource.destination}"
+        logger.info "#{new_resource} exported #{new_resource.repository} at revision #{new_resource.revision} to #{new_resource.destination}"
         c
       end
 
@@ -175,7 +175,7 @@ class Chef
         rev = (repo_attrs["Last Changed Rev"] || repo_attrs["Revision"])
         rev.strip! if rev
         raise "Could not parse `svn info` data: #{svn_info}" if repo_attrs.empty?
-        Chef::Log.debug "#{new_resource} resolved revision #{new_resource.revision} to #{rev}"
+        logger.trace "#{new_resource} resolved revision #{new_resource.revision} to #{rev}"
         rev
       end
 

data/lib/chef/provider/systemd_unit.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Nathan Williams (<nath.e.will@gmail.com>)
-# Copyright:: Copyright 2016, Nathan Williams
+# Copyright:: Copyright 2016-2018, Nathan Williams
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -30,7 +30,7 @@ class Chef
       include Chef::Mixin::Which
       include Chef::Mixin::ShellOut
 
-      provides :systemd_unit, os: "linux"
+      provides :systemd_unit
 
       def load_current_resource
         @current_resource = Chef::Resource::SystemdUnit.new(new_resource.name)
@@ -74,9 +74,21 @@ class Chef
         end
       end
 
+      def action_preset
+        converge_by("restoring enable/disable preset configuration for unit: #{new_resource.unit_name}") do
+          systemctl_execute!(:preset, new_resource.unit_name)
+        end
+      end
+
+      def action_revert
+        converge_by("reverting to vendor version of unit: #{new_resource.unit_name}") do
+          systemctl_execute!(:revert, new_resource.unit_name)
+        end
+      end
+
       def action_enable
         if current_resource.static
-          Chef::Log.debug("#{new_resource.unit_name} is a static unit, enabling is a NOP.")
+          logger.trace("#{new_resource.unit_name} is a static unit, enabling is a NOP.")
         end
 
         unless current_resource.enabled || current_resource.static
@@ -88,7 +100,7 @@ class Chef
 
       def action_disable
         if current_resource.static
-          Chef::Log.debug("#{new_resource.unit_name} is a static unit, disabling is a NOP.")
+          logger.trace("#{new_resource.unit_name} is a static unit, disabling is a NOP.")
         end
 
         if current_resource.enabled && !current_resource.static
@@ -98,6 +110,12 @@ class Chef
         end
       end
 
+      def action_reenable
+        converge_by("reenabling unit: #{new_resource.unit_name}") do
+          systemctl_execute!(:reenable, new_resource.unit_name)
+        end
+      end
+
       def action_mask
         unless current_resource.masked
           converge_by("masking unit: #{new_resource.unit_name}") do
@@ -142,7 +160,7 @@ class Chef
             systemctl_execute!(:reload, new_resource.unit_name)
           end
         else
-          Chef::Log.debug("#{new_resource.unit_name} is not active, skipping reload.")
+          logger.trace("#{new_resource.unit_name} is not active, skipping reload.")
         end
       end
 
@@ -227,10 +245,11 @@ class Chef
       def systemctl_opts
         @systemctl_opts ||=
           if new_resource.user
+            uid = Etc.getpwuid(new_resource.user).uid
             {
               :user => new_resource.user,
               :environment => {
-                "DBUS_SESSION_BUS_ADDRESS" => "unix:path=/run/user/#{node['etc']['passwd'][new_resource.user]['uid']}/bus",
+                "DBUS_SESSION_BUS_ADDRESS" => "unix:path=/run/user/#{uid}/bus",
               },
             }
           else

data/lib/chef/provider/user.rb

@@ -49,7 +49,7 @@ class Chef
           user_info = Etc.getpwnam(new_resource.username)
         rescue ArgumentError
           @user_exists = false
-          Chef::Log.debug("#{new_resource} user does not exist")
+          logger.trace("#{new_resource} user does not exist")
           user_info = nil
         end
 
@@ -120,12 +120,12 @@ class Chef
         if !@user_exists
           converge_by("create user #{new_resource.username}") do
             create_user
-            Chef::Log.info("#{new_resource} created")
+            logger.info("#{new_resource} created")
           end
         elsif compare_user
           converge_by("alter user #{new_resource.username}") do
             manage_user
-            Chef::Log.info("#{new_resource} altered")
+            logger.info("#{new_resource} altered")
           end
         end
       end
@@ -134,7 +134,7 @@ class Chef
         return unless @user_exists
         converge_by("remove user #{new_resource.username}") do
           remove_user
-          Chef::Log.info("#{new_resource} removed")
+          logger.info("#{new_resource} removed")
         end
       end
 
@@ -142,7 +142,7 @@ class Chef
         return unless @user_exists && compare_user
         converge_by("manage user #{new_resource.username}") do
           manage_user
-          Chef::Log.info("#{new_resource} managed")
+          logger.info("#{new_resource} managed")
         end
       end
 
@@ -150,7 +150,7 @@ class Chef
         return unless compare_user
         converge_by("modify user #{new_resource.username}") do
           manage_user
-          Chef::Log.info("#{new_resource} modified")
+          logger.info("#{new_resource} modified")
         end
       end
 
@@ -158,10 +158,10 @@ class Chef
         if check_lock == false
           converge_by("lock the user #{new_resource.username}") do
             lock_user
-            Chef::Log.info("#{new_resource} locked")
+            logger.info("#{new_resource} locked")
           end
         else
-          Chef::Log.debug("#{new_resource} already locked - nothing to do")
+          logger.trace("#{new_resource} already locked - nothing to do")
         end
       end
 
@@ -169,10 +169,10 @@ class Chef
         if check_lock == true
           converge_by("unlock user #{new_resource.username}") do
             unlock_user
-            Chef::Log.info("#{new_resource} unlocked")
+            logger.info("#{new_resource} unlocked")
           end
         else
-          Chef::Log.debug("#{new_resource} already unlocked - nothing to do")
+          logger.trace("#{new_resource} already unlocked - nothing to do")
         end
       end
 

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

@@ -74,7 +74,7 @@ class Chef
 
         def add_password
           return unless current_resource.password != new_resource.password && new_resource.password
-          Chef::Log.debug("#{new_resource.username} setting password to #{new_resource.password}")
+          logger.trace("#{new_resource.username} setting password to #{new_resource.password}")
           command = "echo '#{new_resource.username}:#{new_resource.password}' | chpasswd -e"
           shell_out!(command)
         end
@@ -85,10 +85,10 @@ class Chef
           # -m option does not work on aix, so move dir.
           universal_options.delete("-m")
           if ::File.directory?(current_resource.home)
-            Chef::Log.debug("Changing users home directory from #{current_resource.home} to #{new_resource.home}")
+            logger.trace("Changing users home directory from #{current_resource.home} to #{new_resource.home}")
             FileUtils.mv current_resource.home, new_resource.home
           else
-            Chef::Log.debug("Creating users home directory #{new_resource.home}")
+            logger.trace("Creating users home directory #{new_resource.home}")
             FileUtils.mkdir_p new_resource.home
           end
         end

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

@@ -157,7 +157,7 @@ user password using shadow hash.")
             convert_group_name if new_resource.gid
           else
             @user_exists = false
-            Chef::Log.debug("#{new_resource} user does not exist")
+            logger.trace("#{new_resource} user does not exist")
           end
 
           current_resource
@@ -333,7 +333,7 @@ user password using shadow hash.")
         end
 
         def move_home
-          Chef::Log.debug("#{new_resource} moving #{self} home from #{current_resource.home} to #{new_resource.home}")
+          logger.trace("#{new_resource} moving #{self} home from #{current_resource.home} to #{new_resource.home}")
           new_resource.gid(STAFF_GROUP_ID) if new_resource.gid.nil?
           src = current_resource.home
           FileUtils.mkdir_p(new_resource.home)

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

@@ -78,13 +78,13 @@ class Chef
             field_symbol = field.to_sym
             next unless current_resource.send(field_symbol) != new_resource.send(field_symbol)
             if new_resource.send(field_symbol)
-              Chef::Log.debug("#{new_resource} setting #{field} to #{new_resource.send(field_symbol)}")
+              logger.trace("#{new_resource} setting #{field} to #{new_resource.send(field_symbol)}")
               opts << option
               opts << new_resource.send(field_symbol)
             end
           end
           if new_resource.manage_home
-            Chef::Log.debug("#{new_resource} is managing the users home directory")
+            logger.trace("#{new_resource} is managing the users home directory")
             opts << "-m"
           end
           opts
@@ -92,11 +92,11 @@ class Chef
 
         def modify_password
           if !new_resource.password.nil? && (current_resource.password != new_resource.password)
-            Chef::Log.debug("#{new_resource} updating password")
+            logger.trace("#{new_resource} updating password")
             command = "pw usermod #{new_resource.username} -H 0"
             shell_out!(command, input: new_resource.password.to_s)
           else
-            Chef::Log.debug("#{new_resource} no change needed to password")
+            logger.trace("#{new_resource} no change needed to password")
           end
         end
       end

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

@@ -83,7 +83,7 @@ class Chef
 
         def manage_password
           return unless current_resource.password != new_resource.password && new_resource.password
-          Chef::Log.debug("#{new_resource} setting password to #{new_resource.password}")
+          logger.trace("#{new_resource} setting password to #{new_resource.password}")
           write_shadow_file
         end
 

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

@@ -118,10 +118,10 @@ class Chef
               if updating_home?
                 opts << "-d" << new_resource.home
                 if new_resource.manage_home
-                  Chef::Log.debug("#{new_resource} managing the users home directory")
+                  logger.trace("#{new_resource} managing the users home directory")
                   opts << "-m"
                 else
-                  Chef::Log.debug("#{new_resource} setting home to #{new_resource.home}")
+                  logger.trace("#{new_resource} setting home to #{new_resource.home}")
                 end
               end
               opts << "-o" if new_resource.non_unique
@@ -132,7 +132,7 @@ class Chef
         def update_options(field, option, opts)
           return unless current_resource.send(field).to_s != new_resource.send(field).to_s
           return unless 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).to_s
         end
 

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' (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.")
+            logger.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)
@@ -51,7 +51,7 @@ class Chef
           rescue Chef::Exceptions::UserIDNotFound => e
             # e.message should be "The user name could not be found" but checking for that could cause a localization bug
             @user_exists = false
-            Chef::Log.debug("#{new_resource} does not exist (#{e.message})")
+            logger.trace("#{new_resource} does not exist (#{e.message})")
           end
 
           current_resource
@@ -64,7 +64,7 @@ class Chef
         # <false>:: If the users are identical
         def compare_user
           unless @net_user.validate_credentials(new_resource.password)
-            Chef::Log.debug("#{new_resource} password has changed")
+            logger.trace("#{new_resource} password has changed")
             return true
           end
           [ :uid, :comment, :home, :shell ].any? do |user_attrib|
@@ -112,7 +112,7 @@ class Chef
             next unless current_resource.send(field_symbol) != new_resource.send(field_symbol)
             next unless new_resource.send(field_symbol)
             unless field_symbol == :password
-              Chef::Log.debug("#{new_resource} setting #{field} to #{new_resource.send(field_symbol)}")
+              logger.trace("#{new_resource} setting #{field} to #{new_resource.send(field_symbol)}")
             end
             opts[option.to_sym] = new_resource.send(field_symbol)
           end

data/lib/chef/provider/whyrun_safe_ruby_block.rb

@@ -25,7 +25,7 @@ class Chef
         new_resource.block.call
         new_resource.updated_by_last_action(true)
         @run_context.events.resource_update_applied(new_resource, :create, "execute the whyrun_safe_ruby_block #{new_resource.name}")
-        Chef::Log.info("#{new_resource} called")
+        logger.info("#{new_resource} called")
       end
     end
   end

data/lib/chef/provider/{env.rb → windows_env.rb}

@@ -17,14 +17,17 @@
 #
 
 require "chef/provider"
-require "chef/resource/env"
+require "chef/resource/windows_env"
+require "chef/mixin/windows_env_helper"
 
 class Chef
   class Provider
-    class Env < Chef::Provider
+    class WindowsEnv < Chef::Provider
+      include Chef::Mixin::WindowsEnvHelper
       attr_accessor :key_exists
 
-      provides :env, os: "!windows"
+      provides :env
+      provides :windows_env
 
       def whyrun_supported?
         false
@@ -36,23 +39,19 @@ class Chef
       end
 
       def load_current_resource
-        @current_resource = Chef::Resource::Env.new(new_resource.name)
+        @current_resource = Chef::Resource::WindowsEnv.new(new_resource.name)
         current_resource.key_name(new_resource.key_name)
 
         if env_key_exists(new_resource.key_name)
           current_resource.value(env_value(new_resource.key_name))
         else
           @key_exists = false
-          Chef::Log.debug("#{new_resource} key does not exist")
+          logger.trace("#{new_resource} key does not exist")
         end
 
         current_resource
       end
 
-      def env_value(key_name)
-        raise Chef::Exceptions::Env, "#{self} provider does not implement env_value!"
-      end
-
       def env_key_exists(key_name)
         env_value(key_name) ? true : false
       end
@@ -82,12 +81,12 @@ class Chef
         if @key_exists
           if requires_modify_or_create?
             modify_env
-            Chef::Log.info("#{new_resource} altered")
+            logger.info("#{new_resource} altered")
             new_resource.updated_by_last_action(true)
           end
         else
           create_env
-          Chef::Log.info("#{new_resource} created")
+          logger.info("#{new_resource} created")
           new_resource.updated_by_last_action(true)
         end
       end
@@ -102,7 +101,7 @@ class Chef
         return false unless new_resource.delim #no delim: delete the key
         needs_delete = new_values.any? { |v| current_values.include?(v) }
         if !needs_delete
-          Chef::Log.debug("#{new_resource} element '#{new_resource.value}' does not exist")
+          logger.trace("#{new_resource} element '#{new_resource.value}' does not exist")
           return true #do not delete the key
         else
           new_value =
@@ -115,7 +114,7 @@ class Chef
           else
             old_value = new_resource.value(new_value)
             create_env
-            Chef::Log.debug("#{new_resource} deleted #{old_value} element")
+            logger.trace("#{new_resource} deleted #{old_value} element")
             new_resource.updated_by_last_action(true)
             return true #we removed the element and updated; do not delete the key
           end
@@ -123,9 +122,9 @@ class Chef
       end
 
       def action_delete
-        if @key_exists && !delete_element
+        if ( ENV[new_resource.key_name] || @key_exists ) && !delete_element
           delete_env
-          Chef::Log.info("#{new_resource} deleted")
+          logger.info("#{new_resource} deleted")
           new_resource.updated_by_last_action(true)
         end
       end
@@ -134,20 +133,38 @@ class Chef
         if @key_exists
           if requires_modify_or_create?
             modify_env
-            Chef::Log.info("#{new_resource} modified")
+            logger.info("#{new_resource} modified")
             new_resource.updated_by_last_action(true)
           end
         else
-          raise Chef::Exceptions::Env, "Cannot modify #{new_resource} - key does not exist!"
+          raise Chef::Exceptions::WindowsEnv, "Cannot modify #{new_resource} - key does not exist!"
         end
       end
 
       def create_env
-        raise Chef::Exceptions::UnsupportedAction, "#{self} does not support :#{new_resource.action}"
+        obj = env_obj(@new_resource.key_name)
+        unless obj
+          obj = WIN32OLE.connect("winmgmts://").get("Win32_Environment").spawninstance_
+          obj.name = @new_resource.key_name
+          obj.username = new_resource.user
+        end
+        obj.variablevalue = @new_resource.value
+        obj.put_
+        value = @new_resource.value
+        value = expand_path(value) if @new_resource.key_name.casecmp("PATH") == 0
+        ENV[@new_resource.key_name] = value
+        broadcast_env_change
       end
 
       def delete_env
-        raise Chef::Exceptions::UnsupportedAction, "#{self} does not support :delete"
+        obj = env_obj(@new_resource.key_name)
+        if obj
+          obj.delete_
+          broadcast_env_change
+        end
+        if ENV[@new_resource.key_name]
+          ENV.delete(@new_resource.key_name)
+        end
       end
 
       def modify_env
@@ -166,6 +183,25 @@ class Chef
       def new_values
         @new_values ||= new_resource.value.split(new_resource.delim)
       end
+
+      def env_value(key_name)
+        obj = env_obj(key_name)
+        obj.variablevalue if obj
+      end
+
+      def env_obj(key_name)
+        return @env_obj if @env_obj
+        wmi = WmiLite::Wmi.new
+        # Note that by design this query is case insensitive with regard to key_name
+        environment_variables = wmi.query("select * from Win32_Environment where name = '#{key_name}'")
+        if environment_variables && environment_variables.length > 0
+          environment_variables.each do |env|
+            @env_obj = env.wmi_ole_object
+            return @env_obj if @env_obj.username.split('\\').last.casecmp(new_resource.user) == 0
+          end
+        end
+        @env_obj = nil
+      end
     end
   end
 end