chef 12.15.19 → 12.16.42

data/lib/chef/node/mixin/immutablize_hash.rb

@@ -0,0 +1,54 @@
+#--
+# Copyright:: Copyright 2016, Chef Software, Inc.
+# 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
+  class Node
+    module Mixin
+      module ImmutablizeHash
+        DISALLOWED_MUTATOR_METHODS = [
+          :[]=,
+          :clear,
+          :collect!,
+          :default=,
+          :default_proc=,
+          :delete,
+          :delete_if,
+          :keep_if,
+          :map!,
+          :merge!,
+          :update,
+          :reject!,
+          :replace,
+          :select!,
+          :shift,
+          :write,
+          :write!,
+          :unlink,
+          :unlink!,
+        ]
+
+        # Redefine all of the methods that mutate a Hash to raise an error when called.
+        # This is the magic that makes this object "Immutable"
+        DISALLOWED_MUTATOR_METHODS.each do |mutator_method_name|
+          define_method(mutator_method_name) do |*args, &block|
+            raise Exceptions::ImmutableAttributeModification
+          end
+        end
+      end
+    end
+  end
+end

data/lib/chef/node/mixin/state_tracking.rb

@@ -0,0 +1,93 @@
+#--
+# Copyright:: Copyright 2016, Chef Software, Inc.
+# 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
+  class Node
+    module Mixin
+      module StateTracking
+        attr_reader :__path__
+        attr_reader :__root__
+        attr_reader :__node__
+        attr_reader :__precedence__
+
+        def initialize(data = nil, root = self, node = nil, precedence = nil)
+          # __path__ and __root__ must be nil when we call super so it knows
+          # to avoid resetting the cache on construction
+          data.nil? ? super() : super(data)
+          @__path__ = []
+          @__root__ = root
+          @__node__ = node
+          @__precedence__ = precedence
+        end
+
+        def [](key)
+          ret = super
+          next_path = [ __path__, convert_key(key) ].flatten.compact
+          copy_state_to(ret, next_path)
+        end
+
+        def []=(key, value)
+          ret = super
+          next_path = [ __path__, convert_key(key) ].flatten.compact
+          send_attribute_changed_event(next_path, value)
+          copy_state_to(ret, next_path)
+        end
+
+        protected
+
+        def __path__=(path)
+          @__path__ = path
+        end
+
+        def __root__=(root)
+          @__root__ = root
+        end
+
+        def __precedence__=(precedence)
+          @__precedence__ = precedence
+        end
+
+        def __node__=(node)
+          @__node__ = node
+        end
+
+        private
+
+        def send_attribute_changed_event(next_path, value)
+          if __node__ && __node__.run_context && __node__.run_context.events
+            __node__.run_context.events.attribute_changed(__precedence__, next_path, value)
+          end
+        end
+
+        def send_reset_cache(path = nil, key = nil)
+          next_path = [ path, key ].flatten.compact
+          __root__.reset_cache(next_path.first) if !__root__.nil? && __root__.respond_to?(:reset_cache) && !next_path.nil?
+        end
+
+        def copy_state_to(ret, next_path)
+          if ret.is_a?(StateTracking)
+            ret.__path__ = next_path
+            ret.__root__ = __root__
+            ret.__node__ = __node__
+            ret.__precedence__ = __precedence__
+          end
+          ret
+        end
+      end
+    end
+  end
+end

data/lib/chef/property.rb

@@ -522,22 +522,22 @@ class Chef
       # stack trace if you use `define_method`.
       declared_in.class_eval <<-EOM, __FILE__, __LINE__ + 1
         def #{name}(value=NOT_PASSED)
-          raise "Property #{name} of \#{self} cannot be passed a block! If you meant to create a resource named #{name} instead, you'll need to first rename the property." if block_given?
+          raise "Property `#{name}` of `\#{self}` was incorrectly passed a block.  Possible property-resource collision.  To call a resource named `#{name}` either rename the property or else use `declare_resource(:#{name}, ...)`" if block_given?
           self.class.properties[#{name.inspect}].call(self, value)
         end
         def #{name}=(value)
-          raise "Property #{name} of \#{self} cannot be passed a block! If you meant to create a resource named #{name} instead, you'll need to first rename the property." if block_given?
+          raise "Property `#{name}` of `\#{self}` was incorrectly passed a block.  Possible property-resource collision.  To call a resource named `#{name}` either rename the property or else use `declare_resource(:#{name}, ...)`" if block_given?
           self.class.properties[#{name.inspect}].set(self, value)
         end
       EOM
     rescue SyntaxError
       # If the name is not a valid ruby name, we use define_method.
       declared_in.define_method(name) do |value = NOT_PASSED, &block|
-        raise "Property #{name} of #{self} cannot be passed a block! If you meant to create a resource named #{name} instead, you'll need to first rename the property." if block
+        raise "Property `#{name}` of `#{self}` was incorrectly passed a block!  Possible property-resource collision.  To call a resource named `#{name}` either rename the property or else use `declare_resource(:#{name}, ...)`" if block
         self.class.properties[name].call(self, value)
       end
       declared_in.define_method("#{name}=") do |value, &block|
-        raise "Property #{name} of #{self} cannot be passed a block! If you meant to create a resource named #{name} instead, you'll need to first rename the property." if block
+        raise "Property `#{name}` of `#{self}` was incorrectly passed a block!  Possible property-resource collision.  To call a resource named `#{name}` either rename the property or else use `declare_resource(:#{name}, ...)`" if block
         self.class.properties[name].set(self, value)
       end
     end

data/lib/chef/provider/cron.rb

@@ -199,7 +199,7 @@ class Chef
 
       def set_environment_var(attr_name, attr_value)
         if %w{MAILTO PATH SHELL HOME}.include?(attr_name)
-          @current_resource.send(attr_name.downcase.to_sym, attr_value)
+          @current_resource.send(attr_name.downcase.to_sym, attr_value.gsub(/^"|"$/, ""))
         else
           @current_resource.environment(@current_resource.environment.merge(attr_name => attr_value))
         end

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

@@ -17,6 +17,7 @@
 #
 
 require "chef/provider/group/groupadd"
+require "etc"
 
 class Chef
   class Provider
@@ -36,24 +37,42 @@ class Chef
             a.failure_message Chef::Exceptions::Group, "Could not find binary /usr/sbin/groupmod for #{@new_resource.name}"
             # No whyrun alternative: this component should be available in the base install of any given system that uses it
           end
+
+          requirements.assert(:create, :manage, :modify) do |a|
+            a.assertion do
+              begin
+                to_add(@new_resource.members).all? { |member| Etc.getpwnam(member) }
+              rescue
+                false
+              end
+            end
+            a.failure_message Chef::Exceptions::Group, "Could not add users #{to_add(@new_resource.members).join(", ")} to #{@new_resource.group_name}: one of these users does not exist"
+            a.whyrun "Could not find one of these users: #{to_add(@new_resource.members).join(", ")}. Assuming it will be created by a prior step"
+          end
         end
 
         def set_members(members)
-          to_delete = @current_resource.members - members
-          to_delete.each do |member|
+          to_remove(members).each do |member|
             remove_member(member)
           end
 
-          to_add = members - @current_resource.members
-          to_add.each do |member|
+          to_add(members).each do |member|
             add_member(member)
           end
         end
 
+        def to_add(members)
+          members - @current_resource.members
+        end
+
         def add_member(member)
           shell_out!("groupmod -A #{member} #{@new_resource.group_name}")
         end
 
+        def to_remove(members)
+          @current_resource.members - members
+        end
+
         def remove_member(member)
           shell_out!("groupmod -R #{member} #{@new_resource.group_name}")
         end

data/lib/chef/provider/package.rb

@@ -31,6 +31,8 @@ class Chef
       include Chef::Mixin::ShellOut
       extend Chef::Mixin::SubclassDirective
 
+      use_inline_resources
+
       # subclasses declare this if they want all their arguments as arrays of packages and names
       subclass_directive :use_multipackage_api
       # subclasses declare this if they want sources (filenames) pulled from their package names
@@ -81,7 +83,7 @@ class Chef
         end
       end
 
-      def action_install
+      action :install do
         unless target_version_array.any?
           Chef::Log.debug("#{@new_resource} is already installed - nothing to do")
           return
@@ -116,7 +118,7 @@ class Chef
 
       private :install_description
 
-      def action_upgrade
+      action :upgrade do
         if !target_version_array.any?
           Chef::Log.debug("#{@new_resource} no versions to upgrade - nothing to do")
           return
@@ -146,7 +148,7 @@ class Chef
 
       private :upgrade_description
 
-      def action_remove
+      action :remove do
         if removing_package?
           description = @new_resource.version ? "version #{@new_resource.version} of " : ""
           converge_by("remove #{description}package #{@current_resource.package_name}") do
@@ -181,7 +183,7 @@ class Chef
         end
       end
 
-      def action_purge
+      action :purge do
         if removing_package?
           description = @new_resource.version ? "version #{@new_resource.version} of" : ""
           converge_by("purge #{description} package #{@current_resource.package_name}") do
@@ -193,7 +195,7 @@ class Chef
         end
       end
 
-      def action_reconfig
+      action :reconfig do
         if @current_resource.version == nil
           Chef::Log.debug("#{@new_resource} is NOT installed - nothing to do")
           return
@@ -218,6 +220,34 @@ class Chef
         end
       end
 
+      def action_lock
+        if package_locked(@new_resource.name, @new_resource.version) == false
+          description = @new_resource.version ? "version #{@new_resource.version} of " : ""
+          converge_by("lock #{description}package #{@current_resource.package_name}") do
+            multipackage_api_adapter(@current_resource.package_name, @new_resource.version) do |name, version|
+              lock_package(name, version)
+              Chef::Log.info("#{@new_resource} locked")
+            end
+          end
+        else
+          Chef::Log.debug("#{new_resource} is already locked")
+        end
+      end
+
+      def action_unlock
+        if package_locked(@new_resource.name, @new_resource.version) == true
+          description = @new_resource.version ? "version #{@new_resource.version} of " : ""
+          converge_by("unlock #{description}package #{@current_resource.package_name}") do
+            multipackage_api_adapter(@current_resource.package_name, @new_resource.version) do |name, version|
+              unlock_package(name, version)
+              Chef::Log.info("#{@new_resource} unlocked")
+            end
+          end
+        else
+          Chef::Log.debug("#{new_resource} is already unlocked")
+        end
+      end
+
       # @todo use composition rather than inheritance
 
       def multipackage_api_adapter(name, version)
@@ -252,6 +282,14 @@ class Chef
         raise( Chef::Exceptions::UnsupportedAction, "#{self} does not support :reconfig" )
       end
 
+      def lock_package(name, version)
+        raise( Chef::Exceptions::UnsupportedAction, "#{self} does not support :lock" )
+      end
+
+      def unlock_package(name, version)
+        raise( Chef::Exceptions::UnsupportedAction, "#{self} does not support :unlock" )
+      end
+
       # used by subclasses.  deprecated.  use #a_to_s instead.
       def expand_options(options)
         options ? " #{options}" : ""

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

@@ -70,6 +70,18 @@ class Chef
           @candidate_version ||= get_candidate_versions
         end
 
+        def package_locked(name, version)
+          islocked = false
+          locked = shell_out_with_timeout!("apt-mark showhold")
+          locked.stdout.each_line do |line|
+            line_package = line.strip
+            if line_package == name
+              islocked = true
+            end
+          end
+          return islocked
+        end
+
         def install_package(name, version)
           package_name = name.zip(version).map do |n, v|
             package_data[n][:virtual] ? n : "#{n}=#{v}"
@@ -105,6 +117,14 @@ class Chef
           run_noninteractive("dpkg-reconfigure", name)
         end
 
+        def lock_package(name, version)
+          run_noninteractive("apt-mark", new_resource.options, "hold", name)
+        end
+
+        def unlock_package(name, version)
+          run_noninteractive("apt-mark", new_resource.options, "unhold", name)
+        end
+
         private
 
         # Runs command via shell_out with magic environment to disable

data/lib/chef/provider/package/windows/exe.rb

@@ -89,9 +89,10 @@ class Chef
           end
 
           def current_installed_version
-            @current_installed_version ||= uninstall_entries.count == 0 ? nil : begin
-              uninstall_entries.map { |entry| entry.display_version }.uniq
-            end
+            @current_installed_version ||=
+              if uninstall_entries.count != 0
+                uninstall_entries.map { |entry| entry.display_version }.uniq
+              end
           end
 
           # http://unattended.sourceforge.net/installers.php

data/lib/chef/provider/package/windows/msi.rb

@@ -50,7 +50,7 @@ class Chef
               Chef::Log.debug("#{new_resource} checking package status and version for #{product_code}")
               get_installed_version(product_code)
             else
-              uninstall_entries.count == 0 ? nil : begin
+              if uninstall_entries.count != 0
                 uninstall_entries.map { |entry| entry.display_version }.uniq
               end
             end
@@ -79,9 +79,10 @@ class Chef
               uninstall_version = new_resource.version || installed_version
               uninstall_entries.select { |entry| [uninstall_version].flatten.include?(entry.display_version) }
                 .map { |version| version.uninstall_string }.uniq.each do |uninstall_string|
-                Chef::Log.debug("#{new_resource} removing MSI package version using '#{uninstall_string}'")
+                uninstall_string = "msiexec /x #{uninstall_string.match(/{.*}/)}"
                 uninstall_string += expand_options(new_resource.options)
-                uninstall_string += " /Q" unless uninstall_string =~ / \/Q\b/
+                uninstall_string += " /q" unless uninstall_string.downcase =~ / \/q/
+                Chef::Log.debug("#{new_resource} removing MSI package version using '#{uninstall_string}'")
                 shell_out!(uninstall_string, { :timeout => new_resource.timeout, :returns => new_resource.returns })
               end
             end

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

@@ -123,6 +123,18 @@ class Chef
           end
         end
 
+        def package_locked(name, version)
+          islocked = false
+          locked = shell_out_with_timeout!("yum versionlock")
+          locked.stdout.each_line do |line|
+            line_package = line.sub(/-[^-]*-[^-]*$/, "").split(":").last.strip
+            if line_package == name
+              islocked = true
+            end
+          end
+          return islocked
+        end
+
         # Standard Provider methods for Parent
         #
 
@@ -369,6 +381,14 @@ class Chef
           remove_package(name, version)
         end
 
+        def lock_package(name, version)
+          yum_command("-d0 -e0 -y#{expand_options(@new_resource.options)} versionlock add #{name}")
+        end
+
+        def unlock_package(name, version)
+          yum_command("-d0 -e0 -y#{expand_options(@new_resource.options)} versionlock delete #{name}")
+        end
+
         private
 
         def parse_arch(package_name)

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

@@ -75,6 +75,18 @@ class Chef
           end
         end
 
+        def package_locked(name, version)
+          islocked = false
+          locked = shell_out_with_timeout!("zypper locks")
+          locked.stdout.each_line do |line|
+            line_package = line.split("|").shift(2).last.strip
+            if line_package == name
+              islocked = true
+            end
+          end
+          return islocked
+        end
+
         def load_current_resource
           @current_resource = Chef::Resource::ZypperPackage.new(new_resource.name)
           current_resource.package_name(new_resource.package_name)
@@ -107,6 +119,14 @@ class Chef
           zypper_package("remove --clean-deps", name, version)
         end
 
+        def lock_package(name, version)
+          zypper_package("addlock", name, version)
+        end
+
+        def unlock_package(name, version)
+          zypper_package("removelock", name, version)
+        end
+
         private
 
         def zip(names, versions)