compat_resource 12.9.1 → 12.10.1

data/files/lib/chef_compat/copied_from_chef/chef/mixin/notifying_block.rb

@@ -0,0 +1,66 @@
+begin
+  require 'chef/mixin/notifying_block'
+rescue LoadError; end
+
+require 'chef_compat/copied_from_chef'
+class Chef
+module ::ChefCompat
+module CopiedFromChef
+#--
+# Author:: Lamont Granquist <lamont@chef.io>
+# Copyright:: Copyright 2010-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 < (defined?(::Chef) ? ::Chef : Object)
+  module Mixin
+    CopiedFromChef.extend_chef_module(::Chef::Mixin, self) if defined?(::Chef::Mixin)
+    module NotifyingBlock
+      CopiedFromChef.extend_chef_module(::Chef::Mixin::NotifyingBlock, self) if defined?(::Chef::Mixin::NotifyingBlock)
+
+      def notifying_block(&block)
+        begin
+          subcontext = subcontext_block(&block)
+          Chef::Runner.new(subcontext).converge
+        ensure
+          # recipes don't have a new_resource
+          if respond_to?(:new_resource)
+            if subcontext && subcontext.resource_collection.any?(&:updated?)
+              new_resource.updated_by_last_action(true)
+            end
+          end
+        end
+      end
+
+      def subcontext_block(parent_context = nil, &block)
+        parent_context ||= @run_context
+        sub_run_context = parent_context.create_child
+
+        begin
+          outer_run_context = @run_context
+          @run_context = sub_run_context
+          instance_eval(&block)
+        ensure
+          @run_context = outer_run_context
+        end
+
+        sub_run_context
+      end
+
+    end
+  end
+end
+end
+end
+end

data/files/lib/chef_compat/copied_from_chef/chef/mixin/powershell_out.rb

@@ -0,0 +1,109 @@
+begin
+  require 'chef/mixin/powershell_out'
+rescue LoadError; end
+
+require 'chef_compat/copied_from_chef'
+class Chef
+module ::ChefCompat
+module CopiedFromChef
+#--
+# Copyright:: Copyright 2015-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 < (defined?(::Chef) ? ::Chef : Object)
+  module Mixin
+    CopiedFromChef.extend_chef_module(::Chef::Mixin, self) if defined?(::Chef::Mixin)
+    module PowershellOut
+      CopiedFromChef.extend_chef_module(::Chef::Mixin::PowershellOut, self) if defined?(::Chef::Mixin::PowershellOut)
+      include Chef::Mixin::ShellOut
+      include Chef::Mixin::WindowsArchitectureHelper
+
+      # Run a command under powershell with the same API as shell_out.  The
+      # options hash is extended to take an "architecture" flag which
+      # can be set to :i386 or :x86_64 to force the windows architecture.
+      #
+      # @param script [String] script to run
+      # @param options [Hash] options hash
+      # @return [Mixlib::Shellout] mixlib-shellout object
+      def powershell_out(*command_args)
+        script = command_args.first
+        options = command_args.last.is_a?(Hash) ? command_args.last : nil
+
+        run_command_with_os_architecture(script, options)
+      end
+
+      # Run a command under powershell with the same API as shell_out!
+      # (raises exceptions on errors)
+      #
+      # @param script [String] script to run
+      # @param options [Hash] options hash
+      # @return [Mixlib::Shellout] mixlib-shellout object
+      def powershell_out!(*command_args)
+        cmd = powershell_out(*command_args)
+        cmd.error!
+        cmd
+      end
+
+      private
+
+      # Helper function to run shell_out and wrap it with the correct
+      # flags to possibly disable WOW64 redirection (which we often need
+      # because chef-client runs as a 32-bit app on 64-bit windows).
+      #
+      # @param script [String] script to run
+      # @param options [Hash] options hash
+      # @return [Mixlib::Shellout] mixlib-shellout object
+      def run_command_with_os_architecture(script, options)
+        options ||= {}
+        options = options.dup
+        arch = options.delete(:architecture)
+
+        with_os_architecture(nil, architecture: arch) do
+          shell_out(
+            build_powershell_command(script),
+            options
+          )
+        end
+      end
+
+      # Helper to build a powershell command around the script to run.
+      #
+      # @param script [String] script to run
+      # @retrurn [String] powershell command to execute
+      def build_powershell_command(script)
+        flags = [
+          # Hides the copyright banner at startup.
+          "-NoLogo",
+          # Does not present an interactive prompt to the user.
+          "-NonInteractive",
+          # Does not load the Windows PowerShell profile.
+          "-NoProfile",
+          # always set the ExecutionPolicy flag
+          # see http://technet.microsoft.com/en-us/library/ee176961.aspx
+          "-ExecutionPolicy Unrestricted",
+          # Powershell will hang if STDIN is redirected
+          # http://connect.microsoft.com/PowerShell/feedback/details/572313/powershell-exe-can-hang-if-stdin-is-redirected
+          "-InputFormat None",
+        ]
+
+        "powershell.exe #{flags.join(' ')} -Command \"#{script}\""
+      end
+    end
+  end
+end
+end
+end
+end

data/files/lib/chef_compat/copied_from_chef/chef/property.rb

@@ -77,6 +77,9 @@ class Chef < (defined?(::Chef) ? ::Chef : Object)
     #     property defaults to the same value as `name`. Equivalent to
     #     `default: lazy { name }`, except that #property_is_set? will
     #     return `true` if the property is set *or* if `name` is set.
+    #   @option options [Boolean] :nillable `true` opt-in to Chef-13 style behavior where
+    #     attempting to set a nil value will really set a nil value instead of issuing
+    #     a warning and operating like a getter
     #   @option options [Object] :default The value this property
     #     will return if the user does not set one. If this is `lazy`, it will
     #     be run in the context of the instance (and able to access other
@@ -239,7 +242,7 @@ super if defined?(::Chef::Property)
     #
     def validation_options
       @validation_options ||= options.reject { |k, v|
-        [:declared_in, :name, :instance_variable_name, :desired_state, :identity, :default, :name_property, :coerce, :required].include?(k)
+        [:declared_in, :name, :instance_variable_name, :desired_state, :identity, :default, :name_property, :coerce, :required, :nillable].include?(k)
       }
     end
 
@@ -268,7 +271,7 @@ super if defined?(::Chef::Property)
         return get(resource)
       end
 
-      if value.nil?
+      if value.nil? && !nillable?
         # In Chef 12, value(nil) does a *get* instead of a set, so we
         # warn if the value would have been changed. In Chef 13, it will be
         # equivalent to value = nil.
@@ -676,6 +679,10 @@ super if defined?(::Chef::Property)
 
       result
     end
+
+    def nillable?
+      !!options[:nillable]
+    end
   end
 end
 end

data/files/lib/chef_compat/copied_from_chef/chef/provider.rb

@@ -6,8 +6,10 @@ require 'chef_compat/copied_from_chef'
 class Chef
 module ::ChefCompat
 module CopiedFromChef
+require "chef_compat/copied_from_chef/chef/dsl/core"
 class Chef < (defined?(::Chef) ? ::Chef : Object)
   class Provider < (defined?(::Chef::Provider) ? ::Chef::Provider : Object)
+    include Chef::DSL::Core
     attr_accessor :action
     def initialize(new_resource, run_context)
 super if defined?(::Chef::Provider)
@@ -145,8 +147,6 @@ super if defined?(::Chef::Provider)
           end
         end
       end
-      require "chef_compat/copied_from_chef/chef/dsl/recipe"
-      include Chef::DSL::Recipe::FullDSL
     end
     protected
   end

data/files/lib/chef_compat/copied_from_chef/chef/resource.rb

@@ -9,6 +9,7 @@ module CopiedFromChef
 require "chef_compat/copied_from_chef/chef/resource/action_class"
 require "chef_compat/copied_from_chef/chef/provider"
 require "chef_compat/copied_from_chef/chef/mixin/properties"
+require "chef_compat/copied_from_chef/chef/mixin/powershell_out"
 class Chef < (defined?(::Chef) ? ::Chef : Object)
   class Resource < (defined?(::Chef::Resource) ? ::Chef::Resource : Object)
     include Chef::Mixin::Properties

data/files/lib/chef_compat/copied_from_chef/chef/resource/action_class.rb

@@ -24,11 +24,14 @@ module CopiedFromChef
 # limitations under the License.
 #
 
+require "chef_compat/copied_from_chef/chef/dsl/recipe"
 
 class Chef < (defined?(::Chef) ? ::Chef : Object)
   class Resource < (defined?(::Chef::Resource) ? ::Chef::Resource : Object)
     module ActionClass
       CopiedFromChef.extend_chef_module(::Chef::Resource::ActionClass, self) if defined?(::Chef::Resource::ActionClass)
+      include Chef::DSL::Recipe
+
       def to_s
         "#{new_resource || "<no resource>"} action #{action ? action.inspect : "<no action>"}"
       end

data/files/lib/chef_compat/copied_from_chef/chef/resource_builder.rb

@@ -146,7 +146,7 @@ super if defined?(::Chef::ResourceBuilder)
       @prior_resource ||=
         begin
           key = "#{type}[#{name}]"
-          run_context.resource_collection.lookup(key)
+          run_context.resource_collection.lookup_local(key)
         rescue Chef::Exceptions::ResourceNotFound
           nil
         end

data/files/lib/chef_compat/monkeypatches.rb

@@ -1,10 +1,14 @@
 require 'chef_compat/monkeypatches/chef'
+require 'chef_compat/monkeypatches/chef/exceptions'
 require 'chef_compat/monkeypatches/chef/log'
 require 'chef_compat/monkeypatches/chef/mixin/params_validate'
-require 'chef_compat/monkeypatches/chef/recipe'
-require 'chef_compat/monkeypatches/chef/resource'
 require 'chef_compat/monkeypatches/chef/property'
 require 'chef_compat/monkeypatches/chef/provider'
+require 'chef_compat/monkeypatches/chef/recipe'
+require 'chef_compat/monkeypatches/chef/resource'
 require 'chef_compat/monkeypatches/chef/resource/lwrp_base'
-require 'chef_compat/monkeypatches/chef/exceptions'
+require 'chef_compat/monkeypatches/chef/resource_collection'
+require 'chef_compat/monkeypatches/chef/resource_collection/resource_list'
+require 'chef_compat/monkeypatches/chef/resource_collection/resource_set'
 require 'chef_compat/monkeypatches/chef/run_context'
+require 'chef_compat/monkeypatches/chef/runner'

data/files/lib/chef_compat/monkeypatches/chef.rb

@@ -18,8 +18,8 @@ class Chef
 
       begin
         super
-      # Bleagh. `super_method` doesn't exist on older rubies and I haven't
-      # figured out a way to check for its existence otherwise.
+        # Bleagh. `super_method` doesn't exist on older rubies and I haven't
+        # figured out a way to check for its existence otherwise.
       rescue NoMethodError
         Chef::Log.warn(message)
       end
@@ -29,4 +29,5 @@ class Chef
   class<<self
     prepend ChefCompatDeprecation
   end
+
 end

data/files/lib/chef_compat/monkeypatches/chef/log.rb

@@ -19,3 +19,16 @@ end
 class<<::Chef::Log
   prepend ChefCompat::Monkeypatches::Log
 end
+
+class Chef
+  class Log
+    unless method_defined?(:deprecation)
+      module ChefCompatDeprecation
+        def deprecation(message, location=nil)
+          Chef.log_deprecation(message, location)
+        end
+      end
+      extend ChefCompatDeprecation
+    end
+  end
+end

data/files/lib/chef_compat/monkeypatches/chef/resource_collection.rb

@@ -0,0 +1,103 @@
+#
+# Author:: Adam Jacob (<adam@chef.io>)
+# Author:: Christopher Walters (<cw@chef.io>)
+# Copyright:: Copyright 2008-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.
+#
+
+require "chef/resource_collection/resource_set"
+require "chef/resource_collection/resource_list"
+require "chef/resource_collection"
+require "chef/exceptions"
+
+module ChefCompat
+  module Monkeypatches
+    module Chef
+      module ResourceCollection
+        module RecursiveNotificationLookup
+          #
+          # Copied verbatim from Chef 12.10.24
+          #
+          attr_accessor :run_context
+
+          def initialize(run_context = nil)
+            super()
+            @run_context = run_context
+          end
+
+          def lookup_local(key)
+            resource_set.lookup(key)
+          end
+
+          def find_local(*args)
+            resource_set.find(*args)
+          end
+
+          def lookup(key)
+            if run_context.nil?
+              lookup_local(key)
+            else
+              lookup_recursive(run_context, key)
+            end
+          end
+
+          def find(*args)
+            if run_context.nil?
+              find_local(*args)
+            else
+              find_recursive(run_context, *args)
+            end
+          end
+
+          private
+
+          def lookup_recursive(rc, key)
+            rc.resource_collection.send(:resource_set).lookup(key)
+          rescue ::Chef::Exceptions::ResourceNotFound
+            raise if !rc.respond_to?(:parent_run_context) || rc.parent_run_context.nil?
+            lookup_recursive(rc.parent_run_context, key)
+          end
+
+          def find_recursive(rc, *args)
+            rc.resource_collection.send(:resource_set).find(*args)
+          rescue ::Chef::Exceptions::ResourceNotFound
+            raise if !rc.respond_to?(:parent_run_context) || rc.parent_run_context.nil?
+            find_recursive(rc.parent_run_context, *args)
+          end
+        end
+
+        module DeleteResources
+          #
+          # Copied verbatim from Chef 12.10.24
+          #
+          def delete(key)
+            resource_list.delete(key)
+            resource_set.delete(key)
+          end
+        end
+      end
+    end
+  end
+end
+
+
+class Chef::ResourceCollection
+  unless method_defined?(:lookup_local)
+    prepend ChefCompat::Monkeypatches::Chef::ResourceCollection::RecursiveNotificationLookup
+  end
+  unless method_defined?(:delete)
+    prepend ChefCompat::Monkeypatches::Chef::ResourceCollection::DeleteResources
+  end
+end

data/files/lib/chef_compat/monkeypatches/chef/resource_collection/resource_list.rb

@@ -0,0 +1,49 @@
+#
+# Author:: Tyler Ball (<tball@chef.io>)
+# Copyright:: Copyright 2014-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.
+#
+
+require "chef/resource_collection/resource_list"
+require "chef/exceptions"
+
+module ChefCompat
+  module Monkeypatches
+    module Chef
+      module ResourceCollection
+        module ResourceList
+          module DeleteResource
+            # Copied verbatim from Chef 12.10.4
+            def delete(key)
+              raise ArgumentError, "Must pass a Chef::Resource or String to delete" unless key.is_a?(String) || key.is_a?(Chef::Resource)
+              key = key.to_s
+              ret = @resources.reject! { |r| r.to_s == key }
+              if ret.nil?
+                raise ::Chef::Exceptions::ResourceNotFound, "Cannot find a resource matching #{key} (did you define it first?)"
+              end
+              ret
+            end
+          end
+        end
+      end
+    end
+  end
+end
+
+class Chef::ResourceCollection::ResourceList
+  unless method_defined?(:delete)
+    prepend ChefCompat::Monkeypatches::Chef::ResourceCollection::ResourceList::DeleteResource
+  end
+end