vagrant-clone 0.0.1 → 0.0.3

data/cookbooks/compat_resource/files/lib/chef_compat/monkeypatches/chef/resource_builder.rb

@@ -0,0 +1,167 @@
+#
+# Author:: Lamont Granquist (<lamont@chef.io>)
+# 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.
+#
+
+# XXX: we now have two copies of this file in the compat_resource cookbook.  I'm uncertain if this is a
+# bug or a feature, and I suspect it is actually a feature.  The point of this file is that for all
+# resources and cookbooks the global Chef::ResourceBuilder class must be upgraded to at least the
+# 12.10.24 version.  The point of the other copy is that for compat_resource cookbooks all their
+# resources should be using the lastest version that has been sync'd.  So these two files should
+# diverge as times goes on.  I believe that is the correct behavior and that we want to have both
+# files in this cookbook.
+
+# NOTE: this was extracted from the Recipe DSL mixin, relevant specs are in spec/unit/recipe_spec.rb
+
+if Gem::Requirement.new("< 12.10.24").satisfied_by?(Gem::Version.new(Chef::VERSION))
+  begin
+    require 'chef/resource_builder'
+    # we use the LoadError this creates on early 12.x to not monkeypatch chef client versions that don't have Chef::ResourceBuilder
+    # (it is lazily included and doesn't appear until compile time so we can't resolve the symbol during library loading)
+
+    class Chef
+      class ResourceBuilder
+        attr_reader :type
+        attr_reader :name
+        attr_reader :created_at
+        attr_reader :params
+        attr_reader :run_context
+        attr_reader :cookbook_name
+        attr_reader :recipe_name
+        attr_reader :enclosing_provider
+        attr_reader :resource
+
+        # FIXME (ruby-2.1 syntax): most of these are mandatory
+        def initialize(type:nil, name:nil, created_at: nil, params: nil, run_context: nil, cookbook_name: nil, recipe_name: nil, enclosing_provider: nil)
+          @type               = type
+          @name               = name
+          @created_at         = created_at
+          @params             = params
+          @run_context        = run_context
+          @cookbook_name      = cookbook_name
+          @recipe_name        = recipe_name
+          @enclosing_provider = enclosing_provider
+        end
+
+        def build(&block)
+          raise ArgumentError, "You must supply a name when declaring a #{type} resource" if name.nil?
+
+          @resource = resource_class.new(name, run_context)
+          if resource.resource_name.nil?
+            raise Chef::Exceptions::InvalidResourceSpecification, "#{resource}.resource_name is `nil`!  Did you forget to put `provides :blah` or `resource_name :blah` in your resource class?"
+          end
+          resource.source_line = created_at
+          resource.declared_type = type
+
+          # If we have a resource like this one, we want to steal its state
+          # This behavior is very counter-intuitive and should be removed.
+          # See CHEF-3694, https://tickets.opscode.com/browse/CHEF-3694
+          # Moved to this location to resolve CHEF-5052, https://tickets.opscode.com/browse/CHEF-5052
+          if prior_resource
+            resource.load_from(prior_resource)
+          end
+
+          resource.cookbook_name = cookbook_name
+          resource.recipe_name = recipe_name
+          # Determine whether this resource is being created in the context of an enclosing Provider
+          resource.enclosing_provider = enclosing_provider
+
+          # XXX: this is required for definition params inside of the scope of a
+          # subresource to work correctly.
+          resource.params = params
+
+          # Evaluate resource attribute DSL
+          if block_given?
+            resource.resource_initializing = true
+            begin
+              resource.instance_eval(&block)
+            ensure
+              resource.resource_initializing = false
+            end
+          end
+
+          # emit a cloned resource warning if it is warranted
+          if prior_resource
+            if is_trivial_resource?(prior_resource) && identicalish_resources?(prior_resource, resource)
+              emit_harmless_cloning_debug
+            else
+              emit_cloned_resource_warning
+            end
+          end
+
+          # Run optional resource hook
+          resource.after_created
+
+          resource
+        end
+
+        private
+
+        def resource_class
+          # Checks the new platform => short_name => resource mapping initially
+          # then fall back to the older approach (Chef::Resource.const_get) for
+          # backward compatibility
+          @resource_class ||= Chef::Resource.resource_for_node(type, run_context.node)
+        end
+
+        def is_trivial_resource?(resource)
+          identicalish_resources?(resource_class.new(name, run_context), resource)
+        end
+
+        # this is an equality test specific to checking for 3694 cloning warnings
+        def identicalish_resources?(first, second)
+          skipped_ivars = [ :@source_line, :@cookbook_name, :@recipe_name, :@params, :@elapsed_time, :@declared_type ]
+          checked_ivars = ( first.instance_variables | second.instance_variables ) - skipped_ivars
+          non_matching_ivars = checked_ivars.reject do |iv|
+            if iv == :@action && ( [first.instance_variable_get(iv)].flatten == [:nothing] || [second.instance_variable_get(iv)].flatten == [:nothing] )
+              # :nothing action on either side of the comparison always matches
+              true
+            else
+              first.instance_variable_get(iv) == second.instance_variable_get(iv)
+            end
+          end
+          Chef::Log.debug("ivars which did not match with the prior resource: #{non_matching_ivars}")
+          non_matching_ivars.empty?
+        end
+
+        def emit_cloned_resource_warning
+          Chef::Log.warn("Cloning resource attributes for #{resource} from prior resource (CHEF-3694)")
+          Chef::Log.warn("Previous #{prior_resource}: #{prior_resource.source_line}") if prior_resource.source_line
+          Chef::Log.warn("Current  #{resource}: #{resource.source_line}") if resource.source_line
+        end
+
+        def emit_harmless_cloning_debug
+          Chef::Log.debug("Harmless resource cloning from #{prior_resource}:#{prior_resource.source_line} to #{resource}:#{resource.source_line}")
+        end
+
+        def prior_resource
+          @prior_resource ||=
+            begin
+              key = "#{type}[#{name}]"
+              run_context.resource_collection.lookup_local(key)
+            rescue Chef::Exceptions::ResourceNotFound
+              nil
+            end
+        end
+
+      end
+    end
+  rescue LoadError
+    # cool we're just on early chef 12.x, nothing to do -- we don't have to worry because there's also not parent_run_context pointer, so we don't have to
+    # use lookup_local to avoid resource cloning shit out of the parent run_context.  the resource collection's lookup() method will always use lookup_local
+    # over lookup_recursive.
+  end
+end

data/cookbooks/compat_resource/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

data/cookbooks/compat_resource/files/lib/chef_compat/monkeypatches/chef/resource_collection/resource_set.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 ResourceSet
+          module DeleteResource
+            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
+              res = @resources_by_key.delete(key)
+
+              if res == @resources_by_key.default
+                raise Chef::Exceptions::ResourceNotFound, "Cannot find a resource matching #{key} (did you define it first?)"
+              end
+              res
+            end
+          end
+        end
+      end
+    end
+  end
+end
+
+class Chef::ResourceCollection::ResourceSet
+  unless method_defined?(:delete)
+    prepend ChefCompat::Monkeypatches::Chef::ResourceCollection::ResourceSet::DeleteResource
+  end
+end

data/cookbooks/compat_resource/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